@umbraco-cms/backoffice 14.0.0--preview004-13d6f91d → 14.0.0--preview004.g0774256

package/dist-cms/apps/app/app.context.d.ts

@@ -1,6 +1,5 @@
 import { UmbAppContextConfig } from './app-context-config.interface.js';
-import { UmbBaseController } from '../../libs/class-api/index.js';
-import { type UmbControllerHost } from '../../libs/controller-api/index.js';
+import { UmbBaseController, UmbControllerHost } from '../../libs/controller-api/index.js';
 import { UmbContextToken } from '../../libs/context-api/index.js';
 export declare class UmbAppContext extends UmbBaseController {
     #private;

package/dist-cms/apps/app/app.context.js

@@ -1,4 +1,4 @@
-import { UmbBaseController } from '../../libs/class-api/index.js';
+import { UmbBaseController } from '../../libs/controller-api/index.js';
 import { UmbContextToken } from '../../libs/context-api/index.js';
 export class UmbAppContext extends UmbBaseController {
     #serverUrl;

package/dist-cms/apps/backoffice/backoffice.context.d.ts

@@ -1,9 +1,8 @@
 import { UmbContextToken } from '../../libs/context-api/index.js';
-import { type UmbExtensionManifestInitializer } from '../../libs/extension-api/index.js';
-import { UmbContextBase } from '../../libs/class-api/index.js';
-import { type UmbControllerHost } from '../../libs/controller-api/index.js';
-import { type ManifestSection } from '../../packages/core/extension-registry/index.js';
-export declare class UmbBackofficeContext extends UmbContextBase<UmbBackofficeContext> {
+import { UmbExtensionManifestInitializer } from '../../libs/extension-api/index.js';
+import type { UmbControllerHost } from '../../libs/controller-api/index.js';
+import { ManifestSection } from '../../packages/core/extension-registry/index.js';
+export declare class UmbBackofficeContext {
     #private;
     readonly activeSectionAlias: import("rxjs").Observable<string | undefined>;
     readonly allowedSections: import("rxjs").Observable<UmbExtensionManifestInitializer<ManifestSection, any>[]>;

package/dist-cms/apps/backoffice/backoffice.context.js

@@ -1,20 +1,18 @@
 import { UmbContextToken } from '../../libs/context-api/index.js';
 import { UmbBasicState, UmbStringState } from '../../libs/observable-api/index.js';
-import { UmbExtensionsManifestInitializer, } from '../../libs/extension-api/index.js';
-import { UmbContextBase } from '../../libs/class-api/index.js';
+import { UmbExtensionsManifestInitializer } from '../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../../packages/core/extension-registry/index.js';
-export class UmbBackofficeContext extends UmbContextBase {
+export class UmbBackofficeContext {
     #activeSectionAlias;
     // TODO: We need a class array state:
     #allowedSections;
     constructor(host) {
-        super(host, UMB_BACKOFFICE_CONTEXT_TOKEN);
         this.#activeSectionAlias = new UmbStringState(undefined);
         this.activeSectionAlias = this.#activeSectionAlias.asObservable();
         // TODO: We need a class array state:
         this.#allowedSections = new UmbBasicState([]);
         this.allowedSections = this.#allowedSections.asObservable();
-        new UmbExtensionsManifestInitializer(this, umbExtensionsRegistry, 'section', null, (sections) => {
+        new UmbExtensionsManifestInitializer(host, umbExtensionsRegistry, 'section', null, (sections) => {
             this.#allowedSections.next([...sections]);
         });
     }

package/dist-cms/apps/backoffice/backoffice.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 { UmbBackofficeContext } from './backoffice.context.js';
+import { UmbBackofficeContext, UMB_BACKOFFICE_CONTEXT_TOKEN } from './backoffice.context.js';
 import { UmbServerExtensionRegistrator } from './server-extension-registrator.controller.js';
 import { css, html, customElement } from '../../external/lit/index.js';
 import { umbExtensionsRegistry } from '../../packages/core/extension-registry/index.js';
@@ -37,7 +37,7 @@ export let UmbBackofficeElement = class UmbBackofficeElement extends UmbLitEleme
          * @type {UmbExtensionsRegistry}
          */
         this.extensionRegistry = umbExtensionsRegistry;
-        new UmbBackofficeContext(this);
+        this.provideContext(UMB_BACKOFFICE_CONTEXT_TOKEN, new UmbBackofficeContext(this));
         new UmbBundleExtensionInitializer(this, umbExtensionsRegistry);
         new UmbEntryPointExtensionInitializer(this, umbExtensionsRegistry);
         new UmbServerExtensionRegistrator(this, umbExtensionsRegistry);

package/dist-cms/apps/backoffice/server-extension-registrator.controller.d.ts

@@ -1,5 +1,4 @@
-import { UmbBaseController } from '../../libs/class-api/index.js';
-import { type UmbControllerHost } from '../../libs/controller-api/index.js';
+import { UmbBaseController, type UmbControllerHost } from '../../libs/controller-api/index.js';
 import { UmbBackofficeExtensionRegistry } from '../../packages/core/extension-registry/index.js';
 export declare class UmbServerExtensionRegistrator extends UmbBaseController {
     #private;

package/dist-cms/apps/backoffice/server-extension-registrator.controller.js

@@ -1,5 +1,5 @@
 import { PackageResource, OpenAPI } from '../../external/backend-api/index.js';
-import { UmbBaseController } from '../../libs/class-api/index.js';
+import { UmbBaseController } from '../../libs/controller-api/index.js';
 import { tryExecuteAndNotify } from '../../shared/resources/index.js';
 import { isManifestBaseType } from '../../libs/extension-api/index.js';
 // TODO: consider if this can be replaced by the new extension controllers

package/dist-cms/custom-elements.json

@@ -2810,8 +2810,8 @@
       ]
     },
     {
-      "name": "umb-menu-item-layout",
-      "path": "./../src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts",
+      "name": "umb-menu-item-base",
+      "path": "./../src/packages/core/menu/menu-item-base/menu-item-base.element.ts",
       "attributes": [
         {
           "name": "entity-type",
@@ -2865,8 +2865,8 @@
       ]
     },
     {
-      "name": "umb-menu-item-default",
-      "path": "./../src/packages/core/menu/menu-item/menu-item-default.element.ts",
+      "name": "umb-menu-item",
+      "path": "./../src/packages/core/menu/menu-item/menu-item.element.ts",
       "properties": [
         {
           "name": "manifest"
@@ -4910,8 +4910,8 @@
       ]
     },
     {
-      "name": "umb-tree-item-default",
-      "path": "./../src/packages/core/tree/tree-item-default/tree-item.element.ts",
+      "name": "umb-tree-item",
+      "path": "./../src/packages/core/tree/tree-item/tree-item.element.ts",
       "properties": [
         {
           "name": "item"
@@ -4924,8 +4924,8 @@
       ]
     },
     {
-      "name": "umb-menu-item-tree-default",
-      "path": "./../src/packages/core/tree/tree-menu-item-default/tree-menu-item-default.element.ts",
+      "name": "umb-menu-item-tree",
+      "path": "./../src/packages/core/tree/tree-menu-item/tree-menu-item.element.ts",
       "attributes": [
         {
           "name": "manifest"

package/dist-cms/libs/class-api/class.interface.d.ts

@@ -2,7 +2,7 @@ import type { UmbControllerHost } from '../controller-api/controller-host.interf
 import type { UmbObserverController } from '../observable-api/index.js';
 import type { UmbContextCallback, UmbContextConsumerController, UmbContextProviderController, UmbContextToken } from '../context-api/index.js';
 import type { Observable } from '../../external/rxjs/index.js';
-import type { UmbController } from '../controller-api/index.js';
+import { UmbController } from '../controller-api/index.js';
 export interface UmbClassMixinInterface extends UmbControllerHost, UmbController {
     observe<T>(source: Observable<T> | {
         asObservable: () => Observable<T>;

package/dist-cms/libs/class-api/class.mixin.d.ts

@@ -4,7 +4,7 @@ import type { ClassConstructor } from '../extension-api/index.js';
 import { type UmbControllerHost, UmbController, UmbControllerAlias } from '../controller-api/index.js';
 import { UmbContextToken, UmbContextCallback, UmbContextConsumerController, UmbContextProviderController } from '../context-api/index.js';
 import { UmbObserverController } from '../observable-api/index.js';
-type UmbClassMixinConstructor = new (host: UmbControllerHost, controllerAlias?: UmbControllerAlias) => UmbClassMixinDeclaration;
+type UmbClassMixinConstructor = new (host: UmbControllerHost, controllerAlias: UmbControllerAlias) => UmbClassMixinDeclaration;
 declare class UmbClassMixinDeclaration implements UmbClassMixinInterface {
     _host: UmbControllerHost;
     observe<T>(source: Observable<T>, callback: (_value: T) => void, controllerAlias?: UmbControllerAlias): UmbObserverController<T>;

package/dist-cms/libs/class-api/class.mixin.js

@@ -1,13 +1,12 @@
-import { UmbControllerHostMixin, } from '../controller-api/index.js';
+import { UmbControllerHostBaseMixin, } from '../controller-api/index.js';
 import { UmbContextConsumerController, UmbContextProviderController, } from '../context-api/index.js';
 import { UmbObserverController } from '../observable-api/index.js';
 export const UmbClassMixin = (superClass) => {
-    class UmbClassMixinClass extends UmbControllerHostMixin(superClass) {
+    class UmbClassMixinClass extends UmbControllerHostBaseMixin(superClass) {
         constructor(host, controllerAlias) {
             super();
             this._host = host;
             this._controllerAlias = controllerAlias ?? Symbol(); // This will fallback to a Symbol, ensuring that this class is only appended to the controller host once.
-            this._host.addController(this);
         }
         getHostElement() {
             return this._host.getHostElement();
@@ -45,17 +44,6 @@ export const UmbClassMixin = (superClass) => {
         consumeContext(contextAlias, callback) {
             return new UmbContextConsumerController(this, contextAlias, callback);
         }
-        /**
-         * @description Destroys the controller and removes it from the host.
-         * @memberof UmbClassMixin
-         */
-        destroy() {
-            if (this._host) {
-                this._host.removeController(this);
-                this._host = undefined;
-            }
-            super.destroy();
-        }
     }
     return UmbClassMixinClass;
 };

package/dist-cms/libs/class-api/index.d.ts

@@ -1,4 +1,2 @@
 export * from './class.interface.js';
 export * from './class.mixin.js';
-export * from './context-base.class.js';
-export * from './controller-base.class.js';

package/dist-cms/libs/class-api/index.js

@@ -1,4 +1,2 @@
 export * from './class.interface.js';
 export * from './class.mixin.js';
-export * from './context-base.class.js';
-export * from './controller-base.class.js';

package/dist-cms/libs/context-api/index.d.ts

@@ -1,4 +1,9 @@
-export * from './consume/index.js';
-export * from './debug/context-data.function.js';
-export * from './provide/index.js';
+export * from './consume/context-consumer.controller.js';
+export * from './consume/context-consumer.js';
+export * from './consume/context-request.event.js';
+export * from './provide/context-provider.controller.js';
+export * from './provide/context-provider.js';
+export * from './provide/context-provide.event.js';
+export * from './provide/context-provider.element.js';
 export * from './token/index.js';
+export * from './debug/context-data.function.js';

package/dist-cms/libs/context-api/index.js

@@ -1,4 +1,9 @@
-export * from './consume/index.js';
-export * from './debug/context-data.function.js';
-export * from './provide/index.js';
+export * from './consume/context-consumer.controller.js';
+export * from './consume/context-consumer.js';
+export * from './consume/context-request.event.js';
+export * from './provide/context-provider.controller.js';
+export * from './provide/context-provider.js';
+export * from './provide/context-provide.event.js';
+export * from './provide/context-provider.element.js';
 export * from './token/index.js';
+export * from './debug/context-data.function.js';

package/dist-cms/libs/context-api/provide/context-provider.element.js

@@ -1,6 +1,5 @@
 import { UmbControllerHostElementMixin } from '../../controller-api/index.js';
 import { UmbContextProviderController } from '../index.js';
-// TODO: There is some circular reference from this to Controller-api which is not good. We should move this elsewhere as we do not encourage the use of this element. Its only purpose is within Storybook and tests.
 /**
  * Provides a value to the context down the DOM tree.
  *

package/dist-cms/libs/controller-api/{controller-host.mixin.d.ts → controller-host-base.mixin.d.ts}

@@ -1,4 +1,4 @@
-import type { ClassConstructor } from '../extension-api/types/utils.js';
+import { ClassConstructor } from '../extension-api/types/utils.js';
 import { UmbControllerHost } from './controller-host.interface.js';
 import type { UmbController } from './controller.interface.js';
 declare class UmbControllerHostBaseDeclaration implements Omit<UmbControllerHost, 'getHostElement'> {
@@ -18,5 +18,5 @@ declare class UmbControllerHostBaseDeclaration implements Omit<UmbControllerHost
  * @param {Object} superClass - superclass to be extended.
  * @mixin
  */
-export declare const UmbControllerHostMixin: <T extends ClassConstructor>(superClass: T) => ClassConstructor<UmbControllerHostBaseDeclaration> & T;
+export declare const UmbControllerHostBaseMixin: <T extends ClassConstructor>(superClass: T) => ClassConstructor<UmbControllerHostBaseDeclaration> & T;
 export {};

package/dist-cms/libs/controller-api/{controller-host.mixin.js → controller-host-base.mixin.js}

@@ -5,7 +5,7 @@
  * @param {Object} superClass - superclass to be extended.
  * @mixin
  */
-export const UmbControllerHostMixin = (superClass) => {
+export const UmbControllerHostBaseMixin = (superClass) => {
     class UmbControllerHostBaseClass extends superClass {
         #controllers = [];
         #attached = false;

package/dist-cms/libs/controller-api/controller-host-element.mixin.d.ts

@@ -1,7 +1,7 @@
 import type { UmbControllerAlias } from './controller-alias.type.js';
 import type { UmbControllerHost } from './controller-host.interface.js';
 import type { UmbController } from './controller.interface.js';
-import type { HTMLElementConstructor } from '../extension-api/index.js';
+import { HTMLElementConstructor } from '../extension-api/index.js';
 export declare class UmbControllerHostElement extends HTMLElement implements UmbControllerHost {
     hasController(controller: UmbController): boolean;
     getControllers(filterMethod: (ctrl: UmbController) => boolean): UmbController[];

package/dist-cms/libs/controller-api/controller-host-element.mixin.js

@@ -1,4 +1,4 @@
-import { UmbControllerHostMixin } from './controller-host.mixin.js';
+import { UmbControllerHostBaseMixin } from './controller-host-base.mixin.js';
 /**
  * This mixin enables a web-component to host controllers.
  * This enables controllers to be added to the life cycle of this element.
@@ -7,7 +7,7 @@ import { UmbControllerHostMixin } from './controller-host.mixin.js';
  * @mixin
  */
 export const UmbControllerHostElementMixin = (superClass) => {
-    class UmbControllerHostElementClass extends UmbControllerHostMixin(superClass) {
+    class UmbControllerHostElementClass extends UmbControllerHostBaseMixin(superClass) {
         getHostElement() {
             return this;
         }

package/dist-cms/libs/{class-api/controller-base.class.d.ts → controller-api/controller.class.d.ts}

@@ -1,31 +1,32 @@
-import { type UmbController } from '../controller-api/controller.interface.js';
-declare const UmbBaseController_base: (new (host: import("../controller-api/controller-host.interface.js").UmbControllerHost, controllerAlias?: import("../controller-api/controller-alias.type.js").UmbControllerAlias) => {
-    _host: import("../controller-api/controller-host.interface.js").UmbControllerHost;
-    observe<T>(source: import("rxjs").Observable<T>, callback: (_value: T) => void, controllerAlias?: import("../controller-api/controller-alias.type.js").UmbControllerAlias): import("../observable-api/observer.controller.js").UmbObserverController<T>;
+import { UmbControllerHost } from './controller-host.interface.js';
+import { UmbController } from './controller.interface.js';
+declare const UmbBaseController_base: (new (host: UmbControllerHost, controllerAlias: import("./controller-alias.type.js").UmbControllerAlias) => {
+    _host: UmbControllerHost;
+    observe<T>(source: import("rxjs").Observable<T>, callback: (_value: T) => void, controllerAlias?: import("./controller-alias.type.js").UmbControllerAlias): import("../observable-api/observer.controller.js").UmbObserverController<T>;
     provideContext<BaseType = unknown, ResultType extends BaseType = BaseType, InstanceType_1 extends ResultType = ResultType>(alias: string | import("../context-api/index.js").UmbContextToken<BaseType, ResultType>, instance: InstanceType_1): import("../context-api/index.js").UmbContextProviderController<BaseType, ResultType, InstanceType_1>;
     consumeContext<BaseType_1 = unknown, ResultType_1 extends BaseType_1 = BaseType_1>(alias: string | import("../context-api/index.js").UmbContextToken<BaseType_1, ResultType_1>, callback: import("../context-api/index.js").UmbContextCallback<ResultType_1>): import("../context-api/index.js").UmbContextConsumerController<BaseType_1, ResultType_1>;
     hasController(controller: UmbController): boolean;
     getControllers(filterMethod: (ctrl: UmbController) => boolean): UmbController[];
     addController(controller: UmbController): void;
-    removeControllerByAlias(controllerAlias: import("../controller-api/controller-alias.type.js").UmbControllerAlias): void;
+    removeControllerByAlias(controllerAlias: import("./controller-alias.type.js").UmbControllerAlias): void;
     removeController(controller: UmbController): void;
     getHostElement(): EventTarget;
-    readonly controllerAlias: import("../controller-api/controller-alias.type.js").UmbControllerAlias;
+    readonly controllerAlias: import("./controller-alias.type.js").UmbControllerAlias;
     hostConnected(): void;
     hostDisconnected(): void;
     destroy(): void;
 }) & {
-    _host: import("../controller-api/controller-host.interface.js").UmbControllerHost;
-    observe<T>(source: import("rxjs").Observable<T>, callback: (_value: T) => void, controllerAlias?: import("../controller-api/controller-alias.type.js").UmbControllerAlias): import("../observable-api/observer.controller.js").UmbObserverController<T>;
+    _host: UmbControllerHost;
+    observe<T>(source: import("rxjs").Observable<T>, callback: (_value: T) => void, controllerAlias?: import("./controller-alias.type.js").UmbControllerAlias): import("../observable-api/observer.controller.js").UmbObserverController<T>;
     provideContext<BaseType = unknown, ResultType extends BaseType = BaseType, InstanceType_1 extends ResultType = ResultType>(alias: string | import("../context-api/index.js").UmbContextToken<BaseType, ResultType>, instance: InstanceType_1): import("../context-api/index.js").UmbContextProviderController<BaseType, ResultType, InstanceType_1>;
     consumeContext<BaseType_1 = unknown, ResultType_1 extends BaseType_1 = BaseType_1>(alias: string | import("../context-api/index.js").UmbContextToken<BaseType_1, ResultType_1>, callback: import("../context-api/index.js").UmbContextCallback<ResultType_1>): import("../context-api/index.js").UmbContextConsumerController<BaseType_1, ResultType_1>;
     hasController(controller: UmbController): boolean;
     getControllers(filterMethod: (ctrl: UmbController) => boolean): UmbController[];
     addController(controller: UmbController): void;
-    removeControllerByAlias(controllerAlias: import("../controller-api/controller-alias.type.js").UmbControllerAlias): void;
+    removeControllerByAlias(controllerAlias: import("./controller-alias.type.js").UmbControllerAlias): void;
     removeController(controller: UmbController): void;
     getHostElement(): EventTarget;
-    readonly controllerAlias: import("../controller-api/controller-alias.type.js").UmbControllerAlias;
+    readonly controllerAlias: import("./controller-alias.type.js").UmbControllerAlias;
     hostConnected(): void;
     hostDisconnected(): void;
     destroy(): void;
@@ -36,5 +37,7 @@ declare const UmbBaseController_base: (new (host: import("../controller-api/cont
  *
  */
 export declare abstract class UmbBaseController extends UmbBaseController_base implements UmbController {
+    constructor(host: UmbControllerHost, controllerAlias?: UmbController['controllerAlias']);
+    destroy(): void;
 }
 export {};

package/dist-cms/libs/controller-api/controller.class.js

@@ -0,0 +1,20 @@
+import { UmbClassMixin } from '../class-api/index.js';
+/**
+ * This mixin enables a web-component to host controllers.
+ * This enables controllers to be added to the life cycle of this element.
+ *
+ */
+export class UmbBaseController extends UmbClassMixin(class {
+}) {
+    constructor(host, controllerAlias) {
+        super(host, controllerAlias);
+        this._host.addController(this);
+    }
+    destroy() {
+        if (this._host) {
+            this._host.removeController(this);
+        }
+        //delete this.host;
+        super.destroy();
+    }
+}

package/dist-cms/libs/controller-api/index.d.ts

@@ -1,5 +1,6 @@
-export * from './controller-host.mixin.js';
+export * from './controller-host-base.mixin.js';
 export * from './controller-host.interface.js';
 export * from './controller-host-element.mixin.js';
+export * from './controller.class.js';
 export * from './controller.interface.js';
 export * from './controller-alias.type.js';

package/dist-cms/libs/controller-api/index.js

@@ -1,5 +1,6 @@
-export * from './controller-host.mixin.js';
+export * from './controller-host-base.mixin.js';
 export * from './controller-host.interface.js';
 export * from './controller-host-element.mixin.js';
+export * from './controller.class.js';
 export * from './controller.interface.js';
 export * from './controller-alias.type.js';

package/dist-cms/libs/extension-api/controller/base-extension-initializer.controller.d.ts

@@ -1,5 +1,4 @@
-import { type UmbControllerHost } from '../../controller-api/index.js';
-import { UmbBaseController } from '../../class-api/index.js';
+import { UmbBaseController, type UmbControllerHost } from '../../controller-api/index.js';
 import { type ManifestCondition, type ManifestWithDynamicConditions, type UmbExtensionRegistry } from '../index.js';
 /**
  * This abstract Controller holds the core to manage a single Extension.

package/dist-cms/libs/extension-api/controller/base-extension-initializer.controller.js

@@ -1,4 +1,4 @@
-import { UmbBaseController } from '../../class-api/index.js';
+import { UmbBaseController } from '../../controller-api/index.js';
 import { createExtensionApi, } from '../index.js';
 /**
  * This abstract Controller holds the core to manage a single Extension.

package/dist-cms/libs/extension-api/controller/base-extensions-initializer.controller.d.ts

@@ -1,7 +1,6 @@
 import { ManifestTypeMap, SpecificManifestTypeOrManifestBase } from '../types/map.types.js';
 import type { ManifestBase, UmbBaseExtensionInitializer, UmbExtensionRegistry } from '../index.js';
-import { UmbBaseController } from '../../class-api/index.js';
-import { type UmbControllerHost } from '../../controller-api/index.js';
+import { UmbBaseController, type UmbControllerHost } from '../../controller-api/index.js';
 export type PermittedControllerType<ControllerType extends {
     manifest: any;
 }> = ControllerType & {

package/dist-cms/libs/extension-api/controller/base-extensions-initializer.controller.js

@@ -1,5 +1,5 @@
 import { map } from '../../../external/rxjs/index.js';
-import { UmbBaseController } from '../../class-api/index.js';
+import { UmbBaseController } from '../../controller-api/index.js';
 /**
  * This abstract Controller holds the core to manage a multiple Extensions.
  * When one or more extensions are permitted to be used, then the extender of this class can instantiate the relevant single extension initiator relevant for this type.

package/dist-cms/libs/extension-api/initializers/bundle-extension-initializer.d.ts

@@ -1,7 +1,6 @@
 import type { ManifestBundle } from '../types/index.js';
 import { UmbExtensionRegistry } from '../registry/extension.registry.js';
-import { UmbBaseController } from '../../class-api/index.js';
-import { UmbControllerHostElement } from '../../controller-api/index.js';
+import { UmbBaseController, UmbControllerHostElement } from '../../controller-api/index.js';
 export declare class UmbBundleExtensionInitializer extends UmbBaseController {
     #private;
     constructor(host: UmbControllerHostElement, extensionRegistry: UmbExtensionRegistry<ManifestBundle>);

package/dist-cms/libs/extension-api/initializers/bundle-extension-initializer.js

@@ -1,5 +1,5 @@
 import { loadManifestPlainJs } from '../functions/load-manifest-plain-js.function.js';
-import { UmbBaseController } from '../../class-api/index.js';
+import { UmbBaseController } from '../../controller-api/index.js';
 export class UmbBundleExtensionInitializer extends UmbBaseController {
     #extensionRegistry;
     #bundleMap = new Map();

package/dist-cms/libs/extension-api/initializers/entry-point-extension-initializer.d.ts

@@ -1,6 +1,6 @@
+import { UmbBaseController } from '../../controller-api/controller.class.js';
 import type { ManifestEntryPoint } from '../types/index.js';
 import { UmbExtensionRegistry } from '../registry/extension.registry.js';
-import { UmbBaseController } from '../../class-api/index.js';
 import { UmbElement } from '../../element-api/index.js';
 export declare class UmbEntryPointExtensionInitializer extends UmbBaseController {
     #private;

package/dist-cms/libs/extension-api/initializers/entry-point-extension-initializer.js

@@ -1,5 +1,5 @@
+import { UmbBaseController } from '../../controller-api/controller.class.js';
 import { hasInitExport, loadManifestPlainJs } from '../functions/index.js';
-import { UmbBaseController } from '../../class-api/index.js';
 export class UmbEntryPointExtensionInitializer extends UmbBaseController {
     #host;
     #extensionRegistry;

package/dist-cms/libs/observable-api/observer.controller.d.ts

@@ -1,6 +1,6 @@
-import { type ObserverCallback, UmbObserver } from './observer.js';
-import type { Observable } from '../../external/rxjs/index.js';
-import type { UmbController, UmbControllerAlias, UmbControllerHost } from '../controller-api/index.js';
+import { ObserverCallback, UmbObserver } from './observer.js';
+import { Observable } from '../../external/rxjs/index.js';
+import { UmbController, UmbControllerAlias, UmbControllerHost } from '../controller-api/index.js';
 export declare class UmbObserverController<T = unknown> extends UmbObserver<T> implements UmbController {
     #private;
     get controllerAlias(): UmbControllerAlias;

package/dist-cms/libs/observable-api/states/deep-state.d.ts

@@ -1,6 +1,6 @@
+import { UmbBasicState } from './basic-state.js';
 import type { MappingFunction } from '../types/mapping-function.type.js';
 import type { MemoizationFunction } from '../types/memoization-function.type.js';
-import { UmbBasicState } from './basic-state.js';
 /**
  * @export
  * @class UmbDeepState

package/dist-cms/libs/observable-api/states/deep-state.js

@@ -1,7 +1,7 @@
+import { UmbBasicState } from './basic-state.js';
 import { createObservablePart } from '../utils/create-observable-part.function.js';
 import { deepFreeze } from '../utils/deep-freeze.function.js';
 import { naiveObjectComparison } from '../utils/naive-object-comparison.function.js';
-import { UmbBasicState } from './basic-state.js';
 /**
  * @export
  * @class UmbDeepState

package/dist-cms/packages/core/action/repository-action.d.ts

@@ -1,5 +1,4 @@
-import { type UmbControllerHostElement } from '../../../libs/controller-api/index.js';
-import { UmbBaseController } from '../../../libs/class-api/index.js';
+import { UmbBaseController, UmbControllerHostElement } from '../../../libs/controller-api/index.js';
 import { type UmbApi } from '../../../libs/extension-api/index.js';
 export declare class UmbActionBase<RepositoryType> extends UmbBaseController implements UmbApi {
     repository?: RepositoryType;

package/dist-cms/packages/core/action/repository-action.js

@@ -1,4 +1,4 @@
-import { UmbBaseController } from '../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../libs/controller-api/index.js';
 import { UmbExtensionApiInitializer } from '../../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../extension-registry/index.js';
 export class UmbActionBase extends UmbBaseController {

package/dist-cms/packages/core/collection/action/collection-action-base.d.ts

@@ -1,4 +1,4 @@
-import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../../libs/controller-api/index.js';
 import type { UmbApi } from '../../../../libs/extension-api/index.js';
 export interface UmbCollectionAction extends UmbApi {
     execute(): Promise<void>;

package/dist-cms/packages/core/collection/action/collection-action-base.js

@@ -1,3 +1,3 @@
-import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../../libs/controller-api/index.js';
 export class UmbCollectionActionBase extends UmbBaseController {
 }

package/dist-cms/packages/core/collection/collection-alias.condition.d.ts

@@ -1,4 +1,4 @@
-import { UmbBaseController } from '../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../libs/controller-api/index.js';
 import { ManifestCondition, UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition } from '../../../libs/extension-api/index.js';
 export declare class UmbCollectionAliasCondition extends UmbBaseController implements UmbExtensionCondition {
     #private;

package/dist-cms/packages/core/collection/collection-alias.condition.js

@@ -1,5 +1,5 @@
 import { UMB_COLLECTION_CONTEXT } from './collection-default.context.js';
-import { UmbBaseController } from '../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../libs/controller-api/index.js';
 export class UmbCollectionAliasCondition extends UmbBaseController {
     #onChange;
     constructor(args) {

package/dist-cms/packages/core/collection/collection-default.context.d.ts

@@ -1,7 +1,6 @@
 import { UmbCollectionConfiguration, UmbCollectionContext } from './types.js';
 import { UmbCollectionRepository } from '../repository/index.js';
-import { UmbBaseController } from '../../../libs/class-api/index.js';
-import { type UmbControllerHostElement } from '../../../libs/controller-api/index.js';
+import { UmbBaseController, type UmbControllerHostElement } from '../../../libs/controller-api/index.js';
 import { UmbContextToken } from '../../../libs/context-api/index.js';
 import { UmbApi } from '../../../libs/extension-api/index.js';
 import { ManifestCollection, ManifestCollectionView } from '../extension-registry/index.js';

package/dist-cms/packages/core/collection/collection-default.context.js

@@ -1,4 +1,4 @@
-import { UmbBaseController } from '../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../libs/controller-api/index.js';
 import { UmbContextToken } from '../../../libs/context-api/index.js';
 import { UmbArrayState, UmbNumberState, UmbObjectState, UmbStringState } from '../../../libs/observable-api/index.js';
 import { UmbExtensionApiInitializer, UmbExtensionsManifestInitializer, } from '../../../libs/extension-api/index.js';

package/dist-cms/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.js

@@ -36,7 +36,10 @@ export let UmbBackofficeModalContainerElement = class UmbBackofficeModalContaine
                 return;
             const modalElement = new UmbModalElement();
             modalElement.modalContext = modal;
-            modalElement.element?.addEventListener('close-end', () => this._modalManager?.remove(modal.key));
+            // TODO: We need to change this to the close-end event, when it is added to UUI again.
+            // This solution solves the memory leak issue where the modal contexts where not removed from the manager when they are closed.
+            // It breaks the modal animation though, so we need to wait for the close-end so we are sure the animation is done.
+            modalElement.element?.addEventListener('close', () => this._modalManager?.remove(modal.key));
             this._modalElementMap.set(modal.key, modalElement);
         });
     }

package/dist-cms/packages/core/components/input-tiny-mce/tiny-mce-plugin.d.ts

@@ -1,5 +1,5 @@
 import type { UmbInputTinyMceElement } from '../index.js';
-import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../../libs/controller-api/index.js';
 import { UmbApi } from '../../../../libs/extension-api/index.js';
 import type { Editor } from '../../../../external/tinymce/index.js';
 import type { UmbPropertyEditorConfigCollection } from '../../property-editor/index.js';

package/dist-cms/packages/core/components/input-tiny-mce/tiny-mce-plugin.js

@@ -1,4 +1,4 @@
-import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../../libs/controller-api/index.js';
 export class UmbTinyMcePluginBase extends UmbBaseController {
     constructor(arg) {
         super(arg.host);

package/dist-cms/packages/core/culture/repository/culture.repository.d.ts

@@ -1,5 +1,4 @@
-import { UmbBaseController } from '../../../../libs/class-api/index.js';
-import { type UmbControllerHost } from '../../../../libs/controller-api/index.js';
+import { UmbBaseController, type UmbControllerHost } from '../../../../libs/controller-api/index.js';
 import { type UmbApi } from '../../../../libs/extension-api/index.js';
 export declare class UmbCultureRepository extends UmbBaseController implements UmbApi {
     #private;

package/dist-cms/packages/core/culture/repository/culture.repository.js

@@ -1,5 +1,5 @@
 import { UmbCultureServerDataSource } from './sources/culture.server.data.js';
-import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UmbBaseController } from '../../../../libs/controller-api/index.js';
 export class UmbCultureRepository extends UmbBaseController {
     #dataSource;
     constructor(host) {
@@ -9,5 +9,6 @@ export class UmbCultureRepository extends UmbBaseController {
     requestCultures({ skip, take } = { skip: 0, take: 1000 }) {
         return this.#dataSource.getCollection({ skip, take });
     }
-    destroy() { }
+    destroy() {
+    }
 }