@umbraco-cms/backoffice 14.0.0--preview004-ff25aef3 → 14.0.0--preview004-ada18684

package/dist-cms/custom-elements.json

@@ -8603,30 +8603,6 @@
         }
       ]
     },
-    {
-      "name": "umb-story-modal-context-example",
-      "path": "./../src/shared/modal/stories/story-modal-service-example.element.ts",
-      "attributes": [
-        {
-          "name": "modalLayout",
-          "type": "string",
-          "default": "\"confirm\""
-        }
-      ],
-      "properties": [
-        {
-          "name": "modalLayout",
-          "attribute": "modalLayout",
-          "type": "string",
-          "default": "\"confirm\""
-        },
-        {
-          "name": "value",
-          "type": "string",
-          "default": "\"\""
-        }
-      ]
-    },
     {
       "name": "umb-router-slot",
       "path": "./../src/shared/router/router-slot.element.ts",
@@ -8737,6 +8713,30 @@
           "description": "fires when a path of this router is changed"
         }
       ]
+    },
+    {
+      "name": "umb-story-modal-context-example",
+      "path": "./../storybook/stories/modal/story-modal-service-example.element.ts",
+      "attributes": [
+        {
+          "name": "modalLayout",
+          "type": "string",
+          "default": "\"confirm\""
+        }
+      ],
+      "properties": [
+        {
+          "name": "modalLayout",
+          "attribute": "modalLayout",
+          "type": "string",
+          "default": "\"confirm\""
+        },
+        {
+          "name": "value",
+          "type": "string",
+          "default": "\"\""
+        }
+      ]
     }
   ]
 }

package/dist-cms/packages/core/debug/modals/debug/debug-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbContextDebuggerModalData } from '../../../modal/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbContextDebuggerModalData, UmbModalBaseElement } from '../../../modal/index.js';
 export default class UmbContextDebuggerModalElement extends UmbModalBaseElement<UmbContextDebuggerModalData> {
     private _handleClose;
     render(): import("lit-html").TemplateResult<1>;

package/dist-cms/packages/core/debug/modals/debug/debug-modal.element.js

@@ -5,8 +5,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, customElement } from '../../../../../external/lit/index.js';
-import { UmbTextStyles } from "../../../../../shared/style/index.js";
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbTextStyles } from '../../../../../shared/style/index.js';
+import { UmbModalBaseElement } from '../../../modal/index.js';
 let UmbContextDebuggerModalElement = class UmbContextDebuggerModalElement extends UmbModalBaseElement {
     _handleClose() {
         this.modalContext?.reject();

package/dist-cms/packages/core/modal/common/code-editor/code-editor-modal.element.d.ts

@@ -1,6 +1,5 @@
 import { type UmbCodeEditorElement } from '../../../../templating/code-editor/index.js';
-import { UmbCodeEditorModalData, UmbCodeEditorModalValue } from '../../index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbCodeEditorModalData, UmbCodeEditorModalValue, UmbModalBaseElement } from '../../index.js';
 export declare class UmbCodeEditorModalElement extends UmbModalBaseElement<UmbCodeEditorModalData, UmbCodeEditorModalValue> {
     #private;
     isCodeEditorReady: import("rxjs").Observable<boolean>;

package/dist-cms/packages/core/modal/common/code-editor/code-editor-modal.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { css, html, ifDefined, customElement, query } from '../../../../../external/lit/index.js';
 import { loadCodeEditor } from '../../../../templating/code-editor/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement } from '../../index.js';
 import { UmbBooleanState } from '../../../../../libs/observable-api/index.js';
 export let UmbCodeEditorModalElement = class UmbCodeEditorModalElement extends UmbModalBaseElement {
     #isCodeEditorReady;
@@ -17,7 +17,7 @@ export let UmbCodeEditorModalElement = class UmbCodeEditorModalElement extends U
         this.#loadCodeEditor();
     }
     #handleConfirm() {
-        this.modalContext?.submit({ content: this.data?.content ?? '' });
+        this.modalContext?.submit({ content: this._codeEditor?.editor?.monacoEditor?.getValue() ?? '' });
     }
     #handleCancel() {
         this.modalContext?.reject();
@@ -31,19 +31,10 @@ export let UmbCodeEditorModalElement = class UmbCodeEditorModalElement extends U
             console.error(error);
         }
     }
