@tamagui/portal 1.135.2 → 1.135.4

package/dist/cjs/GorhomPortalItem.cjs

@@ -30,14 +30,24 @@ var import_constants = require("@tamagui/constants"),
 const GorhomPortalItem = props => {
   !props.hostName && !props.passThrough && console.warn("No hostName");
   const cur = import_constants2.allPortalHosts.get(props.hostName || ""),
-    [node, setNode] = (0, import_react.useState)(cur);
-  return !props.passThrough && cur && node !== cur && setNode(cur), (0, import_constants.useIsomorphicLayoutEffect)(() => {
-    if (!props.hostName || node) return;
+    [node, setNode] = (0, import_react.useState)(cur),
+    actualNode = node?.isConnected ? node : null;
+  return !props.passThrough && cur && actualNode !== cur && setNode(cur), (0, import_constants.useIsomorphicLayoutEffect)(() => {
+    if (!props.hostName) return;
+    if (node && !node.isConnected) {
+      setNode(null);
+      return;
+    }
+    if (actualNode) return;
+    if (cur) {
+      setNode(cur);
+      return;
+    }
     const listener = newNode => {
       setNode(newNode);
     };
     return import_constants2.portalListeners[props.hostName] ||= /* @__PURE__ */new Set(), import_constants2.portalListeners[props.hostName].add(listener), () => {
       import_constants2.portalListeners[props.hostName]?.delete(listener);
     };
-  }, [node]), props.passThrough ? props.children : node ? (0, import_react_dom.createPortal)(props.children, node) : null;
+  }, [node, actualNode, cur, props.hostName]), props.passThrough ? props.children : actualNode ? (0, import_react_dom.createPortal)(props.children, actualNode) : null;
 };

package/dist/cjs/GorhomPortalItem.js

@@ -20,15 +20,24 @@ module.exports = __toCommonJS(GorhomPortalItem_exports);
 var import_constants = require("@tamagui/constants"), import_react = require("react"), import_react_dom = require("react-dom"), import_constants2 = require("./constants");
 const GorhomPortalItem = (props) => {
   !props.hostName && !props.passThrough && console.warn("No hostName");
-  const cur = import_constants2.allPortalHosts.get(props.hostName || ""), [node, setNode] = (0, import_react.useState)(cur);
-  return !props.passThrough && cur && node !== cur && setNode(cur), (0, import_constants.useIsomorphicLayoutEffect)(() => {
-    if (!props.hostName || node) return;
+  const cur = import_constants2.allPortalHosts.get(props.hostName || ""), [node, setNode] = (0, import_react.useState)(cur), actualNode = node?.isConnected ? node : null;
+  return !props.passThrough && cur && actualNode !== cur && setNode(cur), (0, import_constants.useIsomorphicLayoutEffect)(() => {
+    if (!props.hostName) return;
+    if (node && !node.isConnected) {
+      setNode(null);
+      return;
+    }
+    if (actualNode) return;
+    if (cur) {
+      setNode(cur);
+      return;
+    }
     const listener = (newNode) => {
       setNode(newNode);
     };
     return import_constants2.portalListeners[props.hostName] ||= /* @__PURE__ */ new Set(), import_constants2.portalListeners[props.hostName].add(listener), () => {
       import_constants2.portalListeners[props.hostName]?.delete(listener);
     };
-  }, [node]), props.passThrough ? props.children : node ? (0, import_react_dom.createPortal)(props.children, node) : null;
+  }, [node, actualNode, cur, props.hostName]), props.passThrough ? props.children : actualNode ? (0, import_react_dom.createPortal)(props.children, actualNode) : null;
 };
 //# sourceMappingURL=GorhomPortalItem.js.map

