@tamagui/sheet 1.61.3 → 1.62.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/Sheet.js +16 -30
- package/dist/cjs/Sheet.js.map +1 -1
- package/dist/cjs/Sheet.native.js +119 -0
- package/dist/cjs/Sheet.native.js.map +6 -0
- package/dist/cjs/SheetContext.js +7 -13
- package/dist/cjs/SheetContext.js.map +1 -1
- package/dist/cjs/SheetContext.native.js +36 -0
- package/dist/cjs/SheetContext.native.js.map +6 -0
- package/dist/cjs/SheetController.js +7 -15
- package/dist/cjs/SheetController.js.map +1 -1
- package/dist/cjs/SheetController.native.js +42 -0
- package/dist/cjs/SheetController.native.js.map +6 -0
- package/dist/cjs/SheetImplementationCustom.js +99 -240
- package/dist/cjs/SheetImplementationCustom.js.map +2 -2
- package/dist/cjs/SheetImplementationCustom.native.js +281 -0
- package/dist/cjs/SheetImplementationCustom.native.js.map +6 -0
- package/dist/cjs/SheetScrollView.js +18 -44
- package/dist/cjs/SheetScrollView.js.map +1 -1
- package/dist/cjs/SheetScrollView.native.js +69 -0
- package/dist/cjs/SheetScrollView.native.js.map +6 -0
- package/dist/cjs/constants.js +7 -17
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/constants.native.js +36 -0
- package/dist/cjs/constants.native.js.map +6 -0
- package/dist/cjs/contexts.js +6 -11
- package/dist/cjs/contexts.js.map +1 -1
- package/dist/cjs/contexts.native.js +31 -0
- package/dist/cjs/contexts.native.js.map +6 -0
- package/dist/cjs/createSheet.js +42 -90
- package/dist/cjs/createSheet.js.map +2 -2
- package/dist/cjs/createSheet.native.js +146 -0
- package/dist/cjs/createSheet.native.js.map +6 -0
- package/dist/cjs/helpers.js +6 -13
- package/dist/cjs/helpers.js.map +1 -1
- package/dist/cjs/helpers.native.js +32 -0
- package/dist/cjs/helpers.native.js.map +6 -0
- package/dist/cjs/index.js +6 -11
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/index.native.js +36 -0
- package/dist/cjs/index.native.js.map +6 -0
- package/dist/cjs/nativeSheet.js +25 -42
- package/dist/cjs/nativeSheet.js.map +1 -1
- package/dist/cjs/nativeSheet.native.js +55 -0
- package/dist/cjs/nativeSheet.native.js.map +6 -0
- package/dist/cjs/types.js +3 -6
- package/dist/cjs/types.js.map +1 -1
- package/dist/cjs/types.native.js +15 -0
- package/dist/cjs/types.native.js.map +6 -0
- package/dist/cjs/useSheet.js +5 -9
- package/dist/cjs/useSheet.js.map +1 -1
- package/dist/cjs/useSheet.native.js +27 -0
- package/dist/cjs/useSheet.native.js.map +6 -0
- package/dist/cjs/useSheetController.js +8 -15
- package/dist/cjs/useSheetController.js.map +1 -1
- package/dist/cjs/useSheetController.native.js +39 -0
- package/dist/cjs/useSheetController.native.js.map +6 -0
- package/dist/cjs/useSheetOffscreenSize.js +13 -30
- package/dist/cjs/useSheetOffscreenSize.js.map +2 -2
- package/dist/cjs/useSheetOffscreenSize.native.js +48 -0
- package/dist/cjs/useSheetOffscreenSize.native.js.map +6 -0
- package/dist/cjs/useSheetOpenState.js +12 -21
- package/dist/cjs/useSheetOpenState.js.map +1 -1
- package/dist/cjs/useSheetOpenState.native.js +43 -0
- package/dist/cjs/useSheetOpenState.native.js.map +6 -0
- package/dist/cjs/useSheetProviderProps.js +44 -96
- package/dist/cjs/useSheetProviderProps.js.map +1 -1
- package/dist/cjs/useSheetProviderProps.native.js +116 -0
- package/dist/cjs/useSheetProviderProps.native.js.map +6 -0
- package/dist/esm/Sheet.js +9 -14
- package/dist/esm/Sheet.js.map +1 -1
- package/dist/esm/SheetContext.js +1 -2
- package/dist/esm/SheetContext.js.map +1 -1
- package/dist/esm/SheetController.js +2 -3
- package/dist/esm/SheetController.js.map +1 -1
- package/dist/esm/SheetImplementationCustom.js +95 -217
- package/dist/esm/SheetImplementationCustom.js.map +2 -2
- package/dist/esm/SheetScrollView.js +13 -31
- package/dist/esm/SheetScrollView.js.map +1 -1
- package/dist/esm/constants.js +2 -8
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/contexts.js +1 -2
- package/dist/esm/contexts.js.map +1 -1
- package/dist/esm/createSheet.js +38 -70
- package/dist/esm/createSheet.js.map +2 -2
- package/dist/esm/helpers.js +1 -4
- package/dist/esm/helpers.js.map +1 -1
- package/dist/esm/nativeSheet.js +20 -27
- package/dist/esm/nativeSheet.js.map +1 -1
- package/dist/esm/useSheetController.js +3 -6
- package/dist/esm/useSheetController.js.map +1 -1
- package/dist/esm/useSheetOffscreenSize.js +8 -21
- package/dist/esm/useSheetOffscreenSize.js.map +2 -2
- package/dist/esm/useSheetOpenState.js +6 -10
- package/dist/esm/useSheetOpenState.js.map +1 -1
- package/dist/esm/useSheetProviderProps.js +36 -79
- package/dist/esm/useSheetProviderProps.js.map +1 -1
- package/dist/jsx/Sheet.js +9 -14
- package/dist/jsx/Sheet.js.map +1 -1
- package/dist/jsx/Sheet.native.js +95 -0
- package/dist/jsx/Sheet.native.js.map +6 -0
- package/dist/jsx/SheetContext.js +1 -2
- package/dist/jsx/SheetContext.js.map +1 -1
- package/dist/jsx/SheetContext.native.js +13 -0
- package/dist/jsx/SheetContext.native.js.map +6 -0
- package/dist/jsx/SheetController.js +1 -2
- package/dist/jsx/SheetController.js.map +1 -1
- package/dist/jsx/SheetController.native.js +23 -0
- package/dist/jsx/SheetController.native.js.map +6 -0
- package/dist/jsx/SheetImplementationCustom.js +90 -210
- package/dist/jsx/SheetImplementationCustom.js.map +2 -2
- package/dist/jsx/SheetImplementationCustom.native.js +288 -0
- package/dist/jsx/SheetImplementationCustom.native.js.map +6 -0
- package/dist/jsx/SheetScrollView.js +12 -30
- package/dist/jsx/SheetScrollView.js.map +1 -1
- package/dist/jsx/SheetScrollView.native.js +47 -0
- package/dist/jsx/SheetScrollView.native.js.map +6 -0
- package/dist/jsx/constants.js +2 -8
- package/dist/jsx/constants.js.map +1 -1
- package/dist/jsx/constants.native.js +11 -0
- package/dist/jsx/constants.native.js.map +6 -0
- package/dist/jsx/contexts.js +1 -2
- package/dist/jsx/contexts.js.map +1 -1
- package/dist/jsx/contexts.native.js +9 -0
- package/dist/jsx/contexts.native.js.map +6 -0
- package/dist/jsx/createSheet.js +30 -61
- package/dist/jsx/createSheet.js.map +2 -2
- package/dist/jsx/createSheet.native.js +128 -0
- package/dist/jsx/createSheet.native.js.map +6 -0
- package/dist/jsx/helpers.js +1 -4
- package/dist/jsx/helpers.js.map +1 -1
- package/dist/jsx/helpers.native.js +11 -0
- package/dist/jsx/helpers.native.js.map +6 -0
- package/dist/jsx/index.native.js +10 -0
- package/dist/jsx/index.native.js.map +6 -0
- package/dist/jsx/nativeSheet.js +21 -27
- package/dist/jsx/nativeSheet.js.map +1 -1
- package/dist/jsx/nativeSheet.native.js +40 -0
- package/dist/jsx/nativeSheet.native.js.map +6 -0
- package/dist/jsx/types.native.js +1 -0
- package/dist/jsx/types.native.js.map +6 -0
- package/dist/jsx/useSheet.native.js +6 -0
- package/dist/jsx/useSheet.native.js.map +6 -0
- package/dist/jsx/useSheetController.js +2 -5
- package/dist/jsx/useSheetController.js.map +1 -1
- package/dist/jsx/useSheetController.native.js +17 -0
- package/dist/jsx/useSheetController.native.js.map +6 -0
- package/dist/jsx/useSheetOffscreenSize.js +8 -21
- package/dist/jsx/useSheetOffscreenSize.js.map +2 -2
- package/dist/jsx/useSheetOffscreenSize.native.js +27 -0
- package/dist/jsx/useSheetOffscreenSize.native.js.map +6 -0
- package/dist/jsx/useSheetOpenState.js +5 -8
- package/dist/jsx/useSheetOpenState.js.map +1 -1
- package/dist/jsx/useSheetOpenState.native.js +23 -0
- package/dist/jsx/useSheetOpenState.native.js.map +6 -0
- package/dist/jsx/useSheetProviderProps.js +36 -79
- package/dist/jsx/useSheetProviderProps.js.map +1 -1
- package/dist/jsx/useSheetProviderProps.native.js +90 -0
- package/dist/jsx/useSheetProviderProps.native.js.map +6 -0
- package/package.json +14 -14
- package/src/SheetImplementationCustom.tsx +21 -3
- package/src/createSheet.tsx +21 -3
- package/types/Sheet.d.ts +2 -0
- package/types/Sheet.d.ts.map +1 -1
- package/types/SheetImplementationCustom.d.ts.map +1 -1
- package/types/createSheet.d.ts +22 -0
- package/types/createSheet.d.ts.map +1 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { jsx, jsxs } from "react/jsx-runtime";
|
|
2
1
|
import { AdaptParentContext } from "@tamagui/adapt";
|
|
3
2
|
import { AnimatePresence } from "@tamagui/animate-presence";
|
|
4
3
|
import { useComposedRefs } from "@tamagui/compose-refs";
|
|
5
4
|
import {
|
|
6
5
|
Theme,
|
|
6
|
+
getConfig,
|
|
7
7
|
isTouchable,
|
|
8
8
|
isWeb,
|
|
9
9
|
themeable,
|
|
@@ -34,25 +34,21 @@ import { resisted } from "./helpers";
|
|
|
34
34
|
import { SheetProvider } from "./SheetContext";
|
|
35
35
|
import { useSheetOpenState } from "./useSheetOpenState";
|
|
36
36
|
import { useSheetProviderProps } from "./useSheetProviderProps";
|
|
37
|
+
import { jsx, jsxs } from "react/jsx-runtime";
|
|
37
38
|
let hiddenSize = 10000.1;
|
|
38
39
|
const SheetImplementationCustom = themeable(
|
|
39
|
-
forwardRef(function
|
|
40
|
-
const parentSheet = useContext(ParentSheetContext)
|
|
41
|
-
|
|
42
|
-
animationConfig,
|
|
43
|
-
modal =
|
|
40
|
+
forwardRef(function(props, forwardedRef) {
|
|
41
|
+
const parentSheet = useContext(ParentSheetContext), {
|
|
42
|
+
animation,
|
|
43
|
+
animationConfig: animationConfigProp,
|
|
44
|
+
modal = !1,
|
|
44
45
|
zIndex = parentSheet.zIndex + 1,
|
|
45
|
-
moveOnKeyboardChange =
|
|
46
|
-
unmountChildrenWhenHidden =
|
|
46
|
+
moveOnKeyboardChange = !1,
|
|
47
|
+
unmountChildrenWhenHidden = !1,
|
|
47
48
|
portalProps
|
|
48
|
-
} = props
|
|
49
|
-
const keyboardIsVisible = useKeyboardVisible();
|
|
50
|
-
const state = useSheetOpenState(props);
|
|
51
|
-
const [overlayComponent, setOverlayComponent] = useState(null);
|
|
52
|
-
const providerProps = useSheetProviderProps(props, state, {
|
|
49
|
+
} = props, keyboardIsVisible = useKeyboardVisible(), state = useSheetOpenState(props), [overlayComponent, setOverlayComponent] = useState(null), providerProps = useSheetProviderProps(props, state, {
|
|
53
50
|
onOverlayComponent: setOverlayComponent
|
|
54
|
-
})
|
|
55
|
-
const {
|
|
51
|
+
}), {
|
|
56
52
|
frameSize,
|
|
57
53
|
setFrameSize,
|
|
58
54
|
snapPoints,
|
|
@@ -64,183 +60,113 @@ const SheetImplementationCustom = themeable(
|
|
|
64
60
|
screenSize,
|
|
65
61
|
setMaxContentSize,
|
|
66
62
|
maxSnapPoint
|
|
67
|
-
} = providerProps
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
const onInnerSheet = useCallback((hasChild) => {
|
|
63
|
+
} = providerProps, { open, controller, isHidden } = state, sheetRef = useRef(null), ref = useComposedRefs(forwardedRef, sheetRef), animationConfig = (() => {
|
|
64
|
+
const [animationProp, animationPropConfig] = animation ? Array.isArray(animation) ? animation : [animation] : [];
|
|
65
|
+
return animationConfigProp ?? (animationProp ? {
|
|
66
|
+
...getConfig().animations.animations[animationProp],
|
|
67
|
+
...animationPropConfig
|
|
68
|
+
} : null);
|
|
69
|
+
})(), [isShowingInnerSheet, setIsShowingInnerSheet] = useState(!1), shouldHideParentSheet = !isWeb && modal && isShowingInnerSheet, parentSheetContext = useContext(SheetInsideSheetContext), onInnerSheet = useCallback((hasChild) => {
|
|
75
70
|
setIsShowingInnerSheet(hasChild);
|
|
76
|
-
}, [])
|
|
77
|
-
const positions = useMemo(
|
|
71
|
+
}, []), positions = useMemo(
|
|
78
72
|
() => snapPoints.map(
|
|
79
73
|
(point) => getYPositions(snapPointsMode, point, screenSize, frameSize)
|
|
80
74
|
),
|
|
81
75
|
[screenSize, frameSize, snapPoints, snapPointsMode]
|
|
82
|
-
);
|
|
83
|
-
const driver = useAnimationDriver();
|
|
84
|
-
const { useAnimatedNumber, useAnimatedNumberStyle, useAnimatedNumberReaction } = driver;
|
|
85
|
-
const AnimatedView = driver.View;
|
|
76
|
+
), driver = useAnimationDriver(), { useAnimatedNumber, useAnimatedNumberStyle, useAnimatedNumberReaction } = driver, AnimatedView = driver.View;
|
|
86
77
|
useIsomorphicLayoutEffect(() => {
|
|
87
|
-
if (
|
|
88
|
-
return
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
parentSheetContext(false);
|
|
92
|
-
};
|
|
78
|
+
if (parentSheetContext && open)
|
|
79
|
+
return parentSheetContext(!0), () => {
|
|
80
|
+
parentSheetContext(!1);
|
|
81
|
+
};
|
|
93
82
|
}, [parentSheetContext, open]);
|
|
94
83
|
const nextParentContext = useMemo(
|
|
95
84
|
() => ({
|
|
96
85
|
zIndex
|
|
97
86
|
}),
|
|
98
87
|
[zIndex]
|
|
99
|
-
);
|
|
100
|
-
const animatedNumber = useAnimatedNumber(hiddenSize);
|
|
101
|
-
const at = useRef(hiddenSize);
|
|
88
|
+
), animatedNumber = useAnimatedNumber(hiddenSize), at = useRef(hiddenSize);
|
|
102
89
|
useAnimatedNumberReaction(
|
|
103
90
|
{
|
|
104
91
|
value: animatedNumber,
|
|
105
92
|
hostRef: sheetRef
|
|
106
93
|
},
|
|
107
94
|
useCallback((value) => {
|
|
108
|
-
|
|
109
|
-
return;
|
|
110
|
-
at.current = value;
|
|
111
|
-
scrollBridge.paneY = value;
|
|
95
|
+
driver.isReactNative && (at.current = value, scrollBridge.paneY = value);
|
|
112
96
|
}, [])
|
|
113
97
|
);
|
|
114
98
|
function stopSpring() {
|
|
115
|
-
animatedNumber.stop();
|
|
116
|
-
if (scrollBridge.onFinishAnimate) {
|
|
117
|
-
scrollBridge.onFinishAnimate();
|
|
118
|
-
scrollBridge.onFinishAnimate = void 0;
|
|
119
|
-
}
|
|
99
|
+
animatedNumber.stop(), scrollBridge.onFinishAnimate && (scrollBridge.onFinishAnimate(), scrollBridge.onFinishAnimate = void 0);
|
|
120
100
|
}
|
|
121
|
-
const hasntMeasured = at.current === hiddenSize
|
|
122
|
-
const animateTo = useEvent((position2) => {
|
|
101
|
+
const hasntMeasured = at.current === hiddenSize, animateTo = useEvent((position2) => {
|
|
123
102
|
if (frameSize === 0)
|
|
124
103
|
return;
|
|
125
104
|
let toValue = isHidden || position2 === -1 ? screenSize : positions[position2];
|
|
126
|
-
if (at.current
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
});
|
|
135
|
-
if (isHidden) {
|
|
136
|
-
return;
|
|
105
|
+
if (at.current !== toValue) {
|
|
106
|
+
if (at.current = toValue, stopSpring(), hasntMeasured || isHidden) {
|
|
107
|
+
if (animatedNumber.setValue(screenSize, {
|
|
108
|
+
type: "timing",
|
|
109
|
+
duration: 0
|
|
110
|
+
}), isHidden)
|
|
111
|
+
return;
|
|
112
|
+
toValue = positions[position2], at.current = toValue;
|
|
137
113
|
}
|
|
138
|
-
toValue
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
animatedNumber.setValue(toValue, {
|
|
142
|
-
type: "spring",
|
|
143
|
-
...animationConfig
|
|
144
|
-
});
|
|
145
|
-
});
|
|
146
|
-
useIsomorphicLayoutEffect(() => {
|
|
147
|
-
if (screenSize && hasntMeasured) {
|
|
148
|
-
animatedNumber.setValue(screenSize, {
|
|
149
|
-
type: "timing",
|
|
150
|
-
duration: 0
|
|
114
|
+
animatedNumber.setValue(toValue, {
|
|
115
|
+
type: "spring",
|
|
116
|
+
...animationConfig
|
|
151
117
|
});
|
|
152
118
|
}
|
|
153
|
-
}
|
|
119
|
+
});
|
|
154
120
|
useIsomorphicLayoutEffect(() => {
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
121
|
+
screenSize && hasntMeasured && animatedNumber.setValue(screenSize, {
|
|
122
|
+
type: "timing",
|
|
123
|
+
duration: 0
|
|
124
|
+
});
|
|
125
|
+
}, [hasntMeasured, screenSize]), useIsomorphicLayoutEffect(() => {
|
|
126
|
+
!frameSize || !screenSize || isHidden || hasntMeasured && !open || animateTo(position);
|
|
159
127
|
}, [isHidden, frameSize, screenSize, open, position]);
|
|
160
|
-
const disableDrag = props.disableDrag ??
|
|
161
|
-
const themeName = useThemeName();
|
|
162
|
-
const panResponder = useMemo(
|
|
128
|
+
const disableDrag = props.disableDrag ?? controller?.disableDrag, themeName = useThemeName(), panResponder = useMemo(
|
|
163
129
|
() => {
|
|
164
|
-
if (disableDrag)
|
|
165
|
-
return;
|
|
166
|
-
if (!frameSize)
|
|
167
|
-
return;
|
|
168
|
-
if (isShowingInnerSheet)
|
|
130
|
+
if (disableDrag || !frameSize || isShowingInnerSheet)
|
|
169
131
|
return;
|
|
170
132
|
const minY = positions[0];
|
|
171
133
|
scrollBridge.paneMinY = minY;
|
|
172
134
|
let startY = at.current;
|
|
173
135
|
function makeUnselectable(val) {
|
|
174
|
-
|
|
175
|
-
return;
|
|
176
|
-
if (!val) {
|
|
177
|
-
SHEET_HIDDEN_STYLESHEET.innerText = "";
|
|
178
|
-
} else {
|
|
179
|
-
SHEET_HIDDEN_STYLESHEET.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }";
|
|
180
|
-
}
|
|
136
|
+
SHEET_HIDDEN_STYLESHEET && (val ? SHEET_HIDDEN_STYLESHEET.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : SHEET_HIDDEN_STYLESHEET.innerText = "");
|
|
181
137
|
}
|
|
182
138
|
const release = ({ vy, dragAt }) => {
|
|
183
|
-
isExternalDrag =
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
const at2 = dragAt + startY;
|
|
187
|
-
const end = at2 + frameSize * vy * 0.2;
|
|
188
|
-
let closestPoint = 0;
|
|
189
|
-
let dist = Infinity;
|
|
139
|
+
isExternalDrag = !1, previouslyScrolling = !1, makeUnselectable(!1);
|
|
140
|
+
const end = dragAt + startY + frameSize * vy * 0.2;
|
|
141
|
+
let closestPoint = 0, dist = 1 / 0;
|
|
190
142
|
for (let i = 0; i < positions.length; i++) {
|
|
191
|
-
const position2 = positions[i];
|
|
192
|
-
|
|
193
|
-
if (curDist < dist) {
|
|
194
|
-
dist = curDist;
|
|
195
|
-
closestPoint = i;
|
|
196
|
-
}
|
|
143
|
+
const position2 = positions[i], curDist = end > position2 ? end - position2 : position2 - end;
|
|
144
|
+
curDist < dist && (dist = curDist, closestPoint = i);
|
|
197
145
|
}
|
|
198
|
-
setPosition(closestPoint);
|
|
199
|
-
|
|
200
|
-
};
|
|
201
|
-
const finish = (_e, state2) => {
|
|
146
|
+
setPosition(closestPoint), animateTo(closestPoint);
|
|
147
|
+
}, finish = (_e, state2) => {
|
|
202
148
|
release({
|
|
203
149
|
vy: state2.vy,
|
|
204
150
|
dragAt: state2.dy
|
|
205
151
|
});
|
|
206
152
|
};
|
|
207
|
-
let previouslyScrolling =
|
|
153
|
+
let previouslyScrolling = !1;
|
|
208
154
|
const onMoveShouldSet = (_e, { dy }) => {
|
|
209
|
-
const isScrolled = scrollBridge.y !== 0;
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
previouslyScrolling = true;
|
|
214
|
-
return false;
|
|
215
|
-
}
|
|
216
|
-
if (isNearTop) {
|
|
217
|
-
if (!isScrolled && isDraggingUp) {
|
|
218
|
-
return false;
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
return Math.abs(dy) > 5;
|
|
222
|
-
};
|
|
223
|
-
const grant = () => {
|
|
224
|
-
makeUnselectable(true);
|
|
225
|
-
stopSpring();
|
|
226
|
-
startY = at.current;
|
|
155
|
+
const isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
|
|
156
|
+
return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && !isScrolled && isDraggingUp ? !1 : Math.abs(dy) > 5;
|
|
157
|
+
}, grant = () => {
|
|
158
|
+
makeUnselectable(!0), stopSpring(), startY = at.current;
|
|
227
159
|
};
|
|
228
|
-
let isExternalDrag =
|
|
229
|
-
scrollBridge.drag = (dy) => {
|
|
230
|
-
|
|
231
|
-
isExternalDrag = true;
|
|
232
|
-
grant();
|
|
233
|
-
}
|
|
160
|
+
let isExternalDrag = !1;
|
|
161
|
+
return scrollBridge.drag = (dy) => {
|
|
162
|
+
isExternalDrag || (isExternalDrag = !0, grant());
|
|
234
163
|
const to = dy + startY;
|
|
235
164
|
animatedNumber.setValue(resisted(to, minY), { type: "direct" });
|
|
236
|
-
}
|
|
237
|
-
scrollBridge.release = release;
|
|
238
|
-
return PanResponder.create({
|
|
165
|
+
}, scrollBridge.release = release, PanResponder.create({
|
|
239
166
|
onMoveShouldSetPanResponder: onMoveShouldSet,
|
|
240
167
|
onPanResponderGrant: grant,
|
|
241
168
|
onPanResponderMove: (_e, { dy }) => {
|
|
242
|
-
const toFull = dy + startY;
|
|
243
|
-
const to = resisted(toFull, minY);
|
|
169
|
+
const toFull = dy + startY, to = resisted(toFull, minY);
|
|
244
170
|
animatedNumber.setValue(to, { type: "direct" });
|
|
245
171
|
},
|
|
246
172
|
onPanResponderEnd: finish,
|
|
@@ -250,68 +176,43 @@ const SheetImplementationCustom = themeable(
|
|
|
250
176
|
},
|
|
251
177
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
252
178
|
[disableDrag, isShowingInnerSheet, animateTo, frameSize, positions, setPosition]
|
|
253
|
-
)
|
|
254
|
-
const handleAnimationViewLayout = useCallback(
|
|
179
|
+
), handleAnimationViewLayout = useCallback(
|
|
255
180
|
(e) => {
|
|
256
181
|
const next = (() => {
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
if (isWeb && isTouchable && !open) {
|
|
260
|
-
_ += 100;
|
|
261
|
-
}
|
|
262
|
-
return _;
|
|
182
|
+
let _ = e.nativeEvent?.layout.height;
|
|
183
|
+
return isWeb && isTouchable && !open && (_ += 100), _;
|
|
263
184
|
})();
|
|
264
|
-
|
|
265
|
-
return;
|
|
266
|
-
setFrameSize(next);
|
|
185
|
+
next && setFrameSize(next);
|
|
267
186
|
},
|
|
268
187
|
[keyboardIsVisible]
|
|
269
|
-
)
|
|
270
|
-
const handleMaxContentViewLayout = useCallback(
|
|
188
|
+
), handleMaxContentViewLayout = useCallback(
|
|
271
189
|
(e) => {
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
if (!next)
|
|
275
|
-
return;
|
|
276
|
-
setMaxContentSize(next);
|
|
190
|
+
const next = e.nativeEvent?.layout.height;
|
|
191
|
+
next && setMaxContentSize(next);
|
|
277
192
|
},
|
|
278
193
|
[keyboardIsVisible]
|
|
279
|
-
)
|
|
280
|
-
const animatedStyle = useAnimatedNumberStyle(animatedNumber, (val) => {
|
|
194
|
+
), animatedStyle = useAnimatedNumberStyle(animatedNumber, (val) => {
|
|
281
195
|
"worklet";
|
|
282
|
-
const translateY = frameSize === 0 ? hiddenSize : val;
|
|
283
196
|
return {
|
|
284
|
-
transform: [{ translateY }]
|
|
197
|
+
transform: [{ translateY: frameSize === 0 ? hiddenSize : val }]
|
|
285
198
|
};
|
|
286
|
-
});
|
|
287
|
-
const sizeBeforeKeyboard = useRef(null);
|
|
199
|
+
}), sizeBeforeKeyboard = useRef(null);
|
|
288
200
|
useEffect(() => {
|
|
289
201
|
if (isWeb || !moveOnKeyboardChange)
|
|
290
202
|
return;
|
|
291
203
|
const keyboardDidShowListener = Keyboard.addListener("keyboardDidShow", (e) => {
|
|
292
|
-
|
|
293
|
-
return;
|
|
294
|
-
sizeBeforeKeyboard.current = animatedNumber.getValue();
|
|
295
|
-
animatedNumber.setValue(
|
|
204
|
+
sizeBeforeKeyboard.current === null && (sizeBeforeKeyboard.current = animatedNumber.getValue(), animatedNumber.setValue(
|
|
296
205
|
Math.max(animatedNumber.getValue() - e.endCoordinates.height, 0)
|
|
297
|
-
);
|
|
298
|
-
})
|
|
299
|
-
|
|
300
|
-
if (sizeBeforeKeyboard.current === null)
|
|
301
|
-
return;
|
|
302
|
-
animatedNumber.setValue(sizeBeforeKeyboard.current);
|
|
303
|
-
sizeBeforeKeyboard.current = null;
|
|
206
|
+
));
|
|
207
|
+
}), keyboardDidHideListener = Keyboard.addListener("keyboardDidHide", () => {
|
|
208
|
+
sizeBeforeKeyboard.current !== null && (animatedNumber.setValue(sizeBeforeKeyboard.current), sizeBeforeKeyboard.current = null);
|
|
304
209
|
});
|
|
305
210
|
return () => {
|
|
306
|
-
keyboardDidHideListener.remove();
|
|
307
|
-
keyboardDidShowListener.remove();
|
|
211
|
+
keyboardDidHideListener.remove(), keyboardDidShowListener.remove();
|
|
308
212
|
};
|
|
309
213
|
}, [moveOnKeyboardChange]);
|
|
310
214
|
const [opacity, setOpacity] = useState(open ? 1 : 0);
|
|
311
|
-
|
|
312
|
-
setOpacity(1);
|
|
313
|
-
}
|
|
314
|
-
useEffect(() => {
|
|
215
|
+
open && opacity === 0 && setOpacity(1), useEffect(() => {
|
|
315
216
|
if (!open) {
|
|
316
217
|
const tm = setTimeout(() => {
|
|
317
218
|
setOpacity(0);
|
|
@@ -321,8 +222,7 @@ const SheetImplementationCustom = themeable(
|
|
|
321
222
|
};
|
|
322
223
|
}
|
|
323
224
|
}, [open]);
|
|
324
|
-
const forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}%` : maxSnapPoint
|
|
325
|
-
const contents = /* @__PURE__ */ jsx(ParentSheetContext.Provider, { value: nextParentContext, children: /* @__PURE__ */ jsxs(SheetProvider, { ...providerProps, children: [
|
|
225
|
+
const forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}%` : maxSnapPoint, contents = /* @__PURE__ */ jsx(ParentSheetContext.Provider, { value: nextParentContext, children: /* @__PURE__ */ jsxs(SheetProvider, { ...providerProps, children: [
|
|
326
226
|
/* @__PURE__ */ jsx(AnimatePresence, { enterExitVariant: "open", children: shouldHideParentSheet || !open ? null : overlayComponent }),
|
|
327
227
|
snapPointsMode !== "percent" && /* @__PURE__ */ jsx(
|
|
328
228
|
View,
|
|
@@ -344,10 +244,9 @@ const SheetImplementationCustom = themeable(
|
|
|
344
244
|
AnimatedView,
|
|
345
245
|
{
|
|
346
246
|
ref,
|
|
347
|
-
...panResponder
|
|
247
|
+
...panResponder?.panHandlers,
|
|
348
248
|
onLayout: handleAnimationViewLayout,
|
|
349
249
|
pointerEvents: open && !shouldHideParentSheet ? "auto" : "none",
|
|
350
|
-
animation: props.animation,
|
|
351
250
|
style: [
|
|
352
251
|
{
|
|
353
252
|
position: "absolute",
|
|
@@ -362,15 +261,10 @@ const SheetImplementationCustom = themeable(
|
|
|
362
261
|
children: props.children
|
|
363
262
|
}
|
|
364
263
|
)
|
|
365
|
-
] }) });
|
|
366
|
-
const adaptContext = useContext(AdaptParentContext);
|
|
367
|
-
const shouldMountChildren = Boolean(opacity || !unmountChildrenWhenHidden);
|
|
264
|
+
] }) }), adaptContext = useContext(AdaptParentContext), shouldMountChildren = !!(opacity || !unmountChildrenWhenHidden);
|
|
368
265
|
if (modal) {
|
|
369
|
-
const modalContents = /* @__PURE__ */ jsx(Portal, { zIndex, ...portalProps, children: shouldMountChildren && /* @__PURE__ */ jsx(Theme, { forceClassName:
|
|
370
|
-
|
|
371
|
-
return modalContents;
|
|
372
|
-
}
|
|
373
|
-
return /* @__PURE__ */ jsx(SheetInsideSheetContext.Provider, { value: onInnerSheet, children: modalContents });
|
|
266
|
+
const modalContents = /* @__PURE__ */ jsx(Portal, { zIndex, ...portalProps, children: shouldMountChildren && /* @__PURE__ */ jsx(Theme, { forceClassName: !0, name: themeName, children: /* @__PURE__ */ jsx(AdaptParentContext.Provider, { value: adaptContext, children: contents }) }) });
|
|
267
|
+
return isWeb ? modalContents : /* @__PURE__ */ jsx(SheetInsideSheetContext.Provider, { value: onInnerSheet, children: modalContents });
|
|
374
268
|
}
|
|
375
269
|
return contents;
|
|
376
270
|
})
|
|
@@ -379,38 +273,22 @@ function getYPositions(mode, point, screenSize, frameSize) {
|
|
|
379
273
|
if (!screenSize || !frameSize)
|
|
380
274
|
return 0;
|
|
381
275
|
if (mode === "mixed") {
|
|
382
|
-
if (typeof point
|
|
276
|
+
if (typeof point == "number")
|
|
383
277
|
return screenSize - Math.min(screenSize, Math.max(0, point));
|
|
384
|
-
|
|
385
|
-
if (point === "fit") {
|
|
278
|
+
if (point === "fit")
|
|
386
279
|
return screenSize - frameSize;
|
|
387
|
-
}
|
|
388
280
|
if (point.endsWith("%")) {
|
|
389
281
|
const pct2 = Math.min(100, Math.max(0, Number(point.slice(0, -1)))) / 100;
|
|
390
|
-
|
|
391
|
-
console.warn("Invalid snapPoint percentage string");
|
|
392
|
-
return 0;
|
|
393
|
-
}
|
|
394
|
-
const next = Math.round(screenSize - pct2 * screenSize);
|
|
395
|
-
return next;
|
|
282
|
+
return Number.isNaN(pct2) ? (console.warn("Invalid snapPoint percentage string"), 0) : Math.round(screenSize - pct2 * screenSize);
|
|
396
283
|
}
|
|
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);
|
|
284
|
+
return console.warn("Invalid snapPoint unknown value"), 0;
|
|
404
285
|
}
|
|
405
|
-
if (mode === "
|
|
286
|
+
if (mode === "fit")
|
|
287
|
+
return point === 0 ? screenSize : screenSize - Math.min(screenSize, frameSize);
|
|
288
|
+
if (mode === "constant" && typeof point == "number")
|
|
406
289
|
return screenSize - Math.min(screenSize, Math.max(0, point));
|
|
407
|
-
}
|
|
408
290
|
const pct = Math.min(100, Math.max(0, Number(point))) / 100;
|
|
409
|
-
|
|
410
|
-
console.warn("Invalid snapPoint percentage");
|
|
411
|
-
return 0;
|
|
412
|
-
}
|
|
413
|
-
return Math.round(screenSize - pct * screenSize);
|
|
291
|
+
return Number.isNaN(pct) ? (console.warn("Invalid snapPoint percentage"), 0) : Math.round(screenSize - pct * screenSize);
|
|
414
292
|
}
|
|
415
293
|
export {
|
|
416
294
|
SheetImplementationCustom
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": "
|
|
5
|
-
"names": ["
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["position", "state", "pct"]
|
|
6
6
|
}
|
|
@@ -1,38 +1,27 @@
|
|
|
1
|
-
import { jsx } from "react/jsx-runtime";
|
|
2
1
|
import { composeRefs } from "@tamagui/core";
|
|
3
2
|
import { ScrollView } from "@tamagui/scroll-view";
|
|
4
3
|
import { forwardRef, useMemo, useRef } from "react";
|
|
5
4
|
import { useSheetContext } from "./SheetContext";
|
|
6
|
-
|
|
7
|
-
const SheetScrollView = forwardRef(
|
|
5
|
+
import { jsx } from "react/jsx-runtime";
|
|
6
|
+
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
8
7
|
({ __scopeSheet, children, ...props }, ref) => {
|
|
9
|
-
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet)
|
|
10
|
-
const { scrollBridge } = context;
|
|
11
|
-
const scrollRef = useRef(null);
|
|
12
|
-
const state = useRef({
|
|
8
|
+
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = useRef(null), state = useRef({
|
|
13
9
|
lastPageY: 0,
|
|
14
10
|
dragAt: 0,
|
|
15
11
|
dys: [],
|
|
16
12
|
// store a few recent dys to get velocity on release
|
|
17
|
-
isScrolling:
|
|
18
|
-
isDragging:
|
|
19
|
-
})
|
|
20
|
-
|
|
21
|
-
if (!state.current.isDragging) {
|
|
13
|
+
isScrolling: !1,
|
|
14
|
+
isDragging: !1
|
|
15
|
+
}), release = () => {
|
|
16
|
+
if (!state.current.isDragging)
|
|
22
17
|
return;
|
|
23
|
-
|
|
24
|
-
state.current.isDragging = false;
|
|
25
|
-
scrollBridge.scrollStartY = -1;
|
|
26
|
-
state.current.isScrolling = false;
|
|
18
|
+
state.current.isDragging = !1, scrollBridge.scrollStartY = -1, state.current.isScrolling = !1;
|
|
27
19
|
let vy = 0;
|
|
28
20
|
if (state.current.dys.length) {
|
|
29
21
|
const recentDys = state.current.dys.slice(-10);
|
|
30
|
-
|
|
31
|
-
const avgDy = dist / recentDys.length;
|
|
32
|
-
vy = avgDy * 0.04;
|
|
22
|
+
vy = (recentDys.length ? recentDys.reduce((a, b) => a + b, 0) : 0) / recentDys.length * 0.04;
|
|
33
23
|
}
|
|
34
|
-
state.current.dys = []
|
|
35
|
-
scrollBridge.release({
|
|
24
|
+
state.current.dys = [], scrollBridge.release({
|
|
36
25
|
dragAt: state.current.dragAt,
|
|
37
26
|
vy
|
|
38
27
|
});
|
|
@@ -45,17 +34,10 @@ const SheetScrollView = forwardRef(
|
|
|
45
34
|
scrollEventThrottle: 8,
|
|
46
35
|
onScroll: (e) => {
|
|
47
36
|
const { y } = e.nativeEvent.contentOffset;
|
|
48
|
-
scrollBridge.y = y;
|
|
49
|
-
if (y > 0) {
|
|
50
|
-
scrollBridge.scrollStartY = -1;
|
|
51
|
-
}
|
|
52
|
-
},
|
|
53
|
-
onStartShouldSetResponder: () => {
|
|
54
|
-
scrollBridge.scrollStartY = -1;
|
|
55
|
-
state.current.isDragging = true;
|
|
56
|
-
return true;
|
|
37
|
+
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1);
|
|
57
38
|
},
|
|
58
|
-
|
|
39
|
+
onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0),
|
|
40
|
+
onMoveShouldSetResponder: () => !1,
|
|
59
41
|
onResponderRelease: release,
|
|
60
42
|
className: "_ovs-contain",
|
|
61
43
|
...props,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AA6D1B;AApDN,MAAM,yBAAyB,mBAElB,kBAAkB;AAAA,EAC7B,CAAC,EAAE,cAAc,UAAU,GAAG,MAAM,GAAsC,QAAQ;AAChF,UAAM,UAAU,gBAAgB,wBAAwB,YAAY,GAC9D,EAAE,aAAa,IAAI,SAEnB,YAAY,OAA4B,IAAI,GAc5C,QAAQ,OAAO;AAAA,MACnB,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,KAAK,YAAY,WAAkB,GAAG;AAAA,QACtC,MAAM;AAAA,QACN,qBAAqB;AAAA,QAErB,UAAU,CAAC,MAAM;AACf,gBAAM,EAAE,EAAE,IAAI,EAAE,YAAY;AAC5B,uBAAa,IAAI,GACb,IAAI,MACN,aAAa,eAAe;AAAA,QAEhC;AAAA,QACA,2BAA2B,OACzB,aAAa,eAAe,IAC5B,MAAM,QAAQ,aAAa,IACpB;AAAA,QAGT,0BAA0B,MAAM;AAAA,QAmChC,oBAAoB;AAAA,QACpB,WAAU;AAAA,QACT,GAAG;AAAA,QAEH,kBAAQ,MAAM,UAAU,CAAC,QAAQ,CAAC;AAAA;AAAA,IACrC;AAAA,EAEJ;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/constants.js
CHANGED
|
@@ -1,12 +1,6 @@
|
|
|
1
1
|
import { isClient } from "@tamagui/core";
|
|
2
|
-
const constants = {};
|
|
3
|
-
|
|
4
|
-
const SHEET_HANDLE_NAME = "SheetHandle";
|
|
5
|
-
const SHEET_OVERLAY_NAME = "SheetOverlay";
|
|
6
|
-
const SHEET_HIDDEN_STYLESHEET = isClient ? document.createElement("style") : null;
|
|
7
|
-
if (SHEET_HIDDEN_STYLESHEET) {
|
|
8
|
-
document.head.appendChild(SHEET_HIDDEN_STYLESHEET);
|
|
9
|
-
}
|
|
2
|
+
const constants = {}, SHEET_NAME = "Sheet", SHEET_HANDLE_NAME = "SheetHandle", SHEET_OVERLAY_NAME = "SheetOverlay", SHEET_HIDDEN_STYLESHEET = isClient ? document.createElement("style") : null;
|
|
3
|
+
SHEET_HIDDEN_STYLESHEET && document.head.appendChild(SHEET_HIDDEN_STYLESHEET);
|
|
10
4
|
export {
|
|
11
5
|
SHEET_HANDLE_NAME,
|
|
12
6
|
SHEET_HIDDEN_STYLESHEET,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/constants.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,gBAAgB;AAElB,MAAM,YAAY,CAAC
|
|
4
|
+
"mappings": "AAAA,SAAS,gBAAgB;AAElB,MAAM,YAAY,CAAC,GAEb,aAAa,SACb,oBAAoB,eACpB,qBAAqB,gBAErB,0BAA0B,WAAW,SAAS,cAAc,OAAO,IAAI;AAChF,2BACF,SAAS,KAAK,YAAY,uBAAuB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/contexts.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { createContext } from "react";
|
|
2
2
|
const ParentSheetContext = createContext({
|
|
3
3
|
zIndex: 1e5
|
|
4
|
-
});
|
|
5
|
-
const SheetInsideSheetContext = createContext(null);
|
|
4
|
+
}), SheetInsideSheetContext = createContext(null);
|
|
6
5
|
export {
|
|
7
6
|
ParentSheetContext,
|
|
8
7
|
SheetInsideSheetContext
|
package/dist/esm/contexts.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/contexts.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,qBAAqB;AAEvB,MAAM,qBAAqB,cAAc;AAAA,EAC9C,QAAQ;AACV,CAAC
|
|
4
|
+
"mappings": "AAAA,SAAS,qBAAqB;AAEvB,MAAM,qBAAqB,cAAc;AAAA,EAC9C,QAAQ;AACV,CAAC,GAEY,0BAA0B,cAErC,IAAI;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|