@tamagui/sheet 1.130.4 → 1.130.6
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.cjs +4 -4
- package/dist/cjs/SheetContext.cjs +1 -1
- package/dist/cjs/SheetController.cjs +1 -1
- package/dist/cjs/SheetImplementationCustom.cjs +5 -5
- package/dist/cjs/SheetScrollView.cjs +4 -3
- package/dist/cjs/SheetScrollView.js +4 -2
- package/dist/cjs/SheetScrollView.js.map +1 -1
- package/dist/cjs/SheetScrollView.native.js +26 -21
- package/dist/cjs/SheetScrollView.native.js.map +1 -1
- package/dist/cjs/createSheet.cjs +7 -7
- package/dist/cjs/index.cjs +11 -11
- package/dist/cjs/nativeSheet.cjs +3 -3
- package/dist/cjs/useSheet.cjs +1 -1
- package/dist/cjs/useSheetOpenState.cjs +1 -1
- package/dist/esm/SheetScrollView.js +4 -2
- package/dist/esm/SheetScrollView.js.map +1 -1
- package/dist/esm/SheetScrollView.mjs +3 -2
- package/dist/esm/SheetScrollView.mjs.map +1 -1
- package/dist/esm/SheetScrollView.native.js +19 -16
- package/dist/esm/SheetScrollView.native.js.map +1 -1
- package/dist/jsx/SheetScrollView.js +4 -2
- package/dist/jsx/SheetScrollView.js.map +1 -1
- package/dist/jsx/SheetScrollView.mjs +3 -2
- package/dist/jsx/SheetScrollView.mjs.map +1 -1
- package/dist/jsx/SheetScrollView.native.js +26 -21
- package/dist/jsx/SheetScrollView.native.js.map +1 -1
- package/package.json +23 -21
- package/src/SheetScrollView.tsx +6 -2
- package/types/SheetScrollView.d.ts.map +1 -1
package/dist/cjs/Sheet.cjs
CHANGED
|
@@ -32,10 +32,10 @@ __export(Sheet_exports, {
|
|
|
32
32
|
module.exports = __toCommonJS(Sheet_exports);
|
|
33
33
|
var import_core = require("@tamagui/core"),
|
|
34
34
|
import_stacks = require("@tamagui/stacks"),
|
|
35
|
-
import_constants = require("./constants
|
|
36
|
-
import_createSheet = require("./createSheet
|
|
37
|
-
import_SheetContext = require("./SheetContext
|
|
38
|
-
__reExport(Sheet_exports, require("./types
|
|
35
|
+
import_constants = require("./constants"),
|
|
36
|
+
import_createSheet = require("./createSheet"),
|
|
37
|
+
import_SheetContext = require("./SheetContext");
|
|
38
|
+
__reExport(Sheet_exports, require("./types"), module.exports);
|
|
39
39
|
const Handle = (0, import_core.styled)(import_stacks.XStack, {
|
|
40
40
|
name: import_constants.SHEET_HANDLE_NAME,
|
|
41
41
|
variants: {
|
|
@@ -27,6 +27,6 @@ __export(SheetContext_exports, {
|
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(SheetContext_exports);
|
|
29
29
|
var import_create_context = require("@tamagui/create-context"),
|
|
30
|
-
import_constants = require("./constants
|
|
30
|
+
import_constants = require("./constants");
|
|
31
31
|
const [createSheetContext, createSheetScope] = (0, import_create_context.createContextScope)(import_constants.SHEET_NAME),
|
|
32
32
|
[SheetProvider, useSheetContext] = createSheetContext(import_constants.SHEET_NAME, {});
|
|
@@ -36,7 +36,7 @@ __export(SheetController_exports, {
|
|
|
36
36
|
module.exports = __toCommonJS(SheetController_exports);
|
|
37
37
|
var import_react = __toESM(require("react")),
|
|
38
38
|
import_core = require("@tamagui/core"),
|
|
39
|
-
import_useSheetController = require("./useSheetController
|
|
39
|
+
import_useSheetController = require("./useSheetController"),
|
|
40
40
|
import_jsx_runtime = require("react/jsx-runtime");
|
|
41
41
|
const SheetController = ({
|
|
42
42
|
children,
|
|
@@ -42,11 +42,11 @@ var import_adapt = require("@tamagui/adapt"),
|
|
|
42
42
|
import_portal = require("@tamagui/portal"),
|
|
43
43
|
import_react = __toESM(require("react")),
|
|
44
44
|
import_react_native = require("react-native-web"),
|
|
45
|
-
import_contexts = require("./contexts
|
|
46
|
-
import_helpers = require("./helpers
|
|
47
|
-
import_SheetContext = require("./SheetContext
|
|
48
|
-
import_useSheetOpenState = require("./useSheetOpenState
|
|
49
|
-
import_useSheetProviderProps = require("./useSheetProviderProps
|
|
45
|
+
import_contexts = require("./contexts"),
|
|
46
|
+
import_helpers = require("./helpers"),
|
|
47
|
+
import_SheetContext = require("./SheetContext"),
|
|
48
|
+
import_useSheetOpenState = require("./useSheetOpenState"),
|
|
49
|
+
import_useSheetProviderProps = require("./useSheetProviderProps"),
|
|
50
50
|
import_jsx_runtime = require("react/jsx-runtime");
|
|
51
51
|
const hiddenSize = 10000.1;
|
|
52
52
|
let sheetHiddenStyleSheet = null;
|
|
@@ -39,7 +39,7 @@ var import_compose_refs = require("@tamagui/compose-refs"),
|
|
|
39
39
|
import_scroll_view = require("@tamagui/scroll-view"),
|
|
40
40
|
import_use_controllable_state = require("@tamagui/use-controllable-state"),
|
|
41
41
|
import_react = __toESM(require("react")),
|
|
42
|
-
import_SheetContext = require("./SheetContext
|
|
42
|
+
import_SheetContext = require("./SheetContext"),
|
|
43
43
|
import_jsx_runtime = require("react/jsx-runtime");
|
|
44
44
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
|
|
45
45
|
SheetScrollView = import_react.default.forwardRef(({
|
|
@@ -92,7 +92,8 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
|
|
|
92
92
|
(0, import_react.useEffect)(() => {
|
|
93
93
|
if (!import_core.isClient || !scrollRef.current) return;
|
|
94
94
|
const controller = new AbortController(),
|
|
95
|
-
node = scrollRef.current
|
|
95
|
+
node = scrollRef.current?.getScrollableNode();
|
|
96
|
+
if (!node) return;
|
|
96
97
|
node.addEventListener("touchmove", e => {
|
|
97
98
|
scrollBridge.isParentDragging && node.scrollTo({
|
|
98
99
|
top: scrollBridge.y,
|
|
@@ -106,7 +107,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
|
|
|
106
107
|
return () => {
|
|
107
108
|
disposeBridgeListen(), controller.abort();
|
|
108
109
|
};
|
|
109
|
-
}, []);
|
|
110
|
+
}, [scrollRef]);
|
|
110
111
|
const [hasScrollableContent, setHasScrollableContent] = (0, import_react.useState)(!0),
|
|
111
112
|
parentHeight = (0, import_react.useRef)(0),
|
|
112
113
|
contentHeight = (0, import_react.useRef)(0),
|
|
@@ -68,7 +68,9 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = import_react
|
|
|
68
68
|
}, scrollable = scrollEnabled;
|
|
69
69
|
(0, import_react.useEffect)(() => {
|
|
70
70
|
if (!import_core.isClient || !scrollRef.current) return;
|
|
71
|
-
const controller = new AbortController(), node = scrollRef.current
|
|
71
|
+
const controller = new AbortController(), node = scrollRef.current?.getScrollableNode();
|
|
72
|
+
if (!node)
|
|
73
|
+
return;
|
|
72
74
|
node.addEventListener(
|
|
73
75
|
"touchmove",
|
|
74
76
|
(e) => {
|
|
@@ -87,7 +89,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = import_react
|
|
|
87
89
|
return () => {
|
|
88
90
|
disposeBridgeListen(), controller.abort();
|
|
89
91
|
};
|
|
90
|
-
}, []);
|
|
92
|
+
}, [scrollRef]);
|
|
91
93
|
const [hasScrollableContent, setHasScrollableContent] = (0, import_react.useState)(!0), parentHeight = (0, import_react.useRef)(0), contentHeight = (0, import_react.useRef)(0), setIsScrollable = () => {
|
|
92
94
|
parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
|
|
93
95
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAA4B,kCAC5B,cAAmD,0BAEnD,qBAA2B,iCAC3B,gCAAqC,4CACrC,eAAmD,2BAEnD,sBAAgC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["React"]
|
|
6
6
|
}
|
|
@@ -68,29 +68,34 @@ var import_jsx_runtime = require("react/jsx-runtime"), import_compose_refs = req
|
|
|
68
68
|
}
|
|
69
69
|
}, scrollable = scrollEnabled;
|
|
70
70
|
(0, import_react.useEffect)(function() {
|
|
71
|
+
var _scrollRef_current;
|
|
71
72
|
if (import_core.isClient && scrollRef.current) {
|
|
72
|
-
var controller = new AbortController(), node = scrollRef.current.getScrollableNode();
|
|
73
|
-
node
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
73
|
+
var controller = new AbortController(), node = (_scrollRef_current = scrollRef.current) === null || _scrollRef_current === void 0 ? void 0 : _scrollRef_current.getScrollableNode();
|
|
74
|
+
if (node) {
|
|
75
|
+
node.addEventListener(
|
|
76
|
+
"touchmove",
|
|
77
|
+
function(e) {
|
|
78
|
+
scrollBridge.isParentDragging && node.scrollTo({
|
|
79
|
+
top: scrollBridge.y,
|
|
80
|
+
behavior: "instant"
|
|
81
|
+
});
|
|
82
|
+
},
|
|
83
|
+
// can't preventdefault its not cancellable
|
|
84
|
+
{
|
|
85
|
+
signal: controller.signal,
|
|
86
|
+
passive: !1
|
|
87
|
+
}
|
|
88
|
+
);
|
|
89
|
+
var disposeBridgeListen = scrollBridge.onParentDragging(function(val) {
|
|
90
|
+
});
|
|
91
|
+
return function() {
|
|
92
|
+
disposeBridgeListen(), controller.abort();
|
|
93
|
+
};
|
|
94
|
+
}
|
|
92
95
|
}
|
|
93
|
-
}, [
|
|
96
|
+
}, [
|
|
97
|
+
scrollRef
|
|
98
|
+
]);
|
|
94
99
|
var [hasScrollableContent, setHasScrollableContent] = (0, import_react.useState)(!0), parentHeight = (0, import_react.useRef)(0), contentHeight = (0, import_react.useRef)(0), setIsScrollable = function() {
|
|
95
100
|
parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
|
|
96
101
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAA,sBAA4B,kCAC5B,cAAmD,0BAEnD,qBAA2B,iCAC3B,gCAAqC,4CACrC,eAAmD,2BAEnD,sBAAgC,2BAS1BA,yBAAyB,mBAElBC,kBAAkBC,6BAAAA,QAAMC;;;EAMnC,SAAA,OAQEC,KAAAA;QAPA,EACEC,cACAC,UACAC,UACAC,eAAeC,mBACf,GAAGC,MAAAA,IAC+B,OAG9BC,cAAUC,qCAAgBZ,wBAAwBK,YAAAA,GAClD,EAAEQ,cAAcC,iBAAgB,IAAKH,SACrC,CAACH,eAAeO,iBAAAA,QAAqBC,oDAAqB;MAC9DC,MAAMR;MACNS,aAAa;IACf,CAAA,GACMC,YAAYjB,aAAAA,QAAMkB,OAA4B,IAAA,GAO9CC,mBAAmB,SAACC,MAAAA;UACxBH,mCAAAA;OAAAA,qBAAAA,UAAUI,aAAO,QAAjBJ,uBAAAA,WAAAA,oCAAAA,mBAAmBK,oBAAc,QAAjCL,sCAAAA,UAAAA,kCAAAA,KAAAA,oBAAoC;QAClCX,eAAec;MACjB,CAAA,GACAP,kBAAkBO,IAAAA;IACpB,GAEMG,QAAQvB,aAAAA,QAAMkB,OAAO;MACzBM,WAAW;MACXC,QAAQ;MACRC,KAAK,CAAA;;MACLC,aAAa;MACbC,sBAAsB;IACxB,CAAA;AAEAC,gCAAU,WAAA;AACRjB,8BAAiB,EAAA,GACV,WAAA;AACLA,yBAAiB,EAAA;MACnB;IACF,GAAG,CAAA,CAAE;AAEL,QAAMkB,UAAU,WAAA;AACd,UAAKP,MAAMF,QAAQO,sBAGnBL;cAAMF,QAAQO,uBAAuB,IACrCjB,aAAaoB,eAAe,IAC5BpB,aAAaqB,aAAa,IAC1BT,MAAMF,QAAQM,cAAc,IAC5BR,iBAAiB,EAAA;AACjB,YAAIc,KAAK;AACT,YAAIV,MAAMF,QAAQK,IAAIQ,QAAQ;AAC5B,cAAMC,YAAYZ,MAAMF,QAAQK,IAAIU,MAAM,GAAC,GACrCC,OAAOF,UAAUD,SAASC,UAAUG,OAAO,SAACC,GAAGC,GAAAA;mBAAMD,IAAIC;aAAG,CAAA,IAAK,GACjEC,QAAQJ,OAAOF,UAAUD;AAC/BD,eAAKQ,QAAQ;QACf;AACAlB,cAAMF,QAAQK,MAAM,CAAA,GACpBf,aAAamB,QAAQ;UACnBL,QAAQF,MAAMF,QAAQI;UACtBQ;QACF,CAAA;;IACF,GAEMS,aAAapC;AAEnBuB,gCAAU,WAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "React", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "scrollEnabled", "scrollEnabledProp", "props", "context", "useSheetContext", "scrollBridge", "setHasScrollView", "setScrollEnabled_", "useControllableState", "prop", "defaultProp", "scrollRef", "useRef", "setScrollEnabled", "next", "current", "setNativeProps", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDraggingScrollArea", "useEffect", "release", "scrollStartY", "scrollLock", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "scrollable", "isClient", "controller", "AbortController", "node", "getScrollableNode", "addEventListener", "e", "isParentDragging", "scrollTo", "top", "y", "behavior", "signal", "passive", "disposeBridgeListen", "onParentDragging", "val", "abort", "hasScrollableContent", "setHasScrollableContent", "useState", "parentHeight", "contentHeight", "setIsScrollable", "_jsxs", "ScrollView", "onLayout", "nativeEvent", "layout", "height", "composeRefs", "flex", "scrollEventThrottle", "onResponderRelease", "className", "contentOffset", "isWeb", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push", "_jsx", "View", "position", "inset", "pointerEvents", "zIndex"]
|
|
6
6
|
}
|
package/dist/cjs/createSheet.cjs
CHANGED
|
@@ -33,13 +33,13 @@ var import_compose_refs = require("@tamagui/compose-refs"),
|
|
|
33
33
|
import_z_index_stack = require("@tamagui/z-index-stack"),
|
|
34
34
|
import_react = require("react"),
|
|
35
35
|
import_react_native = require("react-native-web"),
|
|
36
|
-
import_constants2 = require("./constants
|
|
37
|
-
import_nativeSheet = require("./nativeSheet
|
|
38
|
-
import_SheetContext = require("./SheetContext
|
|
39
|
-
import_SheetImplementationCustom = require("./SheetImplementationCustom
|
|
40
|
-
import_SheetScrollView = require("./SheetScrollView
|
|
41
|
-
import_useSheetController = require("./useSheetController
|
|
42
|
-
import_useSheetOffscreenSize = require("./useSheetOffscreenSize
|
|
36
|
+
import_constants2 = require("./constants"),
|
|
37
|
+
import_nativeSheet = require("./nativeSheet"),
|
|
38
|
+
import_SheetContext = require("./SheetContext"),
|
|
39
|
+
import_SheetImplementationCustom = require("./SheetImplementationCustom"),
|
|
40
|
+
import_SheetScrollView = require("./SheetScrollView"),
|
|
41
|
+
import_useSheetController = require("./useSheetController"),
|
|
42
|
+
import_useSheetOffscreenSize = require("./useSheetOffscreenSize"),
|
|
43
43
|
import_jsx_runtime =
|
|
44
44
|
// @ts-ignore
|
|
45
45
|
require("react/jsx-runtime");
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -15,14 +15,14 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
|
15
15
|
}), mod);
|
|
16
16
|
var index_exports = {};
|
|
17
17
|
module.exports = __toCommonJS(index_exports);
|
|
18
|
-
__reExport(index_exports, require("./Sheet
|
|
19
|
-
__reExport(index_exports, require("./useSheet
|
|
20
|
-
__reExport(index_exports, require("./createSheet
|
|
21
|
-
__reExport(index_exports, require("./SheetController
|
|
22
|
-
__reExport(index_exports, require("./useSheetController
|
|
23
|
-
__reExport(index_exports, require("./useSheetOpenState
|
|
24
|
-
__reExport(index_exports, require("./useSheetOffscreenSize
|
|
25
|
-
__reExport(index_exports, require("./SheetScrollView
|
|
26
|
-
__reExport(index_exports, require("./nativeSheet
|
|
27
|
-
__reExport(index_exports, require("./types
|
|
28
|
-
__reExport(index_exports, require("./contexts
|
|
18
|
+
__reExport(index_exports, require("./Sheet"), module.exports);
|
|
19
|
+
__reExport(index_exports, require("./useSheet"), module.exports);
|
|
20
|
+
__reExport(index_exports, require("./createSheet"), module.exports);
|
|
21
|
+
__reExport(index_exports, require("./SheetController"), module.exports);
|
|
22
|
+
__reExport(index_exports, require("./useSheetController"), module.exports);
|
|
23
|
+
__reExport(index_exports, require("./useSheetOpenState"), module.exports);
|
|
24
|
+
__reExport(index_exports, require("./useSheetOffscreenSize"), module.exports);
|
|
25
|
+
__reExport(index_exports, require("./SheetScrollView"), module.exports);
|
|
26
|
+
__reExport(index_exports, require("./nativeSheet"), module.exports);
|
|
27
|
+
__reExport(index_exports, require("./types"), module.exports);
|
|
28
|
+
__reExport(index_exports, require("./contexts"), module.exports);
|
package/dist/cjs/nativeSheet.cjs
CHANGED
|
@@ -27,9 +27,9 @@ module.exports = __toCommonJS(nativeSheet_exports);
|
|
|
27
27
|
var import_stacks = require("@tamagui/stacks"),
|
|
28
28
|
import_react = require("react"),
|
|
29
29
|
import_react_native = require("react-native-web"),
|
|
30
|
-
import_SheetContext = require("./SheetContext
|
|
31
|
-
import_useSheetOpenState = require("./useSheetOpenState
|
|
32
|
-
import_useSheetProviderProps = require("./useSheetProviderProps
|
|
30
|
+
import_SheetContext = require("./SheetContext"),
|
|
31
|
+
import_useSheetOpenState = require("./useSheetOpenState"),
|
|
32
|
+
import_useSheetProviderProps = require("./useSheetProviderProps"),
|
|
33
33
|
import_jsx_runtime = require("react/jsx-runtime");
|
|
34
34
|
const nativeSheets = {
|
|
35
35
|
ios: null
|
package/dist/cjs/useSheet.cjs
CHANGED
|
@@ -23,5 +23,5 @@ __export(useSheet_exports, {
|
|
|
23
23
|
useSheet: () => useSheet
|
|
24
24
|
});
|
|
25
25
|
module.exports = __toCommonJS(useSheet_exports);
|
|
26
|
-
var import_SheetContext = require("./SheetContext
|
|
26
|
+
var import_SheetContext = require("./SheetContext");
|
|
27
27
|
const useSheet = () => (0, import_SheetContext.useSheetContext)("", void 0);
|
|
@@ -24,7 +24,7 @@ __export(useSheetOpenState_exports, {
|
|
|
24
24
|
});
|
|
25
25
|
module.exports = __toCommonJS(useSheetOpenState_exports);
|
|
26
26
|
var import_use_controllable_state = require("@tamagui/use-controllable-state"),
|
|
27
|
-
import_useSheetController = require("./useSheetController
|
|
27
|
+
import_useSheetController = require("./useSheetController");
|
|
28
28
|
const useSheetOpenState = props => {
|
|
29
29
|
const {
|
|
30
30
|
isHidden,
|
|
@@ -47,7 +47,9 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = React.forwar
|
|
|
47
47
|
}, scrollable = scrollEnabled;
|
|
48
48
|
useEffect(() => {
|
|
49
49
|
if (!isClient || !scrollRef.current) return;
|
|
50
|
-
const controller = new AbortController(), node = scrollRef.current
|
|
50
|
+
const controller = new AbortController(), node = scrollRef.current?.getScrollableNode();
|
|
51
|
+
if (!node)
|
|
52
|
+
return;
|
|
51
53
|
node.addEventListener(
|
|
52
54
|
"touchmove",
|
|
53
55
|
(e) => {
|
|
@@ -66,7 +68,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = React.forwar
|
|
|
66
68
|
return () => {
|
|
67
69
|
disposeBridgeListen(), controller.abort();
|
|
68
70
|
};
|
|
69
|
-
}, []);
|
|
71
|
+
}, [scrollRef]);
|
|
70
72
|
const [hasScrollableContent, setHasScrollableContent] = useState(!0), parentHeight = useRef(0), contentHeight = useRef(0), setIsScrollable = () => {
|
|
71
73
|
parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
|
|
72
74
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,UAAU,OAAO,YAAyB;AAEnD,SAAS,kBAAkB;AAC3B,SAAS,4BAA4B;AACrC,OAAO,SAAS,WAAW,QAAQ,gBAAgB;AAEnD,SAAS,uBAAuB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -56,7 +56,8 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
|
|
|
56
56
|
useEffect(() => {
|
|
57
57
|
if (!isClient || !scrollRef.current) return;
|
|
58
58
|
const controller = new AbortController(),
|
|
59
|
-
node = scrollRef.current
|
|
59
|
+
node = scrollRef.current?.getScrollableNode();
|
|
60
|
+
if (!node) return;
|
|
60
61
|
node.addEventListener("touchmove", e => {
|
|
61
62
|
scrollBridge.isParentDragging && node.scrollTo({
|
|
62
63
|
top: scrollBridge.y,
|
|
@@ -70,7 +71,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
|
|
|
70
71
|
return () => {
|
|
71
72
|
disposeBridgeListen(), controller.abort();
|
|
72
73
|
};
|
|
73
|
-
}, []);
|
|
74
|
+
}, [scrollRef]);
|
|
74
75
|
const [hasScrollableContent, setHasScrollableContent] = useState(!0),
|
|
75
76
|
parentHeight = useRef(0),
|
|
76
77
|
contentHeight = useRef(0),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["composeRefs","isClient","isWeb","View","ScrollView","useControllableState","React","useEffect","useRef","useState","useSheetContext","jsx","jsxs","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","ref","context","scrollBridge","setHasScrollView","setScrollEnabled_","prop","defaultProp","scrollRef","setScrollEnabled","next","current","setNativeProps","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","release","scrollStartY","scrollLock","vy","length","recentDys","slice","reduce","a","b","scrollable","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","hasScrollableContent","setHasScrollableContent","parentHeight","contentHeight","setIsScrollable","onLayout","nativeEvent","layout","height","flex","scrollEventThrottle","onResponderRelease","className","contentOffset","onStartShouldSetResponder","onMoveShouldSetResponder","contentContainerStyle","minHeight","onResponderMove","pageY","dy","isDraggingUp","isPaneAtTop","paneY","paneMinY","drag","push","position","inset","pointerEvents","zIndex"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,QAAA,EAAUC,KAAA,EAAOC,IAAA,QAAyB;AAEnD,SAASC,UAAA,QAAkB;AAC3B,SAASC,oBAAA,QAA4B;AACrC,OAAOC,KAAA,IAASC,SAAA,EAAWC,MAAA,EAAQC,QAAA,QAAgB;AAEnD,SAASC,eAAA,QAAuB;
|
|
1
|
+
{"version":3,"names":["composeRefs","isClient","isWeb","View","ScrollView","useControllableState","React","useEffect","useRef","useState","useSheetContext","jsx","jsxs","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","ref","context","scrollBridge","setHasScrollView","setScrollEnabled_","prop","defaultProp","scrollRef","setScrollEnabled","next","current","setNativeProps","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","release","scrollStartY","scrollLock","vy","length","recentDys","slice","reduce","a","b","scrollable","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","hasScrollableContent","setHasScrollableContent","parentHeight","contentHeight","setIsScrollable","onLayout","nativeEvent","layout","height","flex","scrollEventThrottle","onResponderRelease","className","contentOffset","onStartShouldSetResponder","onMoveShouldSetResponder","contentContainerStyle","minHeight","onResponderMove","pageY","dy","isDraggingUp","isPaneAtTop","paneY","paneMinY","drag","push","position","inset","pointerEvents","zIndex"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -66,26 +66,29 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
|
|
|
66
66
|
},
|
|
67
67
|
scrollable = scrollEnabled;
|
|
68
68
|
useEffect(function () {
|
|
69
|
+
var _scrollRef_current;
|
|
69
70
|
if (isClient && scrollRef.current) {
|
|
70
71
|
var controller = new AbortController(),
|
|
71
|
-
node = scrollRef.current.getScrollableNode();
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
72
|
+
node = (_scrollRef_current = scrollRef.current) === null || _scrollRef_current === void 0 ? void 0 : _scrollRef_current.getScrollableNode();
|
|
73
|
+
if (node) {
|
|
74
|
+
node.addEventListener("touchmove", function (e) {
|
|
75
|
+
scrollBridge.isParentDragging && node.scrollTo({
|
|
76
|
+
top: scrollBridge.y,
|
|
77
|
+
behavior: "instant"
|
|
78
|
+
});
|
|
79
|
+
},
|
|
80
|
+
// can't preventdefault its not cancellable
|
|
81
|
+
{
|
|
82
|
+
signal: controller.signal,
|
|
83
|
+
passive: !1
|
|
76
84
|
});
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
});
|
|
83
|
-
var disposeBridgeListen = scrollBridge.onParentDragging(function (val) {});
|
|
84
|
-
return function () {
|
|
85
|
-
disposeBridgeListen(), controller.abort();
|
|
86
|
-
};
|
|
85
|
+
var disposeBridgeListen = scrollBridge.onParentDragging(function (val) {});
|
|
86
|
+
return function () {
|
|
87
|
+
disposeBridgeListen(), controller.abort();
|
|
88
|
+
};
|
|
89
|
+
}
|
|
87
90
|
}
|
|
88
|
-
}, []);
|
|
91
|
+
}, [scrollRef]);
|
|
89
92
|
var [hasScrollableContent, setHasScrollableContent] = useState(!0),
|
|
90
93
|
parentHeight = useRef(0),
|
|
91
94
|
contentHeight = useRef(0),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","composeRefs","isClient","isWeb","View","ScrollView","useControllableState","React","useEffect","useRef","useState","useSheetContext","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","param","ref","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","context","scrollBridge","setHasScrollView","setScrollEnabled_","prop","defaultProp","scrollRef","setScrollEnabled","next","_scrollRef_current_setNativeProps","_scrollRef_current","current","setNativeProps","call","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","release","scrollStartY","scrollLock","vy","length","recentDys","slice","dist","reduce","a","b","avgDy","scrollable","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","hasScrollableContent","setHasScrollableContent","parentHeight","contentHeight","setIsScrollable","onLayout","nativeEvent","layout","height","flex","scrollEventThrottle","onResponderRelease","className","contentOffset","onStartShouldSetResponder","onMoveShouldSetResponder","contentContainerStyle","minHeight","onResponderMove","pageY","dy","isDraggingUp","isPaneAtTop","paneY","paneMinY","shouldScrollLock","drag","push"
|
|
1
|
+
{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","composeRefs","isClient","isWeb","View","ScrollView","useControllableState","React","useEffect","useRef","useState","useSheetContext","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","param","ref","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","context","scrollBridge","setHasScrollView","setScrollEnabled_","prop","defaultProp","scrollRef","setScrollEnabled","next","_scrollRef_current_setNativeProps","_scrollRef_current","current","setNativeProps","call","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","release","scrollStartY","scrollLock","vy","length","recentDys","slice","dist","reduce","a","b","avgDy","scrollable","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","hasScrollableContent","setHasScrollableContent","parentHeight","contentHeight","setIsScrollable","onLayout","nativeEvent","layout","height","flex","scrollEventThrottle","onResponderRelease","className","contentOffset","onStartShouldSetResponder","onMoveShouldSetResponder","contentContainerStyle","minHeight","onResponderMove","pageY","dy","isDraggingUp","isPaneAtTop","paneY","paneMinY","shouldScrollLock","drag","push"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -47,7 +47,9 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = React.forwar
|
|
|
47
47
|
}, scrollable = scrollEnabled;
|
|
48
48
|
useEffect(() => {
|
|
49
49
|
if (!isClient || !scrollRef.current) return;
|
|
50
|
-
const controller = new AbortController(), node = scrollRef.current
|
|
50
|
+
const controller = new AbortController(), node = scrollRef.current?.getScrollableNode();
|
|
51
|
+
if (!node)
|
|
52
|
+
return;
|
|
51
53
|
node.addEventListener(
|
|
52
54
|
"touchmove",
|
|
53
55
|
(e) => {
|
|
@@ -66,7 +68,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = React.forwar
|
|
|
66
68
|
return () => {
|
|
67
69
|
disposeBridgeListen(), controller.abort();
|
|
68
70
|
};
|
|
69
|
-
}, []);
|
|
71
|
+
}, [scrollRef]);
|
|
70
72
|
const [hasScrollableContent, setHasScrollableContent] = useState(!0), parentHeight = useRef(0), contentHeight = useRef(0), setIsScrollable = () => {
|
|
71
73
|
parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
|
|
72
74
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,UAAU,OAAO,YAAyB;AAEnD,SAAS,kBAAkB;AAC3B,SAAS,4BAA4B;AACrC,OAAO,SAAS,WAAW,QAAQ,gBAAgB;AAEnD,SAAS,uBAAuB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -56,7 +56,8 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
|
|
|
56
56
|
useEffect(() => {
|
|
57
57
|
if (!isClient || !scrollRef.current) return;
|
|
58
58
|
const controller = new AbortController(),
|
|
59
|
-
node = scrollRef.current
|
|
59
|
+
node = scrollRef.current?.getScrollableNode();
|
|
60
|
+
if (!node) return;
|
|
60
61
|
node.addEventListener("touchmove", e => {
|
|
61
62
|
scrollBridge.isParentDragging && node.scrollTo({
|
|
62
63
|
top: scrollBridge.y,
|
|
@@ -70,7 +71,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
|
|
|
70
71
|
return () => {
|
|
71
72
|
disposeBridgeListen(), controller.abort();
|
|
72
73
|
};
|
|
73
|
-
}, []);
|
|
74
|
+
}, [scrollRef]);
|
|
74
75
|
const [hasScrollableContent, setHasScrollableContent] = useState(!0),
|
|
75
76
|
parentHeight = useRef(0),
|
|
76
77
|
contentHeight = useRef(0),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["composeRefs","isClient","isWeb","View","ScrollView","useControllableState","React","useEffect","useRef","useState","useSheetContext","jsx","jsxs","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","ref","context","scrollBridge","setHasScrollView","setScrollEnabled_","prop","defaultProp","scrollRef","setScrollEnabled","next","current","setNativeProps","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","release","scrollStartY","scrollLock","vy","length","recentDys","slice","reduce","a","b","scrollable","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","hasScrollableContent","setHasScrollableContent","parentHeight","contentHeight","setIsScrollable","onLayout","nativeEvent","layout","height","flex","scrollEventThrottle","onResponderRelease","className","contentOffset","onStartShouldSetResponder","onMoveShouldSetResponder","contentContainerStyle","minHeight","onResponderMove","pageY","dy","isDraggingUp","isPaneAtTop","paneY","paneMinY","drag","push","position","inset","pointerEvents","zIndex"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,QAAA,EAAUC,KAAA,EAAOC,IAAA,QAAyB;AAEnD,SAASC,UAAA,QAAkB;AAC3B,SAASC,oBAAA,QAA4B;AACrC,OAAOC,KAAA,IAASC,SAAA,EAAWC,MAAA,EAAQC,QAAA,QAAgB;AAEnD,SAASC,eAAA,QAAuB;
|
|
1
|
+
{"version":3,"names":["composeRefs","isClient","isWeb","View","ScrollView","useControllableState","React","useEffect","useRef","useState","useSheetContext","jsx","jsxs","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","ref","context","scrollBridge","setHasScrollView","setScrollEnabled_","prop","defaultProp","scrollRef","setScrollEnabled","next","current","setNativeProps","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","release","scrollStartY","scrollLock","vy","length","recentDys","slice","reduce","a","b","scrollable","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","hasScrollableContent","setHasScrollableContent","parentHeight","contentHeight","setIsScrollable","onLayout","nativeEvent","layout","height","flex","scrollEventThrottle","onResponderRelease","className","contentOffset","onStartShouldSetResponder","onMoveShouldSetResponder","contentContainerStyle","minHeight","onResponderMove","pageY","dy","isDraggingUp","isPaneAtTop","paneY","paneMinY","drag","push","position","inset","pointerEvents","zIndex"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -47,29 +47,34 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ *
|
|
|
47
47
|
}
|
|
48
48
|
}, scrollable = scrollEnabled;
|
|
49
49
|
useEffect(function() {
|
|
50
|
+
var _scrollRef_current;
|
|
50
51
|
if (isClient && scrollRef.current) {
|
|
51
|
-
var controller = new AbortController(), node = scrollRef.current.getScrollableNode();
|
|
52
|
-
node
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
52
|
+
var controller = new AbortController(), node = (_scrollRef_current = scrollRef.current) === null || _scrollRef_current === void 0 ? void 0 : _scrollRef_current.getScrollableNode();
|
|
53
|
+
if (node) {
|
|
54
|
+
node.addEventListener(
|
|
55
|
+
"touchmove",
|
|
56
|
+
function(e) {
|
|
57
|
+
scrollBridge.isParentDragging && node.scrollTo({
|
|
58
|
+
top: scrollBridge.y,
|
|
59
|
+
behavior: "instant"
|
|
60
|
+
});
|
|
61
|
+
},
|
|
62
|
+
// can't preventdefault its not cancellable
|
|
63
|
+
{
|
|
64
|
+
signal: controller.signal,
|
|
65
|
+
passive: !1
|
|
66
|
+
}
|
|
67
|
+
);
|
|
68
|
+
var disposeBridgeListen = scrollBridge.onParentDragging(function(val) {
|
|
69
|
+
});
|
|
70
|
+
return function() {
|
|
71
|
+
disposeBridgeListen(), controller.abort();
|
|
72
|
+
};
|
|
73
|
+
}
|
|
71
74
|
}
|
|
72
|
-
}, [
|
|
75
|
+
}, [
|
|
76
|
+
scrollRef
|
|
77
|
+
]);
|
|
73
78
|
var [hasScrollableContent, setHasScrollableContent] = useState(!0), parentHeight = useRef(0), contentHeight = useRef(0), setIsScrollable = function() {
|
|
74
79
|
parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
|
|
75
80
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": ";AAAA,SAASA,mBAAmB;AAC5B,SAASC,UAAUC,OAAOC,YAAyB;AAEnD,SAASC,kBAAkB;AAC3B,SAASC,4BAA4B;AACrC,OAAOC,SAASC,WAAWC,QAAQC,gBAAgB;AAEnD,SAASC,uBAAuB;AAShC,IAAMC,yBAAyB,mBAElBC,kBAAkBN,sBAAMO;;;EAMnC,SAAA,OAQEC,KAAAA;QAPA,EACEC,cACAC,UACAC,UACAC,eAAeC,mBACf,GAAGC,MAAAA,IAC+B,OAG9BC,UAAUX,gBAAgBC,wBAAwBI,YAAAA,GAClD,EAAEO,cAAcC,iBAAgB,IAAKF,SACrC,CAACH,eAAeM,iBAAAA,IAAqBnB,qBAAqB;MAC9DoB,MAAMN;MACNO,aAAa;IACf,CAAA,GACMC,YAAYrB,MAAME,OAA4B,IAAA,GAO9CoB,mBAAmB,SAACC,MAAAA;UACxBF,mCAAAA;OAAAA,qBAAAA,UAAUG,aAAO,QAAjBH,uBAAAA,WAAAA,oCAAAA,mBAAmBI,oBAAc,QAAjCJ,sCAAAA,UAAAA,kCAAAA,KAAAA,oBAAoC;QAClCT,eAAeW;MACjB,CAAA,GACAL,kBAAkBK,IAAAA;IACpB,GAEMG,QAAQ1B,MAAME,OAAO;MACzByB,WAAW;MACXC,QAAQ;MACRC,KAAK,CAAA;;MACLC,aAAa;MACbC,sBAAsB;IACxB,CAAA;AAEA9B,cAAU,WAAA;AACRgB,8BAAiB,EAAA,GACV,WAAA;AACLA,yBAAiB,EAAA;MACnB;IACF,GAAG,CAAA,CAAE;AAEL,QAAMe,UAAU,WAAA;AACd,UAAKN,MAAMF,QAAQO,sBAGnBL;cAAMF,QAAQO,uBAAuB,IACrCf,aAAaiB,eAAe,IAC5BjB,aAAakB,aAAa,IAC1BR,MAAMF,QAAQM,cAAc,IAC5BR,iBAAiB,EAAA;AACjB,YAAIa,KAAK;AACT,YAAIT,MAAMF,QAAQK,IAAIO,QAAQ;AAC5B,cAAMC,YAAYX,MAAMF,QAAQK,IAAIS,MAAM,GAAC,GACrCC,OAAOF,UAAUD,SAASC,UAAUG,OAAO,SAACC,GAAGC,GAAAA;mBAAMD,IAAIC;aAAG,CAAA,IAAK,GACjEC,QAAQJ,OAAOF,UAAUD;AAC/BD,eAAKQ,QAAQ;QACf;AACAjB,cAAMF,QAAQK,MAAM,CAAA,GACpBb,aAAagB,QAAQ;UACnBJ,QAAQF,MAAMF,QAAQI;UACtBO;QACF,CAAA;;IACF,GAEMS,aAAahC;AAEnBX,cAAU,WAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["composeRefs", "isClient", "isWeb", "View", "ScrollView", "useControllableState", "React", "useEffect", "useRef", "useState", "useSheetContext", "SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "scrollEnabled", "scrollEnabledProp", "props", "context", "scrollBridge", "setHasScrollView", "setScrollEnabled_", "prop", "defaultProp", "scrollRef", "setScrollEnabled", "next", "current", "setNativeProps", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDraggingScrollArea", "release", "scrollStartY", "scrollLock", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "scrollable", "controller", "AbortController", "node", "getScrollableNode", "addEventListener", "e", "isParentDragging", "scrollTo", "top", "y", "behavior", "signal", "passive", "disposeBridgeListen", "onParentDragging", "val", "abort", "hasScrollableContent", "setHasScrollableContent", "parentHeight", "contentHeight", "setIsScrollable", "onLayout", "nativeEvent", "layout", "height", "flex", "scrollEventThrottle", "onResponderRelease", "className", "contentOffset", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push", "position", "inset", "pointerEvents", "zIndex"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/sheet",
|
|
3
|
-
"version": "1.130.
|
|
3
|
+
"version": "1.130.6",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -37,30 +37,32 @@
|
|
|
37
37
|
}
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@tamagui/adapt": "1.130.
|
|
41
|
-
"@tamagui/animate-presence": "1.130.
|
|
42
|
-
"@tamagui/animations-react-native": "1.130.
|
|
43
|
-
"@tamagui/compose-refs": "1.130.
|
|
44
|
-
"@tamagui/constants": "1.130.
|
|
45
|
-
"@tamagui/core": "1.130.
|
|
46
|
-
"@tamagui/create-context": "1.130.
|
|
47
|
-
"@tamagui/helpers": "1.130.
|
|
48
|
-
"@tamagui/portal": "1.130.
|
|
49
|
-
"@tamagui/remove-scroll": "1.130.
|
|
50
|
-
"@tamagui/scroll-view": "1.130.
|
|
51
|
-
"@tamagui/stacks": "1.130.
|
|
52
|
-
"@tamagui/use-constant": "1.130.
|
|
53
|
-
"@tamagui/use-controllable-state": "1.130.
|
|
54
|
-
"@tamagui/use-did-finish-ssr": "1.130.
|
|
55
|
-
"@tamagui/use-keyboard-visible": "1.130.
|
|
56
|
-
"@tamagui/z-index-stack": "1.130.
|
|
40
|
+
"@tamagui/adapt": "1.130.6",
|
|
41
|
+
"@tamagui/animate-presence": "1.130.6",
|
|
42
|
+
"@tamagui/animations-react-native": "1.130.6",
|
|
43
|
+
"@tamagui/compose-refs": "1.130.6",
|
|
44
|
+
"@tamagui/constants": "1.130.6",
|
|
45
|
+
"@tamagui/core": "1.130.6",
|
|
46
|
+
"@tamagui/create-context": "1.130.6",
|
|
47
|
+
"@tamagui/helpers": "1.130.6",
|
|
48
|
+
"@tamagui/portal": "1.130.6",
|
|
49
|
+
"@tamagui/remove-scroll": "1.130.6",
|
|
50
|
+
"@tamagui/scroll-view": "1.130.6",
|
|
51
|
+
"@tamagui/stacks": "1.130.6",
|
|
52
|
+
"@tamagui/use-constant": "1.130.6",
|
|
53
|
+
"@tamagui/use-controllable-state": "1.130.6",
|
|
54
|
+
"@tamagui/use-did-finish-ssr": "1.130.6",
|
|
55
|
+
"@tamagui/use-keyboard-visible": "1.130.6",
|
|
56
|
+
"@tamagui/z-index-stack": "1.130.6"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
|
-
"react": "*"
|
|
59
|
+
"react": "*",
|
|
60
|
+
"react-native": "^0.79.2"
|
|
60
61
|
},
|
|
61
62
|
"devDependencies": {
|
|
62
|
-
"@tamagui/build": "1.130.
|
|
63
|
-
"react": "*"
|
|
63
|
+
"@tamagui/build": "1.130.6",
|
|
64
|
+
"react": "*",
|
|
65
|
+
"react-native": "^0.79.2"
|
|
64
66
|
},
|
|
65
67
|
"publishConfig": {
|
|
66
68
|
"access": "public"
|
package/src/SheetScrollView.tsx
CHANGED
|
@@ -98,7 +98,11 @@ export const SheetScrollView = React.forwardRef<
|
|
|
98
98
|
|
|
99
99
|
const controller = new AbortController()
|
|
100
100
|
|
|
101
|
-
const node = scrollRef.current
|
|
101
|
+
const node = scrollRef.current?.getScrollableNode() as HTMLElement | undefined
|
|
102
|
+
|
|
103
|
+
if (!node) {
|
|
104
|
+
return
|
|
105
|
+
}
|
|
102
106
|
|
|
103
107
|
// this is unfortuantely the only way to prevent a scroll once a scroll already started
|
|
104
108
|
// we just keep setting it back to the last value - it should only ever be 0 as this only
|
|
@@ -129,7 +133,7 @@ export const SheetScrollView = React.forwardRef<
|
|
|
129
133
|
disposeBridgeListen()
|
|
130
134
|
controller.abort()
|
|
131
135
|
}
|
|
132
|
-
}, [])
|
|
136
|
+
}, [scrollRef])
|
|
133
137
|
|
|
134
138
|
const [hasScrollableContent, setHasScrollableContent] = useState(true)
|
|
135
139
|
const parentHeight = useRef(0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SheetScrollView.d.ts","sourceRoot":"","sources":["../src/SheetScrollView.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AAY9D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"SheetScrollView.d.ts","sourceRoot":"","sources":["../src/SheetScrollView.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AAY9D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;wCA8O3B,CAAA"}
|