@tamagui/sheet 1.29.6 → 1.30.1
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/SheetImplementationCustom.js +44 -24
- package/dist/cjs/SheetImplementationCustom.js.map +1 -1
- package/dist/cjs/SheetScrollView.js +4 -15
- package/dist/cjs/SheetScrollView.js.map +1 -1
- package/dist/cjs/createSheet.js +13 -8
- package/dist/cjs/createSheet.js.map +1 -1
- package/dist/cjs/useSheetOffscreenSize.js +39 -0
- package/dist/cjs/useSheetOffscreenSize.js.map +6 -0
- package/dist/cjs/useSheetProviderProps.js +4 -0
- package/dist/cjs/useSheetProviderProps.js.map +1 -1
- package/dist/esm/SheetImplementationCustom.js +44 -24
- package/dist/esm/SheetImplementationCustom.js.map +1 -1
- package/dist/esm/SheetScrollView.js +7 -18
- package/dist/esm/SheetScrollView.js.map +1 -1
- package/dist/esm/createSheet.js +14 -8
- package/dist/esm/createSheet.js.map +1 -1
- package/dist/esm/useSheetOffscreenSize.js +15 -0
- package/dist/esm/useSheetOffscreenSize.js.map +6 -0
- package/dist/esm/useSheetProviderProps.js +4 -0
- package/dist/esm/useSheetProviderProps.js.map +1 -1
- package/dist/jsx/SheetImplementationCustom.js +43 -23
- package/dist/jsx/SheetImplementationCustom.js.map +1 -1
- package/dist/jsx/SheetImplementationCustom.mjs +43 -23
- package/dist/jsx/SheetImplementationCustom.mjs.map +1 -1
- package/dist/jsx/SheetScrollView.js +5 -16
- package/dist/jsx/SheetScrollView.js.map +1 -1
- package/dist/jsx/SheetScrollView.mjs +5 -16
- package/dist/jsx/SheetScrollView.mjs.map +1 -1
- package/dist/jsx/createSheet.js +14 -8
- package/dist/jsx/createSheet.js.map +1 -1
- package/dist/jsx/createSheet.mjs +14 -8
- package/dist/jsx/createSheet.mjs.map +1 -1
- package/dist/jsx/useSheetOffscreenSize.js +15 -0
- package/dist/jsx/useSheetOffscreenSize.js.map +6 -0
- package/dist/jsx/useSheetOffscreenSize.mjs +15 -0
- package/dist/jsx/useSheetOffscreenSize.mjs.map +6 -0
- package/dist/jsx/useSheetProviderProps.js +4 -0
- package/dist/jsx/useSheetProviderProps.js.map +1 -1
- package/dist/jsx/useSheetProviderProps.mjs +4 -0
- package/dist/jsx/useSheetProviderProps.mjs.map +1 -1
- package/package.json +13 -13
- package/src/SheetImplementationCustom.tsx +55 -26
- package/src/SheetScrollView.tsx +8 -14
- package/src/createSheet.tsx +12 -9
- package/src/types.tsx +5 -0
- package/src/useSheetOffscreenSize.tsx +13 -0
- package/src/useSheetProviderProps.tsx +5 -0
- package/types/Sheet.d.ts +1 -0
- package/types/Sheet.d.ts.map +1 -0
- package/types/SheetContext.d.ts +10 -0
- package/types/SheetContext.d.ts.map +1 -0
- package/types/SheetController.d.ts.map +1 -0
- package/types/SheetImplementationCustom.d.ts +1 -0
- package/types/SheetImplementationCustom.d.ts.map +1 -0
- package/types/SheetScrollView.d.ts.map +1 -0
- package/types/constants.d.ts.map +1 -0
- package/types/contexts.d.ts.map +1 -0
- package/types/createSheet.d.ts +1 -0
- package/types/createSheet.d.ts.map +1 -0
- package/types/helpers.d.ts.map +1 -0
- package/types/index.d.ts.map +1 -0
- package/types/nativeSheet.d.ts.map +1 -0
- package/types/types.d.ts +4 -0
- package/types/types.d.ts.map +1 -0
- package/types/useSheet.d.ts +2 -0
- package/types/useSheet.d.ts.map +1 -0
- package/types/useSheetController.d.ts.map +1 -0
- package/types/useSheetOffscreenSize.d.ts +3 -0
- package/types/useSheetOffscreenSize.d.ts.map +1 -0
- package/types/useSheetOpenState.d.ts.map +1 -0
- package/types/useSheetProviderProps.d.ts +2 -0
- package/types/useSheetProviderProps.d.ts.map +1 -0
package/dist/esm/createSheet.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useComposedRefs } from "@tamagui/compose-refs";
|
|
3
3
|
import {
|
|
4
|
+
Stack,
|
|
4
5
|
mergeEvent,
|
|
5
6
|
useDidFinishSSR,
|
|
6
7
|
withStaticProperties
|
|
@@ -18,6 +19,7 @@ import { useSheetContext } from "./SheetContext";
|
|
|
18
19
|
import { SheetImplementationCustom } from "./SheetImplementationCustom";
|
|
19
20
|
import { SheetScrollView } from "./SheetScrollView";
|
|
20
21
|
import { useSheetController } from "./useSheetController";
|
|
22
|
+
import { useSheetOffscreenSize } from "./useSheetOffscreenSize";
|
|
21
23
|
function createSheet({ Handle, Frame, Overlay }) {
|
|
22
24
|
const SheetHandle = Handle.extractable(
|
|
23
25
|
({ __scopeSheet, ...props }) => {
|
|
@@ -81,7 +83,6 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
81
83
|
return null;
|
|
82
84
|
}
|
|
83
85
|
);
|
|
84
|
-
const SHEET_COVER_NAME = `${SHEET_NAME}Cover`;
|
|
85
86
|
const SheetFrame = Frame.extractable(
|
|
86
87
|
forwardRef(
|
|
87
88
|
({
|
|
@@ -90,30 +91,35 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
90
91
|
...props
|
|
91
92
|
}, forwardedRef) => {
|
|
92
93
|
const context = useSheetContext(SHEET_NAME, __scopeSheet);
|
|
93
|
-
const
|
|
94
|
+
const { removeScrollEnabled, frameSize, contentRef } = context;
|
|
95
|
+
const composedContentRef = useComposedRefs(forwardedRef, contentRef);
|
|
96
|
+
const offscreenSize = useSheetOffscreenSize(context);
|
|
94
97
|
return /* @__PURE__ */ jsxs(Fragment, { children: [
|
|
95
98
|
/* @__PURE__ */ jsx(
|
|
96
99
|
RemoveScroll,
|
|
97
100
|
{
|
|
98
101
|
forwardProps: true,
|
|
99
|
-
enabled:
|
|
102
|
+
enabled: removeScrollEnabled,
|
|
100
103
|
allowPinchZoom: true,
|
|
101
|
-
shards: [
|
|
104
|
+
shards: [contentRef],
|
|
102
105
|
removeScrollBar: false,
|
|
103
|
-
children: /* @__PURE__ */
|
|
106
|
+
children: /* @__PURE__ */ jsxs(Frame, { ref: composedContentRef, height: frameSize, ...props, children: [
|
|
107
|
+
children,
|
|
108
|
+
/* @__PURE__ */ jsx(Stack, { "data-sheet-offscreen-pad": true, height: offscreenSize, width: "100%" })
|
|
109
|
+
] })
|
|
104
110
|
}
|
|
105
111
|
),
|
|
106
112
|
!props.disableHideBottomOverflow && // @ts-ignore
|
|
107
113
|
/* @__PURE__ */ jsx(
|
|
108
114
|
Frame,
|
|
109
115
|
{
|
|
110
|
-
componentName: SHEET_COVER_NAME,
|
|
111
116
|
...props,
|
|
117
|
+
componentName: "SheetCover",
|
|
112
118
|
children: null,
|
|
113
119
|
position: "absolute",
|
|
114
|
-
bottom:
|
|
120
|
+
bottom: "-50%",
|
|
115
121
|
zIndex: -1,
|
|
116
|
-
height: context.frameSize
|
|
122
|
+
height: context.frameSize,
|
|
117
123
|
left: 0,
|
|
118
124
|
right: 0,
|
|
119
125
|
borderWidth: 0,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createSheet.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Sheet"]
|
|
6
6
|
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
const useSheetOffscreenSize = ({
|
|
2
|
+
snapPoints,
|
|
3
|
+
position,
|
|
4
|
+
screenSize
|
|
5
|
+
}) => {
|
|
6
|
+
const maxPercentOpened = snapPoints[0] / 100;
|
|
7
|
+
const percentOpened = (snapPoints[position] || 0) / 100;
|
|
8
|
+
const percentHidden = 1 - maxPercentOpened - percentOpened;
|
|
9
|
+
const offscreenSize = percentHidden * screenSize;
|
|
10
|
+
return offscreenSize;
|
|
11
|
+
};
|
|
12
|
+
export {
|
|
13
|
+
useSheetOffscreenSize
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=useSheetOffscreenSize.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../src/useSheetOffscreenSize.tsx"],
|
|
4
|
+
"mappings": "AAEO,MAAM,wBAAwB,CAAC;AAAA,EACpC;AAAA,EACA;AAAA,EACA;AACF,MAAyB;AACvB,QAAM,mBAAmB,WAAW,CAAC,IAAI;AACzC,QAAM,iBAAiB,WAAW,QAAQ,KAAK,KAAK;AACpD,QAAM,gBAAgB,IAAI,mBAAmB;AAC7C,QAAM,gBAAgB,gBAAgB;AACtC,SAAO;AACT;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -63,7 +63,11 @@ function useSheetProviderProps(props, state, options = {}) {
|
|
|
63
63
|
scrollLock: false
|
|
64
64
|
}));
|
|
65
65
|
const removeScrollEnabled = props.forceRemoveScrollEnabled ?? (open && props.modal);
|
|
66
|
+
const maxSnapPoint = snapPoints.reduce((prev, cur) => Math.max(prev, cur));
|
|
67
|
+
const screenSize = frameSize / (maxSnapPoint / 100);
|
|
66
68
|
const providerProps = {
|
|
69
|
+
screenSize,
|
|
70
|
+
maxSnapPoint,
|
|
67
71
|
removeScrollEnabled,
|
|
68
72
|
scrollBridge,
|
|
69
73
|
modal: !!props.modal,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useSheetProviderProps.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAyB,0BAA0B;AACnD,SAAS,mBAAmB;AAC5B,SAAS,4BAA4B;AACrC,OAAO,SAAS,aAAa,WAAW,SAAS,gBAAgB;AAO1D,SAAS,sBACd,OACA,OACA,UAEI,CAAC,GACL;AACA,QAAM,aAAa,MAAM,OAAuB,IAAI;AACpD,QAAM,CAAC,WAAW,YAAY,IAAI,SAAiB,CAAC;AACpD,QAAM,iBAAiB,MAAM,cAAc,CAAC,EAAE;AAE9C,QAAM,aAAa;AAAA,IACjB,MAAO,MAAM,wBAAwB,CAAC,GAAG,gBAAgB,CAAC,IAAI;AAAA;AAAA,IAE9D,CAAC,KAAK,UAAU,cAAc,GAAG,MAAM,qBAAqB;AAAA,EAC9D;AAGA,QAAM,CAAC,WAAW,oBAAoB,IAAI,qBAAqB;AAAA,IAC7D,MAAM,MAAM;AAAA,IACZ,aAAa,MAAM,oBAAoB,MAAM,OAAO,IAAI;AAAA,IACxD,UAAU,MAAM;AAAA,IAChB,UAAU;AAAA,IACV,YAAY;AAAA,EACd,CAAC;AAED,QAAM,WAAW,MAAM,SAAS,QAAQ,KAAK;AAE7C,QAAM,EAAE,KAAK,IAAI;AAEjB,QAAM,cAAc;AAAA,IAClB,CAAC,SAAiB;AAEhB,UAAI,MAAM,yBAAyB,SAAS,WAAW,SAAS,GAAG;AACjE,cAAM,QAAQ,KAAK;AAAA,MACrB,OAAO;AACL,6BAAqB,IAAI;AAAA,MAC3B;AAAA,IACF;AAAA,IACA,CAAC,MAAM,uBAAuB,WAAW,QAAQ,sBAAsB,MAAM,OAAO;AAAA,EACtF;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,WAAW,KAAK,CAAC,MAAM,IAAI,KAAK,IAAI,GAAG,GAAG;AAC5C,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAGA,MAAI,QAAQ,MAAM,yBAAyB,aAAa,WAAW,SAAS,GAAG;AAC7E,yBAAqB,CAAC;AAAA,EACxB;AAGA,QAAM,wBAAwB,QAAQ,WAAW;AACjD,YAAU,MAAM;AACd,QAAI,uBAAuB;AACzB,kBAAY,CAAC;AAAA,IACf;AAAA,EACF,GAAG,CAAC,aAAa,qBAAqB,CAAC;AAEvC,QAAM,SAAS,mBAAmB;AAClC,MAAI,CAAC,QAAQ;AACX,UAAM,IAAI,MAAM,0CAA0C;AAAA,EAC5D;AAEA,QAAM,eAAe,YAA0B,OAAO;AAAA,IACpD,SAAS;AAAA,IACT,GAAG;AAAA,IACH,OAAO;AAAA,IACP,UAAU;AAAA,IACV,cAAc;AAAA,IACd,MAAM,MAAM;AAAA,IAAC;AAAA,IACb,SAAS,MAAM;AAAA,IAAC;AAAA,IAChB,YAAY;AAAA,EACd,EAAE;AAEF,QAAM,sBAAsB,MAAM,6BAA6B,QAAQ,MAAM;AAE7E,QAAM,gBAAgB;AAAA,IACpB;AAAA,IACA;AAAA,IACA,OAAO,CAAC,CAAC,MAAM;AAAA,IACf,MAAM,MAAM;AAAA,IACZ,SAAS,MAAM;AAAA,IACf,QAAQ,CAAC,CAAC,MAAM;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,IACA,uBAAuB,MAAM,yBAAyB;AAAA,IACtD,uBAAuB,MAAM,yBAAyB;AAAA,IACtD,oBAAoB,QAAQ;AAAA,IAC5B,OAAO,MAAM;AAAA,IACb;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,eAAe;AAAA,EACjB;AAEA,SAAO;AACT;",
|
|
4
|
+
"mappings": "AAAA,SAAyB,0BAA0B;AACnD,SAAS,mBAAmB;AAC5B,SAAS,4BAA4B;AACrC,OAAO,SAAS,aAAa,WAAW,SAAS,gBAAgB;AAO1D,SAAS,sBACd,OACA,OACA,UAEI,CAAC,GACL;AACA,QAAM,aAAa,MAAM,OAAuB,IAAI;AACpD,QAAM,CAAC,WAAW,YAAY,IAAI,SAAiB,CAAC;AACpD,QAAM,iBAAiB,MAAM,cAAc,CAAC,EAAE;AAE9C,QAAM,aAAa;AAAA,IACjB,MAAO,MAAM,wBAAwB,CAAC,GAAG,gBAAgB,CAAC,IAAI;AAAA;AAAA,IAE9D,CAAC,KAAK,UAAU,cAAc,GAAG,MAAM,qBAAqB;AAAA,EAC9D;AAGA,QAAM,CAAC,WAAW,oBAAoB,IAAI,qBAAqB;AAAA,IAC7D,MAAM,MAAM;AAAA,IACZ,aAAa,MAAM,oBAAoB,MAAM,OAAO,IAAI;AAAA,IACxD,UAAU,MAAM;AAAA,IAChB,UAAU;AAAA,IACV,YAAY;AAAA,EACd,CAAC;AAED,QAAM,WAAW,MAAM,SAAS,QAAQ,KAAK;AAE7C,QAAM,EAAE,KAAK,IAAI;AAEjB,QAAM,cAAc;AAAA,IAClB,CAAC,SAAiB;AAEhB,UAAI,MAAM,yBAAyB,SAAS,WAAW,SAAS,GAAG;AACjE,cAAM,QAAQ,KAAK;AAAA,MACrB,OAAO;AACL,6BAAqB,IAAI;AAAA,MAC3B;AAAA,IACF;AAAA,IACA,CAAC,MAAM,uBAAuB,WAAW,QAAQ,sBAAsB,MAAM,OAAO;AAAA,EACtF;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,WAAW,KAAK,CAAC,MAAM,IAAI,KAAK,IAAI,GAAG,GAAG;AAC5C,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAGA,MAAI,QAAQ,MAAM,yBAAyB,aAAa,WAAW,SAAS,GAAG;AAC7E,yBAAqB,CAAC;AAAA,EACxB;AAGA,QAAM,wBAAwB,QAAQ,WAAW;AACjD,YAAU,MAAM;AACd,QAAI,uBAAuB;AACzB,kBAAY,CAAC;AAAA,IACf;AAAA,EACF,GAAG,CAAC,aAAa,qBAAqB,CAAC;AAEvC,QAAM,SAAS,mBAAmB;AAClC,MAAI,CAAC,QAAQ;AACX,UAAM,IAAI,MAAM,0CAA0C;AAAA,EAC5D;AAEA,QAAM,eAAe,YAA0B,OAAO;AAAA,IACpD,SAAS;AAAA,IACT,GAAG;AAAA,IACH,OAAO;AAAA,IACP,UAAU;AAAA,IACV,cAAc;AAAA,IACd,MAAM,MAAM;AAAA,IAAC;AAAA,IACb,SAAS,MAAM;AAAA,IAAC;AAAA,IAChB,YAAY;AAAA,EACd,EAAE;AAEF,QAAM,sBAAsB,MAAM,6BAA6B,QAAQ,MAAM;AAE7E,QAAM,eAAe,WAAW,OAAO,CAAC,MAAM,QAAQ,KAAK,IAAI,MAAM,GAAG,CAAC;AACzE,QAAM,aAAa,aAAa,eAAe;AAE/C,QAAM,gBAAgB;AAAA,IACpB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO,CAAC,CAAC,MAAM;AAAA,IACf,MAAM,MAAM;AAAA,IACZ,SAAS,MAAM;AAAA,IACf,QAAQ,CAAC,CAAC,MAAM;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,IACA,uBAAuB,MAAM,yBAAyB;AAAA,IACtD,uBAAuB,MAAM,yBAAyB;AAAA,IACtD,oBAAoB,QAAQ;AAAA,IAC5B,OAAO,MAAM;AAAA,IACb;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,eAAe;AAAA,EACjB;AAEA,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -39,6 +39,7 @@ const SheetImplementationCustom = themeable(
|
|
|
39
39
|
modal = false,
|
|
40
40
|
zIndex = parentSheet.zIndex + 1,
|
|
41
41
|
moveOnKeyboardChange = false,
|
|
42
|
+
unmountChildrenWhenHidden = false,
|
|
42
43
|
portalProps
|
|
43
44
|
} = props;
|
|
44
45
|
const keyboardIsVisible = useKeyboardVisible();
|
|
@@ -47,7 +48,16 @@ const SheetImplementationCustom = themeable(
|
|
|
47
48
|
const providerProps = useSheetProviderProps(props, state, {
|
|
48
49
|
onOverlayComponent: setOverlayComponent
|
|
49
50
|
});
|
|
50
|
-
const {
|
|
51
|
+
const {
|
|
52
|
+
frameSize,
|
|
53
|
+
setFrameSize,
|
|
54
|
+
snapPoints,
|
|
55
|
+
position,
|
|
56
|
+
setPosition,
|
|
57
|
+
scrollBridge,
|
|
58
|
+
screenSize,
|
|
59
|
+
maxSnapPoint
|
|
60
|
+
} = providerProps;
|
|
51
61
|
const { open, controller, isHidden } = state;
|
|
52
62
|
const sheetRef = useRef(null);
|
|
53
63
|
const ref = useComposedRefs(forwardedRef, sheetRef);
|
|
@@ -57,8 +67,6 @@ const SheetImplementationCustom = themeable(
|
|
|
57
67
|
const onInnerSheet = useCallback((hasChild) => {
|
|
58
68
|
setIsShowingInnerSheet(hasChild);
|
|
59
69
|
}, []);
|
|
60
|
-
const maxSnapPoint = snapPoints.reduce((prev, cur) => Math.max(prev, cur));
|
|
61
|
-
const screenSize = frameSize / (maxSnapPoint / 100);
|
|
62
70
|
const positions = useMemo(
|
|
63
71
|
() => snapPoints.map((point) => getPercentSize(point, screenSize)),
|
|
64
72
|
[frameSize, snapPoints]
|
|
@@ -81,7 +89,8 @@ const SheetImplementationCustom = themeable(
|
|
|
81
89
|
[zIndex]
|
|
82
90
|
);
|
|
83
91
|
const animatedNumber = useAnimatedNumber(HIDDEN_SIZE);
|
|
84
|
-
const at = useRef(
|
|
92
|
+
const at = useRef(HIDDEN_SIZE);
|
|
93
|
+
const currentId = useRef(0);
|
|
85
94
|
useAnimatedNumberReaction(
|
|
86
95
|
{
|
|
87
96
|
value: animatedNumber,
|
|
@@ -101,37 +110,43 @@ const SheetImplementationCustom = themeable(
|
|
|
101
110
|
scrollBridge.onFinishAnimate = void 0;
|
|
102
111
|
}
|
|
103
112
|
}
|
|
113
|
+
const hasntMeasured = at.current === HIDDEN_SIZE;
|
|
104
114
|
const animateTo = useEvent((position2) => {
|
|
105
|
-
const current = animatedNumber.getValue();
|
|
106
|
-
if (isHidden && open)
|
|
107
|
-
return;
|
|
108
|
-
if (!current)
|
|
109
|
-
return;
|
|
110
115
|
if (frameSize === 0)
|
|
111
116
|
return;
|
|
112
|
-
const
|
|
113
|
-
const toValue = isHidden || position2 === -1 ? hiddenValue : positions[position2];
|
|
117
|
+
const toValue = hasntMeasured || isHidden || position2 === -1 ? screenSize : positions[position2];
|
|
114
118
|
if (at.current === toValue)
|
|
115
119
|
return;
|
|
116
120
|
stopSpring();
|
|
117
|
-
if (isHidden) {
|
|
118
|
-
animatedNumber.setValue(
|
|
121
|
+
if (hasntMeasured || isHidden) {
|
|
122
|
+
animatedNumber.setValue(screenSize, {
|
|
119
123
|
type: "timing",
|
|
120
124
|
duration: 0
|
|
121
125
|
});
|
|
122
126
|
at.current = toValue;
|
|
123
|
-
|
|
127
|
+
if (isHidden) {
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
124
130
|
}
|
|
125
|
-
const overshootClamping = at.current === HIDDEN_SIZE;
|
|
126
131
|
animatedNumber.setValue(toValue, {
|
|
127
132
|
...animationConfig,
|
|
128
|
-
type: "spring"
|
|
129
|
-
overshootClamping
|
|
133
|
+
type: "spring"
|
|
130
134
|
});
|
|
131
135
|
});
|
|
132
136
|
useIsomorphicLayoutEffect(() => {
|
|
137
|
+
if (screenSize && hasntMeasured) {
|
|
138
|
+
animatedNumber.setValue(screenSize, {
|
|
139
|
+
type: "timing",
|
|
140
|
+
duration: 0
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
}, [hasntMeasured, screenSize]);
|
|
144
|
+
useIsomorphicLayoutEffect(() => {
|
|
145
|
+
if (!frameSize || isHidden || hasntMeasured && !open) {
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
133
148
|
animateTo(position);
|
|
134
|
-
}, [isHidden, frameSize,
|
|
149
|
+
}, [isHidden, frameSize, open, position]);
|
|
135
150
|
const disableDrag = props.disableDrag ?? controller?.disableDrag;
|
|
136
151
|
const themeName = useThemeName();
|
|
137
152
|
const panResponder = useMemo(
|
|
@@ -228,10 +243,13 @@ const SheetImplementationCustom = themeable(
|
|
|
228
243
|
);
|
|
229
244
|
const handleAnimationViewLayout = useCallback(
|
|
230
245
|
(e) => {
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
246
|
+
const next = (() => {
|
|
247
|
+
let _ = e.nativeEvent?.layout.height;
|
|
248
|
+
if (isWeb && isTouchable && !open) {
|
|
249
|
+
_ += 100;
|
|
250
|
+
}
|
|
251
|
+
return _;
|
|
252
|
+
})();
|
|
235
253
|
if (!next)
|
|
236
254
|
return;
|
|
237
255
|
setFrameSize(next);
|
|
@@ -296,6 +314,7 @@ const SheetImplementationCustom = themeable(
|
|
|
296
314
|
zIndex,
|
|
297
315
|
width: "100%",
|
|
298
316
|
height: `${maxSnapPoint}%`,
|
|
317
|
+
minHeight: `${maxSnapPoint}%`,
|
|
299
318
|
opacity
|
|
300
319
|
},
|
|
301
320
|
animatedStyle
|
|
@@ -303,8 +322,9 @@ const SheetImplementationCustom = themeable(
|
|
|
303
322
|
>{props.children}</AnimatedView>
|
|
304
323
|
</SheetProvider></ParentSheetContext.Provider>;
|
|
305
324
|
const adaptContext = useContext(AdaptParentContext);
|
|
325
|
+
const shouldMountChildren = Boolean(opacity || !unmountChildrenWhenHidden);
|
|
306
326
|
if (modal) {
|
|
307
|
-
const modalContents = <Portal zIndex={zIndex} {...portalProps}>{
|
|
327
|
+
const modalContents = <Portal zIndex={zIndex} {...portalProps}>{shouldMountChildren && <Theme forceClassName name={themeName}><AdaptParentContext.Provider value={adaptContext}>{contents}</AdaptParentContext.Provider></Theme>}</Portal>;
|
|
308
328
|
if (isWeb) {
|
|
309
329
|
return modalContents;
|
|
310
330
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,0BAA0B;AACnC,SAAS,uBAAuB;AAChC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EAGE;AAAA,EAEA;AAAA,OAGK;AAEP,SAAS,aAAa,+BAA+B;AACrD,SAAS,oBAAoB,+BAA+B;AAC5D,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAE/B,MAAM,4BAA4B;AAAA,EACvC,WAA6B,SAASA,2BAA0B,OAAO,cAAc;AACnF,UAAM,cAAc,WAAW,kBAAkB;AAEjD,UAAM;AAAA,MACJ;AAAA,MACA,QAAQ;AAAA,MACR,SAAS,YAAY,SAAS;AAAA,MAC9B,uBAAuB;AAAA,MACvB;AAAA,IACF,IAAI;AAEJ,UAAM,oBAAoB,mBAAmB;AAC7C,UAAM,QAAQ,kBAAkB,KAAK;AACrC,UAAM,CAAC,kBAAkB,mBAAmB,IAAI,SAAc,IAAI;AAClE,UAAM,gBAAgB,sBAAsB,OAAO,OAAO;AAAA,MACxD,oBAAoB;AAAA,IACtB,CAAC;AACD,UAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SheetImplementationCustom", "position", "at", "state"]
|
|
6
6
|
}
|
|
@@ -39,6 +39,7 @@ const SheetImplementationCustom = themeable(
|
|
|
39
39
|
modal = false,
|
|
40
40
|
zIndex = parentSheet.zIndex + 1,
|
|
41
41
|
moveOnKeyboardChange = false,
|
|
42
|
+
unmountChildrenWhenHidden = false,
|
|
42
43
|
portalProps
|
|
43
44
|
} = props;
|
|
44
45
|
const keyboardIsVisible = useKeyboardVisible();
|
|
@@ -47,7 +48,16 @@ const SheetImplementationCustom = themeable(
|
|
|
47
48
|
const providerProps = useSheetProviderProps(props, state, {
|
|
48
49
|
onOverlayComponent: setOverlayComponent
|
|
49
50
|
});
|
|
50
|
-
const {
|
|
51
|
+
const {
|
|
52
|
+
frameSize,
|
|
53
|
+
setFrameSize,
|
|
54
|
+
snapPoints,
|
|
55
|
+
position,
|
|
56
|
+
setPosition,
|
|
57
|
+
scrollBridge,
|
|
58
|
+
screenSize,
|
|
59
|
+
maxSnapPoint
|
|
60
|
+
} = providerProps;
|
|
51
61
|
const { open, controller, isHidden } = state;
|
|
52
62
|
const sheetRef = useRef(null);
|
|
53
63
|
const ref = useComposedRefs(forwardedRef, sheetRef);
|
|
@@ -57,8 +67,6 @@ const SheetImplementationCustom = themeable(
|
|
|
57
67
|
const onInnerSheet = useCallback((hasChild) => {
|
|
58
68
|
setIsShowingInnerSheet(hasChild);
|
|
59
69
|
}, []);
|
|
60
|
-
const maxSnapPoint = snapPoints.reduce((prev, cur) => Math.max(prev, cur));
|
|
61
|
-
const screenSize = frameSize / (maxSnapPoint / 100);
|
|
62
70
|
const positions = useMemo(
|
|
63
71
|
() => snapPoints.map((point) => getPercentSize(point, screenSize)),
|
|
64
72
|
[frameSize, snapPoints]
|
|
@@ -81,7 +89,8 @@ const SheetImplementationCustom = themeable(
|
|
|
81
89
|
[zIndex]
|
|
82
90
|
);
|
|
83
91
|
const animatedNumber = useAnimatedNumber(HIDDEN_SIZE);
|
|
84
|
-
const at = useRef(
|
|
92
|
+
const at = useRef(HIDDEN_SIZE);
|
|
93
|
+
const currentId = useRef(0);
|
|
85
94
|
useAnimatedNumberReaction(
|
|
86
95
|
{
|
|
87
96
|
value: animatedNumber,
|
|
@@ -101,37 +110,43 @@ const SheetImplementationCustom = themeable(
|
|
|
101
110
|
scrollBridge.onFinishAnimate = void 0;
|
|
102
111
|
}
|
|
103
112
|
}
|
|
113
|
+
const hasntMeasured = at.current === HIDDEN_SIZE;
|
|
104
114
|
const animateTo = useEvent((position2) => {
|
|
105
|
-
const current = animatedNumber.getValue();
|
|
106
|
-
if (isHidden && open)
|
|
107
|
-
return;
|
|
108
|
-
if (!current)
|
|
109
|
-
return;
|
|
110
115
|
if (frameSize === 0)
|
|
111
116
|
return;
|
|
112
|
-
const
|
|
113
|
-
const toValue = isHidden || position2 === -1 ? hiddenValue : positions[position2];
|
|
117
|
+
const toValue = hasntMeasured || isHidden || position2 === -1 ? screenSize : positions[position2];
|
|
114
118
|
if (at.current === toValue)
|
|
115
119
|
return;
|
|
116
120
|
stopSpring();
|
|
117
|
-
if (isHidden) {
|
|
118
|
-
animatedNumber.setValue(
|
|
121
|
+
if (hasntMeasured || isHidden) {
|
|
122
|
+
animatedNumber.setValue(screenSize, {
|
|
119
123
|
type: "timing",
|
|
120
124
|
duration: 0
|
|
121
125
|
});
|
|
122
126
|
at.current = toValue;
|
|
123
|
-
|
|
127
|
+
if (isHidden) {
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
124
130
|
}
|
|
125
|
-
const overshootClamping = at.current === HIDDEN_SIZE;
|
|
126
131
|
animatedNumber.setValue(toValue, {
|
|
127
132
|
...animationConfig,
|
|
128
|
-
type: "spring"
|
|
129
|
-
overshootClamping
|
|
133
|
+
type: "spring"
|
|
130
134
|
});
|
|
131
135
|
});
|
|
132
136
|
useIsomorphicLayoutEffect(() => {
|
|
137
|
+
if (screenSize && hasntMeasured) {
|
|
138
|
+
animatedNumber.setValue(screenSize, {
|
|
139
|
+
type: "timing",
|
|
140
|
+
duration: 0
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
}, [hasntMeasured, screenSize]);
|
|
144
|
+
useIsomorphicLayoutEffect(() => {
|
|
145
|
+
if (!frameSize || isHidden || hasntMeasured && !open) {
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
133
148
|
animateTo(position);
|
|
134
|
-
}, [isHidden, frameSize,
|
|
149
|
+
}, [isHidden, frameSize, open, position]);
|
|
135
150
|
const disableDrag = props.disableDrag ?? controller?.disableDrag;
|
|
136
151
|
const themeName = useThemeName();
|
|
137
152
|
const panResponder = useMemo(
|
|
@@ -228,10 +243,13 @@ const SheetImplementationCustom = themeable(
|
|
|
228
243
|
);
|
|
229
244
|
const handleAnimationViewLayout = useCallback(
|
|
230
245
|
(e) => {
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
246
|
+
const next = (() => {
|
|
247
|
+
let _ = e.nativeEvent?.layout.height;
|
|
248
|
+
if (isWeb && isTouchable && !open) {
|
|
249
|
+
_ += 100;
|
|
250
|
+
}
|
|
251
|
+
return _;
|
|
252
|
+
})();
|
|
235
253
|
if (!next)
|
|
236
254
|
return;
|
|
237
255
|
setFrameSize(next);
|
|
@@ -296,6 +314,7 @@ const SheetImplementationCustom = themeable(
|
|
|
296
314
|
zIndex,
|
|
297
315
|
width: "100%",
|
|
298
316
|
height: `${maxSnapPoint}%`,
|
|
317
|
+
minHeight: `${maxSnapPoint}%`,
|
|
299
318
|
opacity
|
|
300
319
|
},
|
|
301
320
|
animatedStyle
|
|
@@ -303,8 +322,9 @@ const SheetImplementationCustom = themeable(
|
|
|
303
322
|
>{props.children}</AnimatedView>
|
|
304
323
|
</SheetProvider></ParentSheetContext.Provider>;
|
|
305
324
|
const adaptContext = useContext(AdaptParentContext);
|
|
325
|
+
const shouldMountChildren = Boolean(opacity || !unmountChildrenWhenHidden);
|
|
306
326
|
if (modal) {
|
|
307
|
-
const modalContents = <Portal zIndex={zIndex} {...portalProps}>{
|
|
327
|
+
const modalContents = <Portal zIndex={zIndex} {...portalProps}>{shouldMountChildren && <Theme forceClassName name={themeName}><AdaptParentContext.Provider value={adaptContext}>{contents}</AdaptParentContext.Provider></Theme>}</Portal>;
|
|
308
328
|
if (isWeb) {
|
|
309
329
|
return modalContents;
|
|
310
330
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,0BAA0B;AACnC,SAAS,uBAAuB;AAChC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EAGE;AAAA,EAEA;AAAA,OAGK;AAEP,SAAS,aAAa,+BAA+B;AACrD,SAAS,oBAAoB,+BAA+B;AAC5D,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAE/B,MAAM,4BAA4B;AAAA,EACvC,WAA6B,SAASA,2BAA0B,OAAO,cAAc;AACnF,UAAM,cAAc,WAAW,kBAAkB;AAEjD,UAAM;AAAA,MACJ;AAAA,MACA,QAAQ;AAAA,MACR,SAAS,YAAY,SAAS;AAAA,MAC9B,uBAAuB;AAAA,MACvB;AAAA,IACF,IAAI;AAEJ,UAAM,oBAAoB,mBAAmB;AAC7C,UAAM,QAAQ,kBAAkB,KAAK;AACrC,UAAM,CAAC,kBAAkB,mBAAmB,IAAI,SAAc,IAAI;AAClE,UAAM,gBAAgB,sBAAsB,OAAO,OAAO;AAAA,MACxD,oBAAoB;AAAA,IACtB,CAAC;AACD,UAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SheetImplementationCustom", "position", "at", "state"]
|
|
6
6
|
}
|
|
@@ -1,21 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { composeRefs } from "@tamagui/core";
|
|
2
2
|
import { ScrollView } from "@tamagui/scroll-view";
|
|
3
|
-
import { forwardRef, useMemo, useRef
|
|
3
|
+
import { forwardRef, useMemo, useRef } from "react";
|
|
4
4
|
import { useSheetContext } from "./SheetContext";
|
|
5
5
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView";
|
|
6
6
|
const SheetScrollView = forwardRef(
|
|
7
7
|
({ __scopeSheet, children, ...props }, ref) => {
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
__scopeSheet
|
|
11
|
-
);
|
|
8
|
+
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet);
|
|
9
|
+
const { scrollBridge } = context;
|
|
12
10
|
const scrollRef = useRef(null);
|
|
13
|
-
const percentOpened = snapPoints[position] ?? 0;
|
|
14
|
-
const [percentToPadBottom, setPercentToPadBottom] = useState(0);
|
|
15
|
-
const next = 100 - percentOpened;
|
|
16
|
-
if (open && next !== percentToPadBottom) {
|
|
17
|
-
setPercentToPadBottom(next);
|
|
18
|
-
}
|
|
19
11
|
const state = useRef({
|
|
20
12
|
lastPageY: 0,
|
|
21
13
|
dragAt: 0,
|
|
@@ -64,10 +56,7 @@ const SheetScrollView = forwardRef(
|
|
|
64
56
|
onResponderRelease={release}
|
|
65
57
|
className="_ovs-contain"
|
|
66
58
|
{...props}
|
|
67
|
-
>
|
|
68
|
-
{useMemo(() => children, [children])}
|
|
69
|
-
<Stack height={percentToPadBottom / 100 * frameSize} width={0} />
|
|
70
|
-
</ScrollView>;
|
|
59
|
+
>{useMemo(() => children, [children])}</ScrollView>;
|
|
71
60
|
}
|
|
72
61
|
);
|
|
73
62
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "AAAA,
|
|
4
|
+
"mappings": "AAAA,SAAyB,mBAAmB;AAC5C,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AAShC,MAAM,yBAAyB;AAExB,MAAM,kBAAkB;AAAA,EAC7B,CAAC,EAAE,cAAc,UAAU,GAAG,MAAM,GAAsC,QAAQ;AAChF,UAAM,UAAU,gBAAgB,wBAAwB,YAAY;AACpE,UAAM,EAAE,aAAa,IAAI;AAEzB,UAAM,YAAY,OAA4B,IAAI;AAclD,UAAM,QAAQ,OAAO;AAAA,MACnB,WAAW;AAAA,MACX,QAAQ;AAAA,MACR,KAAK,CAAC;AAAA;AAAA,MACN,aAAa;AAAA,MACb,YAAY;AAAA,IACd,CAAC;AAED,UAAM,UAAU,MAAM;AACpB,UAAI,CAAC,MAAM,QAAQ,YAAY;AAC7B;AAAA,MACF;AACA,YAAM,QAAQ,aAAa;AAC3B,mBAAa,eAAe;AAC5B,YAAM,QAAQ,cAAc;AAE5B,UAAI,KAAK;AACT,UAAI,MAAM,QAAQ,IAAI,QAAQ;AAC5B,cAAM,YAAY,MAAM,QAAQ,IAAI,MAAM,GAAG;AAC7C,cAAM,OAAO,UAAU,SAAS,UAAU,OAAO,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,IAAI;AACvE,cAAM,QAAQ,OAAO,UAAU;AAC/B,aAAK,QAAQ;AAAA,MACf;AACA,YAAM,QAAQ,MAAM,CAAC;AACrB,mBAAa,QAAQ;AAAA,QACnB,QAAQ,MAAM,QAAQ;AAAA,QACtB;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WACE,CAAC;AAAA,MACC,KAAK,YAAY,WAAkB,GAAG;AAAA,MACtC,MAAM;AAAA,MACN,qBAAqB;AAAA,MAErB,UAAU,CAAC,MAAM;AACf,cAAM,EAAE,EAAE,IAAI,EAAE,YAAY;AAC5B,qBAAa,IAAI;AACjB,YAAI,IAAI,GAAG;AACT,uBAAa,eAAe;AAAA,QAC9B;AAAA,MACF;AAAA,MACA,2BAA2B,MAAM;AAC/B,qBAAa,eAAe;AAC5B,cAAM,QAAQ,aAAa;AAC3B,eAAO;AAAA,MACT;AAAA,MAEA,0BAA0B,MAAM;AAAA,MAmChC,oBAAoB;AAAA,MACpB,UAAU;AAAA,UACN;AAAA,MAEH,QAAQ,MAAM,UAAU,CAAC,QAAQ,CAAC,EACrC,EA1DC;AAAA,EA4DL;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,21 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { composeRefs } from "@tamagui/core";
|
|
2
2
|
import { ScrollView } from "@tamagui/scroll-view";
|
|
3
|
-
import { forwardRef, useMemo, useRef
|
|
3
|
+
import { forwardRef, useMemo, useRef } from "react";
|
|
4
4
|
import { useSheetContext } from "./SheetContext";
|
|
5
5
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView";
|
|
6
6
|
const SheetScrollView = forwardRef(
|
|
7
7
|
({ __scopeSheet, children, ...props }, ref) => {
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
__scopeSheet
|
|
11
|
-
);
|
|
8
|
+
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet);
|
|
9
|
+
const { scrollBridge } = context;
|
|
12
10
|
const scrollRef = useRef(null);
|
|
13
|
-
const percentOpened = snapPoints[position] ?? 0;
|
|
14
|
-
const [percentToPadBottom, setPercentToPadBottom] = useState(0);
|
|
15
|
-
const next = 100 - percentOpened;
|
|
16
|
-
if (open && next !== percentToPadBottom) {
|
|
17
|
-
setPercentToPadBottom(next);
|
|
18
|
-
}
|
|
19
11
|
const state = useRef({
|
|
20
12
|
lastPageY: 0,
|
|
21
13
|
dragAt: 0,
|
|
@@ -64,10 +56,7 @@ const SheetScrollView = forwardRef(
|
|
|
64
56
|
onResponderRelease={release}
|
|
65
57
|
className="_ovs-contain"
|
|
66
58
|
{...props}
|
|
67
|
-
>
|
|
68
|
-
{useMemo(() => children, [children])}
|
|
69
|
-
<Stack height={percentToPadBottom / 100 * frameSize} width={0} />
|
|
70
|
-
</ScrollView>;
|
|
59
|
+
>{useMemo(() => children, [children])}</ScrollView>;
|
|
71
60
|
}
|
|
72
61
|
);
|
|
73
62
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "AAAA,
|
|
4
|
+
"mappings": "AAAA,SAAyB,mBAAmB;AAC5C,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AAShC,MAAM,yBAAyB;AAExB,MAAM,kBAAkB;AAAA,EAC7B,CAAC,EAAE,cAAc,UAAU,GAAG,MAAM,GAAsC,QAAQ;AAChF,UAAM,UAAU,gBAAgB,wBAAwB,YAAY;AACpE,UAAM,EAAE,aAAa,IAAI;AAEzB,UAAM,YAAY,OAA4B,IAAI;AAclD,UAAM,QAAQ,OAAO;AAAA,MACnB,WAAW;AAAA,MACX,QAAQ;AAAA,MACR,KAAK,CAAC;AAAA;AAAA,MACN,aAAa;AAAA,MACb,YAAY;AAAA,IACd,CAAC;AAED,UAAM,UAAU,MAAM;AACpB,UAAI,CAAC,MAAM,QAAQ,YAAY;AAC7B;AAAA,MACF;AACA,YAAM,QAAQ,aAAa;AAC3B,mBAAa,eAAe;AAC5B,YAAM,QAAQ,cAAc;AAE5B,UAAI,KAAK;AACT,UAAI,MAAM,QAAQ,IAAI,QAAQ;AAC5B,cAAM,YAAY,MAAM,QAAQ,IAAI,MAAM,GAAG;AAC7C,cAAM,OAAO,UAAU,SAAS,UAAU,OAAO,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,IAAI;AACvE,cAAM,QAAQ,OAAO,UAAU;AAC/B,aAAK,QAAQ;AAAA,MACf;AACA,YAAM,QAAQ,MAAM,CAAC;AACrB,mBAAa,QAAQ;AAAA,QACnB,QAAQ,MAAM,QAAQ;AAAA,QACtB;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WACE,CAAC;AAAA,MACC,KAAK,YAAY,WAAkB,GAAG;AAAA,MACtC,MAAM;AAAA,MACN,qBAAqB;AAAA,MAErB,UAAU,CAAC,MAAM;AACf,cAAM,EAAE,EAAE,IAAI,EAAE,YAAY;AAC5B,qBAAa,IAAI;AACjB,YAAI,IAAI,GAAG;AACT,uBAAa,eAAe;AAAA,QAC9B;AAAA,MACF;AAAA,MACA,2BAA2B,MAAM;AAC/B,qBAAa,eAAe;AAC5B,cAAM,QAAQ,aAAa;AAC3B,eAAO;AAAA,MACT;AAAA,MAEA,0BAA0B,MAAM;AAAA,MAmChC,oBAAoB;AAAA,MACpB,UAAU;AAAA,UACN;AAAA,MAEH,QAAQ,MAAM,UAAU,CAAC,QAAQ,CAAC,EACrC,EA1DC;AAAA,EA4DL;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|