@tamagui/sheet 1.58.8 → 1.59.0
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 +72 -14
- package/dist/cjs/SheetImplementationCustom.js.map +2 -2
- package/dist/cjs/createSheet.js +20 -4
- package/dist/cjs/createSheet.js.map +1 -1
- package/dist/cjs/useSheetOffscreenSize.js +27 -5
- package/dist/cjs/useSheetOffscreenSize.js.map +2 -2
- package/dist/cjs/useSheetProviderProps.js +43 -5
- package/dist/cjs/useSheetProviderProps.js.map +1 -1
- package/dist/esm/SheetImplementationCustom.js +74 -15
- package/dist/esm/SheetImplementationCustom.js.map +2 -2
- package/dist/esm/createSheet.js +26 -5
- package/dist/esm/createSheet.js.map +1 -1
- package/dist/esm/useSheetOffscreenSize.js +27 -5
- package/dist/esm/useSheetOffscreenSize.js.map +2 -2
- package/dist/esm/useSheetProviderProps.js +43 -5
- package/dist/esm/useSheetProviderProps.js.map +1 -1
- package/dist/jsx/SheetImplementationCustom.js +70 -15
- package/dist/jsx/SheetImplementationCustom.js.map +2 -2
- package/dist/jsx/createSheet.js +18 -2
- package/dist/jsx/createSheet.js.map +1 -1
- package/dist/jsx/useSheetOffscreenSize.js +27 -5
- package/dist/jsx/useSheetOffscreenSize.js.map +2 -2
- package/dist/jsx/useSheetProviderProps.js +43 -5
- package/dist/jsx/useSheetProviderProps.js.map +1 -1
- package/package.json +14 -14
- package/src/SheetImplementationCustom.tsx +85 -15
- package/src/createSheet.tsx +21 -3
- package/src/types.tsx +4 -1
- package/src/useSheetOffscreenSize.tsx +40 -4
- package/src/useSheetProviderProps.tsx +65 -5
- package/types/Sheet.d.ts +2 -1
- package/types/Sheet.d.ts.map +1 -1
- package/types/SheetContext.d.ts +25 -10
- package/types/SheetContext.d.ts.map +1 -1
- package/types/SheetImplementationCustom.d.ts +3 -1
- package/types/SheetImplementationCustom.d.ts.map +1 -1
- package/types/createSheet.d.ts +2 -1
- package/types/createSheet.d.ts.map +1 -1
- package/types/types.d.ts +3 -1
- package/types/types.d.ts.map +1 -1
- package/types/useSheet.d.ts +5 -2
- package/types/useSheet.d.ts.map +1 -1
- package/types/useSheetOffscreenSize.d.ts +1 -1
- package/types/useSheetOffscreenSize.d.ts.map +1 -1
- package/types/useSheetProviderProps.d.ts +5 -2
- package/types/useSheetProviderProps.d.ts.map +1 -1
|
@@ -58,10 +58,13 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
58
58
|
frameSize,
|
|
59
59
|
setFrameSize,
|
|
60
60
|
snapPoints,
|
|
61
|
+
snapPointsMode,
|
|
62
|
+
hasFit,
|
|
61
63
|
position,
|
|
62
64
|
setPosition,
|
|
63
65
|
scrollBridge,
|
|
64
66
|
screenSize,
|
|
67
|
+
setMaxContentSize,
|
|
65
68
|
maxSnapPoint
|
|
66
69
|
} = providerProps;
|
|
67
70
|
const { open, controller, isHidden } = state;
|
|
@@ -74,8 +77,10 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
74
77
|
setIsShowingInnerSheet(hasChild);
|
|
75
78
|
}, []);
|
|
76
79
|
const positions = (0, import_react.useMemo)(
|
|
77
|
-
() => snapPoints.map(
|
|
78
|
-
|
|
80
|
+
() => snapPoints.map(
|
|
81
|
+
(point) => getYPositions(snapPointsMode, point, screenSize, frameSize)
|
|
82
|
+
),
|
|
83
|
+
[screenSize, frameSize, snapPoints, snapPointsMode]
|
|
79
84
|
);
|
|
80
85
|
const driver = (0, import_core.useAnimationDriver)();
|
|
81
86
|
const { useAnimatedNumber, useAnimatedNumberStyle, useAnimatedNumberReaction } = driver;
|
|
@@ -149,11 +154,11 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
149
154
|
}
|
|
150
155
|
}, [hasntMeasured, screenSize]);
|
|
151
156
|
(0, import_core.useIsomorphicLayoutEffect)(() => {
|
|
152
|
-
if (!frameSize || isHidden || hasntMeasured && !open) {
|
|
157
|
+
if (!frameSize || !screenSize || isHidden || hasntMeasured && !open) {
|
|
153
158
|
return;
|
|
154
159
|
}
|
|
155
160
|
animateTo(position);
|
|
156
|
-
}, [isHidden, frameSize, open, position]);
|
|
161
|
+
}, [isHidden, frameSize, screenSize, open, position]);
|
|
157
162
|
const disableDrag = props.disableDrag ?? (controller == null ? void 0 : controller.disableDrag);
|
|
158
163
|
const themeName = (0, import_core.useThemeName)();
|
|
159
164
|
const panResponder = (0, import_react.useMemo)(
|
|
@@ -264,6 +269,16 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
264
269
|
},
|
|
265
270
|
[keyboardIsVisible]
|
|
266
271
|
);
|
|
272
|
+
const handleMaxContentViewLayout = (0, import_react.useCallback)(
|
|
273
|
+
(e) => {
|
|
274
|
+
var _a;
|
|
275
|
+
const next = (_a = e.nativeEvent) == null ? void 0 : _a.layout.height;
|
|
276
|
+
if (!next)
|
|
277
|
+
return;
|
|
278
|
+
setMaxContentSize(next);
|
|
279
|
+
},
|
|
280
|
+
[keyboardIsVisible]
|
|
281
|
+
);
|
|
267
282
|
const animatedStyle = useAnimatedNumberStyle(animatedNumber, (val) => {
|
|
268
283
|
"worklet";
|
|
269
284
|
const translateY = frameSize === 0 ? hiddenSize : val;
|
|
@@ -308,14 +323,31 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
308
323
|
};
|
|
309
324
|
}
|
|
310
325
|
}, [open]);
|
|
326
|
+
const forcedContentHeight = hasFit ? frameSize : snapPointsMode === "percent" ? `${maxSnapPoint}%` : maxSnapPoint;
|
|
311
327
|
const 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: [
|
|
312
328
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_animate_presence.AnimatePresence, { enterExitVariant: "open", children: shouldHideParentSheet || !open ? null : overlayComponent }),
|
|
329
|
+
snapPointsMode !== "percent" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
330
|
+
import_react_native.View,
|
|
331
|
+
{
|
|
332
|
+
style: {
|
|
333
|
+
opacity: 0,
|
|
334
|
+
position: "absolute",
|
|
335
|
+
top: 0,
|
|
336
|
+
left: 0,
|
|
337
|
+
right: 0,
|
|
338
|
+
bottom: 0,
|
|
339
|
+
pointerEvents: "none"
|
|
340
|
+
},
|
|
341
|
+
pointerEvents: "none",
|
|
342
|
+
onLayout: handleMaxContentViewLayout
|
|
343
|
+
}
|
|
344
|
+
),
|
|
313
345
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
314
346
|
AnimatedView,
|
|
315
347
|
{
|
|
316
348
|
ref,
|
|
317
349
|
...panResponder == null ? void 0 : panResponder.panHandlers,
|
|
318
|
-
onLayout: handleAnimationViewLayout,
|
|
350
|
+
onLayout: hasFit ? void 0 : handleAnimationViewLayout,
|
|
319
351
|
pointerEvents: open && !shouldHideParentSheet ? "auto" : "none",
|
|
320
352
|
animation: props.animation,
|
|
321
353
|
style: [
|
|
@@ -323,8 +355,8 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
323
355
|
position: "absolute",
|
|
324
356
|
zIndex,
|
|
325
357
|
width: "100%",
|
|
326
|
-
height:
|
|
327
|
-
minHeight:
|
|
358
|
+
height: forcedContentHeight,
|
|
359
|
+
minHeight: forcedContentHeight,
|
|
328
360
|
opacity
|
|
329
361
|
},
|
|
330
362
|
animatedStyle
|
|
@@ -345,16 +377,42 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
345
377
|
return contents;
|
|
346
378
|
})
|
|
347
379
|
);
|
|
348
|
-
function
|
|
349
|
-
if (!screenSize)
|
|
380
|
+
function getYPositions(mode, point, screenSize, frameSize) {
|
|
381
|
+
if (!screenSize || !frameSize)
|
|
350
382
|
return 0;
|
|
351
|
-
if (
|
|
352
|
-
|
|
383
|
+
if (mode === "mixed") {
|
|
384
|
+
if (typeof point === "number") {
|
|
385
|
+
return screenSize - Math.min(screenSize, Math.max(0, point));
|
|
386
|
+
}
|
|
387
|
+
if (point === "fit") {
|
|
388
|
+
return screenSize - frameSize;
|
|
389
|
+
}
|
|
390
|
+
if (point.endsWith("%")) {
|
|
391
|
+
const pct2 = Math.min(100, Math.max(0, Number(point.slice(0, -1)))) / 100;
|
|
392
|
+
if (Number.isNaN(pct2)) {
|
|
393
|
+
console.warn("Invalid snapPoint percentage string");
|
|
394
|
+
return 0;
|
|
395
|
+
}
|
|
396
|
+
const next = Math.round(screenSize - pct2 * screenSize);
|
|
397
|
+
return next;
|
|
398
|
+
}
|
|
399
|
+
console.warn("Invalid snapPoint unknown value");
|
|
400
|
+
return 0;
|
|
401
|
+
}
|
|
402
|
+
if (mode === "fit") {
|
|
403
|
+
if (point === 0)
|
|
404
|
+
return screenSize;
|
|
405
|
+
return screenSize - Math.min(screenSize, frameSize);
|
|
406
|
+
}
|
|
407
|
+
if (mode === "constant" && typeof point === "number") {
|
|
408
|
+
return screenSize - Math.min(screenSize, Math.max(0, point));
|
|
409
|
+
}
|
|
410
|
+
const pct = Math.min(100, Math.max(0, Number(point))) / 100;
|
|
411
|
+
if (Number.isNaN(pct)) {
|
|
412
|
+
console.warn("Invalid snapPoint percentage");
|
|
353
413
|
return 0;
|
|
354
414
|
}
|
|
355
|
-
|
|
356
|
-
const next = Math.round(screenSize - pct * screenSize);
|
|
357
|
-
return next;
|
|
415
|
+
return Math.round(screenSize - pct * screenSize);
|
|
358
416
|
}
|
|
359
417
|
// Annotate the CommonJS export names for ESM import in node:
|
|
360
418
|
0 && (module.exports = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
5
|
-
"names": ["SheetImplementationCustom", "position", "at", "state"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["SheetImplementationCustom", "position", "at", "state", "pct"]
|
|
6
6
|
}
|
package/dist/cjs/createSheet.js
CHANGED
|
@@ -101,13 +101,29 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
101
101
|
const { removeScrollEnabled, frameSize, contentRef } = context;
|
|
102
102
|
const composedContentRef = (0, import_compose_refs.useComposedRefs)(forwardedRef, contentRef);
|
|
103
103
|
const offscreenSize = (0, import_useSheetOffscreenSize.useSheetOffscreenSize)(context);
|
|
104
|
+
const handleLayoutChange = (0, import_react.useCallback)((e) => {
|
|
105
|
+
var _a;
|
|
106
|
+
const next = (_a = e.nativeEvent) == null ? void 0 : _a.layout.height;
|
|
107
|
+
if (!next)
|
|
108
|
+
return;
|
|
109
|
+
context.setFrameSize(next);
|
|
110
|
+
}, []);
|
|
104
111
|
const sheetContents = (0, import_react.useMemo)(() => {
|
|
105
112
|
return (
|
|
106
113
|
// @ts-ignore
|
|
107
|
-
/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
114
|
+
/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
|
|
115
|
+
Frame,
|
|
116
|
+
{
|
|
117
|
+
ref: composedContentRef,
|
|
118
|
+
height: context.hasFit ? void 0 : frameSize,
|
|
119
|
+
onLayout: context.hasFit ? handleLayoutChange : void 0,
|
|
120
|
+
...props,
|
|
121
|
+
children: [
|
|
122
|
+
children,
|
|
123
|
+
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.Stack, { "data-sheet-offscreen-pad": true, height: offscreenSize, width: "100%" })
|
|
124
|
+
]
|
|
125
|
+
}
|
|
126
|
+
)
|
|
111
127
|
);
|
|
112
128
|
}, [props, frameSize, offscreenSize]);
|
|
113
129
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createSheet.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Sheet"]
|
|
6
6
|
}
|
|
@@ -24,12 +24,34 @@ module.exports = __toCommonJS(useSheetOffscreenSize_exports);
|
|
|
24
24
|
const useSheetOffscreenSize = ({
|
|
25
25
|
snapPoints,
|
|
26
26
|
position,
|
|
27
|
-
screenSize
|
|
27
|
+
screenSize,
|
|
28
|
+
frameSize,
|
|
29
|
+
snapPointsMode
|
|
28
30
|
}) => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
if (snapPointsMode === "fit") {
|
|
32
|
+
return 0;
|
|
33
|
+
}
|
|
34
|
+
if (snapPointsMode === "constant") {
|
|
35
|
+
const maxSize2 = Number(snapPoints[0]);
|
|
36
|
+
const currentSize2 = Number(snapPoints[position] ?? 0);
|
|
37
|
+
const offscreenSize2 = maxSize2 - currentSize2;
|
|
38
|
+
return offscreenSize2;
|
|
39
|
+
}
|
|
40
|
+
if (snapPointsMode === "percent") {
|
|
41
|
+
const maxPercentOpened = Number(snapPoints[0]) / 100;
|
|
42
|
+
const percentOpened = Number(snapPoints[position] ?? 0) / 100;
|
|
43
|
+
const percentHidden = 1 - maxPercentOpened - percentOpened;
|
|
44
|
+
const offscreenSize2 = percentHidden * screenSize;
|
|
45
|
+
return offscreenSize2;
|
|
46
|
+
}
|
|
47
|
+
const maxSnapPoint = snapPoints[0];
|
|
48
|
+
const maxSize = maxSnapPoint === "fit" ? frameSize : typeof maxSnapPoint === "string" ? Number(maxSnapPoint.slice(0, -1)) / 100 * screenSize : maxSnapPoint;
|
|
49
|
+
const currentSnapPoint = snapPoints[position] ?? 0;
|
|
50
|
+
const currentSize = currentSnapPoint === "fit" ? frameSize : typeof currentSnapPoint === "string" ? Number(currentSnapPoint.slice(0, -1)) / 100 * screenSize : currentSnapPoint;
|
|
51
|
+
const offscreenSize = maxSize - currentSize;
|
|
52
|
+
if (Number.isNaN(offscreenSize)) {
|
|
53
|
+
return 0;
|
|
54
|
+
}
|
|
33
55
|
return offscreenSize;
|
|
34
56
|
};
|
|
35
57
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useSheetOffscreenSize.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,wBAAwB,CAAC;AAAA,EACpC;AAAA,EACA;AAAA,EACA;AACF,MAAyB;AACvB,
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,wBAAwB,CAAC;AAAA,EACpC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAyB;AACvB,MAAI,mBAAmB,OAAO;AAC5B,WAAO;AAAA,EACT;AAEA,MAAI,mBAAmB,YAAY;AACjC,UAAMA,WAAU,OAAO,WAAW,CAAC,CAAC;AACpC,UAAMC,eAAc,OAAO,WAAW,QAAQ,KAAK,CAAC;AACpD,UAAMC,iBAAgBF,WAAUC;AAChC,WAAOC;AAAA,EACT;AAEA,MAAI,mBAAmB,WAAW;AAChC,UAAM,mBAAmB,OAAO,WAAW,CAAC,CAAC,IAAI;AACjD,UAAM,gBAAgB,OAAO,WAAW,QAAQ,KAAK,CAAC,IAAI;AAC1D,UAAM,gBAAgB,IAAI,mBAAmB;AAC7C,UAAMA,iBAAgB,gBAAgB;AACtC,WAAOA;AAAA,EACT;AAGA,QAAM,eAAe,WAAW,CAAC;AACjC,QAAM,UACJ,iBAAiB,QACb,YACA,OAAO,iBAAiB,WACvB,OAAO,aAAa,MAAM,GAAG,EAAE,CAAC,IAAI,MAAO,aAC5C;AACN,QAAM,mBAAmB,WAAW,QAAQ,KAAK;AACjD,QAAM,cACJ,qBAAqB,QACjB,YACA,OAAO,qBAAqB,WAC3B,OAAO,iBAAiB,MAAM,GAAG,EAAE,CAAC,IAAI,MAAO,aAChD;AACN,QAAM,gBAAgB,UAAU;AAChC,MAAI,OAAO,MAAM,aAAa,GAAG;AAC/B,WAAO;AAAA,EACT;AACA,SAAO;AACT;",
|
|
5
|
+
"names": ["maxSize", "currentSize", "offscreenSize"]
|
|
6
6
|
}
|
|
@@ -38,7 +38,10 @@ var import_react = __toESM(require("react"));
|
|
|
38
38
|
function useSheetProviderProps(props, state, options = {}) {
|
|
39
39
|
const contentRef = import_react.default.useRef(null);
|
|
40
40
|
const [frameSize, setFrameSize] = (0, import_react.useState)(0);
|
|
41
|
-
const
|
|
41
|
+
const [maxContentSize, setMaxContentSize] = (0, import_react.useState)(0);
|
|
42
|
+
const snapPointsMode = props.snapPointsMode ?? "percent";
|
|
43
|
+
const snapPointsProp = props.snapPoints ?? (snapPointsMode === "percent" ? [80] : snapPointsMode === "constant" ? [256] : ["fit"]);
|
|
44
|
+
const hasFit = snapPointsProp[0] === "fit";
|
|
42
45
|
const snapPoints = (0, import_react.useMemo)(
|
|
43
46
|
() => props.dismissOnSnapToBottom ? [...snapPointsProp, 0] : snapPointsProp,
|
|
44
47
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
@@ -64,9 +67,41 @@ function useSheetProviderProps(props, state, options = {}) {
|
|
|
64
67
|
[props.dismissOnSnapToBottom, snapPoints.length, setPositionImmediate, state.setOpen]
|
|
65
68
|
);
|
|
66
69
|
if (process.env.NODE_ENV === "development") {
|
|
67
|
-
if (snapPoints.some((p) =>
|
|
70
|
+
if (snapPointsMode === "mixed" && snapPoints.some((p) => {
|
|
71
|
+
if (typeof p === "string") {
|
|
72
|
+
if (p === "fit") {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
if (p.endsWith("%")) {
|
|
76
|
+
const n = Number(p.slice(0, -1));
|
|
77
|
+
return n < 0 || n > 100;
|
|
78
|
+
}
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
81
|
+
return typeof p !== "number" || p < 0;
|
|
82
|
+
})) {
|
|
83
|
+
console.warn(
|
|
84
|
+
'\u26A0\uFE0F Invalid snapPoint given, snapPoints must be positive numeric values, string percentages between 0-100%, or "fit" when snapPointsMode is mixed'
|
|
85
|
+
);
|
|
86
|
+
}
|
|
87
|
+
if (snapPointsMode === "mixed" && snapPoints.indexOf("fit") > 0) {
|
|
88
|
+
console.warn(
|
|
89
|
+
'\u26A0\uFE0F Invalid snapPoint given, "fit" must be the first/largest snap point when snapPointsMode is mixed'
|
|
90
|
+
);
|
|
91
|
+
}
|
|
92
|
+
if (snapPointsMode === "fit" && (snapPoints.length !== (props.dismissOnSnapToBottom ? 2 : 1) || snapPoints[0] !== "fit")) {
|
|
93
|
+
console.warn(
|
|
94
|
+
"\u26A0\uFE0F Invalid snapPoint given, there are no snap points when snapPointsMode is fit"
|
|
95
|
+
);
|
|
96
|
+
}
|
|
97
|
+
if (snapPointsMode === "constant" && snapPoints.some((p) => typeof p !== "number" || p < 0)) {
|
|
98
|
+
console.warn(
|
|
99
|
+
"\u26A0\uFE0F Invalid snapPoint given, snapPoints must be positive numeric values when snapPointsMode is constant"
|
|
100
|
+
);
|
|
101
|
+
}
|
|
102
|
+
if (snapPointsMode === "percent" && snapPoints.some((p) => typeof p !== "number" || p < 0 || p > 100)) {
|
|
68
103
|
console.warn(
|
|
69
|
-
"\u26A0\uFE0F Invalid snapPoint given, snapPoints must be between 0 and 100
|
|
104
|
+
"\u26A0\uFE0F Invalid snapPoint given, snapPoints must be numeric values between 0 and 100 when snapPointsMode is percent"
|
|
70
105
|
);
|
|
71
106
|
}
|
|
72
107
|
}
|
|
@@ -96,8 +131,8 @@ function useSheetProviderProps(props, state, options = {}) {
|
|
|
96
131
|
scrollLock: false
|
|
97
132
|
}));
|
|
98
133
|
const removeScrollEnabled = props.forceRemoveScrollEnabled ?? (open && props.modal);
|
|
99
|
-
const maxSnapPoint = snapPoints
|
|
100
|
-
const screenSize = frameSize / (maxSnapPoint / 100);
|
|
134
|
+
const maxSnapPoint = snapPoints[0];
|
|
135
|
+
const screenSize = snapPointsMode === "percent" ? frameSize / ((typeof maxSnapPoint === "number" ? maxSnapPoint : 100) / 100) : maxContentSize;
|
|
101
136
|
const providerProps = {
|
|
102
137
|
screenSize,
|
|
103
138
|
maxSnapPoint,
|
|
@@ -114,8 +149,11 @@ function useSheetProviderProps(props, state, options = {}) {
|
|
|
114
149
|
dismissOnSnapToBottom: props.dismissOnSnapToBottom ?? false,
|
|
115
150
|
onOverlayComponent: options.onOverlayComponent,
|
|
116
151
|
scope: props.__scopeSheet,
|
|
152
|
+
hasFit,
|
|
117
153
|
position,
|
|
118
154
|
snapPoints,
|
|
155
|
+
snapPointsMode,
|
|
156
|
+
setMaxContentSize,
|
|
119
157
|
setPosition,
|
|
120
158
|
setPositionImmediate,
|
|
121
159
|
onlyShowFrame: false
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useSheetProviderProps.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAmD;AACnD,0BAA4B;AAC5B,oCAAqC;AACrC,mBAAiE;AAO1D,SAAS,sBACd,OACA,OACA,UAEI,CAAC,GACL;AACA,QAAM,aAAa,aAAAA,QAAM,OAAuB,IAAI;AACpD,QAAM,CAAC,WAAW,YAAY,QAAI,uBAAiB,CAAC;AACpD,QAAM,iBAAiB,MAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["React"]
|
|
6
6
|
}
|
|
@@ -25,7 +25,8 @@ import {
|
|
|
25
25
|
} from "react";
|
|
26
26
|
import {
|
|
27
27
|
Keyboard,
|
|
28
|
-
PanResponder
|
|
28
|
+
PanResponder,
|
|
29
|
+
View
|
|
29
30
|
} from "react-native";
|
|
30
31
|
import { SHEET_HIDDEN_STYLESHEET } from "./constants";
|
|
31
32
|
import { ParentSheetContext, SheetInsideSheetContext } from "./contexts";
|
|
@@ -55,10 +56,13 @@ const SheetImplementationCustom = themeable(
|
|
|
55
56
|
frameSize,
|
|
56
57
|
setFrameSize,
|
|
57
58
|
snapPoints,
|
|
59
|
+
snapPointsMode,
|
|
60
|
+
hasFit,
|
|
58
61
|
position,
|
|
59
62
|
setPosition,
|
|
60
63
|
scrollBridge,
|
|
61
64
|
screenSize,
|
|
65
|
+
setMaxContentSize,
|
|
62
66
|
maxSnapPoint
|
|
63
67
|
} = providerProps;
|
|
64
68
|
const { open, controller, isHidden } = state;
|
|
@@ -71,8 +75,10 @@ const SheetImplementationCustom = themeable(
|
|
|
71
75
|
setIsShowingInnerSheet(hasChild);
|
|
72
76
|
}, []);
|
|
73
77
|
const positions = useMemo(
|
|
74
|
-
() => snapPoints.map(
|
|
75
|
-
|
|
78
|
+
() => snapPoints.map(
|
|
79
|
+
(point) => getYPositions(snapPointsMode, point, screenSize, frameSize)
|
|
80
|
+
),
|
|
81
|
+
[screenSize, frameSize, snapPoints, snapPointsMode]
|
|
76
82
|
);
|
|
77
83
|
const driver = useAnimationDriver();
|
|
78
84
|
const { useAnimatedNumber, useAnimatedNumberStyle, useAnimatedNumberReaction } = driver;
|
|
@@ -146,11 +152,11 @@ const SheetImplementationCustom = themeable(
|
|
|
146
152
|
}
|
|
147
153
|
}, [hasntMeasured, screenSize]);
|
|
148
154
|
useIsomorphicLayoutEffect(() => {
|
|
149
|
-
if (!frameSize || isHidden || hasntMeasured && !open) {
|
|
155
|
+
if (!frameSize || !screenSize || isHidden || hasntMeasured && !open) {
|
|
150
156
|
return;
|
|
151
157
|
}
|
|
152
158
|
animateTo(position);
|
|
153
|
-
}, [isHidden, frameSize, open, position]);
|
|
159
|
+
}, [isHidden, frameSize, screenSize, open, position]);
|
|
154
160
|
const disableDrag = props.disableDrag ?? (controller == null ? void 0 : controller.disableDrag);
|
|
155
161
|
const themeName = useThemeName();
|
|
156
162
|
const panResponder = useMemo(
|
|
@@ -261,6 +267,16 @@ const SheetImplementationCustom = themeable(
|
|
|
261
267
|
},
|
|
262
268
|
[keyboardIsVisible]
|
|
263
269
|
);
|
|
270
|
+
const handleMaxContentViewLayout = useCallback(
|
|
271
|
+
(e) => {
|
|
272
|
+
var _a;
|
|
273
|
+
const next = (_a = e.nativeEvent) == null ? void 0 : _a.layout.height;
|
|
274
|
+
if (!next)
|
|
275
|
+
return;
|
|
276
|
+
setMaxContentSize(next);
|
|
277
|
+
},
|
|
278
|
+
[keyboardIsVisible]
|
|
279
|
+
);
|
|
264
280
|
const animatedStyle = useAnimatedNumberStyle(animatedNumber, (val) => {
|
|
265
281
|
"worklet";
|
|
266
282
|
const translateY = frameSize === 0 ? hiddenSize : val;
|
|
@@ -305,14 +321,31 @@ const SheetImplementationCustom = themeable(
|
|
|
305
321
|
};
|
|
306
322
|
}
|
|
307
323
|
}, [open]);
|
|
324
|
+
const forcedContentHeight = hasFit ? frameSize : snapPointsMode === "percent" ? `${maxSnapPoint}%` : maxSnapPoint;
|
|
308
325
|
const contents = /* @__PURE__ */ jsx(ParentSheetContext.Provider, { value: nextParentContext, children: /* @__PURE__ */ jsxs(SheetProvider, { ...providerProps, children: [
|
|
309
326
|
/* @__PURE__ */ jsx(AnimatePresence, { enterExitVariant: "open", children: shouldHideParentSheet || !open ? null : overlayComponent }),
|
|
327
|
+
snapPointsMode !== "percent" && /* @__PURE__ */ jsx(
|
|
328
|
+
View,
|
|
329
|
+
{
|
|
330
|
+
style: {
|
|
331
|
+
opacity: 0,
|
|
332
|
+
position: "absolute",
|
|
333
|
+
top: 0,
|
|
334
|
+
left: 0,
|
|
335
|
+
right: 0,
|
|
336
|
+
bottom: 0,
|
|
337
|
+
pointerEvents: "none"
|
|
338
|
+
},
|
|
339
|
+
pointerEvents: "none",
|
|
340
|
+
onLayout: handleMaxContentViewLayout
|
|
341
|
+
}
|
|
342
|
+
),
|
|
310
343
|
/* @__PURE__ */ jsx(
|
|
311
344
|
AnimatedView,
|
|
312
345
|
{
|
|
313
346
|
ref,
|
|
314
347
|
...panResponder == null ? void 0 : panResponder.panHandlers,
|
|
315
|
-
onLayout: handleAnimationViewLayout,
|
|
348
|
+
onLayout: hasFit ? void 0 : handleAnimationViewLayout,
|
|
316
349
|
pointerEvents: open && !shouldHideParentSheet ? "auto" : "none",
|
|
317
350
|
animation: props.animation,
|
|
318
351
|
style: [
|
|
@@ -320,8 +353,8 @@ const SheetImplementationCustom = themeable(
|
|
|
320
353
|
position: "absolute",
|
|
321
354
|
zIndex,
|
|
322
355
|
width: "100%",
|
|
323
|
-
height:
|
|
324
|
-
minHeight:
|
|
356
|
+
height: forcedContentHeight,
|
|
357
|
+
minHeight: forcedContentHeight,
|
|
325
358
|
opacity
|
|
326
359
|
},
|
|
327
360
|
animatedStyle
|
|
@@ -342,16 +375,42 @@ const SheetImplementationCustom = themeable(
|
|
|
342
375
|
return contents;
|
|
343
376
|
})
|
|
344
377
|
);
|
|
345
|
-
function
|
|
346
|
-
if (!screenSize)
|
|
378
|
+
function getYPositions(mode, point, screenSize, frameSize) {
|
|
379
|
+
if (!screenSize || !frameSize)
|
|
347
380
|
return 0;
|
|
348
|
-
if (
|
|
349
|
-
|
|
381
|
+
if (mode === "mixed") {
|
|
382
|
+
if (typeof point === "number") {
|
|
383
|
+
return screenSize - Math.min(screenSize, Math.max(0, point));
|
|
384
|
+
}
|
|
385
|
+
if (point === "fit") {
|
|
386
|
+
return screenSize - frameSize;
|
|
387
|
+
}
|
|
388
|
+
if (point.endsWith("%")) {
|
|
389
|
+
const pct2 = Math.min(100, Math.max(0, Number(point.slice(0, -1)))) / 100;
|
|
390
|
+
if (Number.isNaN(pct2)) {
|
|
391
|
+
console.warn("Invalid snapPoint percentage string");
|
|
392
|
+
return 0;
|
|
393
|
+
}
|
|
394
|
+
const next = Math.round(screenSize - pct2 * screenSize);
|
|
395
|
+
return next;
|
|
396
|
+
}
|
|
397
|
+
console.warn("Invalid snapPoint unknown value");
|
|
398
|
+
return 0;
|
|
399
|
+
}
|
|
400
|
+
if (mode === "fit") {
|
|
401
|
+
if (point === 0)
|
|
402
|
+
return screenSize;
|
|
403
|
+
return screenSize - Math.min(screenSize, frameSize);
|
|
404
|
+
}
|
|
405
|
+
if (mode === "constant" && typeof point === "number") {
|
|
406
|
+
return screenSize - Math.min(screenSize, Math.max(0, point));
|
|
407
|
+
}
|
|
408
|
+
const pct = Math.min(100, Math.max(0, Number(point))) / 100;
|
|
409
|
+
if (Number.isNaN(pct)) {
|
|
410
|
+
console.warn("Invalid snapPoint percentage");
|
|
350
411
|
return 0;
|
|
351
412
|
}
|
|
352
|
-
|
|
353
|
-
const next = Math.round(screenSize - pct * screenSize);
|
|
354
|
-
return next;
|
|
413
|
+
return Math.round(screenSize - pct * screenSize);
|
|
355
414
|
}
|
|
356
415
|
export {
|
|
357
416
|
SheetImplementationCustom
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": "
|
|
5
|
-
"names": ["SheetImplementationCustom", "position", "at", "state"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["SheetImplementationCustom", "position", "at", "state", "pct"]
|
|
6
6
|
}
|
package/dist/esm/createSheet.js
CHANGED
|
@@ -8,7 +8,12 @@ import {
|
|
|
8
8
|
withStaticProperties
|
|
9
9
|
} from "@tamagui/core";
|
|
10
10
|
import { RemoveScroll } from "@tamagui/remove-scroll";
|
|
11
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
forwardRef,
|
|
13
|
+
memo,
|
|
14
|
+
useCallback,
|
|
15
|
+
useMemo
|
|
16
|
+
} from "react";
|
|
12
17
|
import { Platform } from "react-native";
|
|
13
18
|
import { SHEET_HANDLE_NAME, SHEET_NAME, SHEET_OVERLAY_NAME } from "./constants";
|
|
14
19
|
import { getNativeSheet } from "./nativeSheet";
|
|
@@ -84,13 +89,29 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
84
89
|
const { removeScrollEnabled, frameSize, contentRef } = context;
|
|
85
90
|
const composedContentRef = useComposedRefs(forwardedRef, contentRef);
|
|
86
91
|
const offscreenSize = useSheetOffscreenSize(context);
|
|
92
|
+
const handleLayoutChange = useCallback((e) => {
|
|
93
|
+
var _a;
|
|
94
|
+
const next = (_a = e.nativeEvent) == null ? void 0 : _a.layout.height;
|
|
95
|
+
if (!next)
|
|
96
|
+
return;
|
|
97
|
+
context.setFrameSize(next);
|
|
98
|
+
}, []);
|
|
87
99
|
const sheetContents = useMemo(() => {
|
|
88
100
|
return (
|
|
89
101
|
// @ts-ignore
|
|
90
|
-
/* @__PURE__ */ jsxs(
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
102
|
+
/* @__PURE__ */ jsxs(
|
|
103
|
+
Frame,
|
|
104
|
+
{
|
|
105
|
+
ref: composedContentRef,
|
|
106
|
+
height: context.hasFit ? void 0 : frameSize,
|
|
107
|
+
onLayout: context.hasFit ? handleLayoutChange : void 0,
|
|
108
|
+
...props,
|
|
109
|
+
children: [
|
|
110
|
+
children,
|
|
111
|
+
/* @__PURE__ */ jsx(Stack, { "data-sheet-offscreen-pad": true, height: offscreenSize, width: "100%" })
|
|
112
|
+
]
|
|
113
|
+
}
|
|
114
|
+
)
|
|
94
115
|
);
|
|
95
116
|
}, [props, frameSize, offscreenSize]);
|
|
96
117
|
return /* @__PURE__ */ jsxs(Fragment, { children: [
|