@uxland/primary-shell 7.46.3 → 7.46.5

package/dist/primary/shell/src/api/interaction-service/interaction-service-impl.d.ts

@@ -1,5 +1,6 @@
 import { ConfirmationOptions, ConfirmationResult, ConfirmComponentUI, PrimariaInteractionService } from './interaction-service';
 export declare class ParimariaInteractionServiceImpl extends PrimariaInteractionService {
+    private readonly openDialogCancellers;
     confirm<TData = undefined, TResult = undefined>(data: TData | undefined, componentUI: ConfirmComponentUI<TData, TResult>, options?: ConfirmationOptions | undefined): Promise<ConfirmationResult<TResult | undefined>>;
     confirmMessage(message: string, options?: ConfirmationOptions | undefined): Promise<ConfirmationResult>;
     dispose(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "7.46.3",
+  "version": "7.46.5",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",

package/src/api/interaction-service/interaction-service-impl.tsx

@@ -23,13 +23,17 @@ const defaultOptions: ConfirmationOptions = {
 };
 
 export class ParimariaInteractionServiceImpl extends PrimariaInteractionService {
+  private readonly openDialogCancellers = new Set<() => void>();
+
   confirm<TData = undefined, TResult = undefined>(
     data: TData | undefined,
     componentUI: ConfirmComponentUI<TData, TResult>,
     options?: ConfirmationOptions | undefined
   ): Promise<ConfirmationResult<TResult | undefined>> {
     const finalOptions: ConfirmationOptions = { ...defaultOptions, ...(options || {}) };
+    const { openDialogCancellers } = this;
     return new Promise((resolve) => {
+      let isClosing = false;
       const div = document.createElement("div");
       document.body.appendChild(div);
       const wrapperHeadStyles = document.createElement("style");
@@ -56,6 +60,18 @@ export class ParimariaInteractionServiceImpl extends PrimariaInteractionService
 
         useEffect(() => {
           window.addEventListener('keydown', handleKeydown);
+
+          return () => window.removeEventListener('keydown', handleKeydown);
+        }, []);
+
+        useEffect(() => {
+          const cancelDialog = () => handleClose(false);
+
+          openDialogCancellers.add(cancelDialog);
+
+          return () => {
+            openDialogCancellers.delete(cancelDialog);
+          };
         }, []);
 
         const handleKeydown = (event: KeyboardEvent) => {
@@ -104,17 +120,20 @@ export class ParimariaInteractionServiceImpl extends PrimariaInteractionService
         };
 
         const resolvePromise = (finalResult: TResult, confirmed: boolean) => {
+          if (isClosing) return;
+
+          isClosing = true;
           setTimeout(() => {
             const confirmationResult = {
               result: confirmed ? finalResult : undefined,
               confirmed: confirmed,
             };
             resolve(confirmationResult);
+            root.unmount();
             document.body.removeChild(div);
             document.head.removeChild(wrapperHeadStyles);
             if (DialogComponentStyles)
               document.head.removeChild(componentHeadStyles);
-            window.removeEventListener('keydown', handleKeydown);
           }, 300);
         };
 
@@ -233,10 +252,8 @@ export class ParimariaInteractionServiceImpl extends PrimariaInteractionService
   }
 
   dispose(): void {
-    // Limpiar todos los modales abiertos
-    const modals = document.querySelectorAll('.modal');
-    for (const modal of modals) {
-      modal.remove();
+    for (const cancelDialog of [...this.openDialogCancellers]) {
+      cancelDialog();
     }
   }
 }

package/src/handle-plugins.ts

@@ -1,9 +1,5 @@
 import type { BootstrappedPlugin, PluginDefinition, Plugin as PluginType } from "@uxland/harmonix";
 import { bootstrapPlugins as pluginBootstrapper } from "@uxland/harmonix";
-import {
-  dispose as activityHistoryDispose,
-  initialize as activityHistoryInitialize,
-} from "../../../plugins/activity-history/src/plugin";
 import { PrimariaApi, primariaApiFactory } from "./api/api";
 export type { PluginDefinition, PluginInfo } from "@uxland/harmonix";
 
@@ -29,13 +25,13 @@ const CORE_FIRST_ID = "activity-history";
 // from the plugin store (versioned/uploadable) like any other plugin; this
 // bundled copy is the fallback used when the caller does not provide it — e.g.
 // third-party sandboxes that install primary-shell without a plugin store.
+//
+// The import stays inside the importer on purpose: importing it statically would
+// evaluate the plugin's modules on shell load and register its custom elements,
+// so the copy coming from the store would fail to define them again.
 const bundledActivityHistory: PluginDefinition = {
   pluginId: CORE_FIRST_ID,
-  importer: () =>
-    Promise.resolve({
-      initialize: activityHistoryInitialize,
-      dispose: activityHistoryDispose,
-    }),
+  importer: () => import("../../../plugins/activity-history/src/plugin"),
 };
 
 export const bootstrapPlugins = async (plugins: PluginDefinition[], startup?: PrimariaStartupPlugin) => {