@cdx-ui/primitives 0.0.1-beta.99 → 0.1.1

package/lib/module/overlay/useAnchoredOverlay.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useCallback","useContext","useEffect","useMemo","useReducer","useRef","useState","I18nManager","Platform","useWindowDimensions","getAnchoredOverlayPosition","useAnchorPosition","OverlayInsetsContext","STAGING_STYLE","left","opacity","pointerEvents","position","top","setLayoutIfChanged","setLayout","next","previous","width","height","useAnchoredOverlay","anchorRef","open","options","remeasureKey","externalRemeasureKey","trackWhileOpen","positionOptions","revision","update","value","anchorLayout","floatingRef","floatingLayout","setFloatingLayout","viewport","insets","measureFloating","OS","floating","current","getBoundingClientRect","rect","onFloatingLayout","event","nativeEvent","layout","requestUpdate","anchor","resizeObserver","ResizeObserver","observe","visualViewport","window","addEventListener","disconnect","removeEventListener","isRTL","ready","positionStyle","style"],"sourceRoot":"../../../src","sources":["overlay/useAnchoredOverlay.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/overlay/useDismissOverlay.js

@@ -1,8 +1,16 @@
 "use strict";
 
+import { useOverlayStackRegistration } from './OverlayStack';
+
 /**
  * No-op on native — overlay dismissal is handled by backdrop press
  * or the system back gesture / hardware button via Modal.
  */
-export function useDismissOverlay(_open, _contentRef, _excludeRefs, _onDismiss) {}
+export function useDismissOverlay(open, _contentRef, _excludeRefs, _onDismiss, options = {}) {
+  useOverlayStackRegistration({
+    active: open,
+    capabilities: ['outside'],
+    ...options
+  });
+}
 //# sourceMappingURL=useDismissOverlay.js.map

package/lib/module/overlay/useDismissOverlay.js.map

