@tamagui/dismissable 2.0.0-1768586279389 → 2.0.0-1768696252732
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Dismissable.cjs +2 -1
- package/dist/cjs/Dismissable.js +2 -1
- package/dist/cjs/Dismissable.js.map +1 -1
- package/dist/esm/Dismissable.js +2 -1
- package/dist/esm/Dismissable.js.map +1 -1
- package/dist/esm/Dismissable.mjs +2 -1
- package/dist/esm/Dismissable.mjs.map +1 -1
- package/dist/jsx/Dismissable.js +2 -1
- package/dist/jsx/Dismissable.js.map +1 -1
- package/dist/jsx/Dismissable.mjs +2 -1
- package/dist/jsx/Dismissable.mjs.map +1 -1
- package/package.json +7 -7
- package/src/Dismissable.tsx +4 -1
- package/types/Dismissable.d.ts.map +1 -1
package/dist/cjs/Dismissable.cjs
CHANGED
|
@@ -90,7 +90,8 @@ const DismissableContext = React.createContext({
|
|
|
90
90
|
[...context.branches].some(branch => branch.contains(target)) || (onFocusOutside?.(event), onInteractOutside?.(event), event.defaultPrevented || onDismiss?.());
|
|
91
91
|
});
|
|
92
92
|
return (0, import_use_escape_keydown.useEscapeKeydown)(event => {
|
|
93
|
-
|
|
93
|
+
const currentLayers = Array.from(context.layers);
|
|
94
|
+
(node ? currentLayers.indexOf(node) : -1) === currentLayers.length - 1 && (onEscapeKeyDown?.(event), !event.defaultPrevented && onDismiss && (event.preventDefault(), onDismiss()));
|
|
94
95
|
}), React.useEffect(() => {
|
|
95
96
|
if (node) return disableOutsidePointerEvents && (context.layersWithOutsidePointerEventsDisabled.size === 0 && (originalBodyPointerEvents = document.body.style.pointerEvents, document.body.style.pointerEvents = "none"), context.layersWithOutsidePointerEventsDisabled.add(node)), context.layers.add(node), dispatchUpdate(), () => {
|
|
96
97
|
disableOutsidePointerEvents && context.layersWithOutsidePointerEventsDisabled.size === 1 && (document.body.style.pointerEvents = originalBodyPointerEvents);
|
package/dist/cjs/Dismissable.js
CHANGED
|
@@ -65,7 +65,8 @@ const DismissableContext = React.createContext({
|
|
|
65
65
|
) || (onFocusOutside?.(event), onInteractOutside?.(event), event.defaultPrevented || onDismiss?.());
|
|
66
66
|
});
|
|
67
67
|
return (0, import_use_escape_keydown.useEscapeKeydown)((event) => {
|
|
68
|
-
|
|
68
|
+
const currentLayers = Array.from(context.layers);
|
|
69
|
+
(node ? currentLayers.indexOf(node) : -1) === currentLayers.length - 1 && (onEscapeKeyDown?.(event), !event.defaultPrevented && onDismiss && (event.preventDefault(), onDismiss()));
|
|
69
70
|
}), React.useEffect(() => {
|
|
70
71
|
if (node)
|
|
71
72
|
return disableOutsidePointerEvents && (context.layersWithOutsidePointerEventsDisabled.size === 0 && (originalBodyPointerEvents = document.body.style.pointerEvents, document.body.style.pointerEvents = "none"), context.layersWithOutsidePointerEventsDisabled.add(node)), context.layers.add(node), dispatchUpdate(), () => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Dismissable.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,0BAAgC,kCAChC,cAAkD,0BAClD,4BAAiC,wCACjC,mBAAyB,+BACzB,QAAuB,8BACvB,WAA0B,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,0BAAgC,kCAChC,cAAkD,0BAClD,4BAAiC,wCACjC,mBAAyB,+BACzB,QAAuB,8BACvB,WAA0B,kCAiJtB;AA7IG,SAAS,4BACd,QACA,OACA;AACA,EAAI,UAAQ,SAAS,UAAU,MAAM,OAAO,cAAc,KAAK,CAAC;AAClE;AAMA,MAAM,yBAAyB,eACzB,iBAAiB,sBACjB,uBAAuB,kCACvB,gBAAgB;AAEtB,IAAI;AAEJ,MAAM,qBAAqB,MAAM,cAAc;AAAA,EAC7C,QAAQ,oBAAI,IAAoB;AAAA,EAChC,wCAAwC,oBAAI,IAAoB;AAAA,EAChE,UAAU,oBAAI,IAAoB;AACpC,CAAC,GAEK,cAAc,MAAM,WAGxB,CAAC,OAAO,iBAAiB;AACzB,QAAM;AAAA,IACJ,8BAA8B;AAAA,IAC9B;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI,OACE,OAAQ,UAAU,mBAAO,mBACzB,UAAU,MAAM,WAAW,kBAAkB,GAC7C,CAAC,MAAM,OAAO,IAAI,MAAM,SAAgC,IAAI,GAC5D,CAAC,EAAE,KAAK,IAAI,MAAM,SAAS,CAAC,CAAC,GAC7B,mBAAe,qCAAgB,cAAc,CAACA,UAAS,QAAQA,KAAI,CAAC,GACpE,SAAS,MAAM,KAAK,QAAQ,MAAM,GAElC,CAAC,4CAA4C,IAAI;AAAA,IACrD,GAAG,QAAQ;AAAA,EACb,EAAE,MAAM,EAAE,GACJ,oDAAoD,OAAO;AAAA,IAC/D;AAAA,EACF,GAEM,QAAQ,OAAO,OAAO,QAAQ,IAAI,IAAI,IACtC,8BACJ,QAAQ,uCAAuC,OAAO,GAClD,yBACJ,SAAS,mDAEL,qBAAqB,sBAAsB,CAAC,UAAU;AAC1D,UAAM,SAAS,MAAM,QACf,wBAAwB,CAAC,GAAG,QAAQ,QAAQ,EAAE;AAAA,MAAK,CAAC,WACxD,OAAO,SAAS,MAAM;AAAA,IACxB;AACA,IAAI,CAAC,0BAA0B,0BAC/B,uBAAuB,KAAK,GAC5B,oBAAoB,KAAK,GACpB,MAAM,oBAAkB,YAAY;AAAA,EAC3C,CAAC,GAEK,eAAe,gBAAgB,CAAC,UAAU;AAC9C,UAAM,SAAS,MAAM;AAIrB,IAHwB,CAAC,GAAG,QAAQ,QAAQ,EAAE;AAAA,MAAK,CAAC,WAClD,OAAO,SAAS,MAAM;AAAA,IACxB,MAEA,iBAAiB,KAAK,GACtB,oBAAoB,KAAK,GACpB,MAAM,oBAAkB,YAAY;AAAA,EAC3C,CAAC;AAED,yDAAiB,CAAC,UAAU;AAE1B,UAAM,gBAAgB,MAAM,KAAK,QAAQ,MAAM;AAG/C,KAFqB,OAAO,cAAc,QAAQ,IAAI,IAAI,QAClB,cAAc,SAAS,MAE/D,kBAAkB,KAAK,GACnB,CAAC,MAAM,oBAAoB,cAC7B,MAAM,eAAe,GACrB,UAAU;AAAA,EAEd,CAAC,GAED,MAAM,UAAU,MAAM;AACpB,QAAK;AACL,aAAI,gCACE,QAAQ,uCAAuC,SAAS,MAC1D,4BAA4B,SAAS,KAAK,MAAM,eAChD,SAAS,KAAK,MAAM,gBAAgB,SAEtC,QAAQ,uCAAuC,IAAI,IAAI,IAEzD,QAAQ,OAAO,IAAI,IAAI,GACvB,eAAe,GACR,MAAM;AACX,QACE,+BACA,QAAQ,uCAAuC,SAAS,MAExD,SAAS,KAAK,MAAM,gBAAgB;AAAA,MAExC;AAAA,EACF,GAAG,CAAC,MAAM,6BAA6B,OAAO,CAAC,GAQ/C,MAAM,UAAU,MAAM;AACpB,QAAI;AACJ,aAAO,MAAM;AACX,QAAK,SACL,QAAQ,OAAO,OAAO,IAAI,GAC1B,QAAQ,uCAAuC,OAAO,IAAI,GAC1D,eAAe;AAAA,MACjB;AAAA,EACF,GAAG,CAAC,MAAM,SAAS,YAAY,CAAC,GAEhC,MAAM,UAAU,MAAM;AACpB,UAAM,eAAe,MAAM;AACzB,YAAM,CAAC,CAAC;AAAA,IACV;AACA,oBAAS,iBAAiB,gBAAgB,YAAY,GAC/C,MAAM,SAAS,oBAAoB,gBAAgB,YAAY;AAAA,EACxE,GAAG,CAAC,CAAC,GAGH;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MAEJ,KAAK;AAAA,MACL,SAAQ;AAAA,MACR,eACE,8BACI,yBACE,SACA,SACF;AAAA,MAEN,oBAAgB;AAAA,QACd,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA,mBAAe;AAAA,QACb,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA,0BAAsB;AAAA,QACpB,MAAM;AAAA,QACN,mBAAmB;AAAA,MACrB;AAAA,MAEC;AAAA;AAAA,EACH;AAEJ,CAAC;AAED,YAAY,cAAc;AAM1B,MAAM,cAAc,qBAEd,oBAAoB,MAAM;AAAA,EAC9B,CAAC,OAAO,iBAAiB;AACvB,UAAM,UAAU,MAAM,WAAW,kBAAkB,GAC7C,MAAM,MAAM,OAAuB,IAAI,GACvC,mBAAe,qCAAgB,cAAc,GAAG;AAEtD,iBAAM,UAAU,MAAM;AACpB,YAAM,OAAO,IAAI;AACjB,UAAI;AACF,uBAAQ,SAAS,IAAI,IAAI,GAClB,MAAM;AACX,kBAAQ,SAAS,OAAO,IAAI;AAAA,QAC9B;AAAA,IAEJ,GAAG,CAAC,QAAQ,QAAQ,CAAC,GAEd,4CAAC,SAAI,OAAO,EAAE,SAAS,WAAW,GAAI,GAAG,OAAO,KAAK,cAAc;AAAA,EAC5E;AACF;AAEA,kBAAkB,cAAc;AAYhC,SAAS,sBACP,sBACA;AACA,QAAM,+BAA2B,2BAAS,oBAAoB,GACxD,8BAA8B,MAAM,OAAO,EAAK,GAChD,iBAAiB,MAAM,OAAO,MAAM;AAAA,EAAC,CAAC;AAE5C,eAAM,UAAU,MAAM;AACpB,UAAM,oBAAoB,CAAC,UAAwB;AACjD,UAAI,MAAM,UAAU,CAAC,4BAA4B,SAAS;AAGxD,YAAS,2CAAT,WAAoD;AAClD;AAAA,YACE;AAAA,YACA;AAAA,YACA;AAAA,YACA,EAAE,UAAU,GAAK;AAAA,UACnB;AAAA,QACF;AATA,cAAM,cAAc,EAAE,eAAe,MAAM;AAuB3C,QAAI,MAAM,gBAAgB,WACxB,SAAS,oBAAoB,SAAS,eAAe,OAAO,GAC5D,eAAe,UAAU,0CACzB,SAAS,iBAAiB,SAAS,eAAe,SAAS,EAAE,MAAM,GAAK,CAAC,KAEzE,yCAAyC;AAAA,MAE7C;AACA,kCAA4B,UAAU;AAAA,IACxC,GAcM,UAAU,WAAW,MAAM;AAC/B,eAAS,iBAAiB,eAAe,iBAAiB;AAAA,IAC5D,GAAG,CAAC;AACJ,WAAO,MAAM;AACX,aAAO,aAAa,OAAO,GAC3B,SAAS,oBAAoB,eAAe,iBAAiB,GAC7D,SAAS,oBAAoB,SAAS,eAAe,OAAO;AAAA,IAC9D;AAAA,EACF,GAAG,CAAC,wBAAwB,CAAC,GAEtB;AAAA;AAAA,IAEL,sBAAsB,MAAM;AAC1B,kCAA4B,UAAU;AAAA,IACxC;AAAA,EACF;AACF;AAMA,SAAS,gBAAgB,gBAAqD;AAC5E,QAAM,yBAAqB,2BAAS,cAAc,GAC5C,4BAA4B,MAAM,OAAO,EAAK;AAEpD,eAAM,UAAU,MAAM;AACpB,UAAM,cAAc,CAAC,UAAsB;AACzC,MAAI,MAAM,UAAU,CAAC,0BAA0B,WAE7C,6BAA6B,eAAe,oBADxB,EAAE,eAAe,MAAM,GACkC;AAAA,QAC3E,UAAU;AAAA,MACZ,CAAC;AAAA,IAEL;AACA,oBAAS,iBAAiB,WAAW,WAAW,GACzC,MAAM,SAAS,oBAAoB,WAAW,WAAW;AAAA,EAClE,GAAG,CAAC,kBAAkB,CAAC,GAEhB;AAAA,IACL,gBAAgB,MAAM;AACpB,gCAA0B,UAAU;AAAA,IACtC;AAAA,IACA,eAAe,MAAM;AACnB,gCAA0B,UAAU;AAAA,IACtC;AAAA,EACF;AACF;AAEA,SAAS,iBAAiB;AACxB,QAAM,QAAQ,IAAI,YAAY,cAAc;AAC5C,WAAS,cAAc,KAAK;AAC9B;AAEA,SAAS,6BACP,MACA,SACA,QACA,EAAE,SAAS,GACX;AACA,QAAM,SAAS,OAAO,cAAc,QAC9B,QAAQ,IAAI,YAAY,MAAM,EAAE,SAAS,IAAO,YAAY,IAAM,OAAO,CAAC;AAChF,EAAI,WAAS,OAAO,iBAAiB,MAAM,SAA0B,EAAE,MAAM,GAAK,CAAC,GAE/E,WACF,4BAA4B,QAAQ,KAAK,IAEzC,OAAO,cAAc,KAAK;AAE9B;",
|
|
5
5
|
"names": ["node"]
|
|
6
6
|
}
|
package/dist/esm/Dismissable.js
CHANGED
|
@@ -42,7 +42,8 @@ const DismissableContext = React.createContext({
|
|
|
42
42
|
) || (onFocusOutside?.(event), onInteractOutside?.(event), event.defaultPrevented || onDismiss?.());
|
|
43
43
|
});
|
|
44
44
|
return useEscapeKeydown((event) => {
|
|
45
|
-
|
|
45
|
+
const currentLayers = Array.from(context.layers);
|
|
46
|
+
(node ? currentLayers.indexOf(node) : -1) === currentLayers.length - 1 && (onEscapeKeyDown?.(event), !event.defaultPrevented && onDismiss && (event.preventDefault(), onDismiss()));
|
|
46
47
|
}), React.useEffect(() => {
|
|
47
48
|
if (node)
|
|
48
49
|
return disableOutsidePointerEvents && (context.layersWithOutsidePointerEventsDisabled.size === 0 && (originalBodyPointerEvents = document.body.style.pointerEvents, document.body.style.pointerEvents = "none"), context.layersWithOutsidePointerEventsDisabled.add(node)), context.layers.add(node), dispatchUpdate(), () => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Dismissable.tsx"],
|
|
4
|
-
"mappings": "AAGA,SAAS,uBAAuB;AAChC,SAAS,MAAM,OAAO,4BAA4B;AAClD,SAAS,wBAAwB;AACjC,SAAS,gBAAgB;AACzB,YAAY,WAAW;AACvB,YAAY,cAAc;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["node"]
|
|
6
6
|
}
|
package/dist/esm/Dismissable.mjs
CHANGED
|
@@ -52,7 +52,8 @@ const DismissableContext = React.createContext({
|
|
|
52
52
|
[...context.branches].some(branch => branch.contains(target)) || (onFocusOutside?.(event), onInteractOutside?.(event), event.defaultPrevented || onDismiss?.());
|
|
53
53
|
});
|
|
54
54
|
return useEscapeKeydown(event => {
|
|
55
|
-
|
|
55
|
+
const currentLayers = Array.from(context.layers);
|
|
56
|
+
(node ? currentLayers.indexOf(node) : -1) === currentLayers.length - 1 && (onEscapeKeyDown?.(event), !event.defaultPrevented && onDismiss && (event.preventDefault(), onDismiss()));
|
|
56
57
|
}), React.useEffect(() => {
|
|
57
58
|
if (node) return disableOutsidePointerEvents && (context.layersWithOutsidePointerEventsDisabled.size === 0 && (originalBodyPointerEvents = document.body.style.pointerEvents, document.body.style.pointerEvents = "none"), context.layersWithOutsidePointerEventsDisabled.add(node)), context.layers.add(node), dispatchUpdate(), () => {
|
|
58
59
|
disableOutsidePointerEvents && context.layersWithOutsidePointerEventsDisabled.size === 1 && (document.body.style.pointerEvents = originalBodyPointerEvents);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useComposedRefs","Slot","Stack","composeEventHandlers","useEscapeKeydown","useEvent","React","ReactDOM","jsx","dispatchDiscreteCustomEvent","target","event","flushSync","dispatchEvent","DISMISSABLE_LAYER_NAME","CONTEXT_UPDATE","POINTER_DOWN_OUTSIDE","FOCUS_OUTSIDE","originalBodyPointerEvents","DismissableContext","createContext","layers","Set","layersWithOutsidePointerEventsDisabled","branches","Dismissable","forwardRef","props","forwardedRef","disableOutsidePointerEvents","forceUnmount","onEscapeKeyDown","onPointerDownOutside","onFocusOutside","onInteractOutside","onDismiss","asChild","children","layerProps","Comp","context","useContext","node","setNode","useState","force","composedRefs","node2","Array","from","highestLayerWithOutsidePointerEventsDisabled","slice","highestLayerWithOutsidePointerEventsDisabledIndex","indexOf","index","isBodyPointerEventsDisabled","size","isPointerEventsEnabled","pointerDownOutside","usePointerDownOutside","isPointerDownOnBranch","some","branch","contains","defaultPrevented","focusOutside","useFocusOutside","preventDefault","useEffect","document","body","style","pointerEvents","add","dispatchUpdate","delete","handleUpdate","addEventListener","removeEventListener","ref","display","onFocusCapture","onBlurCapture","onPointerDownCapture","displayName","BRANCH_NAME","DismissableBranch","useRef","current","handlePointerDownOutside","isPointerInsideReactTreeRef","handleClickRef","handlePointerDown","handleAndDispatchPointerDownOutsideEvent","handleAndDispatchCustomEvent","eventDetail","discrete","originalEvent","pointerType","once","timerId","setTimeout","window","clearTimeout","handleFocusOutside","isFocusInsideReactTreeRef","handleFocus","CustomEvent","name","handler","detail","bubbles","cancelable"],"sources":["../../src/Dismissable.tsx"],"sourcesContent":[null],"mappings":"AAGA,SAASA,eAAA,QAAuB;AAChC,SAASC,IAAA,EAAMC,KAAA,EAAOC,oBAAA,QAA4B;AAClD,SAASC,gBAAA,QAAwB;AACjC,SAASC,QAAA,QAAgB;AACzB,YAAYC,KAAA,MAAW;AACvB,YAAYC,QAAA,MAAc;
|
|
1
|
+
{"version":3,"names":["useComposedRefs","Slot","Stack","composeEventHandlers","useEscapeKeydown","useEvent","React","ReactDOM","jsx","dispatchDiscreteCustomEvent","target","event","flushSync","dispatchEvent","DISMISSABLE_LAYER_NAME","CONTEXT_UPDATE","POINTER_DOWN_OUTSIDE","FOCUS_OUTSIDE","originalBodyPointerEvents","DismissableContext","createContext","layers","Set","layersWithOutsidePointerEventsDisabled","branches","Dismissable","forwardRef","props","forwardedRef","disableOutsidePointerEvents","forceUnmount","onEscapeKeyDown","onPointerDownOutside","onFocusOutside","onInteractOutside","onDismiss","asChild","children","layerProps","Comp","context","useContext","node","setNode","useState","force","composedRefs","node2","Array","from","highestLayerWithOutsidePointerEventsDisabled","slice","highestLayerWithOutsidePointerEventsDisabledIndex","indexOf","index","isBodyPointerEventsDisabled","size","isPointerEventsEnabled","pointerDownOutside","usePointerDownOutside","isPointerDownOnBranch","some","branch","contains","defaultPrevented","focusOutside","useFocusOutside","currentLayers","length","preventDefault","useEffect","document","body","style","pointerEvents","add","dispatchUpdate","delete","handleUpdate","addEventListener","removeEventListener","ref","display","onFocusCapture","onBlurCapture","onPointerDownCapture","displayName","BRANCH_NAME","DismissableBranch","useRef","current","handlePointerDownOutside","isPointerInsideReactTreeRef","handleClickRef","handlePointerDown","handleAndDispatchPointerDownOutsideEvent","handleAndDispatchCustomEvent","eventDetail","discrete","originalEvent","pointerType","once","timerId","setTimeout","window","clearTimeout","handleFocusOutside","isFocusInsideReactTreeRef","handleFocus","CustomEvent","name","handler","detail","bubbles","cancelable"],"sources":["../../src/Dismissable.tsx"],"sourcesContent":[null],"mappings":"AAGA,SAASA,eAAA,QAAuB;AAChC,SAASC,IAAA,EAAMC,KAAA,EAAOC,oBAAA,QAA4B;AAClD,SAASC,gBAAA,QAAwB;AACjC,SAASC,QAAA,QAAgB;AACzB,YAAYC,KAAA,MAAW;AACvB,YAAYC,QAAA,MAAc;AAiJtB,SAAAC,GAAA;AA7IG,SAASC,4BACdC,MAAA,EACAC,KAAA,EACA;EACID,MAAA,IAAQH,QAAA,CAASK,SAAA,CAAU,MAAMF,MAAA,CAAOG,aAAA,CAAcF,KAAK,CAAC;AAClE;AAMA,MAAMG,sBAAA,GAAyB;EACzBC,cAAA,GAAiB;EACjBC,oBAAA,GAAuB;EACvBC,aAAA,GAAgB;AAEtB,IAAIC,yBAAA;AAEJ,MAAMC,kBAAA,GAAqBb,KAAA,CAAMc,aAAA,CAAc;IAC7CC,MAAA,EAAQ,mBAAIC,GAAA,CAAoB;IAChCC,sCAAA,EAAwC,mBAAID,GAAA,CAAoB;IAChEE,QAAA,EAAU,mBAAIF,GAAA,CAAoB;EACpC,CAAC;EAEKG,WAAA,GAAcnB,KAAA,CAAMoB,UAAA,CAGxB,CAACC,KAAA,EAAOC,YAAA,KAAiB;IACzB,MAAM;QACJC,2BAAA,GAA8B;QAC9BC,YAAA;QACAC,eAAA;QACAC,oBAAA;QACAC,cAAA;QACAC,iBAAA;QACAC,SAAA;QACAC,OAAA;QACAC,QAAA;QACA,GAAGC;MACL,IAAIX,KAAA;MACEY,IAAA,GAAQH,OAAA,GAAUnC,IAAA,GAAOC,KAAA;MACzBsC,OAAA,GAAUlC,KAAA,CAAMmC,UAAA,CAAWtB,kBAAkB;MAC7C,CAACuB,IAAA,EAAMC,OAAO,IAAIrC,KAAA,CAAMsC,QAAA,CAAgC,IAAI;MAC5D,GAAGC,KAAK,IAAIvC,KAAA,CAAMsC,QAAA,CAAS,CAAC,CAAC;MAC7BE,YAAA,GAAe9C,eAAA,CAAgB4B,YAAA,EAAemB,KAAA,IAASJ,OAAA,CAAQI,KAAI,CAAC;MACpE1B,MAAA,GAAS2B,KAAA,CAAMC,IAAA,CAAKT,OAAA,CAAQnB,MAAM;MAElC,CAAC6B,4CAA4C,IAAI,CACrD,GAAGV,OAAA,CAAQjB,sCAAA,CACb,CAAE4B,KAAA,CAAM,EAAE;MACJC,iDAAA,GAAoD/B,MAAA,CAAOgC,OAAA,CAC/DH,4CACF;MAEMI,KAAA,GAAQZ,IAAA,GAAOrB,MAAA,CAAOgC,OAAA,CAAQX,IAAI,IAAI;MACtCa,2BAAA,GACJf,OAAA,CAAQjB,sCAAA,CAAuCiC,IAAA,GAAO;MAClDC,sBAAA,GACJH,KAAA,IAASF,iDAAA;MAELM,kBAAA,GAAqBC,qBAAA,CAAuBhD,KAAA,IAAU;QAC1D,MAAMD,MAAA,GAASC,KAAA,CAAMD,MAAA;UACfkD,qBAAA,GAAwB,CAAC,GAAGpB,OAAA,CAAQhB,QAAQ,EAAEqC,IAAA,CAAMC,MAAA,IACxDA,MAAA,CAAOC,QAAA,CAASrD,MAAM,CACxB;QACI,CAAC+C,sBAAA,IAA0BG,qBAAA,KAC/B5B,oBAAA,GAAuBrB,KAAK,GAC5BuB,iBAAA,GAAoBvB,KAAK,GACpBA,KAAA,CAAMqD,gBAAA,IAAkB7B,SAAA,GAAY;MAC3C,CAAC;MAEK8B,YAAA,GAAeC,eAAA,CAAiBvD,KAAA,IAAU;QAC9C,MAAMD,MAAA,GAASC,KAAA,CAAMD,MAAA;QACG,CAAC,GAAG8B,OAAA,CAAQhB,QAAQ,EAAEqC,IAAA,CAAMC,MAAA,IAClDA,MAAA,CAAOC,QAAA,CAASrD,MAAM,CACxB,MAEAuB,cAAA,GAAiBtB,KAAK,GACtBuB,iBAAA,GAAoBvB,KAAK,GACpBA,KAAA,CAAMqD,gBAAA,IAAkB7B,SAAA,GAAY;MAC3C,CAAC;IAED,OAAA/B,gBAAA,CAAkBO,KAAA,IAAU;MAE1B,MAAMwD,aAAA,GAAgBnB,KAAA,CAAMC,IAAA,CAAKT,OAAA,CAAQnB,MAAM;MAG/C,CAFqBqB,IAAA,GAAOyB,aAAA,CAAcd,OAAA,CAAQX,IAAI,IAAI,QAClByB,aAAA,CAAcC,MAAA,GAAS,MAE/DrC,eAAA,GAAkBpB,KAAK,GACnB,CAACA,KAAA,CAAMqD,gBAAA,IAAoB7B,SAAA,KAC7BxB,KAAA,CAAM0D,cAAA,CAAe,GACrBlC,SAAA,CAAU;IAEd,CAAC,GAED7B,KAAA,CAAMgE,SAAA,CAAU,MAAM;MACpB,IAAK5B,IAAA,EACL,OAAIb,2BAAA,KACEW,OAAA,CAAQjB,sCAAA,CAAuCiC,IAAA,KAAS,MAC1DtC,yBAAA,GAA4BqD,QAAA,CAASC,IAAA,CAAKC,KAAA,CAAMC,aAAA,EAChDH,QAAA,CAASC,IAAA,CAAKC,KAAA,CAAMC,aAAA,GAAgB,SAEtClC,OAAA,CAAQjB,sCAAA,CAAuCoD,GAAA,CAAIjC,IAAI,IAEzDF,OAAA,CAAQnB,MAAA,CAAOsD,GAAA,CAAIjC,IAAI,GACvBkC,cAAA,CAAe,GACR,MAAM;QAET/C,2BAAA,IACAW,OAAA,CAAQjB,sCAAA,CAAuCiC,IAAA,KAAS,MAExDe,QAAA,CAASC,IAAA,CAAKC,KAAA,CAAMC,aAAA,GAAgBxD,yBAAA;MAExC;IACF,GAAG,CAACwB,IAAA,EAAMb,2BAAA,EAA6BW,OAAO,CAAC,GAQ/ClC,KAAA,CAAMgE,SAAA,CAAU,MAAM;MACpB,IAAI,CAAAxC,YAAA,EACJ,OAAO,MAAM;QACNY,IAAA,KACLF,OAAA,CAAQnB,MAAA,CAAOwD,MAAA,CAAOnC,IAAI,GAC1BF,OAAA,CAAQjB,sCAAA,CAAuCsD,MAAA,CAAOnC,IAAI,GAC1DkC,cAAA,CAAe;MACjB;IACF,GAAG,CAAClC,IAAA,EAAMF,OAAA,EAASV,YAAY,CAAC,GAEhCxB,KAAA,CAAMgE,SAAA,CAAU,MAAM;MACpB,MAAMQ,YAAA,GAAeA,CAAA,KAAM;QACzBjC,KAAA,CAAM,CAAC,CAAC;MACV;MACA,OAAA0B,QAAA,CAASQ,gBAAA,CAAiBhE,cAAA,EAAgB+D,YAAY,GAC/C,MAAMP,QAAA,CAASS,mBAAA,CAAoBjE,cAAA,EAAgB+D,YAAY;IACxE,GAAG,EAAE,GAGH,eAAAtE,GAAA,CAAC+B,IAAA;MACE,GAAGD,UAAA;MAEJ2C,GAAA,EAAKnC,YAAA;MACLoC,OAAA,EAAQ;MACRR,aAAA,EACEnB,2BAAA,GACIE,sBAAA,GACE,SACA,SACF;MAEN0B,cAAA,EAAgBhF,oBAAA,CACdwB,KAAA,CAAMwD,cAAA,EACNlB,YAAA,CAAakB,cACf;MACAC,aAAA,EAAejF,oBAAA,CACbwB,KAAA,CAAMyD,aAAA,EACNnB,YAAA,CAAamB,aACf;MACAC,oBAAA,EAAsBlF,oBAAA,CACpBwB,KAAA,CAAM0D,oBAAA,EACN3B,kBAAA,CAAmB2B,oBACrB;MAEChD;IAAA,CACH;EAEJ,CAAC;AAEDZ,WAAA,CAAY6D,WAAA,GAAcxE,sBAAA;AAM1B,MAAMyE,WAAA,GAAc;EAEdC,iBAAA,GAAoBlF,KAAA,CAAMoB,UAAA,CAC9B,CAACC,KAAA,EAAOC,YAAA,KAAiB;IACvB,MAAMY,OAAA,GAAUlC,KAAA,CAAMmC,UAAA,CAAWtB,kBAAkB;MAC7C8D,GAAA,GAAM3E,KAAA,CAAMmF,MAAA,CAAuB,IAAI;MACvC3C,YAAA,GAAe9C,eAAA,CAAgB4B,YAAA,EAAcqD,GAAG;IAEtD,OAAA3E,KAAA,CAAMgE,SAAA,CAAU,MAAM;MACpB,MAAM5B,IAAA,GAAOuC,GAAA,CAAIS,OAAA;MACjB,IAAIhD,IAAA,EACF,OAAAF,OAAA,CAAQhB,QAAA,CAASmD,GAAA,CAAIjC,IAAI,GAClB,MAAM;QACXF,OAAA,CAAQhB,QAAA,CAASqD,MAAA,CAAOnC,IAAI;MAC9B;IAEJ,GAAG,CAACF,OAAA,CAAQhB,QAAQ,CAAC,GAEd,eAAAhB,GAAA,CAAC;MAAIiE,KAAA,EAAO;QAAES,OAAA,EAAS;MAAW;MAAI,GAAGvD,KAAA;MAAOsD,GAAA,EAAKnC;IAAA,CAAc;EAC5E,CACF;AAEA0C,iBAAA,CAAkBF,WAAA,GAAcC,WAAA;AAYhC,SAAS5B,sBACP3B,oBAAA,EACA;EACA,MAAM2D,wBAAA,GAA2BtF,QAAA,CAAS2B,oBAAoB;IACxD4D,2BAAA,GAA8BtF,KAAA,CAAMmF,MAAA,CAAO,EAAK;IAChDI,cAAA,GAAiBvF,KAAA,CAAMmF,MAAA,CAAO,MAAM,CAAC,CAAC;EAE5C,OAAAnF,KAAA,CAAMgE,SAAA,CAAU,MAAM;IACpB,MAAMwB,iBAAA,GAAqBnF,KAAA,IAAwB;QACjD,IAAIA,KAAA,CAAMD,MAAA,IAAU,CAACkF,2BAAA,CAA4BF,OAAA,EAAS;UAGxD,IAASK,wCAAA,GAAT,SAAAA,CAAA,EAAoD;YAClDC,4BAAA,CACEhF,oBAAA,EACA2E,wBAAA,EACAM,WAAA,EACA;cAAEC,QAAA,EAAU;YAAK,CACnB;UACF;UATA,MAAMD,WAAA,GAAc;YAAEE,aAAA,EAAexF;UAAM;UAuBvCA,KAAA,CAAMyF,WAAA,KAAgB,WACxB7B,QAAA,CAASS,mBAAA,CAAoB,SAASa,cAAA,CAAeH,OAAO,GAC5DG,cAAA,CAAeH,OAAA,GAAUK,wCAAA,EACzBxB,QAAA,CAASQ,gBAAA,CAAiB,SAASc,cAAA,CAAeH,OAAA,EAAS;YAAEW,IAAA,EAAM;UAAK,CAAC,KAEzEN,wCAAA,CAAyC;QAE7C;QACAH,2BAAA,CAA4BF,OAAA,GAAU;MACxC;MAcMY,OAAA,GAAUC,UAAA,CAAW,MAAM;QAC/BhC,QAAA,CAASQ,gBAAA,CAAiB,eAAee,iBAAiB;MAC5D,GAAG,CAAC;IACJ,OAAO,MAAM;MACXU,MAAA,CAAOC,YAAA,CAAaH,OAAO,GAC3B/B,QAAA,CAASS,mBAAA,CAAoB,eAAec,iBAAiB,GAC7DvB,QAAA,CAASS,mBAAA,CAAoB,SAASa,cAAA,CAAeH,OAAO;IAC9D;EACF,GAAG,CAACC,wBAAwB,CAAC,GAEtB;IAAA;IAELN,oBAAA,EAAsBA,CAAA,KAAM;MAC1BO,2BAAA,CAA4BF,OAAA,GAAU;IACxC;EACF;AACF;AAMA,SAASxB,gBAAgBjC,cAAA,EAAqD;EAC5E,MAAMyE,kBAAA,GAAqBrG,QAAA,CAAS4B,cAAc;IAC5C0E,yBAAA,GAA4BrG,KAAA,CAAMmF,MAAA,CAAO,EAAK;EAEpD,OAAAnF,KAAA,CAAMgE,SAAA,CAAU,MAAM;IACpB,MAAMsC,WAAA,GAAejG,KAAA,IAAsB;MACrCA,KAAA,CAAMD,MAAA,IAAU,CAACiG,yBAAA,CAA0BjB,OAAA,IAE7CM,4BAAA,CAA6B/E,aAAA,EAAeyF,kBAAA,EADxB;QAAEP,aAAA,EAAexF;MAAM,GACkC;QAC3EuF,QAAA,EAAU;MACZ,CAAC;IAEL;IACA,OAAA3B,QAAA,CAASQ,gBAAA,CAAiB,WAAW6B,WAAW,GACzC,MAAMrC,QAAA,CAASS,mBAAA,CAAoB,WAAW4B,WAAW;EAClE,GAAG,CAACF,kBAAkB,CAAC,GAEhB;IACLvB,cAAA,EAAgBA,CAAA,KAAM;MACpBwB,yBAAA,CAA0BjB,OAAA,GAAU;IACtC;IACAN,aAAA,EAAeA,CAAA,KAAM;MACnBuB,yBAAA,CAA0BjB,OAAA,GAAU;IACtC;EACF;AACF;AAEA,SAASd,eAAA,EAAiB;EACxB,MAAMjE,KAAA,GAAQ,IAAIkG,WAAA,CAAY9F,cAAc;EAC5CwD,QAAA,CAAS1D,aAAA,CAAcF,KAAK;AAC9B;AAEA,SAASqF,6BACPc,IAAA,EACAC,OAAA,EACAC,MAAA,EACA;EAAEd;AAAS,GACX;EACA,MAAMxF,MAAA,GAASsG,MAAA,CAAOb,aAAA,CAAczF,MAAA;IAC9BC,KAAA,GAAQ,IAAIkG,WAAA,CAAYC,IAAA,EAAM;MAAEG,OAAA,EAAS;MAAOC,UAAA,EAAY;MAAMF;IAAO,CAAC;EAC5ED,OAAA,IAASrG,MAAA,CAAOqE,gBAAA,CAAiB+B,IAAA,EAAMC,OAAA,EAA0B;IAAEV,IAAA,EAAM;EAAK,CAAC,GAE/EH,QAAA,GACFzF,2BAAA,CAA4BC,MAAA,EAAQC,KAAK,IAEzCD,MAAA,CAAOG,aAAA,CAAcF,KAAK;AAE9B","ignoreList":[]}
|
package/dist/jsx/Dismissable.js
CHANGED
|
@@ -42,7 +42,8 @@ const DismissableContext = React.createContext({
|
|
|
42
42
|
) || (onFocusOutside?.(event), onInteractOutside?.(event), event.defaultPrevented || onDismiss?.());
|
|
43
43
|
});
|
|
44
44
|
return useEscapeKeydown((event) => {
|
|
45
|
-
|
|
45
|
+
const currentLayers = Array.from(context.layers);
|
|
46
|
+
(node ? currentLayers.indexOf(node) : -1) === currentLayers.length - 1 && (onEscapeKeyDown?.(event), !event.defaultPrevented && onDismiss && (event.preventDefault(), onDismiss()));
|
|
46
47
|
}), React.useEffect(() => {
|
|
47
48
|
if (node)
|
|
48
49
|
return disableOutsidePointerEvents && (context.layersWithOutsidePointerEventsDisabled.size === 0 && (originalBodyPointerEvents = document.body.style.pointerEvents, document.body.style.pointerEvents = "none"), context.layersWithOutsidePointerEventsDisabled.add(node)), context.layers.add(node), dispatchUpdate(), () => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Dismissable.tsx"],
|
|
4
|
-
"mappings": "AAGA,SAAS,uBAAuB;AAChC,SAAS,MAAM,OAAO,4BAA4B;AAClD,SAAS,wBAAwB;AACjC,SAAS,gBAAgB;AACzB,YAAY,WAAW;AACvB,YAAY,cAAc;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["node"]
|
|
6
6
|
}
|
package/dist/jsx/Dismissable.mjs
CHANGED
|
@@ -52,7 +52,8 @@ const DismissableContext = React.createContext({
|
|
|
52
52
|
[...context.branches].some(branch => branch.contains(target)) || (onFocusOutside?.(event), onInteractOutside?.(event), event.defaultPrevented || onDismiss?.());
|
|
53
53
|
});
|
|
54
54
|
return useEscapeKeydown(event => {
|
|
55
|
-
|
|
55
|
+
const currentLayers = Array.from(context.layers);
|
|
56
|
+
(node ? currentLayers.indexOf(node) : -1) === currentLayers.length - 1 && (onEscapeKeyDown?.(event), !event.defaultPrevented && onDismiss && (event.preventDefault(), onDismiss()));
|
|
56
57
|
}), React.useEffect(() => {
|
|
57
58
|
if (node) return disableOutsidePointerEvents && (context.layersWithOutsidePointerEventsDisabled.size === 0 && (originalBodyPointerEvents = document.body.style.pointerEvents, document.body.style.pointerEvents = "none"), context.layersWithOutsidePointerEventsDisabled.add(node)), context.layers.add(node), dispatchUpdate(), () => {
|
|
58
59
|
disableOutsidePointerEvents && context.layersWithOutsidePointerEventsDisabled.size === 1 && (document.body.style.pointerEvents = originalBodyPointerEvents);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useComposedRefs","Slot","Stack","composeEventHandlers","useEscapeKeydown","useEvent","React","ReactDOM","jsx","dispatchDiscreteCustomEvent","target","event","flushSync","dispatchEvent","DISMISSABLE_LAYER_NAME","CONTEXT_UPDATE","POINTER_DOWN_OUTSIDE","FOCUS_OUTSIDE","originalBodyPointerEvents","DismissableContext","createContext","layers","Set","layersWithOutsidePointerEventsDisabled","branches","Dismissable","forwardRef","props","forwardedRef","disableOutsidePointerEvents","forceUnmount","onEscapeKeyDown","onPointerDownOutside","onFocusOutside","onInteractOutside","onDismiss","asChild","children","layerProps","Comp","context","useContext","node","setNode","useState","force","composedRefs","node2","Array","from","highestLayerWithOutsidePointerEventsDisabled","slice","highestLayerWithOutsidePointerEventsDisabledIndex","indexOf","index","isBodyPointerEventsDisabled","size","isPointerEventsEnabled","pointerDownOutside","usePointerDownOutside","isPointerDownOnBranch","some","branch","contains","defaultPrevented","focusOutside","useFocusOutside","preventDefault","useEffect","document","body","style","pointerEvents","add","dispatchUpdate","delete","handleUpdate","addEventListener","removeEventListener","ref","display","onFocusCapture","onBlurCapture","onPointerDownCapture","displayName","BRANCH_NAME","DismissableBranch","useRef","current","handlePointerDownOutside","isPointerInsideReactTreeRef","handleClickRef","handlePointerDown","handleAndDispatchPointerDownOutsideEvent","handleAndDispatchCustomEvent","eventDetail","discrete","originalEvent","pointerType","once","timerId","setTimeout","window","clearTimeout","handleFocusOutside","isFocusInsideReactTreeRef","handleFocus","CustomEvent","name","handler","detail","bubbles","cancelable"],"sources":["../../src/Dismissable.tsx"],"sourcesContent":[null],"mappings":"AAGA,SAASA,eAAA,QAAuB;AAChC,SAASC,IAAA,EAAMC,KAAA,EAAOC,oBAAA,QAA4B;AAClD,SAASC,gBAAA,QAAwB;AACjC,SAASC,QAAA,QAAgB;AACzB,YAAYC,KAAA,MAAW;AACvB,YAAYC,QAAA,MAAc;
|
|
1
|
+
{"version":3,"names":["useComposedRefs","Slot","Stack","composeEventHandlers","useEscapeKeydown","useEvent","React","ReactDOM","jsx","dispatchDiscreteCustomEvent","target","event","flushSync","dispatchEvent","DISMISSABLE_LAYER_NAME","CONTEXT_UPDATE","POINTER_DOWN_OUTSIDE","FOCUS_OUTSIDE","originalBodyPointerEvents","DismissableContext","createContext","layers","Set","layersWithOutsidePointerEventsDisabled","branches","Dismissable","forwardRef","props","forwardedRef","disableOutsidePointerEvents","forceUnmount","onEscapeKeyDown","onPointerDownOutside","onFocusOutside","onInteractOutside","onDismiss","asChild","children","layerProps","Comp","context","useContext","node","setNode","useState","force","composedRefs","node2","Array","from","highestLayerWithOutsidePointerEventsDisabled","slice","highestLayerWithOutsidePointerEventsDisabledIndex","indexOf","index","isBodyPointerEventsDisabled","size","isPointerEventsEnabled","pointerDownOutside","usePointerDownOutside","isPointerDownOnBranch","some","branch","contains","defaultPrevented","focusOutside","useFocusOutside","currentLayers","length","preventDefault","useEffect","document","body","style","pointerEvents","add","dispatchUpdate","delete","handleUpdate","addEventListener","removeEventListener","ref","display","onFocusCapture","onBlurCapture","onPointerDownCapture","displayName","BRANCH_NAME","DismissableBranch","useRef","current","handlePointerDownOutside","isPointerInsideReactTreeRef","handleClickRef","handlePointerDown","handleAndDispatchPointerDownOutsideEvent","handleAndDispatchCustomEvent","eventDetail","discrete","originalEvent","pointerType","once","timerId","setTimeout","window","clearTimeout","handleFocusOutside","isFocusInsideReactTreeRef","handleFocus","CustomEvent","name","handler","detail","bubbles","cancelable"],"sources":["../../src/Dismissable.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/dismissable",
|
|
3
|
-
"version": "2.0.0-
|
|
3
|
+
"version": "2.0.0-1768696252732",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": true,
|
|
6
6
|
"source": "src/index.ts",
|
|
@@ -37,14 +37,14 @@
|
|
|
37
37
|
}
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@tamagui/compose-refs": "2.0.0-
|
|
41
|
-
"@tamagui/core": "2.0.0-
|
|
42
|
-
"@tamagui/helpers": "2.0.0-
|
|
43
|
-
"@tamagui/use-escape-keydown": "2.0.0-
|
|
44
|
-
"@tamagui/use-event": "2.0.0-
|
|
40
|
+
"@tamagui/compose-refs": "2.0.0-1768696252732",
|
|
41
|
+
"@tamagui/core": "2.0.0-1768696252732",
|
|
42
|
+
"@tamagui/helpers": "2.0.0-1768696252732",
|
|
43
|
+
"@tamagui/use-escape-keydown": "2.0.0-1768696252732",
|
|
44
|
+
"@tamagui/use-event": "2.0.0-1768696252732"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@tamagui/build": "2.0.0-
|
|
47
|
+
"@tamagui/build": "2.0.0-1768696252732",
|
|
48
48
|
"react": "*",
|
|
49
49
|
"react-dom": "*"
|
|
50
50
|
},
|
package/src/Dismissable.tsx
CHANGED
|
@@ -93,7 +93,10 @@ const Dismissable = React.forwardRef<
|
|
|
93
93
|
})
|
|
94
94
|
|
|
95
95
|
useEscapeKeydown((event) => {
|
|
96
|
-
|
|
96
|
+
// Check layers at callback time, not render time, to avoid stale closures
|
|
97
|
+
const currentLayers = Array.from(context.layers)
|
|
98
|
+
const currentIndex = node ? currentLayers.indexOf(node) : -1
|
|
99
|
+
const isHighestLayer = currentIndex === currentLayers.length - 1
|
|
97
100
|
if (!isHighestLayer) return
|
|
98
101
|
onEscapeKeyDown?.(event)
|
|
99
102
|
if (!event.defaultPrevented && onDismiss) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dismissable.d.ts","sourceRoot":"","sources":["../src/Dismissable.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAG9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAElF,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,WAAW,EAC/D,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,EACnB,KAAK,EAAE,CAAC,QAGT;AAmBD,QAAA,MAAM,WAAW;cAEgB,OAAO;
|
|
1
|
+
{"version":3,"file":"Dismissable.d.ts","sourceRoot":"","sources":["../src/Dismissable.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAG9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAElF,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,WAAW,EAC/D,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,EACnB,KAAK,EAAE,CAAC,QAGT;AAmBD,QAAA,MAAM,WAAW;cAEgB,OAAO;wCA+ItC,CAAA;AAUF,QAAA,MAAM,iBAAiB,+FAkBtB,CAAA;AAMD,MAAM,MAAM,uBAAuB,GAAG,WAAW,CAAC;IAAE,aAAa,EAAE,YAAY,CAAA;CAAE,CAAC,CAAA;AAClF,MAAM,MAAM,iBAAiB,GAAG,WAAW,CAAC;IAAE,aAAa,EAAE,UAAU,CAAA;CAAE,CAAC,CAAA;AAsI1E,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAA;AAEzC,YAAY,EAAE,gBAAgB,EAAE,CAAA"}
|