-    // TODO => debounce?
-    #onCodeEditorInput(e) {
-        e.preventDefault();
-        if (!this.data) {
-            return;
-        }
-        this.data.content = this._codeEditor?.code ?? '';
-    }
     #renderCodeEditor() {
         return html `<umb-code-editor
 			language=${ifDefined(this.data?.language)}
-			.code=${this.data?.content ?? ''}
-			@input=${this.#onCodeEditorInput}></umb-code-editor>`;
+			.code=${this.data?.content ?? ''}></umb-code-editor>`;
     }
     #renderLoading() {
         return html `<div id="loader-container">

package/dist-cms/packages/core/modal/common/embedded-media/embedded-media-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalValue } from '../../index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalValue, UmbModalBaseElement } from '../../index.js';
 export declare class UmbEmbeddedMediaModalElement extends UmbModalBaseElement<UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalValue> {
     #private;
     private _model;

package/dist-cms/packages/core/modal/common/embedded-media/embedded-media-modal.element.js

@@ -6,9 +6,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { css, html, unsafeHTML, when, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { OEmbedStatus, } from '../../index.js';
+import { OEmbedStatus, UmbModalBaseElement, } from '../../index.js';
 import { umbracoPath } from '../../../../../shared/utils/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 export let UmbEmbeddedMediaModalElement = class UmbEmbeddedMediaModalElement extends UmbModalBaseElement {
     constructor() {
         super(...arguments);

package/dist-cms/packages/core/modal/common/icon-picker/icon-picker-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbIconPickerModalData, UmbIconPickerModalValue } from '../../index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbIconPickerModalData, UmbIconPickerModalValue, UmbModalBaseElement } from '../../index.js';
 export declare class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPickerModalData, UmbIconPickerModalValue> {
     private _iconList;
     private _iconListFiltered;

package/dist-cms/packages/core/modal/common/icon-picker/icon-picker-modal.element.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import icons from '../../../../../shared/icon-registry/icons/icons.json' assert { type: 'json' };
 import { css, html, styleMap, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement } from '../../index.js';
 // TODO: Make use of UmbPickerLayoutBase
 // TODO: to prevent element extension we need to move the Picker logic into a separate class we can reuse across all pickers
 export let UmbIconPickerModalElement = class UmbIconPickerModalElement extends UmbModalBaseElement {

package/dist-cms/packages/core/modal/common/link-picker/link-picker-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbLinkPickerConfig, UmbLinkPickerLink, UmbLinkPickerModalData, UmbLinkPickerModalValue } from '../../index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbLinkPickerConfig, UmbLinkPickerLink, UmbLinkPickerModalData, UmbLinkPickerModalValue, UmbModalBaseElement } from '../../index.js';
 export declare class UmbLinkPickerModalElement extends UmbModalBaseElement<UmbLinkPickerModalData, UmbLinkPickerModalValue> {
     _selectedKey?: string;
     _index: number | null;

package/dist-cms/packages/core/modal/common/link-picker/link-picker-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, nothing, customElement, query, state } from '../../../../../external/lit/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement, } from '../../index.js';
 import { buildUdi, getKeyFromUdi } from '../../../../../shared/utils/index.js';
 export let UmbLinkPickerModalElement = class UmbLinkPickerModalElement extends UmbModalBaseElement {
     constructor() {

package/dist-cms/packages/core/modal/common/property-settings/property-settings-modal.element.d.ts

@@ -1,6 +1,5 @@
 import { PropertyValueMap } from '../../../../../external/lit/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
-import { UmbPropertySettingsModalValue, UmbPropertySettingsModalData } from '../../index.js';
+import { UmbPropertySettingsModalValue, UmbPropertySettingsModalData, UmbModalBaseElement } from '../../index.js';
 export declare class UmbPropertySettingsModalElement extends UmbModalBaseElement<UmbPropertySettingsModalData, UmbPropertySettingsModalValue> {
     #private;
     private _customValidationOptions;

package/dist-cms/packages/core/modal/common/property-settings/property-settings-modal.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
 import { css, html, nothing, customElement, state } from '../../../../../external/lit/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement, } from '../../index.js';
 import { generateAlias } from '../../../../../shared/utils/index.js';
 import { UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN } from '../../../../documents/document-types/index.js';
 // TODO: Could base take a token to get its types?.

package/dist-cms/packages/core/modal/common/section-picker/section-picker-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
-import { UmbSectionPickerModalData, UmbSectionPickerModalValue } from '../../index.js';
+import { UmbSectionPickerModalData, UmbSectionPickerModalValue, UmbModalBaseElement } from '../../index.js';
 export declare class UmbSectionPickerModalElement extends UmbModalBaseElement<UmbSectionPickerModalData, UmbSectionPickerModalValue> {
     #private;
     private _sections;

package/dist-cms/packages/core/modal/common/section-picker/section-picker-modal.element.js

@@ -7,8 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
 import { css, html, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbSelectionManagerBase } from '../../../../../shared/utils/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { umbExtensionsRegistry } from '../../../extension-registry/index.js';
+import { UmbModalBaseElement, } from '../../index.js';
 export let UmbSectionPickerModalElement = class UmbSectionPickerModalElement extends UmbModalBaseElement {
     constructor() {
         super(...arguments);

package/dist-cms/packages/core/modal/common/template/template-modal.element.d.ts

@@ -1,7 +1,6 @@
 import type { UmbCodeEditorElement } from '../../../../templating/code-editor/index.js';
-import { UmbTemplateModalData, UmbTemplateModalValue } from '../../index.js';
+import { UmbTemplateModalData, UmbTemplateModalValue, UmbModalBaseElement } from '../../index.js';
 import { TemplateResponseModel } from '../../../../../external/backend-api/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 export declare class UmbTemplateModalElement extends UmbModalBaseElement<UmbTemplateModalData, UmbTemplateModalValue> {
     #private;
     _id: string;

package/dist-cms/packages/core/modal/common/template/template-modal.element.js

@@ -5,8 +5,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, ifDefined, customElement, query, state } from '../../../../../external/lit/index.js';
+import { UmbModalBaseElement } from '../../index.js';
 import { TemplateResource } from '../../../../../external/backend-api/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
 //TODO: make a default tree-picker that can be used across multiple pickers
 // TODO: make use of UmbPickerLayoutBase

package/dist-cms/packages/core/modal/common/tree-picker/tree-picker-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbTreePickerModalData, UmbPickerModalValue } from '../../index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbTreePickerModalData, UmbPickerModalValue, UmbModalBaseElement } from '../../index.js';
 import { TreeItemPresentationModel } from '../../../../../external/backend-api/index.js';
 export declare class UmbTreePickerModalElement<TreeItemType extends TreeItemPresentationModel> extends UmbModalBaseElement<UmbTreePickerModalData<TreeItemType>, UmbPickerModalValue> {
     #private;

package/dist-cms/packages/core/modal/common/tree-picker/tree-picker-modal.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { html, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement } from '../../index.js';
 import { UmbSelectionChangeEvent } from '../../../event/index.js';
 export let UmbTreePickerModalElement = class UmbTreePickerModalElement extends UmbModalBaseElement {
     constructor() {

package/dist-cms/packages/core/modal/index.d.ts

@@ -5,4 +5,5 @@ export * from './modal-route-registration.js';
 export * from './modal-route-registration.controller.js';
 export * from './token/index.js';
 export * from './modal.interfaces.js';
+export * from './modal-element.element.js';
 export * from './modal.element.js';

package/dist-cms/packages/core/modal/index.js

@@ -5,4 +5,5 @@ export * from './modal-route-registration.js';
 export * from './modal-route-registration.controller.js';
 export * from './token/index.js';
 export * from './modal.interfaces.js';
+export * from './modal-element.element.js';
 export * from './modal.element.js';

package/dist-cms/{shared → packages/core}/modal/modal-element.element.d.ts

@@ -1,6 +1,6 @@
-import { UmbLitElement } from '../lit-element/index.js';
-import { UmbModalContext } from '../../packages/core/modal/index.js';
-import type { ManifestModal, UmbModalExtensionElement } from '../../packages/core/extension-registry/index.js';
+import { UmbLitElement } from '../../../shared/lit-element/index.js';
+import { UmbModalContext } from './index.js';
+import type { ManifestModal, UmbModalExtensionElement } from '../extension-registry/index.js';
 export declare abstract class UmbModalBaseElement<ModalDataType extends object = object, ModalValueType = unknown, ModalManifestType extends ManifestModal = ManifestModal> extends UmbLitElement implements UmbModalExtensionElement<ModalDataType, ModalValueType, ModalManifestType> {
     manifest?: ModalManifestType;
     modalContext?: UmbModalContext<ModalDataType, ModalValueType>;

package/dist-cms/{shared → packages/core}/modal/modal-element.element.js

@@ -4,8 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { property, state } from '../../external/lit/index.js';
-import { UmbLitElement } from '../lit-element/index.js';
+import { property, state } from '../../../external/lit/index.js';
+import { UmbLitElement } from '../../../shared/lit-element/index.js';
 export class UmbModalBaseElement extends UmbLitElement {
     get _value() {
         return this.modalContext?.getValue() ?? {};

package/dist-cms/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-linkpicker.plugin.js

@@ -42,27 +42,25 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
             data.text = ' ';
         }
         if (!this.#anchorElement) {
-            this.#openLinkPicker();
+            this.#openLinkPicker({ name: this.editor.selection.getContent() });
             return;
         }
         //if we already have a link selected, we want to pass that data over to the dialog
         const currentTarget = {
-            name: this.#anchorElement.title,
-            url: this.#anchorElement.getAttribute('href') ?? '',
+            name: this.#anchorElement.title || this.#anchorElement.textContent,
             target: this.#anchorElement.target,
+            queryString: `${this.#anchorElement.search}${this.#anchorElement.hash}`,
         };
-        // drop the lead char from the anchor text, if it has a value
-        const anchorVal = this.#anchorElement.dataset.anchor;
-        if (anchorVal) {
-            currentTarget.queryString = anchorVal.substring(1);
+        if (this.#anchorElement.href.includes('localLink:')) {
+            const href = this.#anchorElement.getAttribute('href');
+            currentTarget.udi = href.split('localLink:')[1].slice(0, -1);
         }
-        if (currentTarget.url?.includes('localLink:')) {
-            currentTarget.udi =
-                currentTarget.url?.substring(currentTarget.url.indexOf(':') + 1, currentTarget.url.lastIndexOf('}')) ?? '';
+        else if (this.#anchorElement.host.length) {
+            currentTarget.url = this.#anchorElement.protocol ? this.#anchorElement.protocol + '//' : undefined;
+            currentTarget.url += this.#anchorElement.host + this.#anchorElement.pathname;
         }
         this.#openLinkPicker(currentTarget);
     }
-    // TODO => get anchors to provide to link picker?
     async #openLinkPicker(currentTarget) {
         const modalHandler = this.#modalContext?.open(UMB_LINK_PICKER_MODAL, {
             config: {
@@ -73,7 +71,7 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
         });
         if (!modalHandler)
             return;
-        const linkPickerData = await modalHandler.onSubmit();
+        const linkPickerData = await modalHandler.onSubmit().catch(() => undefined);
         if (!linkPickerData)
             return;
         this.#linkPickerData = linkPickerData;
@@ -82,12 +80,17 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
     //Create a json obj used to create the attributes for the tag
     // TODO => where has rel gone?
     #createElemAttributes() {
-        const a = Object.assign({}, this.#linkPickerData?.link, { 'data-anchor': null });
+        // Attribute 'name' because of linkPickerData. It should be 'title' .
+        const { name, ...linkPickerData } = this.#linkPickerData.link;
+        const a = Object.assign({}, linkPickerData);
         // always need to map back to href for tinymce to render correctly
         // do this first as checking querystring below may modify the href property
         if (this.#linkPickerData?.link.url) {
             a.href = this.#linkPickerData.link.url;
         }
+        if (this.#linkPickerData?.link.name) {
+            a.title = name;
+        }
         if (this.#linkPickerData?.link.queryString?.startsWith('#')) {
             a['data-anchor'] = this.#linkPickerData?.link.queryString;
             a.href += this.#linkPickerData?.link.queryString;
@@ -136,7 +139,7 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
                 this.#linkPickerData.link.queryString = urlParts[1] + urlParts[2];
             }
         }
-        if (!this.#linkPickerData?.link.url && !this.#linkPickerData?.link.queryString) {
+        if (!this.#linkPickerData?.link.url && !this.#linkPickerData?.link.queryString && !this.#linkPickerData?.link.udi) {
             this.editor.execCommand('unlink');
             return;
         }

package/dist-cms/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UmbTextStyles } from "../../../../../shared/style/index.js";
+import { UmbTextStyles } from '../../../../../shared/style/index.js';
 import { html, customElement, property } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
 /**

package/dist-cms/packages/core/workspace/workspace-property-layout/workspace-property-layout.element.js

@@ -71,7 +71,6 @@ export let UmbWorkspacePropertyLayoutElement = class UmbWorkspacePropertyLayoutE
 				column-gap: var(--uui-size-layout-2);
 				border-bottom: 1px solid var(--uui-color-divider);
 				padding: var(--uui-size-layout-1) 0;
-				container-type: inline-size;
 			}
 
 			:host(:last-of-type) {
@@ -90,7 +89,6 @@ export let UmbWorkspacePropertyLayoutElement = class UmbWorkspacePropertyLayoutE
 			#headerColumn {
 				position: relative;
 				height: min-content;
-				z-index: 2;
 			}
 			@container (width > 600px) {
 				#headerColumn {

package/dist-cms/packages/dictionary/dictionary/entity-actions/create/create-dictionary-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbCreateDictionaryModalData, UmbCreateDictionaryModalValue } from '../../../../core/modal/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbCreateDictionaryModalData, UmbCreateDictionaryModalValue, UmbModalBaseElement } from '../../../../core/modal/index.js';
 export declare class UmbCreateDictionaryModalElement extends UmbModalBaseElement<UmbCreateDictionaryModalData, UmbCreateDictionaryModalValue> {
     #private;
     private _form;

package/dist-cms/packages/dictionary/dictionary/entity-actions/create/create-dictionary-modal.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { html, customElement, query, when } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement, } from '../../../../core/modal/index.js';
 export let UmbCreateDictionaryModalElement = class UmbCreateDictionaryModalElement extends UmbModalBaseElement {
     #parentName;
     connectedCallback() {

package/dist-cms/packages/dictionary/dictionary/entity-actions/export/export-dictionary-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbExportDictionaryModalData, UmbExportDictionaryModalValue } from '../../../../core/modal/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbExportDictionaryModalData, UmbExportDictionaryModalValue, UmbModalBaseElement } from '../../../../core/modal/index.js';
 export declare class UmbExportDictionaryModalElement extends UmbModalBaseElement<UmbExportDictionaryModalData, UmbExportDictionaryModalValue> {
     #private;
     private _form;

package/dist-cms/packages/dictionary/dictionary/entity-actions/export/export-dictionary-modal.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { html, customElement, query } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement, } from '../../../../core/modal/index.js';
 export let UmbExportDictionaryModalElement = class UmbExportDictionaryModalElement extends UmbModalBaseElement {
     #handleClose() {
         this.modalContext?.reject();

package/dist-cms/packages/dictionary/dictionary/entity-actions/import/import-dictionary-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbImportDictionaryModalData, UmbImportDictionaryModalValue } from '../../../../core/modal/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbImportDictionaryModalData, UmbImportDictionaryModalValue, UmbModalBaseElement } from '../../../../core/modal/index.js';
 export declare class UmbImportDictionaryModalLayout extends UmbModalBaseElement<UmbImportDictionaryModalData, UmbImportDictionaryModalValue> {
     #private;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/packages/dictionary/dictionary/entity-actions/import/import-dictionary-modal.element.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbDictionaryRepository } from '../../repository/dictionary.repository.js';
 import { css, html, customElement, query, state, when } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement, } from '../../../../core/modal/index.js';
 export let UmbImportDictionaryModalLayout = class UmbImportDictionaryModalLayout extends UmbModalBaseElement {
     constructor() {
         super(...arguments);

package/dist-cms/packages/documents/documents/entity-actions/create/create-document-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbCreateDocumentModalData, UmbCreateDocumentModalValue } from '../../../../core/modal/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbCreateDocumentModalData, UmbCreateDocumentModalValue, UmbModalBaseElement } from '../../../../core/modal/index.js';
 export declare class UmbCreateDocumentModalElement extends UmbModalBaseElement<UmbCreateDocumentModalData, UmbCreateDocumentModalValue> {
     #private;
     private _allowedDocumentTypes;

package/dist-cms/packages/documents/documents/entity-actions/create/create-document-modal.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { html, nothing, customElement, state, ifDefined } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement, } from '../../../../core/modal/index.js';
 import { UmbDocumentRepository } from '../../index.js';
 export let UmbCreateDocumentModalElement = class UmbCreateDocumentModalElement extends UmbModalBaseElement {
     constructor() {

package/dist-cms/packages/log-viewer/workspace/views/search/components/log-viewer-search-input-modal.element.d.ts

@@ -1,4 +1,4 @@
-import { UmbModalBaseElement } from '../../../../../../shared/modal/index.js';
+import { UmbModalBaseElement } from '../../../../../core/modal/index.js';
 import { SavedLogSearchPresenationBaseModel } from '../../../../../../external/backend-api/index.js';
 export default class UmbLogViewerSaveSearchModalElement extends UmbModalBaseElement<{
     query: string;

package/dist-cms/packages/log-viewer/workspace/views/search/components/log-viewer-search-input-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { html, css, customElement, query, state } from '../../../../../../external/lit/index.js';
-import { UmbModalBaseElement } from '../../../../../../shared/modal/index.js';
+import { UmbModalBaseElement } from '../../../../../core/modal/index.js';
 let UmbLogViewerSaveSearchModalElement = class UmbLogViewerSaveSearchModalElement extends UmbModalBaseElement {
     constructor() {
         super(...arguments);

package/dist-cms/packages/search/examine-management-dashboard/views/modal-views/fields-settings.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbExamineFieldsSettingsModalValue, UmbExamineFieldsSettingsModalData } from '../../../../core/modal/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbExamineFieldsSettingsModalValue, UmbExamineFieldsSettingsModalData, UmbModalBaseElement } from '../../../../core/modal/index.js';
 export declare class UmbExamineFieldsSettingsModalElement extends UmbModalBaseElement<UmbExamineFieldsSettingsModalData, UmbExamineFieldsSettingsModalValue> {
     private _fields?;
     private _handleClose;

package/dist-cms/packages/search/examine-management-dashboard/views/modal-views/fields-settings.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { html, css, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement, } from '../../../../core/modal/index.js';
 export let UmbExamineFieldsSettingsModalElement = class UmbExamineFieldsSettingsModalElement extends UmbModalBaseElement {
     _handleClose() {
         this.modalContext?.submit({ fields: this._fields });

package/dist-cms/packages/search/examine-management-dashboard/views/modal-views/fields-viewer.element.d.ts

@@ -1,5 +1,5 @@
 import { nothing } from '../../../../../external/lit/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbModalBaseElement } from '../../../../core/modal/index.js';
 import type { SearchResultResponseModel } from '../../../../../external/backend-api/index.js';
 export declare class UmbModalElementFieldsViewerElement extends UmbModalBaseElement<SearchResultResponseModel & {
     name: string;

package/dist-cms/packages/search/examine-management-dashboard/views/modal-views/fields-viewer.element.js

@@ -5,8 +5,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { html, css, nothing, customElement } from '../../../../../external/lit/index.js';
-import { UmbTextStyles } from "../../../../../shared/style/index.js";
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
+import { UmbTextStyles } from '../../../../../shared/style/index.js';
+import { UmbModalBaseElement } from '../../../../core/modal/index.js';
 export let UmbModalElementFieldsViewerElement = class UmbModalElementFieldsViewerElement extends UmbModalBaseElement {
     _handleClose() {
         this.modalContext?.reject();

package/dist-cms/packages/settings/languages/modals/language-picker/language-picker-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
-import { UmbLanguagePickerModalValue, UmbLanguagePickerModalData } from '../../../../core/modal/index.js';
+import { UmbLanguagePickerModalValue, UmbLanguagePickerModalData, UmbModalBaseElement } from '../../../../core/modal/index.js';
 export declare class UmbLanguagePickerModalElement extends UmbModalBaseElement<UmbLanguagePickerModalData, UmbLanguagePickerModalValue> {
     #private;
     private _languages;

package/dist-cms/packages/settings/languages/modals/language-picker/language-picker-modal.element.js

@@ -7,8 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbLanguageRepository } from '../../repository/language.repository.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
 import { css, html, customElement, state, repeat } from '../../../../../external/lit/index.js';
-import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { UmbSelectionManagerBase } from '../../../../../shared/utils/index.js';
+import { UmbModalBaseElement, } from '../../../../core/modal/index.js';
 export let UmbLanguagePickerModalElement = class UmbLanguagePickerModalElement extends UmbModalBaseElement {
     constructor() {
         super(...arguments);

package/dist-cms/packages/templating/modals/insert-choose-type-sidebar.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbModalBaseElement } from '../../../shared/modal/index.js';
-import { UmbDictionaryItemPickerModalValue } from '../../core/modal/index.js';
+import { UmbDictionaryItemPickerModalValue, UmbModalBaseElement } from '../../core/modal/index.js';
 export interface ChooseInsertTypeModalData {
     hidePartialViews?: boolean;
 }

package/dist-cms/packages/templating/modals/insert-choose-type-sidebar.element.js

@@ -6,8 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbTextStyles } from '../../../shared/style/index.js';
 import { css, html, customElement } from '../../../external/lit/index.js';
-import { UmbModalBaseElement } from '../../../shared/modal/index.js';
-import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_PARTIAL_VIEW_PICKER_MODAL, UMB_DICTIONARY_ITEM_PICKER_MODAL, } from '../../core/modal/index.js';
+import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_PARTIAL_VIEW_PICKER_MODAL, UMB_DICTIONARY_ITEM_PICKER_MODAL, UmbModalBaseElement, } from '../../core/modal/index.js';
 export var CodeSnippetType;
 (function (CodeSnippetType) {
     CodeSnippetType["partialView"] = "partialView";

package/dist-cms/packages/templating/modals/insert-section-modal/insert-section-modal.element.d.ts

@@ -1,5 +1,4 @@
-import { UmbModalToken } from '../../../core/modal/index.js';
-import { UmbModalBaseElement } from '../../../../shared/modal/index.js';
+import { UmbModalToken, UmbModalBaseElement } from '../../../core/modal/index.js';
 import './insert-section-input.element.js';
 import type { UmbInsertSectionCheckboxElement } from './insert-section-input.element.js';
 export declare const UMB_MODAL_TEMPLATING_INSERT_SECTION_MODAL: UmbModalToken<object, UmbInsertSectionModalModalValue>;