package/dist/cjs/GorhomPortalItem.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/GorhomPortalItem.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0C,+BAC1C,eAAyB,kBACzB,mBAA6B,sBAC7BA,oBAAgD;AAGzC,MAAM,mBAAmB,CAAC,UAA2B;AAC1D,EAAI,CAAC,MAAM,YAAY,CAAC,MAAM,eAC5B,QAAQ,KAAK,aAAa;AAG5B,QAAM,MAAM,iCAAe,IAAI,MAAM,YAAY,EAAE,GAC7C,CAAC,MAAM,OAAO,QAAI,uBAAS,GAAG;AAqBpC,SAnBI,CAAC,MAAM,eAAe,OAAO,SAAS,OACxC,QAAQ,GAAG,OAGb,4CAA0B,MAAM;AAE9B,QADI,CAAC,MAAM,YACP,KAAM;AAEV,UAAM,WAAW,CAAC,YAAyB;AACzC,cAAQ,OAAO;AAAA,IACjB;AAEA,6CAAgB,MAAM,QAAQ,MAAM,oBAAI,IAAI,GAC5C,kCAAgB,MAAM,QAAQ,EAAE,IAAI,QAAQ,GACrC,MAAM;AACX,wCAAgB,MAAM,QAAS,GAAG,OAAO,QAAQ;AAAA,IACnD;AAAA,EACF,GAAG,CAAC,IAAI,CAAC,GAEL,MAAM,cACD,MAAM,WAGV,WAIE,+BAAa,MAAM,UAAU,IAAI,IAH/B;AAIX;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0C,+BAC1C,eAAyB,kBACzB,mBAA6B,sBAC7BA,oBAAgD;AAGzC,MAAM,mBAAmB,CAAC,UAA2B;AAC1D,EAAI,CAAC,MAAM,YAAY,CAAC,MAAM,eAC5B,QAAQ,KAAK,aAAa;AAG5B,QAAM,MAAM,iCAAe,IAAI,MAAM,YAAY,EAAE,GAC7C,CAAC,MAAM,OAAO,QAAI,uBAAyC,GAAG,GAG9D,aAAa,MAAM,cAAc,OAAO;AAkC9C,SAhCI,CAAC,MAAM,eAAe,OAAO,eAAe,OAC9C,QAAQ,GAAG,OAGb,4CAA0B,MAAM;AAC9B,QAAI,CAAC,MAAM,SAAU;AAGrB,QAAI,QAAQ,CAAC,KAAK,aAAa;AAC7B,cAAQ,IAAI;AACZ;AAAA,IACF;AAEA,QAAI,WAAY;AAGhB,QAAI,KAAK;AACP,cAAQ,GAAG;AACX;AAAA,IACF;AAEA,UAAM,WAAW,CAAC,YAAyB;AACzC,cAAQ,OAAO;AAAA,IACjB;AAEA,6CAAgB,MAAM,QAAQ,MAAM,oBAAI,IAAI,GAC5C,kCAAgB,MAAM,QAAQ,EAAE,IAAI,QAAQ,GACrC,MAAM;AACX,wCAAgB,MAAM,QAAS,GAAG,OAAO,QAAQ;AAAA,IACnD;AAAA,EACF,GAAG,CAAC,MAAM,YAAY,KAAK,MAAM,QAAQ,CAAC,GAEtC,MAAM,cACD,MAAM,WAGV,iBAIE,+BAAa,MAAM,UAAU,UAAU,IAHrC;AAIX;",
   "names": ["import_constants"]
 }

package/dist/esm/GorhomPortalItem.js

