@tamagui/sheet 1.79.7 → 1.79.9
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/SheetScrollView.js +2 -2
- package/dist/cjs/SheetScrollView.js.map +1 -1
- package/dist/cjs/SheetScrollView.native.js +2 -2
- package/dist/cjs/SheetScrollView.native.js.map +1 -1
- package/dist/esm/SheetScrollView.js +2 -2
- package/dist/esm/SheetScrollView.js.map +1 -1
- package/dist/esm/SheetScrollView.native.js +2 -2
- package/dist/esm/SheetScrollView.native.js.map +1 -1
- package/dist/jsx/SheetScrollView.js +2 -2
- package/dist/jsx/SheetScrollView.js.map +1 -1
- package/dist/jsx/SheetScrollView.native.js +2 -2
- package/dist/jsx/SheetScrollView.native.js.map +1 -1
- package/package.json +14 -14
- package/src/SheetScrollView.tsx +15 -1
- package/types/SheetScrollView.d.ts.map +1 -1
|
@@ -19,7 +19,7 @@ __export(SheetScrollView_exports, {
|
|
|
19
19
|
module.exports = __toCommonJS(SheetScrollView_exports);
|
|
20
20
|
var import_core = require("@tamagui/core"), import_scroll_view = require("@tamagui/scroll-view"), import_react = require("react"), import_SheetContext = require("./SheetContext"), import_jsx_runtime = require("react/jsx-runtime");
|
|
21
21
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = (0, import_react.forwardRef)(
|
|
22
|
-
({ __scopeSheet, children, ...props }, ref) => {
|
|
22
|
+
({ __scopeSheet, children, onScroll, ...props }, ref) => {
|
|
23
23
|
const context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = (0, import_react.useRef)(null), state = (0, import_react.useRef)({
|
|
24
24
|
lastPageY: 0,
|
|
25
25
|
dragAt: 0,
|
|
@@ -49,7 +49,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = (0, import_r
|
|
|
49
49
|
scrollEventThrottle: 8,
|
|
50
50
|
onScroll: (e) => {
|
|
51
51
|
const { y } = e.nativeEvent.contentOffset;
|
|
52
|
-
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1);
|
|
52
|
+
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll == null || onScroll(e);
|
|
53
53
|
},
|
|
54
54
|
onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0),
|
|
55
55
|
onMoveShouldSetResponder: () => !1,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAoC,0BACpC,qBAA4C,iCAC5C,eAA4C,kBAG5C,sBAAgC,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAoC,0BACpC,qBAA4C,iCAC5C,eAA4C,kBAG5C,sBAAgC,2BAgE1B;AAvDN,MAAM,yBAAyB,mBAElB,sBAAkB;AAAA,EAC7B,CACE,EAAE,cAAc,UAAU,UAAU,GAAG,MAAM,GAC7C,QACG;AACH,UAAM,cAAU,qCAAgB,wBAAwB,YAAY,GAC9D,EAAE,aAAa,IAAI,SAEnB,gBAAY,qBAA4B,IAAI,GAc5C,YAAQ,qBAAO;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,SAAK,yBAAY,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,KAI9B,6BAAW;AAAA,QASb;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,oCAAQ,MAAM,UAAU,CAAC,QAAQ,CAAC;AAAA;AAAA,IACrC;AAAA,EAEJ;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -20,7 +20,7 @@ __export(SheetScrollView_exports, {
|
|
|
20
20
|
module.exports = __toCommonJS(SheetScrollView_exports);
|
|
21
21
|
var import_core = require("@tamagui/core"), import_scroll_view = require("@tamagui/scroll-view"), import_react = require("react"), import_SheetContext = require("./SheetContext"), import_jsx_runtime = require("react/jsx-runtime");
|
|
22
22
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = (0, import_react.forwardRef)(
|
|
23
|
-
({ __scopeSheet, children, ...props }, ref) => {
|
|
23
|
+
({ __scopeSheet, children, onScroll, ...props }, ref) => {
|
|
24
24
|
const context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = (0, import_react.useRef)(null), state = (0, import_react.useRef)({
|
|
25
25
|
lastPageY: 0,
|
|
26
26
|
dragAt: 0,
|
|
@@ -50,7 +50,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = (0, import_r
|
|
|
50
50
|
scrollEventThrottle: 8,
|
|
51
51
|
onScroll: (e) => {
|
|
52
52
|
const { y } = e.nativeEvent.contentOffset;
|
|
53
|
-
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1);
|
|
53
|
+
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll == null || onScroll(e);
|
|
54
54
|
},
|
|
55
55
|
onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0),
|
|
56
56
|
onMoveShouldSetResponder: () => !1,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAoC,0BACpC,qBAA4C,iCAC5C,eAA4C,kBAG5C,sBAAgC,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAoC,0BACpC,qBAA4C,iCAC5C,eAA4C,kBAG5C,sBAAgC,2BAgE1B;AAvDN,MAAM,yBAAyB,mBAElB,sBAAkB;AAAA,EAC7B,CACE,EAAE,cAAc,UAAU,UAAU,GAAG,MAAM,GAC7C,QACG;AACH,UAAM,cAAU,qCAAgB,wBAAwB,YAAY,GAC9D,EAAE,aAAa,IAAI,SAEnB,gBAAY,qBAA4B,IAAI,GAc5C,YAAQ,qBAAO;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,SAAK,yBAAY,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,KAI9B,6BAAW;AAAA,QASb;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,oCAAQ,MAAM,UAAU,CAAC,QAAQ,CAAC;AAAA;AAAA,IACrC;AAAA,EAEJ;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -4,7 +4,7 @@ import { forwardRef, useMemo, useRef } from "react";
|
|
|
4
4
|
import { useSheetContext } from "./SheetContext";
|
|
5
5
|
import { jsx } from "react/jsx-runtime";
|
|
6
6
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
7
|
-
({ __scopeSheet, children, ...props }, ref) => {
|
|
7
|
+
({ __scopeSheet, children, onScroll, ...props }, ref) => {
|
|
8
8
|
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = useRef(null), state = useRef({
|
|
9
9
|
lastPageY: 0,
|
|
10
10
|
dragAt: 0,
|
|
@@ -34,7 +34,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
|
34
34
|
scrollEventThrottle: 8,
|
|
35
35
|
onScroll: (e) => {
|
|
36
36
|
const { y } = e.nativeEvent.contentOffset;
|
|
37
|
-
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1);
|
|
37
|
+
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll?.(e);
|
|
38
38
|
},
|
|
39
39
|
onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0),
|
|
40
40
|
onMoveShouldSetResponder: () => !1,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;
|
|
4
|
+
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AAgE1B;AAvDN,MAAM,yBAAyB,mBAElB,kBAAkB;AAAA,EAC7B,CACE,EAAE,cAAc,UAAU,UAAU,GAAG,MAAM,GAC7C,QACG;AACH,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,KAI9B,WAAW,CAAC;AAAA,QASd;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
|
}
|
|
@@ -4,7 +4,7 @@ import { forwardRef, useMemo, useRef } from "react";
|
|
|
4
4
|
import { useSheetContext } from "./SheetContext";
|
|
5
5
|
import { jsx } from "react/jsx-runtime";
|
|
6
6
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
7
|
-
({ __scopeSheet, children, ...props }, ref) => {
|
|
7
|
+
({ __scopeSheet, children, onScroll, ...props }, ref) => {
|
|
8
8
|
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = useRef(null), state = useRef({
|
|
9
9
|
lastPageY: 0,
|
|
10
10
|
dragAt: 0,
|
|
@@ -34,7 +34,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
|
34
34
|
scrollEventThrottle: 8,
|
|
35
35
|
onScroll: (e) => {
|
|
36
36
|
const { y } = e.nativeEvent.contentOffset;
|
|
37
|
-
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1);
|
|
37
|
+
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll?.(e);
|
|
38
38
|
},
|
|
39
39
|
onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0),
|
|
40
40
|
onMoveShouldSetResponder: () => !1,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;
|
|
4
|
+
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AAgE1B;AAvDN,MAAM,yBAAyB,mBAElB,kBAAkB;AAAA,EAC7B,CACE,EAAE,cAAc,UAAU,UAAU,GAAG,MAAM,GAC7C,QACG;AACH,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,KAI9B,WAAW,CAAC;AAAA,QASd;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
|
}
|
|
@@ -3,7 +3,7 @@ import { ScrollView } from "@tamagui/scroll-view";
|
|
|
3
3
|
import { forwardRef, useMemo, useRef } from "react";
|
|
4
4
|
import { useSheetContext } from "./SheetContext";
|
|
5
5
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
6
|
-
({ __scopeSheet, children, ...props }, ref) => {
|
|
6
|
+
({ __scopeSheet, children, onScroll, ...props }, ref) => {
|
|
7
7
|
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = useRef(null), state = useRef({
|
|
8
8
|
lastPageY: 0,
|
|
9
9
|
dragAt: 0,
|
|
@@ -31,7 +31,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
|
31
31
|
scrollEventThrottle={8}
|
|
32
32
|
onScroll={(e) => {
|
|
33
33
|
const { y } = e.nativeEvent.contentOffset;
|
|
34
|
-
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1);
|
|
34
|
+
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll?.(e);
|
|
35
35
|
}}
|
|
36
36
|
onStartShouldSetResponder={() => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0)}
|
|
37
37
|
onMoveShouldSetResponder={() => !1}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AAShC,MAAM,yBAAyB,mBAElB,kBAAkB;AAAA,EAC7B,
|
|
4
|
+
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AAShC,MAAM,yBAAyB,mBAElB,kBAAkB;AAAA,EAC7B,CACE,EAAE,cAAc,UAAU,UAAU,GAAG,MAAM,GAC7C,QACG;AACH,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,CAAC;AAAA,MACC,KAAK,YAAY,WAAkB,GAAG;AAAA,MACtC,MAAM;AAAA,MACN,qBAAqB;AAAA,MAErB,UAAU,CAAC,MAAM;AACf,cAAM,EAAE,EAAE,IAAI,EAAE,YAAY;AAC5B,qBAAa,IAAI,GACb,IAAI,MACN,aAAa,eAAe,KAI9B,WAAW,CAAC;AAAA,MASd;AAAA,MACA,2BAA2B,OACzB,aAAa,eAAe,IAC5B,MAAM,QAAQ,aAAa,IACpB;AAAA,MAGT,0BAA0B,MAAM;AAAA,MAmChC,oBAAoB;AAAA,MACpB,UAAU;AAAA,UACN;AAAA,MAEH,QAAQ,MAAM,UAAU,CAAC,QAAQ,CAAC,EACrC,EArEC;AAAA,EAuEL;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,7 +3,7 @@ import { ScrollView } from "@tamagui/scroll-view";
|
|
|
3
3
|
import { forwardRef, useMemo, useRef } from "react";
|
|
4
4
|
import { useSheetContext } from "./SheetContext";
|
|
5
5
|
const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
6
|
-
({ __scopeSheet, children, ...props }, ref) => {
|
|
6
|
+
({ __scopeSheet, children, onScroll, ...props }, ref) => {
|
|
7
7
|
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = useRef(null), state = useRef({
|
|
8
8
|
lastPageY: 0,
|
|
9
9
|
dragAt: 0,
|
|
@@ -31,7 +31,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = forwardRef(
|
|
|
31
31
|
scrollEventThrottle={8}
|
|
32
32
|
onScroll={(e) => {
|
|
33
33
|
const { y } = e.nativeEvent.contentOffset;
|
|
34
|
-
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1);
|
|
34
|
+
scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll == null || onScroll(e);
|
|
35
35
|
}}
|
|
36
36
|
onStartShouldSetResponder={() => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0)}
|
|
37
37
|
onMoveShouldSetResponder={() => !1}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetScrollView.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AAShC,MAAM,yBAAyB,mBAElB,kBAAkB;AAAA,EAC7B,
|
|
4
|
+
"mappings": "AAAA,SAAiB,mBAAmB;AACpC,SAAS,kBAAmC;AAC5C,SAAS,YAAY,SAAS,cAAc;AAG5C,SAAS,uBAAuB;AAShC,MAAM,yBAAyB,mBAElB,kBAAkB;AAAA,EAC7B,CACE,EAAE,cAAc,UAAU,UAAU,GAAG,MAAM,GAC7C,QACG;AACH,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,CAAC;AAAA,MACC,KAAK,YAAY,WAAkB,GAAG;AAAA,MACtC,MAAM;AAAA,MACN,qBAAqB;AAAA,MAErB,UAAU,CAAC,MAAM;AACf,cAAM,EAAE,EAAE,IAAI,EAAE,YAAY;AAC5B,qBAAa,IAAI,GACb,IAAI,MACN,aAAa,eAAe,KAI9B,6BAAW;AAAA,MASb;AAAA,MACA,2BAA2B,OACzB,aAAa,eAAe,IAC5B,MAAM,QAAQ,aAAa,IACpB;AAAA,MAGT,0BAA0B,MAAM;AAAA,MAmChC,oBAAoB;AAAA,MACpB,UAAU;AAAA,UACN;AAAA,MAEH,QAAQ,MAAM,UAAU,CAAC,QAAQ,CAAC,EACrC,EArEC;AAAA,EAuEL;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/sheet",
|
|
3
|
-
"version": "1.79.
|
|
3
|
+
"version": "1.79.9",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -31,25 +31,25 @@
|
|
|
31
31
|
}
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@tamagui/animate-presence": "1.79.
|
|
35
|
-
"@tamagui/animations-react-native": "1.79.
|
|
36
|
-
"@tamagui/compose-refs": "1.79.
|
|
37
|
-
"@tamagui/core": "1.79.
|
|
38
|
-
"@tamagui/create-context": "1.79.
|
|
39
|
-
"@tamagui/portal": "1.79.
|
|
40
|
-
"@tamagui/remove-scroll": "1.79.
|
|
41
|
-
"@tamagui/scroll-view": "1.79.
|
|
42
|
-
"@tamagui/stacks": "1.79.
|
|
43
|
-
"@tamagui/use-constant": "1.79.
|
|
44
|
-
"@tamagui/use-controllable-state": "1.79.
|
|
45
|
-
"@tamagui/use-keyboard-visible": "1.79.
|
|
34
|
+
"@tamagui/animate-presence": "1.79.9",
|
|
35
|
+
"@tamagui/animations-react-native": "1.79.9",
|
|
36
|
+
"@tamagui/compose-refs": "1.79.9",
|
|
37
|
+
"@tamagui/core": "1.79.9",
|
|
38
|
+
"@tamagui/create-context": "1.79.9",
|
|
39
|
+
"@tamagui/portal": "1.79.9",
|
|
40
|
+
"@tamagui/remove-scroll": "1.79.9",
|
|
41
|
+
"@tamagui/scroll-view": "1.79.9",
|
|
42
|
+
"@tamagui/stacks": "1.79.9",
|
|
43
|
+
"@tamagui/use-constant": "1.79.9",
|
|
44
|
+
"@tamagui/use-controllable-state": "1.79.9",
|
|
45
|
+
"@tamagui/use-keyboard-visible": "1.79.9"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
48
|
"react": "*",
|
|
49
49
|
"react-native": "*"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@tamagui/build": "1.79.
|
|
52
|
+
"@tamagui/build": "1.79.9",
|
|
53
53
|
"react": "^18.2.0",
|
|
54
54
|
"react-native": "^0.72.1"
|
|
55
55
|
},
|
package/src/SheetScrollView.tsx
CHANGED
|
@@ -15,7 +15,10 @@ import { SheetScopedProps } from './types'
|
|
|
15
15
|
const SHEET_SCROLL_VIEW_NAME = 'SheetScrollView'
|
|
16
16
|
|
|
17
17
|
export const SheetScrollView = forwardRef<GetRef<typeof ScrollView>, ScrollViewProps>(
|
|
18
|
-
(
|
|
18
|
+
(
|
|
19
|
+
{ __scopeSheet, children, onScroll, ...props }: SheetScopedProps<ScrollViewProps>,
|
|
20
|
+
ref
|
|
21
|
+
) => {
|
|
19
22
|
const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet)
|
|
20
23
|
const { scrollBridge } = context
|
|
21
24
|
// const [scrollEnabled, setScrollEnabled_] = useState(true)
|
|
@@ -75,6 +78,17 @@ export const SheetScrollView = forwardRef<GetRef<typeof ScrollView>, ScrollViewP
|
|
|
75
78
|
if (y > 0) {
|
|
76
79
|
scrollBridge.scrollStartY = -1
|
|
77
80
|
}
|
|
81
|
+
|
|
82
|
+
// Process the "onScroll" prop here if any
|
|
83
|
+
onScroll?.(e)
|
|
84
|
+
|
|
85
|
+
// This assures that we do not skip the "scrollBridge" values processing
|
|
86
|
+
// when passing this prop into a <Sheet.ScrollView /> overriding it here
|
|
87
|
+
|
|
88
|
+
// Useful when using this ScrollView with lists such as "FlashList", i.e.
|
|
89
|
+
// ```
|
|
90
|
+
// renderScrollComponent={Sheet.ScrollView}
|
|
91
|
+
// ```
|
|
78
92
|
}}
|
|
79
93
|
onStartShouldSetResponder={() => {
|
|
80
94
|
scrollBridge.scrollStartY = -1
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SheetScrollView.d.ts","sourceRoot":"","sources":["../src/SheetScrollView.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AAazD,eAAO,MAAM,eAAe;;;;;;
|
|
1
|
+
{"version":3,"file":"SheetScrollView.d.ts","sourceRoot":"","sources":["../src/SheetScrollView.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AAazD,eAAO,MAAM,eAAe;;;;;;kDA6H3B,CAAA"}
|