Merge pull request #2519 from umbraco/v15/feature/fix-block-grid-edit…

…or-circular-imports-take-1 Feature: Fix imports for circular deps
umbraco · Nov 7, 2024 · f3eefdd · f3eefdd
2 parents 8916717 + 5ae423e
commit f3eefdd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...ck/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts b/...ck/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts
@@ -1,7 +1,8 @@
+import type { UmbBlockGridTypeAreaType } from '../../types.js';
+import { UMB_BLOCK_GRID_ENTRY_CONTEXT } from '../../context/index.js';
 import { UMB_BLOCK_GRID_MANAGER_CONTEXT } from '../../context/block-grid-manager.context-token.js';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { css, customElement, html, repeat, state } from '@umbraco-cms/backoffice/external/lit';
-import { UMB_BLOCK_GRID_ENTRY_CONTEXT, type UmbBlockGridTypeAreaType } from '@umbraco-cms/backoffice/block-grid';
 
 import '../block-grid-entries/index.js';
 /**

diff --git a/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts b/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts
@@ -1,5 +1,6 @@
 import { UmbBlockGridEntriesContext } from '../../context/block-grid-entries.context.js';
 import type { UmbBlockGridEntryElement } from '../block-grid-entry/index.js';
+import type { UmbBlockGridLayoutModel } from '../../types.js';
 import {
 	getAccumulatedValueOfIndex,
 	getInterpolatedIndexOfPositionInWeightMap,
@@ -16,7 +17,6 @@ import {
 	type UmbFormControlValidatorConfig,
 } from '@umbraco-cms/backoffice/validation';
 import type { UmbNumberRangeValueType } from '@umbraco-cms/backoffice/models';
-import type { UmbBlockGridLayoutModel } from '@umbraco-cms/backoffice/block-grid';
 
 /**
  * Notice this utility method is not really shareable with others as it also takes areas into account. [NL]

diff --git a/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts b/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts
@@ -1,10 +1,11 @@
 import { UmbBlockGridEntryContext } from '../../context/block-grid-entry.context.js';
+import type { UmbBlockGridLayoutModel } from '../../types.js';
+import { UMB_BLOCK_GRID } from '../../constants.js';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { html, css, customElement, property, state, nothing } from '@umbraco-cms/backoffice/external/lit';
 import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
 import { stringOrStringArrayContains } from '@umbraco-cms/backoffice/utils';
-import { UMB_BLOCK_GRID, type UmbBlockGridLayoutModel } from '@umbraco-cms/backoffice/block-grid';
 
 import '../block-grid-block-inline/index.js';
 import '../block-grid-block/index.js';

diff --git a/src/packages/block/block-grid/components/block-scale-handler/block-scale-handler.element.ts b/src/packages/block/block-grid/components/block-scale-handler/block-scale-handler.element.ts
@@ -1,7 +1,6 @@
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { html, css, customElement } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
-import '../block-grid-block/index.js';
 
 /**
  * @element umb-block-scale-handler