@@ -4,16 +4,25 @@ import { createPortal } from "react-dom";
 import { allPortalHosts, portalListeners } from "./constants";
 const GorhomPortalItem = (props) => {
   !props.hostName && !props.passThrough && console.warn("No hostName");
-  const cur = allPortalHosts.get(props.hostName || ""), [node, setNode] = useState(cur);
-  return !props.passThrough && cur && node !== cur && setNode(cur), useIsomorphicLayoutEffect(() => {
-    if (!props.hostName || node) return;
+  const cur = allPortalHosts.get(props.hostName || ""), [node, setNode] = useState(cur), actualNode = node?.isConnected ? node : null;
+  return !props.passThrough && cur && actualNode !== cur && setNode(cur), useIsomorphicLayoutEffect(() => {
+    if (!props.hostName) return;
+    if (node && !node.isConnected) {
+      setNode(null);
+      return;
+    }
+    if (actualNode) return;
+    if (cur) {
+      setNode(cur);
+      return;
+    }
     const listener = (newNode) => {
       setNode(newNode);
     };
     return portalListeners[props.hostName] ||= /* @__PURE__ */ new Set(), portalListeners[props.hostName].add(listener), () => {
       portalListeners[props.hostName]?.delete(listener);
     };
-  }, [node]), props.passThrough ? props.children : node ? createPortal(props.children, node) : null;
+  }, [node, actualNode, cur, props.hostName]), props.passThrough ? props.children : actualNode ? createPortal(props.children, actualNode) : null;
 };
 export {
   GorhomPortalItem

package/dist/esm/GorhomPortalItem.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/GorhomPortalItem.tsx"],
-  "mappings": "AAAA,SAAS,iCAAiC;AAC1C,SAAS,gBAAgB;AACzB,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB,uBAAuB;AAGzC,MAAM,mBAAmB,CAAC,UAA2B;AAC1D,EAAI,CAAC,MAAM,YAAY,CAAC,MAAM,eAC5B,QAAQ,KAAK,aAAa;AAG5B,QAAM,MAAM,eAAe,IAAI,MAAM,YAAY,EAAE,GAC7C,CAAC,MAAM,OAAO,IAAI,SAAS,GAAG;AAqBpC,SAnBI,CAAC,MAAM,eAAe,OAAO,SAAS,OACxC,QAAQ,GAAG,GAGb,0BAA0B,MAAM;AAE9B,QADI,CAAC,MAAM,YACP,KAAM;AAEV,UAAM,WAAW,CAAC,YAAyB;AACzC,cAAQ,OAAO;AAAA,IACjB;AAEA,2BAAgB,MAAM,QAAQ,MAAM,oBAAI,IAAI,GAC5C,gBAAgB,MAAM,QAAQ,EAAE,IAAI,QAAQ,GACrC,MAAM;AACX,sBAAgB,MAAM,QAAS,GAAG,OAAO,QAAQ;AAAA,IACnD;AAAA,EACF,GAAG,CAAC,IAAI,CAAC,GAEL,MAAM,cACD,MAAM,WAGV,OAIE,aAAa,MAAM,UAAU,IAAI,IAH/B;AAIX;",
+  "mappings": "AAAA,SAAS,iCAAiC;AAC1C,SAAS,gBAAgB;AACzB,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB,uBAAuB;AAGzC,MAAM,mBAAmB,CAAC,UAA2B;AAC1D,EAAI,CAAC,MAAM,YAAY,CAAC,MAAM,eAC5B,QAAQ,KAAK,aAAa;AAG5B,QAAM,MAAM,eAAe,IAAI,MAAM,YAAY,EAAE,GAC7C,CAAC,MAAM,OAAO,IAAI,SAAyC,GAAG,GAG9D,aAAa,MAAM,cAAc,OAAO;AAkC9C,SAhCI,CAAC,MAAM,eAAe,OAAO,eAAe,OAC9C,QAAQ,GAAG,GAGb,0BAA0B,MAAM;AAC9B,QAAI,CAAC,MAAM,SAAU;AAGrB,QAAI,QAAQ,CAAC,KAAK,aAAa;AAC7B,cAAQ,IAAI;AACZ;AAAA,IACF;AAEA,QAAI,WAAY;AAGhB,QAAI,KAAK;AACP,cAAQ,GAAG;AACX;AAAA,IACF;AAEA,UAAM,WAAW,CAAC,YAAyB;AACzC,cAAQ,OAAO;AAAA,IACjB;AAEA,2BAAgB,MAAM,QAAQ,MAAM,oBAAI,IAAI,GAC5C,gBAAgB,MAAM,QAAQ,EAAE,IAAI,QAAQ,GACrC,MAAM;AACX,sBAAgB,MAAM,QAAS,GAAG,OAAO,QAAQ;AAAA,IACnD;AAAA,EACF,GAAG,CAAC,MAAM,YAAY,KAAK,MAAM,QAAQ,CAAC,GAEtC,MAAM,cACD,MAAM,WAGV,aAIE,aAAa,MAAM,UAAU,UAAU,IAHrC;AAIX;",
   "names": []
 }

package/dist/esm/GorhomPortalItem.mjs

@@ -5,16 +5,26 @@ import { allPortalHosts, portalListeners } from "./constants.mjs";
 const GorhomPortalItem = props => {
   !props.hostName && !props.passThrough && console.warn("No hostName");
   const cur = allPortalHosts.get(props.hostName || ""),
-    [node, setNode] = useState(cur);
-  return !props.passThrough && cur && node !== cur && setNode(cur), useIsomorphicLayoutEffect(() => {
-    if (!props.hostName || node) return;
+    [node, setNode] = useState(cur),
+    actualNode = node?.isConnected ? node : null;
+  return !props.passThrough && cur && actualNode !== cur && setNode(cur), useIsomorphicLayoutEffect(() => {
+    if (!props.hostName) return;
+    if (node && !node.isConnected) {
+      setNode(null);
+      return;
+    }
+    if (actualNode) return;
+    if (cur) {
+      setNode(cur);
+      return;
+    }
     const listener = newNode => {
       setNode(newNode);
     };
     return portalListeners[props.hostName] ||= /* @__PURE__ */new Set(), portalListeners[props.hostName].add(listener), () => {
       portalListeners[props.hostName]?.delete(listener);
     };
-  }, [node]), props.passThrough ? props.children : node ? createPortal(props.children, node) : null;
+  }, [node, actualNode, cur, props.hostName]), props.passThrough ? props.children : actualNode ? createPortal(props.children, actualNode) : null;
 };
 export { GorhomPortalItem };
 //# sourceMappingURL=GorhomPortalItem.mjs.map

