@tamagui/sheet 1.116.1 → 1.116.2
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 +12 -11
- package/dist/cjs/SheetImplementationCustom.js.map +1 -1
- package/dist/cjs/SheetScrollView.js +3 -3
- package/dist/cjs/SheetScrollView.js.map +1 -1
- package/dist/cjs/nativeSheet.js +10 -5
- package/dist/cjs/nativeSheet.js.map +1 -1
- package/package.json +16 -16
|
@@ -25,7 +25,7 @@ __export(SheetImplementationCustom_exports, {
|
|
|
25
25
|
SheetImplementationCustom: () => SheetImplementationCustom
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(SheetImplementationCustom_exports);
|
|
28
|
-
var
|
|
28
|
+
var import_animate_presence = require("@tamagui/animate-presence"), import_compose_refs = require("@tamagui/compose-refs"), import_constants = require("@tamagui/constants"), import_core = require("@tamagui/core"), import_portal = require("@tamagui/portal"), import_react = __toESM(require("react")), import_react_native = require("react-native-web"), import_contexts = require("./contexts"), import_helpers = require("./helpers"), import_SheetContext = require("./SheetContext"), import_useSheetOpenState = require("./useSheetOpenState"), import_useSheetProviderProps = require("./useSheetProviderProps"), import_jsx_runtime = require("react/jsx-runtime");
|
|
29
29
|
let hiddenSize = 10000.1, sheetHiddenStyleSheet = null;
|
|
30
30
|
const relativeDimensionTo = import_constants.isWeb ? "window" : "screen", SheetImplementationCustom = import_react.default.forwardRef(
|
|
31
31
|
function(props, forwardedRef) {
|
|
@@ -52,13 +52,14 @@ const relativeDimensionTo = import_constants.isWeb ? "window" : "screen", SheetI
|
|
|
52
52
|
screenSize,
|
|
53
53
|
setMaxContentSize,
|
|
54
54
|
maxSnapPoint
|
|
55
|
-
} = providerProps, { open, controller, isHidden } = state, sheetRef = import_react.default.useRef(null), ref = (0, import_compose_refs.useComposedRefs)(forwardedRef, sheetRef), animationConfig = (() => {
|
|
55
|
+
} = providerProps, { open, controller, isHidden } = state, sheetRef = import_react.default.useRef(null), ref = (0, import_compose_refs.useComposedRefs)(forwardedRef, sheetRef, providerProps.contentRef), animationConfig = (() => {
|
|
56
56
|
const [animationProp, animationPropConfig] = animation ? Array.isArray(animation) ? animation : [animation] : [];
|
|
57
57
|
return animationConfigProp ?? (animationProp ? {
|
|
58
58
|
...(0, import_core.getConfig)().animations.animations[animationProp],
|
|
59
59
|
...animationPropConfig
|
|
60
60
|
} : null);
|
|
61
|
-
})(), [isShowingInnerSheet, setIsShowingInnerSheet] = import_react.default.useState(!1), shouldHideParentSheet = !import_constants.isWeb && modal && isShowingInnerSheet
|
|
61
|
+
})(), [isShowingInnerSheet, setIsShowingInnerSheet] = import_react.default.useState(!1), shouldHideParentSheet = !import_constants.isWeb && modal && isShowingInnerSheet && // if not using weird portal limitation we dont need to hide parent sheet
|
|
62
|
+
process.env.TAMAGUI_USE_NATIVE_PORTAL !== "false", sheetInsideSheet = import_react.default.useContext(import_contexts.SheetInsideSheetContext), onInnerSheet = import_react.default.useCallback((hasChild) => {
|
|
62
63
|
setIsShowingInnerSheet(hasChild);
|
|
63
64
|
}, []), positions = import_react.default.useMemo(
|
|
64
65
|
() => snapPoints.map(
|
|
@@ -67,11 +68,11 @@ const relativeDimensionTo = import_constants.isWeb ? "window" : "screen", SheetI
|
|
|
67
68
|
[screenSize, frameSize, snapPoints, snapPointsMode]
|
|
68
69
|
), { animationDriver } = (0, import_core.useConfiguration)(), { useAnimatedNumber, useAnimatedNumberStyle, useAnimatedNumberReaction } = animationDriver, AnimatedView = animationDriver.View ?? import_core.Stack;
|
|
69
70
|
(0, import_constants.useIsomorphicLayoutEffect)(() => {
|
|
70
|
-
if (
|
|
71
|
-
return
|
|
72
|
-
|
|
71
|
+
if (sheetInsideSheet && open)
|
|
72
|
+
return sheetInsideSheet(!0), () => {
|
|
73
|
+
sheetInsideSheet(!1);
|
|
73
74
|
};
|
|
74
|
-
}, [
|
|
75
|
+
}, [sheetInsideSheet, open]);
|
|
75
76
|
const nextParentContext = import_react.default.useMemo(
|
|
76
77
|
() => ({
|
|
77
78
|
zIndex
|
|
@@ -227,7 +228,7 @@ const relativeDimensionTo = import_constants.isWeb ? "window" : "screen", SheetI
|
|
|
227
228
|
};
|
|
228
229
|
}
|
|
229
230
|
}, [open]);
|
|
230
|
-
const forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}${import_constants.isWeb ? "dvh" : "%"}` : maxSnapPoint, contents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_contexts.ParentSheetContext.Provider, { value: nextParentContext, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_SheetContext.SheetProvider, { ...providerProps, children: [
|
|
231
|
+
const forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}${import_constants.isWeb ? "dvh" : "%"}` : maxSnapPoint, id = (0, import_react.useId)(), contents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_contexts.ParentSheetContext.Provider, { value: nextParentContext, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_SheetContext.SheetProvider, { ...providerProps, children: [
|
|
231
232
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_animate_presence.AnimatePresence, { custom: { open }, children: shouldHideParentSheet || !open ? null : overlayComponent }),
|
|
232
233
|
snapPointsMode !== "percent" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
233
234
|
import_react_native.View,
|
|
@@ -262,7 +263,7 @@ const relativeDimensionTo = import_constants.isWeb ? "window" : "screen", SheetI
|
|
|
262
263
|
width: "100%",
|
|
263
264
|
height: forcedContentHeight,
|
|
264
265
|
minHeight: forcedContentHeight,
|
|
265
|
-
opacity,
|
|
266
|
+
opacity: shouldHideParentSheet ? 0 : opacity,
|
|
266
267
|
...(shouldHideParentSheet || !open) && {
|
|
267
268
|
pointerEvents: "none"
|
|
268
269
|
}
|
|
@@ -272,9 +273,9 @@ const relativeDimensionTo = import_constants.isWeb ? "window" : "screen", SheetI
|
|
|
272
273
|
children: props.children
|
|
273
274
|
}
|
|
274
275
|
)
|
|
275
|
-
] }) }),
|
|
276
|
+
] }) }), shouldMountChildren = unmountChildrenWhenHidden ? !opacity : !0;
|
|
276
277
|
if (modal) {
|
|
277
|
-
const modalContents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_portal.Portal, { zIndex, ...portalProps, children: shouldMountChildren && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContainerComponent, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.Theme, { forceClassName: !0, name: themeName, children:
|
|
278
|
+
const modalContents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_portal.Portal, { stackZIndex: zIndex, ...portalProps, children: shouldMountChildren && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContainerComponent, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.Theme, { forceClassName: !0, name: themeName, children: contents }) }) });
|
|
278
279
|
return import_constants.isWeb ? modalContents : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_contexts.SheetInsideSheetContext.Provider, { value: onInnerSheet, children: modalContents });
|
|
279
280
|
}
|
|
280
281
|
return contents;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["React", "position", "state", "pct"]
|
|
6
6
|
}
|
|
@@ -55,16 +55,16 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = import_react
|
|
|
55
55
|
ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
|
|
56
56
|
flex: 1,
|
|
57
57
|
scrollEventThrottle: 8,
|
|
58
|
+
onResponderRelease: release,
|
|
59
|
+
className: "_ovs-contain",
|
|
58
60
|
onScroll: (e) => {
|
|
59
61
|
const { y } = e.nativeEvent.contentOffset;
|
|
60
62
|
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll?.(e);
|
|
61
63
|
},
|
|
62
64
|
onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0),
|
|
63
65
|
onMoveShouldSetResponder: () => !1,
|
|
64
|
-
onResponderRelease: release,
|
|
65
|
-
className: "_ovs-contain",
|
|
66
66
|
...props,
|
|
67
|
-
children
|
|
67
|
+
children
|
|
68
68
|
}
|
|
69
69
|
);
|
|
70
70
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB,2BAClB,sBAA4B,kCAG5B,qBAA2B,iCAI3B,sBAAgC,2BAmE1B;AA1DN,MAAM,yBAAyB,mBAElB,kBAAkB,aAAAA,QAAM;AAAA,EAInC,CACE,EAAE,cAAc,UAAU,UAAU,GAAG,MAAM,GAC7C,QACG;AACH,UAAM,cAAU,qCAAgB,wBAAwB,YAAY,GAC9D,EAAE,aAAa,IAAI,SAEnB,YAAY,aAAAA,QAAM,OAA4B,IAAI,GAclD,QAAQ,aAAAA,QAAM,OAAO;AAAA,MACzB,WAAW;AAAA,MACX,QAAQ;AAAA,MACR,KAAK,CAAC;AAAA;AAAA,MACN,aAAa;AAAA,MACb,YAAY;AAAA,IACd,CAAC,GAEK,UAAU,MAAM;AACpB,UAAI,CAAC,MAAM,QAAQ;AACjB;AAEF,YAAM,QAAQ,aAAa,IAC3B,aAAa,eAAe,IAC5B,MAAM,QAAQ,cAAc;AAE5B,UAAI,KAAK;AACT,UAAI,MAAM,QAAQ,IAAI,QAAQ;AAC5B,cAAM,YAAY,MAAM,QAAQ,IAAI,MAAM,GAAG;AAG7C,cAFa,UAAU,SAAS,UAAU,OAAO,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,IAAI,KAClD,UAAU,SAClB;AAAA,MACf;AACA,YAAM,QAAQ,MAAM,CAAC,GACrB,aAAa,QAAQ;AAAA,QACnB,QAAQ,MAAM,QAAQ;AAAA,QACtB;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WACE;AAAA,MAAC;AAAA;AAAA,QACC,SAAK,iCAAY,WAAkB,GAAG;AAAA,QACtC,MAAM;AAAA,QACN,qBAAqB;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB,2BAClB,sBAA4B,kCAG5B,qBAA2B,iCAI3B,sBAAgC,2BAmE1B;AA1DN,MAAM,yBAAyB,mBAElB,kBAAkB,aAAAA,QAAM;AAAA,EAInC,CACE,EAAE,cAAc,UAAU,UAAU,GAAG,MAAM,GAC7C,QACG;AACH,UAAM,cAAU,qCAAgB,wBAAwB,YAAY,GAC9D,EAAE,aAAa,IAAI,SAEnB,YAAY,aAAAA,QAAM,OAA4B,IAAI,GAclD,QAAQ,aAAAA,QAAM,OAAO;AAAA,MACzB,WAAW;AAAA,MACX,QAAQ;AAAA,MACR,KAAK,CAAC;AAAA;AAAA,MACN,aAAa;AAAA,MACb,YAAY;AAAA,IACd,CAAC,GAEK,UAAU,MAAM;AACpB,UAAI,CAAC,MAAM,QAAQ;AACjB;AAEF,YAAM,QAAQ,aAAa,IAC3B,aAAa,eAAe,IAC5B,MAAM,QAAQ,cAAc;AAE5B,UAAI,KAAK;AACT,UAAI,MAAM,QAAQ,IAAI,QAAQ;AAC5B,cAAM,YAAY,MAAM,QAAQ,IAAI,MAAM,GAAG;AAG7C,cAFa,UAAU,SAAS,UAAU,OAAO,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,IAAI,KAClD,UAAU,SAClB;AAAA,MACf;AACA,YAAM,QAAQ,MAAM,CAAC,GACrB,aAAa,QAAQ;AAAA,QACnB,QAAQ,MAAM,QAAQ;AAAA,QACtB;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WACE;AAAA,MAAC;AAAA;AAAA,QACC,SAAK,iCAAY,WAAkB,GAAG;AAAA,QACtC,MAAM;AAAA,QACN,qBAAqB;AAAA,QACrB,oBAAoB;AAAA,QACpB,WAAU;AAAA,QAEV,UAAU,CAAC,MAAM;AACf,gBAAM,EAAE,EAAE,IAAI,EAAE,YAAY;AAC5B,uBAAa,IAAI,GACb,IAAI,MACN,aAAa,eAAe,KAI9B,WAAW,CAAC;AAAA,QASd;AAAA,QACA,2BAA2B,OACzB,aAAa,eAAe,IAC5B,MAAM,QAAQ,aAAa,IACpB;AAAA,QAGT,0BAA0B,MAAM;AAAA,QAmC/B,GAAG;AAAA,QAEH;AAAA;AAAA,IACH;AAAA,EAEJ;AACF;",
|
|
5
5
|
"names": ["React"]
|
|
6
6
|
}
|
package/dist/cjs/nativeSheet.js
CHANGED
|
@@ -25,13 +25,18 @@ const nativeSheets = {
|
|
|
25
25
|
function getNativeSheet(platform) {
|
|
26
26
|
return nativeSheets[platform];
|
|
27
27
|
}
|
|
28
|
-
function setupNativeSheet(platform,
|
|
28
|
+
function setupNativeSheet(platform, RNIOSModal) {
|
|
29
|
+
const { ModalSheetView, ModalSheetViewMainContent } = RNIOSModal;
|
|
29
30
|
platform === "ios" && (nativeSheets[platform] = (props) => {
|
|
30
31
|
const state = (0, import_useSheetOpenState.useSheetOpenState)(props), providerProps = (0, import_useSheetProviderProps.useSheetProviderProps)(props, state), { open, setOpen } = state, ref = (0, import_react.useRef)();
|
|
31
|
-
|
|
32
|
-
ref.current?.
|
|
33
|
-
}, [open])
|
|
34
|
-
|
|
32
|
+
(0, import_react.useEffect)(() => {
|
|
33
|
+
open ? ref.current?.presentModal() : ref.current?.dismissModal();
|
|
34
|
+
}, [open]);
|
|
35
|
+
function setOpenInternal(next) {
|
|
36
|
+
props.onOpenChange?.(open), setOpen(next);
|
|
37
|
+
}
|
|
38
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_SheetContext.SheetProvider, { ...providerProps, onlyShowFrame: !0, children: [
|
|
39
|
+
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModalSheetView, { ref, onModalDidDismiss: () => setOpenInternal(!1), children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModalSheetViewMainContent, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, { style: { flex: 1 }, children: props.children }) }) }),
|
|
35
40
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
36
41
|
import_stacks.YStack,
|
|
37
42
|
{
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/nativeSheet.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAuB,4BAEvB,eAAkC,kBAClC,sBAAqB,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAuB,4BAEvB,eAAkC,kBAClC,sBAAqB,yBACrB,sBAA8B,2BAE9B,2BAAkC,gCAClC,+BAAsC,oCAqD9B;AA/CR,MAAM,eAAmF;AAAA,EACvF,KAAK;AACP;AAEO,SAAS,eAAe,UAAgC;AAC7D,SAAO,aAAa,QAAQ;AAC9B;AAEO,SAAS,iBACd,UACA,YACA;AACA,QAAM,EAAE,gBAAgB,0BAA0B,IAAI;AAEtD,EAAI,aAAa,UACf,aAAa,QAAQ,IAAI,CAAC,UAAsB;AAC9C,UAAM,YAAQ,4CAAkB,KAAK,GAC/B,oBAAgB,oDAAsB,OAAO,KAAK,GAIlD,EAAE,MAAM,QAAQ,IAAI,OACpB,UAAM,qBAGT;AAEH,gCAAU,MAAM;AACd,MAAI,OACF,IAAI,SAAS,aAAa,IAE1B,IAAI,SAAS,aAAa;AAAA,IAE9B,GAAG,CAAC,IAAI,CAAC;AAET,aAAS,gBAAgB,MAAe;AACtC,YAAM,eAAe,IAAI,GACzB,QAAQ,IAAI;AAAA,IACd;AAQA,WACE,2EACE,uDAAC,qCAAe,GAAG,eAAe,eAAa,IAC7C;AAAA,kDAAC,kBAAe,KAAU,mBAAmB,MAAM,gBAAgB,EAAK,GACtE,sDAAC,6BACC,sDAAC,4BAAK,OAAO,EAAE,MAAM,EAAE,GAAI,gBAAM,UAAS,GAC5C,GACF;AAAA,MAIA;AAAA,QAAC;AAAA;AAAA,UACC,UAAS;AAAA,UACT,SAAS;AAAA,UACT,eAAc;AAAA,UACd,OAAO;AAAA,UACP,QAAQ;AAAA,UAEP,gBAAM;AAAA;AAAA,MACT;AAAA,OACF,GACF;AAAA,EAEJ;AAEJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/sheet",
|
|
3
|
-
"version": "1.116.
|
|
3
|
+
"version": "1.116.2",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -35,26 +35,26 @@
|
|
|
35
35
|
}
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@tamagui/animate-presence": "1.116.
|
|
39
|
-
"@tamagui/animations-react-native": "1.116.
|
|
40
|
-
"@tamagui/compose-refs": "1.116.
|
|
41
|
-
"@tamagui/constants": "1.116.
|
|
42
|
-
"@tamagui/core": "1.116.
|
|
43
|
-
"@tamagui/create-context": "1.116.
|
|
44
|
-
"@tamagui/helpers": "1.116.
|
|
45
|
-
"@tamagui/portal": "1.116.
|
|
46
|
-
"@tamagui/remove-scroll": "1.116.
|
|
47
|
-
"@tamagui/scroll-view": "1.116.
|
|
48
|
-
"@tamagui/stacks": "1.116.
|
|
49
|
-
"@tamagui/use-constant": "1.116.
|
|
50
|
-
"@tamagui/use-controllable-state": "1.116.
|
|
51
|
-
"@tamagui/use-keyboard-visible": "1.116.
|
|
38
|
+
"@tamagui/animate-presence": "1.116.2",
|
|
39
|
+
"@tamagui/animations-react-native": "1.116.2",
|
|
40
|
+
"@tamagui/compose-refs": "1.116.2",
|
|
41
|
+
"@tamagui/constants": "1.116.2",
|
|
42
|
+
"@tamagui/core": "1.116.2",
|
|
43
|
+
"@tamagui/create-context": "1.116.2",
|
|
44
|
+
"@tamagui/helpers": "1.116.2",
|
|
45
|
+
"@tamagui/portal": "1.116.2",
|
|
46
|
+
"@tamagui/remove-scroll": "1.116.2",
|
|
47
|
+
"@tamagui/scroll-view": "1.116.2",
|
|
48
|
+
"@tamagui/stacks": "1.116.2",
|
|
49
|
+
"@tamagui/use-constant": "1.116.2",
|
|
50
|
+
"@tamagui/use-controllable-state": "1.116.2",
|
|
51
|
+
"@tamagui/use-keyboard-visible": "1.116.2"
|
|
52
52
|
},
|
|
53
53
|
"peerDependencies": {
|
|
54
54
|
"react": "*"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@tamagui/build": "1.116.
|
|
57
|
+
"@tamagui/build": "1.116.2",
|
|
58
58
|
"react": "^18.2.0 || ^19.0.0"
|
|
59
59
|
},
|
|
60
60
|
"publishConfig": {
|