@@ -1 +1 @@
-{"version":3,"names":["useDismissOverlay","_open","_contentRef","_excludeRefs","_onDismiss"],"sourceRoot":"../../../src","sources":["overlay/useDismissOverlay.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASA,iBAAiBA,CAC/BC,KAAc,EACdC,WAA2B,EAC3BC,YAA8B,EAC9BC,UAAsB,EACtB,CAAC","ignoreList":[]}
+{"version":3,"names":["useOverlayStackRegistration","useDismissOverlay","open","_contentRef","_excludeRefs","_onDismiss","options","active","capabilities"],"sourceRoot":"../../../src","sources":["overlay/useDismissOverlay.ts"],"mappings":";;AACA,SAASA,2BAA2B,QAAmC,gBAAgB;;AAEvF;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAC/BC,IAAa,EACbC,WAA2B,EAC3BC,YAA8B,EAC9BC,UAAsB,EACtBC,OAA6B,GAAG,CAAC,CAAC,EAClC;EACAN,2BAA2B,CAAC;IAC1BO,MAAM,EAAEL,IAAI;IACZM,YAAY,EAAE,CAAC,SAAS,CAAC;IACzB,GAAGF;EACL,CAAC,CAAC;AACJ","ignoreList":[]}

package/lib/module/overlay/useDismissOverlay.web.js

@@ -1,34 +1,49 @@
 "use strict";
 
 import { useEffect, useRef } from 'react';
+import { useOverlayStackRegistration } from './OverlayStack';
+function refContainsNode(ref, target) {
+  const current = ref.current;
+  if (!current || typeof current.contains !== 'function') {
+    return false;
+  }
+  return current.contains(target);
+}
 
 /**
  * Dismisses an overlay when the user clicks/presses outside of it or when
  * focus moves to an element outside the overlay via keyboard.
  * Events targeting `contentRef` or any of `excludeRefs` are ignored.
  */
-export function useDismissOverlay(open, contentRef, excludeRefs, onDismiss) {
+export function useDismissOverlay(open, contentRef, excludeRefs, onDismiss, options = {}) {
   const onDismissRef = useRef(onDismiss);
   onDismissRef.current = onDismiss;
   const excludeRefsRef = useRef(excludeRefs);
   excludeRefsRef.current = excludeRefs;
+  const {
+    isTopmost
+  } = useOverlayStackRegistration({
+    active: open,
+    capabilities: ['outside'],
+    ...options
+  });
   useEffect(() => {
     if (!open) {
       return;
     }
     const isInsideOverlay = target => {
-      if (contentRef.current?.contains?.(target)) {
+      if (refContainsNode(contentRef, target)) {
         return true;
       }
       for (const ref of excludeRefsRef.current) {
-        if (ref.current?.contains?.(target)) {
+        if (refContainsNode(ref, target)) {
           return true;
         }
       }
       return false;
     };
     const dismissIfOutside = e => {
-      if (!isInsideOverlay(e.target)) {
+      if (isTopmost('outside') && !isInsideOverlay(e.target)) {
         onDismissRef.current();
       }
     };
@@ -38,6 +53,6 @@ export function useDismissOverlay(open, contentRef, excludeRefs, onDismiss) {
       document.removeEventListener('pointerdown', dismissIfOutside);
       document.removeEventListener('focusin', dismissIfOutside);
     };
-  }, [open, contentRef]);
+  }, [open, contentRef, isTopmost]);
 }
 //# sourceMappingURL=useDismissOverlay.web.js.map

package/lib/module/overlay/useDismissOverlay.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","useDismissOverlay","open","contentRef","excludeRefs","onDismiss","onDismissRef","current","excludeRefsRef","isInsideOverlay","target","contains","ref","dismissIfOutside","e","document","addEventListener","removeEventListener"],"sourceRoot":"../../../src","sources":["overlay/useDismissOverlay.web.ts"],"mappings":";;AACA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;;AAEzC;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAC/BC,IAAa,EACbC,UAA0B,EAC1BC,WAA6B,EAC7BC,SAAqB,EACrB;EACA,MAAMC,YAAY,GAAGN,MAAM,CAACK,SAAS,CAAC;EACtCC,YAAY,CAACC,OAAO,GAAGF,SAAS;EAEhC,MAAMG,cAAc,GAAGR,MAAM,CAACI,WAAW,CAAC;EAC1CI,cAAc,CAACD,OAAO,GAAGH,WAAW;EAEpCL,SAAS,CAAC,MAAM;IACd,IAAI,CAACG,IAAI,EAAE;MACT;IACF;IAEA,MAAMO,eAAe,GAAIC,MAAY,IAAK;MACxC,IAAIP,UAAU,CAACI,OAAO,EAAEI,QAAQ,GAAGD,MAAM,CAAC,EAAE;QAC1C,OAAO,IAAI;MACb;MACA,KAAK,MAAME,GAAG,IAAIJ,cAAc,CAACD,OAAO,EAAE;QACxC,IAAIK,GAAG,CAACL,OAAO,EAAEI,QAAQ,GAAGD,MAAM,CAAC,EAAE;UACnC,OAAO,IAAI;QACb;MACF;MACA,OAAO,KAAK;IACd,CAAC;IAED,MAAMG,gBAAgB,GAAIC,CAAQ,IAAK;MACrC,IAAI,CAACL,eAAe,CAACK,CAAC,CAACJ,MAAc,CAAC,EAAE;QACtCJ,YAAY,CAACC,OAAO,CAAC,CAAC;MACxB;IACF,CAAC;IAEDQ,QAAQ,CAACC,gBAAgB,CAAC,aAAa,EAAEH,gBAAgB,CAAC;IAC1DE,QAAQ,CAACC,gBAAgB,CAAC,SAAS,EAAEH,gBAAgB,CAAC;IACtD,OAAO,MAAM;MACXE,QAAQ,CAACE,mBAAmB,CAAC,aAAa,EAAEJ,gBAAgB,CAAC;MAC7DE,QAAQ,CAACE,mBAAmB,CAAC,SAAS,EAAEJ,gBAAgB,CAAC;IAC3D,CAAC;EACH,CAAC,EAAE,CAACX,IAAI,EAAEC,UAAU,CAAC,CAAC;AACxB","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","useOverlayStackRegistration","refContainsNode","ref","target","current","contains","useDismissOverlay","open","contentRef","excludeRefs","onDismiss","options","onDismissRef","excludeRefsRef","isTopmost","active","capabilities","isInsideOverlay","dismissIfOutside","e","document","addEventListener","removeEventListener"],"sourceRoot":"../../../src","sources":["overlay/useDismissOverlay.web.ts"],"mappings":";;AACA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AACzC,SAASC,2BAA2B,QAAmC,gBAAgB;AAEvF,SAASC,eAAeA,CAACC,GAAuB,EAAEC,MAAY,EAAW;EACvE,MAAMC,OAAO,GAAGF,GAAG,CAACE,OAAwD;EAC5E,IAAI,CAACA,OAAO,IAAI,OAAOA,OAAO,CAACC,QAAQ,KAAK,UAAU,EAAE;IACtD,OAAO,KAAK;EACd;EACA,OAAOD,OAAO,CAACC,QAAQ,CAACF,MAAM,CAAC;AACjC;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASG,iBAAiBA,CAC/BC,IAAa,EACbC,UAA0B,EAC1BC,WAA6B,EAC7BC,SAAqB,EACrBC,OAA6B,GAAG,CAAC,CAAC,EAClC;EACA,MAAMC,YAAY,GAAGb,MAAM,CAACW,SAAS,CAAC;EACtCE,YAAY,CAACR,OAAO,GAAGM,SAAS;EAEhC,MAAMG,cAAc,GAAGd,MAAM,CAACU,WAAW,CAAC;EAC1CI,cAAc,CAACT,OAAO,GAAGK,WAAW;EACpC,MAAM;IAAEK;EAAU,CAAC,GAAGd,2BAA2B,CAAC;IAChDe,MAAM,EAAER,IAAI;IACZS,YAAY,EAAE,CAAC,SAAS,CAAC;IACzB,GAAGL;EACL,CAAC,CAAC;EAEFb,SAAS,CAAC,MAAM;IACd,IAAI,CAACS,IAAI,EAAE;MACT;IACF;IAEA,MAAMU,eAAe,GAAId,MAAY,IAAK;MACxC,IAAIF,eAAe,CAACO,UAAU,EAAEL,MAAM,CAAC,EAAE;QACvC,OAAO,IAAI;MACb;MACA,KAAK,MAAMD,GAAG,IAAIW,cAAc,CAACT,OAAO,EAAE;QACxC,IAAIH,eAAe,CAACC,GAAG,EAAEC,MAAM,CAAC,EAAE;UAChC,OAAO,IAAI;QACb;MACF;MACA,OAAO,KAAK;IACd,CAAC;IAED,MAAMe,gBAAgB,GAAIC,CAAQ,IAAK;MACrC,IAAIL,SAAS,CAAC,SAAS,CAAC,IAAI,CAACG,eAAe,CAACE,CAAC,CAAChB,MAAc,CAAC,EAAE;QAC9DS,YAAY,CAACR,OAAO,CAAC,CAAC;MACxB;IACF,CAAC;IAEDgB,QAAQ,CAACC,gBAAgB,CAAC,aAAa,EAAEH,gBAAgB,CAAC;IAC1DE,QAAQ,CAACC,gBAAgB,CAAC,SAAS,EAAEH,gBAAgB,CAAC;IACtD,OAAO,MAAM;MACXE,QAAQ,CAACE,mBAAmB,CAAC,aAAa,EAAEJ,gBAAgB,CAAC;MAC7DE,QAAQ,CAACE,mBAAmB,CAAC,SAAS,EAAEJ,gBAAgB,CAAC;IAC3D,CAAC;EACH,CAAC,EAAE,CAACX,IAAI,EAAEC,UAAU,EAAEM,SAAS,CAAC,CAAC;AACnC","ignoreList":[]}

package/lib/module/overlay/useEscapeKey.js

@@ -1,8 +1,16 @@
 "use strict";
 
+import { useOverlayStackRegistration } from './OverlayStack';
+
 /**
  * No-op on native — Escape key dismissal is not applicable.
  * Native uses the system back gesture / hardware button via Modal.
  */
-export function useEscapeKey(_open, _onEscape) {}
+export function useEscapeKey(open, _onEscape, options = {}) {
+  useOverlayStackRegistration({
+    active: open,
+    capabilities: ['escape'],
+    ...options
+  });
+}
 //# sourceMappingURL=useEscapeKey.js.map

package/lib/module/overlay/useEscapeKey.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEscapeKey","_open","_onEscape"],"sourceRoot":"../../../src","sources":["overlay/useEscapeKey.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA,OAAO,SAASA,YAAYA,CAACC,KAAc,EAAEC,SAAqB,EAAE,CAAC","ignoreList":[]}
+{"version":3,"names":["useOverlayStackRegistration","useEscapeKey","open","_onEscape","options","active","capabilities"],"sourceRoot":"../../../src","sources":["overlay/useEscapeKey.ts"],"mappings":";;AAAA,SAASA,2BAA2B,QAAmC,gBAAgB;;AAEvF;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAC1BC,IAAa,EACbC,SAAqB,EACrBC,OAA6B,GAAG,CAAC,CAAC,EAClC;EACAJ,2BAA2B,CAAC;IAC1BK,MAAM,EAAEH,IAAI;IACZI,YAAY,EAAE,CAAC,QAAQ,CAAC;IACxB,GAAGF;EACL,CAAC,CAAC;AACJ","ignoreList":[]}

package/lib/module/overlay/useEscapeKey.web.js

@@ -1,20 +1,28 @@
 "use strict";
 
 import { useEffect, useRef } from 'react';
+import { useOverlayStackRegistration } from './OverlayStack';
 
 /**
  * Closes an overlay when the user presses the Escape key.
  * Web-only — native platforms use Modal's `onRequestClose` for back/dismiss.
  */
-export function useEscapeKey(open, onEscape) {
+export function useEscapeKey(open, onEscape, options = {}) {
   const onEscapeRef = useRef(onEscape);
   onEscapeRef.current = onEscape;
+  const {
+    isTopmost
+  } = useOverlayStackRegistration({
+    active: open,
+    capabilities: ['escape'],
+    ...options
+  });
   useEffect(() => {
     if (!open) {
       return;
     }
     const handleKeyDown = e => {
-      if (e.key === 'Escape') {
+      if (e.key === 'Escape' && isTopmost('escape')) {
         onEscapeRef.current();
       }
     };
@@ -22,6 +30,6 @@ export function useEscapeKey(open, onEscape) {
     return () => {
       document.removeEventListener('keydown', handleKeyDown);
     };
-  }, [open]);
+  }, [isTopmost, open]);
 }
 //# sourceMappingURL=useEscapeKey.web.js.map

package/lib/module/overlay/useEscapeKey.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","useEscapeKey","open","onEscape","onEscapeRef","current","handleKeyDown","e","key","document","addEventListener","removeEventListener"],"sourceRoot":"../../../src","sources":["overlay/useEscapeKey.web.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;;AAEzC;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAACC,IAAa,EAAEC,QAAoB,EAAE;EAChE,MAAMC,WAAW,GAAGJ,MAAM,CAACG,QAAQ,CAAC;EACpCC,WAAW,CAACC,OAAO,GAAGF,QAAQ;EAE9BJ,SAAS,CAAC,MAAM;IACd,IAAI,CAACG,IAAI,EAAE;MACT;IACF;IAEA,MAAMI,aAAa,GAAIC,CAAgB,IAAK;MAC1C,IAAIA,CAAC,CAACC,GAAG,KAAK,QAAQ,EAAE;QACtBJ,WAAW,CAACC,OAAO,CAAC,CAAC;MACvB;IACF,CAAC;IAEDI,QAAQ,CAACC,gBAAgB,CAAC,SAAS,EAAEJ,aAAa,CAAC;IACnD,OAAO,MAAM;MACXG,QAAQ,CAACE,mBAAmB,CAAC,SAAS,EAAEL,aAAa,CAAC;IACxD,CAAC;EACH,CAAC,EAAE,CAACJ,IAAI,CAAC,CAAC;AACZ","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","useOverlayStackRegistration","useEscapeKey","open","onEscape","options","onEscapeRef","current","isTopmost","active","capabilities","handleKeyDown","e","key","document","addEventListener","removeEventListener"],"sourceRoot":"../../../src","sources":["overlay/useEscapeKey.web.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AACzC,SAASC,2BAA2B,QAAmC,gBAAgB;;AAEvF;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAC1BC,IAAa,EACbC,QAAoB,EACpBC,OAA6B,GAAG,CAAC,CAAC,EAClC;EACA,MAAMC,WAAW,GAAGN,MAAM,CAACI,QAAQ,CAAC;EACpCE,WAAW,CAACC,OAAO,GAAGH,QAAQ;EAC9B,MAAM;IAAEI;EAAU,CAAC,GAAGP,2BAA2B,CAAC;IAChDQ,MAAM,EAAEN,IAAI;IACZO,YAAY,EAAE,CAAC,QAAQ,CAAC;IACxB,GAAGL;EACL,CAAC,CAAC;EAEFN,SAAS,CAAC,MAAM;IACd,IAAI,CAACI,IAAI,EAAE;MACT;IACF;IAEA,MAAMQ,aAAa,GAAIC,CAAgB,IAAK;MAC1C,IAAIA,CAAC,CAACC,GAAG,KAAK,QAAQ,IAAIL,SAAS,CAAC,QAAQ,CAAC,EAAE;QAC7CF,WAAW,CAACC,OAAO,CAAC,CAAC;MACvB;IACF,CAAC;IAEDO,QAAQ,CAACC,gBAAgB,CAAC,SAAS,EAAEJ,aAAa,CAAC;IACnD,OAAO,MAAM;MACXG,QAAQ,CAACE,mBAAmB,CAAC,SAAS,EAAEL,aAAa,CAAC;IACxD,CAAC;EACH,CAAC,EAAE,CAACH,SAAS,EAAEL,IAAI,CAAC,CAAC;AACvB","ignoreList":[]}

package/lib/module/overlay/useOverlayPosition.js

@@ -35,6 +35,9 @@ export const OverlayInsetsProvider = OverlayInsetsContext.Provider;
 /** Minimum gap (px) between the overlay edge and the viewport/safe-area boundary. */
 const SCREEN_EDGE_PADDING = 8;
 
+/** Gap between anchor and popover content. */
+const POPOVER_GAP = 4;
+
 /** Minimum usable space (px) below the anchor before the overlay flips above. */
 const MIN_CONTENT_HEIGHT = 200;
 /**
@@ -45,27 +48,37 @@ const MIN_CONTENT_HEIGHT = 200;
  *
  * Respects safe-area insets provided via `OverlayInsetsProvider`.
  */
-export function useOverlayPosition(anchorLayout) {
+export function useOverlayPosition(anchorLayout, options) {
   const {
+    width: viewportWidth,
     height: viewportHeight
   } = useWindowDimensions();
   const {
     top: insetTop,
-    bottom: insetBottom
+    bottom: insetBottom,
+    right: insetRight
   } = useContext(OverlayInsetsContext);
+  const matchAnchorWidth = options?.matchAnchorWidth ?? true;
   return useMemo(() => {
     if (!anchorLayout) return null;
     const anchorBottom = anchorLayout.y + anchorLayout.height;
     const spaceBelow = viewportHeight - anchorBottom - insetBottom - SCREEN_EDGE_PADDING;
     const spaceAbove = anchorLayout.y - insetTop - SCREEN_EDGE_PADDING;
     const preferBelow = spaceBelow >= MIN_CONTENT_HEIGHT || spaceBelow >= spaceAbove;
+    const horizontalStyle = matchAnchorWidth ? {
+      left: anchorLayout.x,
+      width: anchorLayout.width
+    } : {
+      left: anchorLayout.x,
+      alignItems: 'flex-start',
+      maxWidth: Math.max(0, viewportWidth - anchorLayout.x - insetRight - SCREEN_EDGE_PADDING)
+    };
     if (preferBelow) {
       const maxHeight = Math.max(0, spaceBelow);
       return {
         style: {
-          top: anchorBottom,
-          left: anchorLayout.x,
-          width: anchorLayout.width,
+          ...horizontalStyle,
+          top: anchorBottom + POPOVER_GAP,
           maxHeight
         },
         maxHeight,
@@ -75,14 +88,13 @@ export function useOverlayPosition(anchorLayout) {
     const maxHeight = Math.max(0, spaceAbove);
     return {
       style: {
-        bottom: viewportHeight - anchorLayout.y,
-        left: anchorLayout.x,
-        width: anchorLayout.width,
+        ...horizontalStyle,
+        bottom: viewportHeight - anchorLayout.y + POPOVER_GAP,
         maxHeight
       },
       maxHeight,
       placement: 'top'
     };
-  }, [anchorLayout, viewportHeight, insetTop, insetBottom]);
+  }, [anchorLayout, viewportWidth, viewportHeight, insetTop, insetBottom, insetRight, matchAnchorWidth]);
 }
 //# sourceMappingURL=useOverlayPosition.js.map

package/lib/module/overlay/useOverlayPosition.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useContext","useMemo","useWindowDimensions","DEFAULT_INSETS","top","right","bottom","left","OverlayInsetsContext","OverlayInsetsProvider","Provider","SCREEN_EDGE_PADDING","MIN_CONTENT_HEIGHT","useOverlayPosition","anchorLayout","height","viewportHeight","insetTop","insetBottom","anchorBottom","y","spaceBelow","spaceAbove","preferBelow","maxHeight","Math","max","style","x","width","placement"],"sourceRoot":"../../../src","sources":["overlay/useOverlayPosition.ts"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAC1D,SAASC,mBAAmB,QAAwB,cAAc;AAUlE,MAAMC,cAA0B,GAAG;EAAEC,GAAG,EAAE,CAAC;EAAEC,KAAK,EAAE,CAAC;EAAEC,MAAM,EAAE,CAAC;EAAEC,IAAI,EAAE;AAAE,CAAC;;AAE3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,gBAAGT,aAAa,CAAaI,cAAc,CAAC;AAC7E,OAAO,MAAMM,qBAAqB,GAAGD,oBAAoB,CAACE,QAAQ;;AAElE;AACA,MAAMC,mBAAmB,GAAG,CAAC;;AAE7B;AACA,MAAMC,kBAAkB,GAAG,GAAG;AAQ9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAACC,YAAiC,EAA0B;EAC5F,MAAM;IAAEC,MAAM,EAAEC;EAAe,CAAC,GAAGd,mBAAmB,CAAC,CAAC;EACxD,MAAM;IAAEE,GAAG,EAAEa,QAAQ;IAAEX,MAAM,EAAEY;EAAY,CAAC,GAAGlB,UAAU,CAACQ,oBAAoB,CAAC;EAE/E,OAAOP,OAAO,CAAC,MAAM;IACnB,IAAI,CAACa,YAAY,EAAE,OAAO,IAAI;IAE9B,MAAMK,YAAY,GAAGL,YAAY,CAACM,CAAC,GAAGN,YAAY,CAACC,MAAM;IACzD,MAAMM,UAAU,GAAGL,cAAc,GAAGG,YAAY,GAAGD,WAAW,GAAGP,mBAAmB;IACpF,MAAMW,UAAU,GAAGR,YAAY,CAACM,CAAC,GAAGH,QAAQ,GAAGN,mBAAmB;IAElE,MAAMY,WAAW,GAAGF,UAAU,IAAIT,kBAAkB,IAAIS,UAAU,IAAIC,UAAU;IAEhF,IAAIC,WAAW,EAAE;MACf,MAAMC,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEL,UAAU,CAAC;MACzC,OAAO;QACLM,KAAK,EAAE;UACLvB,GAAG,EAAEe,YAAY;UACjBZ,IAAI,EAAEO,YAAY,CAACc,CAAC;UACpBC,KAAK,EAAEf,YAAY,CAACe,KAAK;UACzBL;QACF,CAAC;QACDA,SAAS;QACTM,SAAS,EAAE;MACb,CAAC;IACH;IAEA,MAAMN,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEJ,UAAU,CAAC;IACzC,OAAO;MACLK,KAAK,EAAE;QACLrB,MAAM,EAAEU,cAAc,GAAGF,YAAY,CAACM,CAAC;QACvCb,IAAI,EAAEO,YAAY,CAACc,CAAC;QACpBC,KAAK,EAAEf,YAAY,CAACe,KAAK;QACzBL;MACF,CAAC;MACDA,SAAS;MACTM,SAAS,EAAE;IACb,CAAC;EACH,CAAC,EAAE,CAAChB,YAAY,EAAEE,cAAc,EAAEC,QAAQ,EAAEC,WAAW,CAAC,CAAC;AAC3D","ignoreList":[]}
+{"version":3,"names":["createContext","useContext","useMemo","useWindowDimensions","DEFAULT_INSETS","top","right","bottom","left","OverlayInsetsContext","OverlayInsetsProvider","Provider","SCREEN_EDGE_PADDING","POPOVER_GAP","MIN_CONTENT_HEIGHT","useOverlayPosition","anchorLayout","options","width","viewportWidth","height","viewportHeight","insetTop","insetBottom","insetRight","matchAnchorWidth","anchorBottom","y","spaceBelow","spaceAbove","preferBelow","horizontalStyle","x","alignItems","maxWidth","Math","max","maxHeight","style","placement"],"sourceRoot":"../../../src","sources":["overlay/useOverlayPosition.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/portal/portal.js

@@ -3,42 +3,101 @@
 import * as React from 'react';
 import { useEffect, useSyncExternalStore } from 'react';
 import { Platform } from 'react-native';
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { createPortalFn } from '../utils/createPortal';
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 const DEFAULT_PORTAL_HOST = 'FORGE_UI_DEFAULT_HOST_NAME';
-const store = {
-  map: new Map().set(DEFAULT_PORTAL_HOST, new Map()),
-  listeners: new Set()
-};
-
-// --------------------------------------------------
+function createPortalRegistry() {
+  return {
+    map: new Map().set(DEFAULT_PORTAL_HOST, new Map()),
+    hostStacks: new Map(),
+    portalListeners: new Set(),
+    hostListeners: new Set(),
+    hasWarnedMultipleHosts: false
+  };
+}
 
-function emit() {
-  for (const cb of store.listeners) cb();
+/**
+ * Standalone Portal and PortalHost instances continue to share this fallback.
+ * PortalProvider creates an isolated registry for each provider subtree.
+ */
+const fallbackPortalRegistry = createPortalRegistry();
+const PortalRegistryContext = /*#__PURE__*/React.createContext(null);
+function emitPortals(registry) {
+  for (const cb of registry.portalListeners) cb();
+}
+function emitHosts(registry) {
+  for (const cb of registry.hostListeners) cb();
+}
+function subscribeHosts(registry, cb) {
+  registry.hostListeners.add(cb);
+  return () => {
+    registry.hostListeners.delete(cb);
+  };
+}
+function pushPortalHost(registry, name, id) {
+  const stacks = new Map(registry.hostStacks);
+  const stack = [...(stacks.get(name) ?? [])];
+  stack.push(id);
+  stacks.set(name, stack);
+  registry.hostStacks = stacks;
+  if (__DEV__ && !registry.hasWarnedMultipleHosts && stack.length > 1) {
+    registry.hasWarnedMultipleHosts = true;
+    console.warn('[Forge UI] Multiple PortalHost instances detected for the same host name. ' + 'Only the first mounted PortalHost renders portal content. ' + 'Mount a single PortalHost near your app root (ForgeDesignProvider does this automatically).');
+  }
+  emitHosts(registry);
 }
-function getSnapshot() {
-  return store.map;
+function popPortalHost(registry, name, id) {
+  const stacks = new Map(registry.hostStacks);
+  const stack = (stacks.get(name) ?? []).filter(entry => entry !== id);
+  if (stack.length === 0) {
+    stacks.delete(name);
+  } else {
+    stacks.set(name, stack);
+  }
+  registry.hostStacks = stacks;
+  emitHosts(registry);
 }
-function subscribe(cb) {
-  store.listeners.add(cb);
+function isActivePortalHost(registry, name, id) {
+  const stack = registry.hostStacks.get(name) ?? [];
+  return stack.length > 0 && stack[0] === id;
+}
+function subscribePortals(registry, cb) {
+  registry.portalListeners.add(cb);
   return () => {
-    store.listeners.delete(cb);
+    registry.portalListeners.delete(cb);
   };
 }
-function updatePortal(hostName, name, children) {
-  const next = new Map(store.map);
-  const portal = next.get(hostName) ?? new Map();
+function updatePortal(registry, hostName, name, children) {
+  const next = new Map(registry.map);
+  const portal = new Map(next.get(hostName) ?? []);
   portal.set(name, children);
   next.set(hostName, portal);
-  store.map = next;
-  emit();
+  registry.map = next;
+  emitPortals(registry);
 }
-function removePortal(hostName, name) {
-  const next = new Map(store.map);
-  const portal = next.get(hostName) ?? new Map();
+function removePortal(registry, hostName, name) {
+  const next = new Map(registry.map);
+  const portal = new Map(next.get(hostName) ?? []);
   portal.delete(name);
-  next.set(hostName, portal);
-  store.map = next;
-  emit();
+  if (portal.size === 0 && hostName !== DEFAULT_PORTAL_HOST) {
+    next.delete(hostName);
+  } else {
+    next.set(hostName, portal);
+  }
+  registry.map = next;
+  emitPortals(registry);
+}
+
+// --------------------------------------------------
+
+export function PortalProvider({
+  children
+}) {
+  const [registry] = React.useState(createPortalRegistry);
+  return /*#__PURE__*/_jsx(PortalRegistryContext.Provider, {
+    value: registry,
+    children: children
+  });
 }
 
 // --------------------------------------------------
@@ -46,12 +105,29 @@ function removePortal(hostName, name) {
 export function PortalHost({
   name = DEFAULT_PORTAL_HOST
 }) {
-  const map = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const registry = React.useContext(PortalRegistryContext) ?? fallbackPortalRegistry;
+  const hostId = React.useRef(Symbol()).current;
+  useEffect(() => {
+    pushPortalHost(registry, name, hostId);
+    return () => {
+      popPortalHost(registry, name, hostId);
+    };
+  }, [registry, name, hostId]);
+  useSyncExternalStore(cb => subscribeHosts(registry, cb), () => registry.hostStacks, () => registry.hostStacks);
+  const map = useSyncExternalStore(cb => subscribePortals(registry, cb), () => registry.map, () => registry.map);
   const portalMap = map.get(name) ?? new Map();
-  if (portalMap.size === 0) return null;
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: Array.from(portalMap.values())
+  if (!isActivePortalHost(registry, name, hostId) || portalMap.size === 0) {
+    return null;
+  }
+  const content = /*#__PURE__*/_jsx(_Fragment, {
+    children: Array.from(portalMap.entries()).map(([portalName, children]) => /*#__PURE__*/_jsx(React.Fragment, {
+      children: children
+    }, portalName))
   });
+  if (Platform.OS === 'web' && createPortalFn && typeof document !== 'undefined') {
+    return createPortalFn(content, document.body);
+  }
+  return content;
 }
 
 // --------------------------------------------------
@@ -61,12 +137,15 @@ export function Portal({
   hostName = DEFAULT_PORTAL_HOST,
   children
 }) {
+  const registry = React.useContext(PortalRegistryContext) ?? fallbackPortalRegistry;
+  useEffect(() => {
+    updatePortal(registry, hostName, name, children);
+  }, [registry, hostName, name, children]);
   useEffect(() => {
-    updatePortal(hostName, name, children);
     return () => {
-      removePortal(hostName, name);
+      removePortal(registry, hostName, name);
     };
-  }, [hostName, name, children]);
+  }, [registry, hostName, name]);
   return null;
 }
 

package/lib/module/portal/portal.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useSyncExternalStore","Platform","Fragment","_Fragment","jsx","_jsx","DEFAULT_PORTAL_HOST","store","map","Map","set","listeners","Set","emit","cb","getSnapshot","subscribe","add","delete","updatePortal","hostName","name","children","next","portal","get","removePortal","PortalHost","portalMap","size","Array","from","values","Portal","ROOT","flex","useModalPortalRoot","ref","useRef","offset","setSideOffSet","useState","onLayout","useCallback","OS","current","measure","_x","_y","_width","_height","_pageX","pageY","style"],"sourceRoot":"../../../src","sources":["portal/portal.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useSyncExternalStore","Platform","createPortalFn","jsx","_jsx","Fragment","_Fragment","DEFAULT_PORTAL_HOST","createPortalRegistry","map","Map","set","hostStacks","portalListeners","Set","hostListeners","hasWarnedMultipleHosts","fallbackPortalRegistry","PortalRegistryContext","createContext","emitPortals","registry","cb","emitHosts","subscribeHosts","add","delete","pushPortalHost","name","id","stacks","stack","get","push","__DEV__","length","console","warn","popPortalHost","filter","entry","isActivePortalHost","subscribePortals","updatePortal","hostName","children","next","portal","removePortal","size","PortalProvider","useState","Provider","value","PortalHost","useContext","hostId","useRef","Symbol","current","portalMap","content","Array","from","entries","portalName","OS","document","body","Portal","ROOT","flex","useModalPortalRoot","ref","offset","setSideOffSet","onLayout","useCallback","measure","_x","_y","_width","_height","_pageX","pageY","style"],"sourceRoot":"../../../src","sources":["portal/portal.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/radio/RadioGroup.js

@@ -1,13 +1,14 @@
 "use strict";
 
-import { forwardRef } from 'react';
-import { View } from 'react-native';
-import { useFormControlContext } from '@cdx-ui/utils';
+import { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
+import { Platform, View } from 'react-native';
+import { composeEventHandlers, useFormControl } from '@cdx-ui/utils';
 import { useRadioGroup } from '@react-native-aria/radio';
 import { useRadioGroupState } from '@react-stately/radio';
 import { Slot } from '../slot';
 import { dataAttributes, mergeDataAttributes } from '../utils/dataAttributes';
 import { RadioGroupContext } from './context';
+import { useRadioGroupNavigation } from './useRadioGroupNavigation';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const RadioGroup = /*#__PURE__*/forwardRef(({
   asChild,
@@ -16,25 +17,66 @@ export const RadioGroup = /*#__PURE__*/forwardRef(({
   style,
   ...props
 }, ref) => {
-  const formControlContext = useFormControlContext();
-  const combinedProps = {
-    ...formControlContext,
-    ...props
-  };
+  const formControlProps = useFormControl({
+    isDisabled: props.isDisabled,
+    isRequired: props.isRequired,
+    isInvalid: props.isInvalid,
+    isReadOnly: props.isReadOnly
+  });
+  const isDisabled = props.isDisabled ?? Boolean(formControlProps.disabled);
+  const isInvalid = props.isInvalid ?? Boolean(formControlProps['aria-invalid']);
+  const isRequired = props.isRequired ?? Boolean(formControlProps.required);
+  const isReadOnly = props.isReadOnly ?? Boolean(formControlProps.readOnly);
+  const name = props.name ?? formControlProps.name;
+  const ariaLabel = props['aria-label'];
+  const ariaLabelledBy = props['aria-labelledby'] ?? formControlProps['aria-labelledby'];
+  const ariaDescribedBy = formControlProps['aria-describedby'];
   const radioGroupState = useRadioGroupState({
-    ...combinedProps,
-    validationState: combinedProps.isInvalid ? 'invalid' : 'valid'
+    name,
+    value: props.value,
+    defaultValue: props.defaultValue,
+    onChange: props.onChange,
+    isDisabled,
+    isInvalid,
+    isRequired,
+    isReadOnly,
+    validationState: isInvalid ? 'invalid' : 'valid'
   });
   const {
     radioGroupProps
   } = useRadioGroup({
-    ...combinedProps,
-    'aria-label': combinedProps['aria-label']
+    'aria-label': ariaLabel,
+    'aria-labelledby': ariaLabelledBy,
+    isDisabled
   }, radioGroupState);
-  const isDisabled = combinedProps.isDisabled ?? false;
-  const isInvalid = combinedProps.isInvalid ?? false;
-  const isRequired = combinedProps.isRequired ?? false;
-  const isReadOnly = combinedProps.isReadOnly ?? false;
+  const [focusedValue, setFocusedValue] = useState(undefined);
+  // Identity of getRadios depends on this so roving tabIndex recomputes after register/unregister.
+  const [registrationEpoch, setRegistrationEpoch] = useState(0);
+  const radiosRef = useRef(new Map());
+  useEffect(() => {
+    setFocusedValue(prev => prev !== undefined && prev !== radioGroupState.selectedValue ? undefined : prev);
+  }, [radioGroupState.selectedValue]);
+  const registerRadio = useCallback((value, entry) => {
+    radiosRef.current.set(value, entry);
+    setRegistrationEpoch(epoch => epoch + 1);
+  }, []);
+  const unregisterRadio = useCallback(value => {
+    radiosRef.current.delete(value);
+    setRegistrationEpoch(epoch => epoch + 1);
+  }, []);
+  const getRadios = useCallback(() => Array.from(radiosRef.current.entries()), [registrationEpoch]);
+  const {
+    handleKeyDown
+  } = useRadioGroupNavigation({
+    getRadios,
+    focusedValue,
+    setFocusedValue,
+    selectedValue: radioGroupState.selectedValue,
+    selectValue: value => radioGroupState.setSelectedValue(value)
+  });
+  const webProps = Platform.OS === 'web' ? {
+    onKeyDown: composeEventHandlers(props.onKeyDown, handleKeyDown)
+  } : {};
   const Comp = asChild ? Slot : View;
   return /*#__PURE__*/_jsx(RadioGroupContext.Provider, {
     value: {
@@ -47,17 +89,24 @@ export const RadioGroup = /*#__PURE__*/forwardRef(({
         selectValue: value => radioGroupState.setSelectedValue(value)
       },
       radioGroupState,
-      name: combinedProps.name
+      name,
+      focusedValue,
+      setFocusedValue,
+      registerRadio,
+      unregisterRadio,
+      getRadios
     },
     children: /*#__PURE__*/_jsx(Comp, {
       ...radioGroupProps,
-      "aria-label": combinedProps['aria-label'],
-      "aria-labelledby": combinedProps['aria-labelledby'],
+      "aria-label": ariaLabel,
+      "aria-labelledby": ariaLabelledBy,
+      "aria-describedby": ariaDescribedBy,
       "aria-required": isRequired || undefined,
       "aria-readonly": isReadOnly || undefined,
       className: className,
       style: style,
       ref: ref,
+      ...webProps,
       ...mergeDataAttributes(props, dataAttributes({
         disabled: isDisabled,
         invalid: isInvalid