@omegagrid/bucket 0.11.30 → 0.11.32

package/dist/ui/bucket.components.d.ts

@@ -1,6 +1,8 @@
 import { ComponentId, ComponentSlice, ComponentState } from "@omegagrid/core";
 import { ComponentUpdateOptions, PathSegments } from "../types";
 import { Bucket } from "./bucket";
+/** Calls dispose() of a component that is not used again (a closed tab, modal sidebar or dialog), if it has one */
+export declare const disposeComponent: (component: HTMLElement) => void;
 export declare class BucketComponents extends ComponentSlice<Bucket> {
     private _componentPromiseResolutions;
     private _resolvingComponentIds;

package/dist/ui/bucket.components.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bucket.components.d.ts","sourceRoot":"","sources":["../../src/ui/bucket.components.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,cAAc,EAAkB,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,MAAM,EAAe,MAAM,UAAU,CAAC;AAE/C,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,MAAM,CAAC;IAE3D,OAAO,CAAC,4BAA4B,CAG7B;IAEP,OAAO,CAAC,sBAAsB,CAA0B;IAExD,QAAQ,CAAC,KAAK,iCAAwC;IACtD,QAAQ,CAAC,UAAU,gCAAuC;IAC1D,QAAQ,CAAC,mBAAmB,gCAAuC;IACnE,QAAQ,CAAC,iBAAiB,mBAA0B;IACpD,IAAI,oBAAoB,YAA6C;IAErE,IAAI,MAAM,WAA4B;IAEtC,QAAQ,CAAC,MAAM,mCAA0C;IAEzD,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc;IAS/C,GAAG,CAAC,EAAE,EAAE,WAAW;IAInB,OAAO,CAAC,OAAO;IAIf,GAAG,CAAC,EAAE,EAAE,WAAW;IAyBnB,OAAO,CAAC,EAAE,EAAE,WAAW;IAUvB,wBAAwB,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW;IAQjE,0BAA0B,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,SAAS,EAAE,WAAW,KAAK,IAAI,EAAE,MAAM,EAAE,MAAM,IAAI;IAKzG,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,sBAAsB;IAWvD,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW;IAchD,UAAU,CAAC,EAAE,EAAE,WAAW;IAmBpB,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;CAQrD"}
+{"version":3,"file":"bucket.components.d.ts","sourceRoot":"","sources":["../../src/ui/bucket.components.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,cAAc,EAAkB,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,MAAM,EAAe,MAAM,UAAU,CAAC;AAE/C,mHAAmH;AACnH,eAAO,MAAM,gBAAgB,GAAI,WAAW,WAAW,SAGtD,CAAA;AAED,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,MAAM,CAAC;IAE3D,OAAO,CAAC,4BAA4B,CAG7B;IAEP,OAAO,CAAC,sBAAsB,CAA0B;IAExD,QAAQ,CAAC,KAAK,iCAAwC;IACtD,QAAQ,CAAC,UAAU,gCAAuC;IAC1D,QAAQ,CAAC,mBAAmB,gCAAuC;IACnE,QAAQ,CAAC,iBAAiB,mBAA0B;IACpD,IAAI,oBAAoB,YAA6C;IAErE,IAAI,MAAM,WAA4B;IAEtC,QAAQ,CAAC,MAAM,mCAA0C;IAEzD,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc;IAS/C,GAAG,CAAC,EAAE,EAAE,WAAW;IAInB,OAAO,CAAC,OAAO;IAIf,GAAG,CAAC,EAAE,EAAE,WAAW;IAyBnB,OAAO,CAAC,EAAE,EAAE,WAAW;IAUvB,wBAAwB,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW;IAQjE,0BAA0B,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,SAAS,EAAE,WAAW,KAAK,IAAI,EAAE,MAAM,EAAE,MAAM,IAAI;IAKzG,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,sBAAsB;IAcvD,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW;IAchD,UAAU,CAAC,EAAE,EAAE,WAAW;IAcpB,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;CAQrD"}

package/dist/ui/bucket.components.js

@@ -1,5 +1,11 @@
 import { ComponentSlice } from "@omegagrid/core";
 import { Bucket, BucketEvent } from "./bucket";
+/** Calls dispose() of a component that is not used again (a closed tab, modal sidebar or dialog), if it has one */
+export const disposeComponent = (component) => {
+    const disposable = component;
+    if (component && typeof disposable.dispose === 'function')
+        disposable.dispose();
+};
 export class BucketComponents extends ComponentSlice {
     constructor() {
         super(...arguments);
@@ -77,8 +83,11 @@ export class BucketComponents extends ComponentSlice {
         const newId = options.id ?? id;
         this.bucket.editorContainer.updateTab(id, { id: newId, title: options.title ?? undefined });
         if (this.components.has(id) && newId != id) {
+            // the component lives on under the new id: moved over, not disposed like on unregister()
             const c = this.components.get(id);
-            this.unregister(id);
+            this.components.delete(id);
+            this.paths.delete(id);
+            this.bucket.dispatchEvent(new BucketEvent('unregister', { componentId: id }));
             this.register(newId, c);
         }
         return this.components.get(newId);
@@ -107,10 +116,7 @@ export class BucketComponents extends ComponentSlice {
         }
         this.components.delete(id);
         this.anonymousComponents.delete(id);
-        const disposable = component;
-        if (component && typeof disposable.dispose === 'function') {
-            disposable.dispose();
-        }
+        disposeComponent(component);
         this.paths.delete(id);
         this.bucket.dispatchEvent(new BucketEvent('unregister', { componentId: id }));
     }

package/dist/ui/bucket.components.js.map

@@ -1 +1 @@
-{"version":3,"file":"bucket.components.js","sourceRoot":"","sources":["../../src/ui/bucket.components.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentId, ComponentSlice, ComponentState, OmegaComponent } from \"@omegagrid/core\";\nimport { ComponentUpdateOptions, PathSegments } from \"../types\";\nimport { Bucket, BucketEvent } from \"./bucket\";\n\nexport class BucketComponents extends ComponentSlice<Bucket> {\n\n\tprivate _componentPromiseResolutions = new Map<ComponentId, {\n\t\tresolve: (component: HTMLElement) => void,\n\t\treject: () => void\n\t}[]>();\n\n\tprivate _resolvingComponentIds = new Set<ComponentId>();\n\n\treadonly paths = new Map<ComponentId, PathSegments>();\n\treadonly components = new Map<ComponentId, HTMLElement>();\n\treadonly anonymousComponents = new Map<ComponentId, HTMLElement>();\n\treadonly unsavedComponents = new Set<ComponentId>();\n\tget hasUnsavedComponents() { return this.unsavedComponents.size > 0 }\n\n\tget bucket() { return this.component }\n\n\treadonly states = new Map<ComponentId, ComponentState>();\n\n\tsetState(id: ComponentId, state: ComponentState) {\n\t\tconst component = this.components.get(id) as OmegaComponent;\n\t\tif (component && component.setState) {\n\t\t\tcomponent.setState(state);\n\t\t} else {\n\t\t\tthis.states.set(id, state);\n\t\t}\n\t}\n\n\thas(id: ComponentId) {\n\t\treturn this.components.has(id) || this.anonymousComponents.has(id) || this._resolvingComponentIds.has(id);\n\t}\n\n\tprivate _lookup(id: ComponentId) {\n\t\treturn this.components.get(id) ?? this.anonymousComponents.get(id);\n\t}\n\n\tget(id: ComponentId) {\n\t\tconst component = this._lookup(id);\n\t\tif (component) {\n\t\t\tthis.resolveComponentPromises(id, component);\n\t\t\treturn component;\n\t\t}\n\n\t\treturn new Promise<HTMLElement>((resolve, reject) => {\n\t\t\tthis.enqueueComponentResolution(id, resolve, reject);\n\t\t\tif (this._resolvingComponentIds.has(id)) return;\n\t\t\tthis._resolvingComponentIds.add(id);\n\t\t\tPromise.resolve(this.component.createComponent(id)).then(created => {\n\t\t\t\tconst component = created as OmegaComponent;\n\t\t\t\tif (component) {\n\t\t\t\t\tthis.register(id, component);\n\t\t\t\t\tconst state = this.bucket.state;\n\t\t\t\t\tif (state?.components?.[id] && component.setState) {\n\t\t\t\t\t\tcomponent.setState(state.components[id]);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tthis.resolveComponentPromises(id, component);\n\t\t\t});\n\t\t});\n\t}\n\n\twaitFor(id: ComponentId) {\n\t\treturn new Promise<HTMLElement>((resolve, reject) => {\n\t\t\tthis.enqueueComponentResolution(id, resolve, reject);\n\t\t\tconst component = this._lookup(id);\n\t\t\tif (component && !this._resolvingComponentIds.has(id)) {\n\t\t\t\tthis.resolveComponentPromises(id, component);\n\t\t\t}\n\t\t});\n\t}\n\n\tresolveComponentPromises(id: ComponentId, component?: HTMLElement) {\n\t\tif (this._componentPromiseResolutions.has(id)) {\n\t\t\tthis._componentPromiseResolutions.get(id).forEach(res => res.resolve(component));\n\t\t\tthis._componentPromiseResolutions.delete(id);\n\t\t}\n\t\tthis._resolvingComponentIds.delete(id);\n\t}\n\n\tenqueueComponentResolution(id: ComponentId, resolve: (component: HTMLElement) => void, reject: () => void) {\n\t\tif (!this._componentPromiseResolutions.has(id)) this._componentPromiseResolutions.set(id, []);\n\t\tthis._componentPromiseResolutions.get(id).push({ resolve, reject });\n\t}\n\n\tupdate(id: ComponentId, options: ComponentUpdateOptions) {\n\t\tconst newId = options.id ?? id;\n\t\tthis.bucket.editorContainer.updateTab(id, {id: newId, title: options.title ?? undefined});\n\t\tif (this.components.has(id) && newId != id) {\n\t\t\tconst c = this.components.get(id);\n\t\t\tthis.unregister(id);\n\t\t\tthis.register(newId, c);\n\t\t}\n\t\treturn this.components.get(newId);\n\t}\n\n\tregister(id: ComponentId, component: HTMLElement) {\n\t\tif (id == null) {\n\t\t\tid = `temp_${Bucket.getUniqueId()}`;\n\t\t\tthis.anonymousComponents.set(id, component);\n\t\t} else {\n\t\t\tconst alreadyRegistered = this.components.has(id);\n\t\t\tthis.components.set(id, component);\n\t\t\tif (alreadyRegistered) return id;\n\t\t}\n\n\t\tthis.bucket.dispatchEvent(new BucketEvent('register', {componentId: id}));\n\t\treturn id;\n\t}\n\n\tunregister(id: ComponentId) {\n\t\tlet component: HTMLElement;\n\t\tif (this.components.has(id)) {\n\t\t\tcomponent = this.components.get(id);\n\t\t} else if (this.anonymousComponents.has(id)) {\n\t\t\tcomponent = this.anonymousComponents.get(id);\n\t\t}\n\t\tthis.components.delete(id);\n\t\tthis.anonymousComponents.delete(id);\n\n\t\tconst disposable = component as unknown as { dispose?: () => void };\n\t\tif (component && typeof disposable.dispose === 'function') {\n\t\t\tdisposable.dispose();\n\t\t}\n\n\t\tthis.paths.delete(id);\n\t\tthis.bucket.dispatchEvent(new BucketEvent('unregister', {componentId: id}));\n\t}\n\n\tasync getPath(id: ComponentId): Promise<PathSegments> {\n\t\tif (this.paths.has(id)) return this.paths.get(id);\n\t\tif (!this.bucket.options.pathResolver) return [];\n\t\tconst path = await this.bucket.options.pathResolver(id);\n\t\tthis.paths.set(id, path);\n\t\treturn path;\n\t}\n\n}\n"]}
+{"version":3,"file":"bucket.components.js","sourceRoot":"","sources":["../../src/ui/bucket.components.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentId, ComponentSlice, ComponentState, OmegaComponent } from \"@omegagrid/core\";\nimport { ComponentUpdateOptions, PathSegments } from \"../types\";\nimport { Bucket, BucketEvent } from \"./bucket\";\n\n/** Calls dispose() of a component that is not used again (a closed tab, modal sidebar or dialog), if it has one */\nexport const disposeComponent = (component: HTMLElement) => {\n\tconst disposable = component as unknown as { dispose?: () => void };\n\tif (component && typeof disposable.dispose === 'function') disposable.dispose();\n}\n\nexport class BucketComponents extends ComponentSlice<Bucket> {\n\n\tprivate _componentPromiseResolutions = new Map<ComponentId, {\n\t\tresolve: (component: HTMLElement) => void,\n\t\treject: () => void\n\t}[]>();\n\n\tprivate _resolvingComponentIds = new Set<ComponentId>();\n\n\treadonly paths = new Map<ComponentId, PathSegments>();\n\treadonly components = new Map<ComponentId, HTMLElement>();\n\treadonly anonymousComponents = new Map<ComponentId, HTMLElement>();\n\treadonly unsavedComponents = new Set<ComponentId>();\n\tget hasUnsavedComponents() { return this.unsavedComponents.size > 0 }\n\n\tget bucket() { return this.component }\n\n\treadonly states = new Map<ComponentId, ComponentState>();\n\n\tsetState(id: ComponentId, state: ComponentState) {\n\t\tconst component = this.components.get(id) as OmegaComponent;\n\t\tif (component && component.setState) {\n\t\t\tcomponent.setState(state);\n\t\t} else {\n\t\t\tthis.states.set(id, state);\n\t\t}\n\t}\n\n\thas(id: ComponentId) {\n\t\treturn this.components.has(id) || this.anonymousComponents.has(id) || this._resolvingComponentIds.has(id);\n\t}\n\n\tprivate _lookup(id: ComponentId) {\n\t\treturn this.components.get(id) ?? this.anonymousComponents.get(id);\n\t}\n\n\tget(id: ComponentId) {\n\t\tconst component = this._lookup(id);\n\t\tif (component) {\n\t\t\tthis.resolveComponentPromises(id, component);\n\t\t\treturn component;\n\t\t}\n\n\t\treturn new Promise<HTMLElement>((resolve, reject) => {\n\t\t\tthis.enqueueComponentResolution(id, resolve, reject);\n\t\t\tif (this._resolvingComponentIds.has(id)) return;\n\t\t\tthis._resolvingComponentIds.add(id);\n\t\t\tPromise.resolve(this.component.createComponent(id)).then(created => {\n\t\t\t\tconst component = created as OmegaComponent;\n\t\t\t\tif (component) {\n\t\t\t\t\tthis.register(id, component);\n\t\t\t\t\tconst state = this.bucket.state;\n\t\t\t\t\tif (state?.components?.[id] && component.setState) {\n\t\t\t\t\t\tcomponent.setState(state.components[id]);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tthis.resolveComponentPromises(id, component);\n\t\t\t});\n\t\t});\n\t}\n\n\twaitFor(id: ComponentId) {\n\t\treturn new Promise<HTMLElement>((resolve, reject) => {\n\t\t\tthis.enqueueComponentResolution(id, resolve, reject);\n\t\t\tconst component = this._lookup(id);\n\t\t\tif (component && !this._resolvingComponentIds.has(id)) {\n\t\t\t\tthis.resolveComponentPromises(id, component);\n\t\t\t}\n\t\t});\n\t}\n\n\tresolveComponentPromises(id: ComponentId, component?: HTMLElement) {\n\t\tif (this._componentPromiseResolutions.has(id)) {\n\t\t\tthis._componentPromiseResolutions.get(id).forEach(res => res.resolve(component));\n\t\t\tthis._componentPromiseResolutions.delete(id);\n\t\t}\n\t\tthis._resolvingComponentIds.delete(id);\n\t}\n\n\tenqueueComponentResolution(id: ComponentId, resolve: (component: HTMLElement) => void, reject: () => void) {\n\t\tif (!this._componentPromiseResolutions.has(id)) this._componentPromiseResolutions.set(id, []);\n\t\tthis._componentPromiseResolutions.get(id).push({ resolve, reject });\n\t}\n\n\tupdate(id: ComponentId, options: ComponentUpdateOptions) {\n\t\tconst newId = options.id ?? id;\n\t\tthis.bucket.editorContainer.updateTab(id, {id: newId, title: options.title ?? undefined});\n\t\tif (this.components.has(id) && newId != id) {\n\t\t\t// the component lives on under the new id: moved over, not disposed like on unregister()\n\t\t\tconst c = this.components.get(id);\n\t\t\tthis.components.delete(id);\n\t\t\tthis.paths.delete(id);\n\t\t\tthis.bucket.dispatchEvent(new BucketEvent('unregister', {componentId: id}));\n\t\t\tthis.register(newId, c);\n\t\t}\n\t\treturn this.components.get(newId);\n\t}\n\n\tregister(id: ComponentId, component: HTMLElement) {\n\t\tif (id == null) {\n\t\t\tid = `temp_${Bucket.getUniqueId()}`;\n\t\t\tthis.anonymousComponents.set(id, component);\n\t\t} else {\n\t\t\tconst alreadyRegistered = this.components.has(id);\n\t\t\tthis.components.set(id, component);\n\t\t\tif (alreadyRegistered) return id;\n\t\t}\n\n\t\tthis.bucket.dispatchEvent(new BucketEvent('register', {componentId: id}));\n\t\treturn id;\n\t}\n\n\tunregister(id: ComponentId) {\n\t\tlet component: HTMLElement;\n\t\tif (this.components.has(id)) {\n\t\t\tcomponent = this.components.get(id);\n\t\t} else if (this.anonymousComponents.has(id)) {\n\t\t\tcomponent = this.anonymousComponents.get(id);\n\t\t}\n\t\tthis.components.delete(id);\n\t\tthis.anonymousComponents.delete(id);\n\t\tdisposeComponent(component);\n\t\tthis.paths.delete(id);\n\t\tthis.bucket.dispatchEvent(new BucketEvent('unregister', {componentId: id}));\n\t}\n\n\tasync getPath(id: ComponentId): Promise<PathSegments> {\n\t\tif (this.paths.has(id)) return this.paths.get(id);\n\t\tif (!this.bucket.options.pathResolver) return [];\n\t\tconst path = await this.bucket.options.pathResolver(id);\n\t\tthis.paths.set(id, path);\n\t\treturn path;\n\t}\n\n}\n"]}

package/dist/ui/bucket.dialogs.d.ts

@@ -5,7 +5,14 @@ export declare class BucketDialogs extends ComponentSlice<Bucket> {
     readonly items: Map<ComponentId, BucketDialog>;
     get bucket(): Bucket;
     register(id: ComponentId, dialog: BucketDialog): void;
+    /** Drops the dialog from the state; its component is disposed when the dialog closes */
     unregister(id: ComponentId): void;
+    /**
+     * The dialog closed: it leaves the state and its component is disposed like the component of a closed tab.
+     * The component belongs to the dialog alone (created for it or passed in by the caller) and is not among the
+     * registered components, so the registry is left alone - a tab open under the same id keeps its component.
+     */
+    private _onClose;
     open(options: OpenDialogOptions): Promise<BucketDialog>;
 }
 //# sourceMappingURL=bucket.dialogs.d.ts.map

package/dist/ui/bucket.dialogs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bucket.dialogs.d.ts","sourceRoot":"","sources":["../../src/ui/bucket.dialogs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAO,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG3D,qBAAa,aAAc,SAAQ,cAAc,CAAC,MAAM,CAAC;IAExD,QAAQ,CAAC,KAAK,iCAAwC;IAEtD,IAAI,MAAM,WAA4B;IAEtC,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY;IAI9C,UAAU,CAAC,EAAE,EAAE,WAAW;IAMpB,IAAI,CAAC,OAAO,EAAE,iBAAiB;CAuCrC"}
+{"version":3,"file":"bucket.dialogs.d.ts","sourceRoot":"","sources":["../../src/ui/bucket.dialogs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAO,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAI3D,qBAAa,aAAc,SAAQ,cAAc,CAAC,MAAM,CAAC;IAExD,QAAQ,CAAC,KAAK,iCAAwC;IAEtD,IAAI,MAAM,WAA4B;IAEtC,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY;IAI9C,wFAAwF;IACxF,UAAU,CAAC,EAAE,EAAE,WAAW;IAK1B;;;;OAIG;IACH,OAAO,CAAC,QAAQ;IAOV,IAAI,CAAC,OAAO,EAAE,iBAAiB;CAuCrC"}

package/dist/ui/bucket.dialogs.js

@@ -1,4 +1,5 @@
 import { ComponentSlice, dom } from "@omegagrid/core";
+import { disposeComponent } from "./bucket.components";
 export class BucketDialogs extends ComponentSlice {
     constructor() {
         super(...arguments);
@@ -8,9 +9,21 @@ export class BucketDialogs extends ComponentSlice {
     register(id, dialog) {
         this.items.set(id, dialog);
     }
+    /** Drops the dialog from the state; its component is disposed when the dialog closes */
     unregister(id) {
         this.items.delete(id);
-        this.bucket.components.unregister(id);
+        this.bucket.dispatchStateEvent();
+    }
+    /**
+     * The dialog closed: it leaves the state and its component is disposed like the component of a closed tab.
+     * The component belongs to the dialog alone (created for it or passed in by the caller) and is not among the
+     * registered components, so the registry is left alone - a tab open under the same id keeps its component.
+     */
+    _onClose(dialog) {
+        const id = dialog.componentId;
+        if (id != null && this.items.get(id) === dialog)
+            this.items.delete(id);
+        disposeComponent(dialog.component);
         this.bucket.dispatchStateEvent();
     }
     async open(options) {
@@ -20,7 +33,7 @@ export class BucketDialogs extends ComponentSlice {
             listeners: [
                 ['dialog.move', () => this.bucket.dispatchStateEvent()],
                 ['dialog.resize', () => this.bucket.dispatchStateEvent()],
-                ['dialog.close', (e) => this.unregister(e.dialog.componentId)]
+                ['dialog.close', (e) => this._onClose(e.dialog)]
             ]
         });
         // compact (mobile) bucket: dialogs fill the whole bucket regardless of the requested size

package/dist/ui/bucket.dialogs.js.map

@@ -1 +1 @@
-{"version":3,"file":"bucket.dialogs.js","sourceRoot":"","sources":["../../src/ui/bucket.dialogs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAKnE,MAAM,OAAO,aAAc,SAAQ,cAAsB;IAAzD;;QAEU,UAAK,GAAG,IAAI,GAAG,EAA6B,CAAC;IAqDvD,CAAC;IAnDA,IAAI,MAAM,KAAK,OAAO,IAAI,CAAC,SAAS,CAAA,CAAC,CAAC;IAEtC,QAAQ,CAAC,EAAe,EAAE,MAAoB;QAC7C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,UAAU,CAAC,EAAe;QACzB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA0B;QACpC,MAAM,MAAM,GAAG,GAAG,CAAC,aAAa,CAAe,WAAW,EAAE;YAC3D,WAAW,EAAE,OAAO,CAAC,EAAE;YACvB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI;YACxC,SAAS,EAAE;gBACV,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBACvD,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBACzD,CAAC,cAAc,EAAE,CAAC,CAAc,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAE,CAAC,CAAC,MAAuB,CAAC,WAAW,CAAC,CAAC;aAC7F;SACD,CAAC,CAAC;QACH,0FAA0F;QAC1F,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;YACpC,CAAC,CAAC,EAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC,EAAE,SAAS,EAAE,KAAK,EAAC;YACvF,CAAC,CAAC,OAAO,CACT,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,UAAU,EAAE,CAAC;QAEpB,IAAI,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAClC,OAAO,OAAO,CAAC,SAAS,CAAC;QACzB,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;YAC9B,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAE7B,yEAAyE;QACzE,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;YAChB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;QAED,8BAA8B;QAE9B,OAAO,MAAM,CAAC;IACf,CAAC;CAED","sourcesContent":["import { ComponentId, ComponentSlice, dom } from \"@omegagrid/core\";\nimport { Bucket } from \"./bucket\";\nimport { BucketDialog, OpenDialogOptions } from \"../types\";\nimport { DialogEvent } from \"@omegagrid/dialog\";\n\nexport class BucketDialogs extends ComponentSlice<Bucket> {\n\n\treadonly items = new Map<ComponentId, BucketDialog>();\n\n\tget bucket() { return this.component }\n\n\tregister(id: ComponentId, dialog: BucketDialog) {\t\n\t\tthis.items.set(id, dialog);\n\t}\n\n\tunregister(id: ComponentId) {\t\n\t\tthis.items.delete(id);\n\t\tthis.bucket.components.unregister(id);\n\t\tthis.bucket.dispatchStateEvent();\n\t}\n\n\tasync open(options: OpenDialogOptions) {\n\t\tconst dialog = dom.createElement<BucketDialog>('og-dialog', {\n\t\t\tcomponentId: options.id,\n\t\t\tmaximizable: options.maximizable ?? true,\n\t\t\tlisteners: [\n\t\t\t\t['dialog.move', () => this.bucket.dispatchStateEvent()],\n\t\t\t\t['dialog.resize', () => this.bucket.dispatchStateEvent()],\n\t\t\t\t['dialog.close', (e: DialogEvent) => this.unregister((e.dialog as BucketDialog).componentId)]\n\t\t\t]\n\t\t});\n\t\t// compact (mobile) bucket: dialogs fill the whole bucket regardless of the requested size\n\t\tdialog.setOptions(this.bucket.compact\n\t\t\t? {...options, width: '100%', height: '100%', location: {x: 0, y: 0}, resizable: false}\n\t\t\t: options\n\t\t);\n\t\tdialog.open(this.bucket);\n\t\tdialog.showLoader();\n\n\t\tlet component = options.component;\n\t\tdelete options.component;\n\t\tif (!component && options.id) {\n\t\t\tcomponent = await this.bucket.createComponent(options.id);\n\t\t\tthis.register(options.id, dialog);\n\t\t}\n\n\t\tdialog.hideLoader();\n\t\tdialog.component = component;\n\n\t\t// dialog without component id cannot be registered and included in state\n\t\tif (options.id) {\n\t\t\tthis.register(options.id, dialog);\n\t\t\tthis.bucket.dispatchStateEvent();\n\t\t}\n\n\t\t// TODO - fix dialog position;\n\n\t\treturn dialog;\n\t}\n\n}\n"]}
+{"version":3,"file":"bucket.dialogs.js","sourceRoot":"","sources":["../../src/ui/bucket.dialogs.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentId, ComponentSlice, dom } from \"@omegagrid/core\";\nimport { Bucket } from \"./bucket\";\nimport { BucketDialog, OpenDialogOptions } from \"../types\";\nimport { DialogEvent } from \"@omegagrid/dialog\";\nimport { disposeComponent } from \"./bucket.components\";\n\nexport class BucketDialogs extends ComponentSlice<Bucket> {\n\n\treadonly items = new Map<ComponentId, BucketDialog>();\n\n\tget bucket() { return this.component }\n\n\tregister(id: ComponentId, dialog: BucketDialog) {\n\t\tthis.items.set(id, dialog);\n\t}\n\n\t/** Drops the dialog from the state; its component is disposed when the dialog closes */\n\tunregister(id: ComponentId) {\n\t\tthis.items.delete(id);\n\t\tthis.bucket.dispatchStateEvent();\n\t}\n\n\t/**\n\t * The dialog closed: it leaves the state and its component is disposed like the component of a closed tab.\n\t * The component belongs to the dialog alone (created for it or passed in by the caller) and is not among the\n\t * registered components, so the registry is left alone - a tab open under the same id keeps its component.\n\t */\n\tprivate _onClose(dialog: BucketDialog) {\n\t\tconst id = dialog.componentId;\n\t\tif (id != null && this.items.get(id) === dialog) this.items.delete(id);\n\t\tdisposeComponent(dialog.component);\n\t\tthis.bucket.dispatchStateEvent();\n\t}\n\n\tasync open(options: OpenDialogOptions) {\n\t\tconst dialog = dom.createElement<BucketDialog>('og-dialog', {\n\t\t\tcomponentId: options.id,\n\t\t\tmaximizable: options.maximizable ?? true,\n\t\t\tlisteners: [\n\t\t\t\t['dialog.move', () => this.bucket.dispatchStateEvent()],\n\t\t\t\t['dialog.resize', () => this.bucket.dispatchStateEvent()],\n\t\t\t\t['dialog.close', (e: DialogEvent) => this._onClose(e.dialog as BucketDialog)]\n\t\t\t]\n\t\t});\n\t\t// compact (mobile) bucket: dialogs fill the whole bucket regardless of the requested size\n\t\tdialog.setOptions(this.bucket.compact\n\t\t\t? {...options, width: '100%', height: '100%', location: {x: 0, y: 0}, resizable: false}\n\t\t\t: options\n\t\t);\n\t\tdialog.open(this.bucket);\n\t\tdialog.showLoader();\n\n\t\tlet component = options.component;\n\t\tdelete options.component;\n\t\tif (!component && options.id) {\n\t\t\tcomponent = await this.bucket.createComponent(options.id);\n\t\t\tthis.register(options.id, dialog);\n\t\t}\n\n\t\tdialog.hideLoader();\n\t\tdialog.component = component;\n\n\t\t// dialog without component id cannot be registered and included in state\n\t\tif (options.id) {\n\t\t\tthis.register(options.id, dialog);\n\t\t\tthis.bucket.dispatchStateEvent();\n\t\t}\n\n\t\t// TODO - fix dialog position;\n\n\t\treturn dialog;\n\t}\n\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omegagrid/bucket",
-  "version": "0.11.30",
+  "version": "0.11.32",
   "license": "UNLICENSED",
   "description": "Application layout component",
   "main": "./dist/index.js",
@@ -28,11 +28,11 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^7.0.1",
-    "@omegagrid/commands": "^0.11.30",
-    "@omegagrid/core": "^0.11.30",
-    "@omegagrid/dialog": "^0.11.30",
-    "@omegagrid/localize": "^0.11.30",
-    "@omegagrid/tabs": "^0.11.30",
+    "@omegagrid/commands": "^0.11.32",
+    "@omegagrid/core": "^0.11.32",
+    "@omegagrid/dialog": "^0.11.32",
+    "@omegagrid/localize": "^0.11.32",
+    "@omegagrid/tabs": "^0.11.32",
     "lit": "^3.1.1",
     "ts-debounce": "^4.0.0"
   },