Merge branch 'main' into v15/feature/template-insert-modal-validation

src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.modal-token.ts

@@ -1,4 +1,4 @@
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type

src/packages/block/block-grid/workspace/block-grid-type-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import { UMB_BLOCK_GRID_TYPE, type UmbBlockGridTypeModel } from '../types.js';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export type UmbBlockGridTypeWorkspaceData = UmbWorkspaceModalData<UmbBlockGridTypeModel>;

src/packages/block/block-grid/workspace/block-grid-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import type { UmbBlockWorkspaceData, UmbBlockWorkspaceOriginData } from '@umbraco-cms/backoffice/block';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbBlockGridWorkspaceOriginData extends UmbBlockWorkspaceOriginData {

src/packages/block/block-list/property-editors/block-list-type-configuration/property-editor-ui-block-list-type-configuration.element.ts

@@ -8,7 +8,7 @@ import {
 	type UmbPropertyEditorConfigCollection,
 } from '@umbraco-cms/backoffice/property-editor';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 
 /**

src/packages/block/block-list/workspace/block-list-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import type { UmbBlockWorkspaceData } from '@umbraco-cms/backoffice/block';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbBlockListWorkspaceOriginData {

src/packages/block/block-rte/workspace/block-rte-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import type { UmbBlockWorkspaceData } from '@umbraco-cms/backoffice/block';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type

src/packages/block/block/workspace/block-workspace.modal-token.ts

@@ -1,4 +1,4 @@
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type

src/packages/core/modal/common/code-editor/code-editor-modal.element.ts → src/packages/code-editor/code-editor-modal/code-editor-modal.element.ts

@@ -1,9 +1,7 @@
+import type { UmbCodeEditorElement } from '../components/code-editor.element.js';
+import type { UmbCodeEditorModalData, UmbCodeEditorModalValue } from './code-editor-modal.token.js';
 import { css, html, ifDefined, customElement, query } from '@umbraco-cms/backoffice/external/lit';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
-import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor';
-import type { UmbCodeEditorModalData, UmbCodeEditorModalValue } from '@umbraco-cms/backoffice/modal';
-
-import '@umbraco-cms/backoffice/code-editor';
 
 const elementName = 'umb-code-editor-modal';
 

src/packages/core/modal/common/code-editor/code-editor-modal.stories.ts → src/packages/code-editor/code-editor-modal/code-editor-modal.stories.ts

@@ -1,8 +1,8 @@
 import '../confirm/confirm-modal.element.js';
 
+import type { UmbCodeEditorModalData } from './code-editor-modal.token.js';
 import type { Meta, Story } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbCodeEditorModalData } from '@umbraco-cms/backoffice/modal';
 
 export default {
 	title: 'API/Modals/Layouts/Code Editor',

src/packages/core/modal/token/code-editor-modal.token.ts → src/packages/code-editor/code-editor-modal/code-editor-modal.token.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 // TODO => investigate why exporting CodeEditorLanguage in code-editor barrel
 // causes the schema generation task to fail... For now, language property below

src/packages/code-editor/code-editor-modal/index.ts

@@ -0,0 +1 @@
+export * from './code-editor-modal.token.js';

src/packages/code-editor/code-editor-modal/manifests.ts

@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.CodeEditor',
+		name: 'Code Editor Modal',
+		element: () => import('./code-editor-modal.element.js'),
+	},
+];

src/packages/code-editor/index.ts

@@ -1,5 +1,7 @@
 export * from './components/index.js';
 export * from './models/index.js';
+export * from './code-editor-modal/index.js';
+
 export type { UmbCodeEditorController } from './code-editor.controller.js';
 
 /**

src/packages/code-editor/manifests.ts

@@ -1,3 +1,4 @@
 import { manifest as propertyEditorManifest } from './property-editor/manifests.js';
+import { manifests as codeEditorModalManifests } from './code-editor-modal/manifests.js';
 
-export const manifests: Array<UmbExtensionManifest> = [propertyEditorManifest];
+export const manifests: Array<UmbExtensionManifest> = [propertyEditorManifest, ...codeEditorModalManifests];

src/packages/core/content-type/workspace/views/design/content-type-design-editor-tab.element.ts

@@ -6,7 +6,7 @@ import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import type { UmbContentTypeModel, UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type';
 import type { UmbSorterConfig } from '@umbraco-cms/backoffice/sorter';
 

src/packages/core/modal/common/icon-picker/icon-picker-modal.element.ts → src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts

@@ -1,10 +1,10 @@
+import type { UmbIconPickerModalData, UmbIconPickerModalValue } from './icon-picker-modal.token.js';
 import { css, customElement, html, nothing, query, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { extractUmbColorVariable, umbracoColors } from '@umbraco-cms/backoffice/resources';
 import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_ICON_REGISTRY_CONTEXT, type UmbIconDefinition } from '@umbraco-cms/backoffice/icon';
-import type { UmbIconPickerModalData, UmbIconPickerModalValue } from '@umbraco-cms/backoffice/modal';
 import type { UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-icon-picker-modal')

src/packages/core/modal/common/icon-picker/icon-picker-modal.stories.ts → src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.stories.ts

@@ -2,11 +2,10 @@ import '../../../components/body-layout/body-layout.element.js';
 import './icon-picker-modal.element.js';
 
 import type { UmbIconPickerModalElement } from './icon-picker-modal.element.js';
+import type { UmbIconPickerModalValue } from './icon-picker-modal.token.js';
 import type { Meta, Story } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';
 
-import type { UmbIconPickerModalValue } from '@umbraco-cms/backoffice/modal';
-
 export default {
 	title: 'API/Modals/Layouts/Icon Picker',
 	component: 'umb-icon-picker-modal',

src/packages/core/modal/token/icon-picker-modal.token.ts → src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.token.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export type UmbIconPickerModalData = never;
 

src/packages/core/icon-registry/icon-picker-modal/index.ts

@@ -0,0 +1,2 @@
+export * from './icon-picker-modal.token.js';
+export * from './icon-picker-modal.element.js';

src/packages/core/icon-registry/icon-picker-modal/manifests.ts

@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.IconPicker',
+		name: 'Icon Picker Modal',
+		element: () => import('./icon-picker-modal.element.js'),
+	},
+];

src/packages/core/icon-registry/index.ts

@@ -2,3 +2,4 @@ export * from './icon-registry.context-token.js';
 export * from './icon-registry.context.js';
 export * from './icon.registry.js';
 export * from './types.js';
+export * from './icon-picker-modal/index.js';

src/packages/core/icon-registry/manifests.ts

@@ -1,3 +1,5 @@
+import { manifests as iconPickerModalManifests } from './icon-picker-modal/manifests.js';
+
 export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'icons',
@@ -11,4 +13,5 @@ export const manifests: Array<UmbExtensionManifest> = [
 		name: 'Icons Context',
 		api: () => import('./icon-registry.context.js'),
 	},
+	...iconPickerModalManifests,
 ];

src/packages/core/modal/common/manifests.ts

@@ -5,18 +5,6 @@ export const manifests: Array<UmbExtensionManifest> = [
 		name: 'Confirm Modal',
 		element: () => import('./confirm/confirm-modal.element.js'),
 	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.IconPicker',
-		name: 'Icon Picker Modal',
-		element: () => import('./icon-picker/icon-picker-modal.element.js'),
-	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.CodeEditor',
-		name: 'Code Editor Modal',
-		element: () => import('./code-editor/code-editor-modal.element.js'),
-	},
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.EmbeddedMedia',

src/packages/core/modal/token/index.ts

@@ -1,11 +1,8 @@
 export * from './change-password-modal.token.js';
-export * from './code-editor-modal.token.js';
 export * from './confirm-modal.token.js';
 export * from './debug-modal.token.js';
 export * from './embedded-media-modal.token.js';
 export * from './entity-user-permission-settings-modal.token.js';
-export * from './icon-picker-modal.token.js';
 export * from './item-picker-modal.token.js';
 export * from './modal-token.js';
 export * from './property-editor-ui-picker-modal.token.js';
-export * from './workspace-modal.token.js';

src/packages/core/property-type/workspace/property-type-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import { UMB_PROPERTY_TYPE_ENTITY_TYPE } from './constants.js';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbPropertyTypeWorkspaceData extends UmbWorkspaceModalData {

src/packages/core/tree/tree-picker-modal/tree-picker-modal.element.ts

@@ -3,7 +3,8 @@ import { UmbTreeItemPickerContext } from '../tree-item-picker/index.js';
 import type { UmbTreePickerModalData, UmbTreePickerModalValue } from './tree-picker-modal.token.js';
 import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
 import { html, customElement, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
-import { UMB_WORKSPACE_MODAL, UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
+import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbDeselectedEvent, UmbSelectedEvent } from '@umbraco-cms/backoffice/event';
 import type { UmbTreeItemModelBase } from '@umbraco-cms/backoffice/tree';

src/packages/core/tree/tree-picker-modal/tree-picker-modal.token.ts

@@ -1,6 +1,7 @@
 import type { UmbTreeStartNode } from '../types.js';
 import { UMB_TREE_PICKER_MODAL_ALIAS } from './constants.js';
-import type { UmbPickerModalData, UmbPickerModalValue, UmbWorkspaceModalData } from '@umbraco-cms/backoffice/modal';
+import type { UmbPickerModalData, UmbPickerModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 import type { UmbPathPattern, UmbPathPatternParamsType } from '@umbraco-cms/backoffice/router';
 

src/packages/core/workspace/modals/index.ts

@@ -1 +1,2 @@
 export * from './workspace-modal.element.js';
+export * from './workspace-modal.token.js';

src/packages/core/workspace/modals/workspace-modal.element.ts

@@ -1,7 +1,7 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
 import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbWorkspaceModalData } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData } from '@umbraco-cms/backoffice/workspace';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 @customElement('umb-workspace-modal')

src/packages/core/modal/token/workspace-modal.token.ts → src/packages/core/workspace/modals/workspace-modal.token.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 export interface UmbWorkspaceModalData<DataModelType = unknown> {
 	entityType: string;
 	preset: Partial<DataModelType>;

src/packages/data-type/workspace/data-type-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import type { UmbDataTypeDetailModel } from '../types.js';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export const UMB_DATATYPE_WORKSPACE_MODAL = new UmbModalToken<

src/packages/data-type/workspace/views/info/data-type-workspace-view-info-reference.element.ts

@@ -3,7 +3,7 @@ import type { UmbDataTypeReferenceModel } from '../../../reference/index.js';
 import { css, html, customElement, state, repeat, property, when } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import type { UmbModalRouteBuilder } from '@umbraco-cms/backoffice/router';
 

src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts

@@ -2,7 +2,8 @@ import { UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT } from './document-type-workspace.c
 import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
 import { umbFocus, UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import { UMB_MODAL_MANAGER_CONTEXT, UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
 import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
 import { umbBindToValidation } from '@umbraco-cms/backoffice/validation';
 

src/packages/documents/document-types/workspace/document-type-workspace.modal-token.ts

@@ -1,7 +1,8 @@
 import { UMB_DOCUMENT_TYPE_ENTITY_TYPE } from '../entity.js';
-import { UMB_WORKSPACE_MODAL, UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import type { UmbDeepPartialObject } from '@umbraco-cms/backoffice/utils';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface UmbDocumentTypeWorkspaceData extends UmbWorkspaceModalData {}

src/packages/documents/documents/collection/action/create-document-collection-action.element.ts

@@ -8,7 +8,7 @@ import {
 	UMB_DOCUMENT_ROOT_ENTITY_TYPE,
 	UMB_DOCUMENT_WORKSPACE_CONTEXT,
 } from '@umbraco-cms/backoffice/document';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection';
 import type { UmbAllowedDocumentTypeModel } from '@umbraco-cms/backoffice/document-type';

src/packages/documents/documents/collection/views/grid/document-grid-collection-view.element.ts

@@ -7,7 +7,7 @@ import { fromCamelCase } from '@umbraco-cms/backoffice/utils';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import type { UmbDefaultCollectionContext, UmbCollectionColumnConfiguration } from '@umbraco-cms/backoffice/collection';
 import type { UUIInterfaceColor } from '@umbraco-cms/backoffice/external/uui';
 

src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts

@@ -7,7 +7,7 @@ import type { UmbCollectionColumnConfiguration } from '@umbraco-cms/backoffice/c
 import { css, customElement, html, nothing, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import type { UmbModalRouteBuilder } from '@umbraco-cms/backoffice/router';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import type {

src/packages/documents/documents/components/input-document/input-document.element.ts

@@ -14,7 +14,7 @@ import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import type { UmbDocumentItemModel } from '@umbraco-cms/backoffice/document';
 import type { UmbTreeStartNode } from '@umbraco-cms/backoffice/tree';

src/packages/documents/documents/workspace/views/info/document-workspace-view-info-reference.element.ts

@@ -3,7 +3,7 @@ import { css, html, customElement, state, nothing, repeat, property } from '@umb
 import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import {
 	isDefaultReference,

src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts

@@ -5,7 +5,8 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/document';
-import { UMB_MODAL_MANAGER_CONTEXT, UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UMB_TEMPLATE_PICKER_MODAL, UmbTemplateItemRepository } from '@umbraco-cms/backoffice/template';
 import type { DocumentUrlInfoModel } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbDocumentTypeDetailModel } from '@umbraco-cms/backoffice/document-type';

src/packages/language/workspace/language/language-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import type { UmbLanguageDetailModel } from '../../types.js';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export const UMB_LANGUAGE_WORKSPACE_MODAL = new UmbModalToken<

src/packages/media/media-types/components/input-media-type/input-media-type.element.ts

@@ -4,7 +4,7 @@ import { css, html, customElement, property, state, repeat, nothing } from '@umb
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';