package/dist/esm/GorhomPortalItem.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useIsomorphicLayoutEffect","useState","createPortal","allPortalHosts","portalListeners","GorhomPortalItem","props","hostName","passThrough","console","warn","cur","get","node","setNode","listener","newNode","Set","add","delete","children"],"sources":["../../src/GorhomPortalItem.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,yBAAA,QAAiC;AAC1C,SAASC,QAAA,QAAgB;AACzB,SAASC,YAAA,QAAoB;AAC7B,SAASC,cAAA,EAAgBC,eAAA,QAAuB;AAGzC,MAAMC,gBAAA,GAAoBC,KAAA,IAA2B;EACtD,CAACA,KAAA,CAAMC,QAAA,IAAY,CAACD,KAAA,CAAME,WAAA,IAC5BC,OAAA,CAAQC,IAAA,CAAK,aAAa;EAG5B,MAAMC,GAAA,GAAMR,cAAA,CAAeS,GAAA,CAAIN,KAAA,CAAMC,QAAA,IAAY,EAAE;IAC7C,CAACM,IAAA,EAAMC,OAAO,IAAIb,QAAA,CAASU,GAAG;EAqBpC,OAnBI,CAACL,KAAA,CAAME,WAAA,IAAeG,GAAA,IAAOE,IAAA,KAASF,GAAA,IACxCG,OAAA,CAAQH,GAAG,GAGbX,yBAAA,CAA0B,MAAM;IAE9B,IADI,CAACM,KAAA,CAAMC,QAAA,IACPM,IAAA,EAAM;IAEV,MAAME,QAAA,GAAYC,OAAA,IAAyB;MACzCF,OAAA,CAAQE,OAAO;IACjB;IAEA,OAAAZ,eAAA,CAAgBE,KAAA,CAAMC,QAAQ,MAAM,mBAAIU,GAAA,CAAI,GAC5Cb,eAAA,CAAgBE,KAAA,CAAMC,QAAQ,EAAEW,GAAA,CAAIH,QAAQ,GACrC,MAAM;MACXX,eAAA,CAAgBE,KAAA,CAAMC,QAAS,GAAGY,MAAA,CAAOJ,QAAQ;IACnD;EACF,GAAG,CAACF,IAAI,CAAC,GAELP,KAAA,CAAME,WAAA,GACDF,KAAA,CAAMc,QAAA,GAGVP,IAAA,GAIEX,YAAA,CAAaI,KAAA,CAAMc,QAAA,EAAUP,IAAI,IAH/B;AAIX","ignoreList":[]}
+{"version":3,"names":["useIsomorphicLayoutEffect","useState","createPortal","allPortalHosts","portalListeners","GorhomPortalItem","props","hostName","passThrough","console","warn","cur","get","node","setNode","actualNode","isConnected","listener","newNode","Set","add","delete","children"],"sources":["../../src/GorhomPortalItem.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,yBAAA,QAAiC;AAC1C,SAASC,QAAA,QAAgB;AACzB,SAASC,YAAA,QAAoB;AAC7B,SAASC,cAAA,EAAgBC,eAAA,QAAuB;AAGzC,MAAMC,gBAAA,GAAoBC,KAAA,IAA2B;EACtD,CAACA,KAAA,CAAMC,QAAA,IAAY,CAACD,KAAA,CAAME,WAAA,IAC5BC,OAAA,CAAQC,IAAA,CAAK,aAAa;EAG5B,MAAMC,GAAA,GAAMR,cAAA,CAAeS,GAAA,CAAIN,KAAA,CAAMC,QAAA,IAAY,EAAE;IAC7C,CAACM,IAAA,EAAMC,OAAO,IAAIb,QAAA,CAAyCU,GAAG;IAG9DI,UAAA,GAAaF,IAAA,EAAMG,WAAA,GAAcH,IAAA,GAAO;EAkC9C,OAhCI,CAACP,KAAA,CAAME,WAAA,IAAeG,GAAA,IAAOI,UAAA,KAAeJ,GAAA,IAC9CG,OAAA,CAAQH,GAAG,GAGbX,yBAAA,CAA0B,MAAM;IAC9B,IAAI,CAACM,KAAA,CAAMC,QAAA,EAAU;IAGrB,IAAIM,IAAA,IAAQ,CAACA,IAAA,CAAKG,WAAA,EAAa;MAC7BF,OAAA,CAAQ,IAAI;MACZ;IACF;IAEA,IAAIC,UAAA,EAAY;IAGhB,IAAIJ,GAAA,EAAK;MACPG,OAAA,CAAQH,GAAG;MACX;IACF;IAEA,MAAMM,QAAA,GAAYC,OAAA,IAAyB;MACzCJ,OAAA,CAAQI,OAAO;IACjB;IAEA,OAAAd,eAAA,CAAgBE,KAAA,CAAMC,QAAQ,MAAM,mBAAIY,GAAA,CAAI,GAC5Cf,eAAA,CAAgBE,KAAA,CAAMC,QAAQ,EAAEa,GAAA,CAAIH,QAAQ,GACrC,MAAM;MACXb,eAAA,CAAgBE,KAAA,CAAMC,QAAS,GAAGc,MAAA,CAAOJ,QAAQ;IACnD;EACF,GAAG,CAACJ,IAAA,EAAME,UAAA,EAAYJ,GAAA,EAAKL,KAAA,CAAMC,QAAQ,CAAC,GAEtCD,KAAA,CAAME,WAAA,GACDF,KAAA,CAAMgB,QAAA,GAGVP,UAAA,GAIEb,YAAA,CAAaI,KAAA,CAAMgB,QAAA,EAAUP,UAAU,IAHrC;AAIX","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/portal",
-  "version": "1.135.2",
+  "version": "1.135.4",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -32,15 +32,15 @@
     }
   },
   "dependencies": {
-    "@tamagui/constants": "1.135.2",
-    "@tamagui/core": "1.135.2",
-    "@tamagui/start-transition": "1.135.2",
-    "@tamagui/use-event": "1.135.2",
-    "@tamagui/web": "1.135.2",
-    "@tamagui/z-index-stack": "1.135.2"
+    "@tamagui/constants": "1.135.4",
+    "@tamagui/core": "1.135.4",
+    "@tamagui/start-transition": "1.135.4",
+    "@tamagui/use-event": "1.135.4",
+    "@tamagui/web": "1.135.4",
+    "@tamagui/z-index-stack": "1.135.4"
   },
   "devDependencies": {
-    "@tamagui/build": "1.135.2",
+    "@tamagui/build": "1.135.4",
     "react": "*",
     "react-dom": "*",
     "react-native": "^0.79.2"

package/src/GorhomPortalItem.tsx

@@ -10,15 +10,31 @@ export const GorhomPortalItem = (props: PortalItemProps) => {
   }
 
   const cur = allPortalHosts.get(props.hostName || '')
-  const [node, setNode] = useState(cur)
+  const [node, setNode] = useState<HTMLElement | null | undefined>(cur)
 
-  if (!props.passThrough && cur && node !== cur) {
+  // Check if current node is disconnected and clear it immediately
+  const actualNode = node?.isConnected ? node : null
+
+  if (!props.passThrough && cur && actualNode !== cur) {
     setNode(cur)
   }
 
   useIsomorphicLayoutEffect(() => {
     if (!props.hostName) return
-    if (node) return
+
+    // Check if current node is still in the document
+    if (node && !node.isConnected) {
+      setNode(null)
+      return
+    }
+
+    if (actualNode) return
+
+    // If we already have cur from Map, use it immediately
+    if (cur) {
+      setNode(cur)
+      return
+    }
 
     const listener = (newNode: HTMLElement) => {
       setNode(newNode)
@@ -29,15 +45,15 @@ export const GorhomPortalItem = (props: PortalItemProps) => {
     return () => {
       portalListeners[props.hostName!]?.delete(listener)
     }
-  }, [node])
+  }, [node, actualNode, cur, props.hostName])
 
   if (props.passThrough) {
     return props.children
   }
 
-  if (!node) {
+  if (!actualNode) {
     return null
   }
 
-  return createPortal(props.children, node)
+  return createPortal(props.children, actualNode)
 }

package/types/GorhomPortalItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GorhomPortalItem.d.ts","sourceRoot":"","sources":["../src/GorhomPortalItem.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,eAAO,MAAM,gBAAgB,GAAI,OAAO,eAAe,QAoCtD,CAAA"}
+{"version":3,"file":"GorhomPortalItem.d.ts","sourceRoot":"","sources":["../src/GorhomPortalItem.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,eAAO,MAAM,gBAAgB,GAAI,OAAO,eAAe,QAoDtD,CAAA"}