Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Fix imports for circular deps #2519

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Feature: Fix imports for circular deps #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47952fa
fix imports
nielslyngsoe Nov 7, 2024
5ae423e
Merge branch 'main' into v15/feature/fix-block-grid-editor-circular-i…
nielslyngsoe Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ck/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
/**
Expand Down
2 changes: 1 addition & 1 deletion src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
1 change: 0 additions & 1 deletion src/packages/block/block-grid/components/block-scale-handler/block-scale-handler.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading