yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1830 from umbraco/bugfix/block-grid-detect-allowed-blocks-of-area

Browse Source 
Block Grid: Detect right blocks allowed fix
This commit is contained in:
Jacob Overgaard
2024-05-21 09:14:24 +02:00
committed by GitHub
parent 3d14ffb2ea 9877a6c89f
commit 7263a7cae8
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts
View File

@@ -120,7 +120,7 @@ export class UmbBlockGridEntriesContext
protected _gotBlockManager() {
if (!this._manager) return;
this.#allowedBlockTypes.setValue(this.#retrieveAllowedElementTypes());
this.#getAllowedBlockTypes();
this.observe(
this._manager.propertyAlias,
@@ -154,6 +154,7 @@ export class UmbBlockGridEntriesContext
await this._retrieveManager;
if (!this._manager) return;
this.removeUmbControllerByAlias('observeParentUnique');
this.setParentUnique(null);
this.observe(
this._manager.layouts,
@@ -170,8 +171,6 @@ export class UmbBlockGridEntriesContext
'observeThisLayouts',
);
this.removeUmbControllerByAlias('observeAreaType');
const hostEl = this.getHostElement() as HTMLElement | undefined;
if (hostEl) {
hostEl.removeAttribute('data-area-alias');
@@ -181,6 +180,9 @@ export class UmbBlockGridEntriesContext
hostEl.style.removeProperty('--umb-block-grid--area-column-span');
hostEl.style.removeProperty('--umb-block-grid--area-row-span');
}
this.removeUmbControllerByAlias('observeAreaType');
this.#getAllowedBlockTypes();
} else {
if (!this.#parentEntry) return;
@@ -221,12 +223,19 @@ export class UmbBlockGridEntriesContext
hostEl.style.setProperty('--umb-block-grid--grid-columns', areaType?.columnSpan?.toString() ?? '');
hostEl.style.setProperty('--umb-block-grid--area-column-span', areaType?.columnSpan?.toString() ?? '');
hostEl.style.setProperty('--umb-block-grid--area-row-span', areaType?.rowSpan?.toString() ?? '');
this.#getAllowedBlockTypes();
},
'observeAreaType',
);
}
}
#getAllowedBlockTypes() {
if (this.#areaKey === undefined || !this._manager) return;
this.#allowedBlockTypes.setValue(this.#retrieveAllowedElementTypes());
}
getPathForCreateBlock(index: number) {
return this._catalogueRouteBuilderState.getValue()?.({ view: 'create', index: index });
}