piral-core 1.11.0 → 1.11.1-beta.220bc90

package/lib/actions/portal.js

@@ -1,4 +1,7 @@
 import { withoutKey, withKey, includeItem, excludeItem, replaceOrAddItem } from '../utils';
+function getPortalContainer(portal) {
+    return portal.containerInfo;
+}
 export function destroyPortal(ctx, id) {
     ctx.dispatch((state) => ({
         ...state,
@@ -11,10 +14,15 @@ export function hidePortal(ctx, id, entry) {
         portals: withKey(state.portals, id, excludeItem(state.portals[id], entry)),
     }));
 }
+function isSamePortal(current, candidate) {
+    const currentContainer = getPortalContainer(current);
+    const candidateContainer = getPortalContainer(candidate);
+    return candidate === current || (!!currentContainer && currentContainer === candidateContainer);
+}
 export function updatePortal(ctx, id, current, next) {
     ctx.dispatch((state) => ({
         ...state,
-        portals: withKey(state.portals, id, replaceOrAddItem(state.portals[id], next, (m) => m === current)),
+        portals: withKey(state.portals, id, replaceOrAddItem(state.portals[id], next, (m) => isSamePortal(current, m))),
     }));
 }
 export function showPortal(ctx, id, entry) {

package/lib/actions/portal.js.map

@@ -1 +1 @@
-{"version":3,"file":"portal.js","sourceRoot":"","sources":["../../src/actions/portal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAG3F,MAAM,UAAU,aAAa,CAAC,GAAuB,EAAE,EAAU;IAC/D,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;KACvC,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAuB,EAAE,EAAU,EAAE,KAAkB;IAChF,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;KAC3E,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAuB,EAAE,EAAU,EAAE,OAAoB,EAAE,IAAiB;IACvG,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,OAAO,EAAE,OAAO,CACd,KAAK,CAAC,OAAO,EACb,EAAE,EACF,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAChE;KACF,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAuB,EAAE,EAAU,EAAE,KAAkB;IAChF,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;KAC3E,CAAC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"portal.js","sourceRoot":"","sources":["../../src/actions/portal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAO3F,SAAS,kBAAkB,CAAC,MAAmB;IAC7C,OAAQ,MAA8B,CAAC,aAAa,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAuB,EAAE,EAAU;IAC/D,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;KACvC,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAuB,EAAE,EAAU,EAAE,KAAkB;IAChF,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;KAC3E,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,OAAoB,EAAE,SAAsB;IAChE,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAEzD,OAAO,SAAS,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,gBAAgB,IAAI,gBAAgB,KAAK,kBAAkB,CAAC,CAAC;AAClG,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAuB,EAAE,EAAU,EAAE,OAAoB,EAAE,IAAiB;IACvG,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,OAAO,EAAE,OAAO,CACd,KAAK,CAAC,OAAO,EACb,EAAE,EACF,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAC3E;KACF,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAuB,EAAE,EAAU,EAAE,KAAkB;IAChF,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;KAC3E,CAAC,CAAC,CAAC;AACN,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-core",
-  "version": "1.11.0",
+  "version": "1.11.1-beta.220bc90",
   "description": "The core library for creating a Piral instance.",
   "keywords": [
     "portal",
@@ -63,8 +63,8 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "piral-base": "^1.11.0",
-    "piral-debug-utils": "^1.11.0",
+    "piral-base": "1.11.1-beta.220bc90",
+    "piral-debug-utils": "1.11.1-beta.220bc90",
     "zustand": "^3.0.0"
   },
   "devDependencies": {
@@ -84,5 +84,5 @@
     "react-router-dom",
     "tslib"
   ],
-  "gitHead": "7bb5f7938f1a3211aa3e81ac5b7101b7605140d6"
+  "gitHead": "220bc902cdf09a8debd69e4d0beda078315d6a76"
 }

package/src/actions/portal.test.ts

@@ -70,6 +70,48 @@ describe('Piral-Core portal actions', () => {
     expect(portals.test).not.toBeNull();
   });
 
+  it('updatePortal replaces a portal with the same container', () => {
+    const children = React.createElement('div');
+    const container = {};
+    const stored = {
+      key: 'stored',
+      children: { children },
+      type: 'div',
+      props: null,
+      containerInfo: container,
+    } as unknown as React.ReactPortal & { containerInfo: unknown };
+    const current = {
+      key: 'current',
+      children: { children },
+      type: 'div',
+      props: null,
+      containerInfo: container,
+    } as unknown as React.ReactPortal & { containerInfo: unknown };
+    const next = {
+      key: 'next',
+      children: { children },
+      type: 'div',
+      props: null,
+      containerInfo: container,
+    } as unknown as React.ReactPortal & { containerInfo: unknown };
+
+    const state = create(() => ({
+      portals: { test: [stored] },
+    }));
+
+    const ctx: any = {
+      state,
+      dispatch(update) {
+        state.setState(update(state.getState()));
+      },
+    };
+
+    updatePortal(ctx, 'test', current, next);
+    const { portals } = ctx.state.getState();
+    expect(portals.test).toHaveLength(1);
+    expect(portals.test[0]).toBe(next);
+  });
+
   it('showPortal adds a portal', () => {
     const children = React.createElement('div');
     const newPortal: React.ReactPortal = { key: 'test', children: { children }, type: 'div', props: null };

package/src/actions/portal.ts

@@ -2,6 +2,14 @@ import { ReactPortal } from 'react';
 import { withoutKey, withKey, includeItem, excludeItem, replaceOrAddItem } from '../utils';
 import { GlobalStateContext } from '../types';
 
+type PortalWithContainer = ReactPortal & {
+  containerInfo?: unknown;
+};
+
+function getPortalContainer(portal: ReactPortal) {
+  return (portal as PortalWithContainer).containerInfo;
+}
+
 export function destroyPortal(ctx: GlobalStateContext, id: string) {
   ctx.dispatch((state) => ({
     ...state,
@@ -16,13 +24,20 @@ export function hidePortal(ctx: GlobalStateContext, id: string, entry: ReactPort
   }));
 }
 
+function isSamePortal(current: ReactPortal, candidate: ReactPortal) {
+  const currentContainer = getPortalContainer(current);
+  const candidateContainer = getPortalContainer(candidate);
+
+  return candidate === current || (!!currentContainer && currentContainer === candidateContainer);
+}
+
 export function updatePortal(ctx: GlobalStateContext, id: string, current: ReactPortal, next: ReactPortal) {
   ctx.dispatch((state) => ({
     ...state,
     portals: withKey(
       state.portals,
       id,
-      replaceOrAddItem(state.portals[id], next, (m) => m === current),
+      replaceOrAddItem(state.portals[id], next, (m) => isSamePortal(current, m)),
     ),
   }));
 }