Merge pull request #1952 from umbraco/v14/bugfix/block-grid-adjust-co…

…lumnSpan-to-context Fix: Block Grid Editor - Adjust columnSpan to context
umbraco · May 29, 2024 · 2977336 · 2977336
2 parents 6c6ad7f + 91ca3e4
commit 2977336
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/packages/block/block-grid/context/block-grid-entry.context.ts b/src/packages/block/block-grid/context/block-grid-entry.context.ts
@@ -206,9 +206,9 @@ export class UmbBlockGridEntryContext
 
 		// Secure columnSpan fits options:
 		this.observe(
-			observeMultiple([this.layout, this.columnSpan, this.relevantColumnSpanOptions, this._entries.layoutColumns]),
-			([layout, columnSpan, relevantColumnSpanOptions, layoutColumns]) => {
-				if (!layout || !layoutColumns) return;
+			observeMultiple([this.columnSpan, this.relevantColumnSpanOptions, this._entries.layoutColumns]),
+			([columnSpan, relevantColumnSpanOptions, layoutColumns]) => {
+				if (!layoutColumns) return;
 				const newColumnSpan = this.#calcColumnSpan(
 					columnSpan ?? layoutColumns,
 					relevantColumnSpanOptions,

diff --git a/src/packages/block/block/context/block-entry.context.ts b/src/packages/block/block/context/block-entry.context.ts
@@ -146,15 +146,15 @@ export abstract class UmbBlockEntryContext<
 		// Consume block manager:
 		this.consumeContext(blockManagerContextToken, (manager) => {
 			this._manager = manager;
-			this.#gotManager();
 			this._gotManager();
+			this.#gotManager();
 		});
 
 		// Consume block entries:
 		this.consumeContext(blockEntriesContextToken, (entries) => {
 			this._entries = entries;
-			this.#gotEntries();
 			this._gotEntries();
+			this.#gotEntries();
 		});
 
 		// Observe UDI: