@tamagui/sheet 1.130.5 → 1.130.7

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.
Files changed (69) hide show
  1. package/dist/cjs/Sheet.cjs +4 -4
  2. package/dist/cjs/SheetContext.cjs +1 -1
  3. package/dist/cjs/SheetController.cjs +1 -1
  4. package/dist/cjs/SheetImplementationCustom.cjs +15 -11
  5. package/dist/cjs/SheetImplementationCustom.js +11 -5
  6. package/dist/cjs/SheetImplementationCustom.js.map +1 -1
  7. package/dist/cjs/SheetImplementationCustom.native.js +11 -5
  8. package/dist/cjs/SheetImplementationCustom.native.js.map +2 -2
  9. package/dist/cjs/SheetScrollView.cjs +6 -4
  10. package/dist/cjs/SheetScrollView.js +5 -3
  11. package/dist/cjs/SheetScrollView.js.map +1 -1
  12. package/dist/cjs/SheetScrollView.native.js +7 -3
  13. package/dist/cjs/SheetScrollView.native.js.map +2 -2
  14. package/dist/cjs/createSheet.cjs +7 -7
  15. package/dist/cjs/index.cjs +11 -11
  16. package/dist/cjs/nativeSheet.cjs +3 -3
  17. package/dist/cjs/useSheet.cjs +1 -1
  18. package/dist/cjs/useSheetOpenState.cjs +1 -1
  19. package/dist/cjs/useSheetProviderProps.cjs +1 -0
  20. package/dist/cjs/useSheetProviderProps.js +1 -0
  21. package/dist/cjs/useSheetProviderProps.js.map +1 -1
  22. package/dist/cjs/useSheetProviderProps.native.js +1 -0
  23. package/dist/cjs/useSheetProviderProps.native.js.map +2 -2
  24. package/dist/esm/SheetImplementationCustom.js +11 -5
  25. package/dist/esm/SheetImplementationCustom.js.map +1 -1
  26. package/dist/esm/SheetImplementationCustom.mjs +10 -6
  27. package/dist/esm/SheetImplementationCustom.mjs.map +1 -1
  28. package/dist/esm/SheetImplementationCustom.native.js +10 -6
  29. package/dist/esm/SheetImplementationCustom.native.js.map +1 -1
  30. package/dist/esm/SheetScrollView.js +5 -3
  31. package/dist/esm/SheetScrollView.js.map +1 -1
  32. package/dist/esm/SheetScrollView.mjs +5 -3
  33. package/dist/esm/SheetScrollView.mjs.map +1 -1
  34. package/dist/esm/SheetScrollView.native.js +5 -3
  35. package/dist/esm/SheetScrollView.native.js.map +1 -1
  36. package/dist/esm/useSheetProviderProps.js +1 -0
  37. package/dist/esm/useSheetProviderProps.js.map +1 -1
  38. package/dist/esm/useSheetProviderProps.mjs +1 -0
  39. package/dist/esm/useSheetProviderProps.mjs.map +1 -1
  40. package/dist/esm/useSheetProviderProps.native.js +1 -0
  41. package/dist/esm/useSheetProviderProps.native.js.map +1 -1
  42. package/dist/jsx/SheetImplementationCustom.js +11 -5
  43. package/dist/jsx/SheetImplementationCustom.js.map +1 -1
  44. package/dist/jsx/SheetImplementationCustom.mjs +10 -6
  45. package/dist/jsx/SheetImplementationCustom.mjs.map +1 -1
  46. package/dist/jsx/SheetImplementationCustom.native.js +11 -5
  47. package/dist/jsx/SheetImplementationCustom.native.js.map +2 -2
  48. package/dist/jsx/SheetScrollView.js +5 -3
  49. package/dist/jsx/SheetScrollView.js.map +1 -1
  50. package/dist/jsx/SheetScrollView.mjs +5 -3
  51. package/dist/jsx/SheetScrollView.mjs.map +1 -1
  52. package/dist/jsx/SheetScrollView.native.js +7 -3
  53. package/dist/jsx/SheetScrollView.native.js.map +2 -2
  54. package/dist/jsx/useSheetProviderProps.js +1 -0
  55. package/dist/jsx/useSheetProviderProps.js.map +1 -1
  56. package/dist/jsx/useSheetProviderProps.mjs +1 -0
  57. package/dist/jsx/useSheetProviderProps.mjs.map +1 -1
  58. package/dist/jsx/useSheetProviderProps.native.js +1 -0
  59. package/dist/jsx/useSheetProviderProps.native.js.map +2 -2
  60. package/package.json +23 -21
  61. package/src/SheetImplementationCustom.tsx +24 -16
  62. package/src/SheetScrollView.tsx +7 -2
  63. package/src/types.tsx +1 -0
  64. package/src/useSheetProviderProps.tsx +1 -0
  65. package/types/SheetImplementationCustom.d.ts.map +1 -1
  66. package/types/SheetScrollView.d.ts.map +1 -1
  67. package/types/types.d.ts +1 -0
  68. package/types/types.d.ts.map +1 -1
  69. package/types/useSheetProviderProps.d.ts.map +1 -1
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/useSheetProviderProps.tsx"],
4
- "mappings": "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",
5
- "names": ["React", "useConfiguration", "useConstant", "useControllableState", "useSheetProviderProps", "props", "state", "options", "handleRef", "useRef", "contentRef", "frameSize", "setFrameSize", "useState", "maxContentSize", "setMaxContentSize", "snapPointsMode", "snapPointsProp", "snapPoints", "hasFit", "useMemo", "dismissOnSnapToBottom", "JSON", "stringify", "position_", "setPositionImmediate", "prop", "position", "defaultProp", "defaultPosition", "open", "onChange", "onPositionChange", "strategy", "setPosition", "useCallback", "next", "length", "setOpen", "process", "env", "NODE_ENV", "some", "p", "endsWith", "n", "Number", "slice", "console", "warn", "indexOf", "shouldSetPositionOpen", "useEffect", "animationDriver", "Error", "scrollBridge", "parentDragListeners", "Set", "bridge", "enabled", "y", "paneY", "paneMinY", "scrollStartY", "drag", "release", "scrollLock", "isParentDragging", "onParentDragging", "cb", "add", "delete", "setParentDragging", "val", "forEach", "removeScrollEnabled", "forceRemoveScrollEnabled", "modal", "maxSnapPoint", "screenSize", "providerProps", "hidden", "isHidden", "dismissOnOverlayPress", "onOverlayComponent", "scope", "__scopeSheet", "onlyShowFrame"]
4
+ "mappings": "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",
5
+ "names": ["React", "useConfiguration", "useConstant", "useControllableState", "useSheetProviderProps", "props", "state", "options", "handleRef", "useRef", "contentRef", "frameSize", "setFrameSize", "useState", "maxContentSize", "setMaxContentSize", "snapPointsMode", "snapPointsProp", "snapPoints", "hasFit", "useMemo", "dismissOnSnapToBottom", "JSON", "stringify", "position_", "setPositionImmediate", "prop", "position", "defaultProp", "defaultPosition", "open", "onChange", "onPositionChange", "strategy", "setPosition", "useCallback", "next", "length", "setOpen", "process", "env", "NODE_ENV", "some", "p", "endsWith", "n", "Number", "slice", "console", "warn", "indexOf", "shouldSetPositionOpen", "useEffect", "animationDriver", "Error", "scrollBridge", "parentDragListeners", "Set", "bridge", "hasScrollableContent", "enabled", "y", "paneY", "paneMinY", "scrollStartY", "drag", "release", "scrollLock", "isParentDragging", "onParentDragging", "cb", "add", "delete", "setParentDragging", "val", "forEach", "removeScrollEnabled", "forceRemoveScrollEnabled", "modal", "maxSnapPoint", "screenSize", "providerProps", "hidden", "isHidden", "dismissOnOverlayPress", "onOverlayComponent", "scope", "__scopeSheet", "onlyShowFrame"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/sheet",
3
- "version": "1.130.5",
3
+ "version": "1.130.7",
4
4
  "sideEffects": [
5
5
  "*.css"
6
6
  ],
@@ -37,30 +37,32 @@
37
37
  }
38
38
  },
39
39
  "dependencies": {
40
- "@tamagui/adapt": "1.130.5",
41
- "@tamagui/animate-presence": "1.130.5",
42
- "@tamagui/animations-react-native": "1.130.5",
43
- "@tamagui/compose-refs": "1.130.5",
44
- "@tamagui/constants": "1.130.5",
45
- "@tamagui/core": "1.130.5",
46
- "@tamagui/create-context": "1.130.5",
47
- "@tamagui/helpers": "1.130.5",
48
- "@tamagui/portal": "1.130.5",
49
- "@tamagui/remove-scroll": "1.130.5",
50
- "@tamagui/scroll-view": "1.130.5",
51
- "@tamagui/stacks": "1.130.5",
52
- "@tamagui/use-constant": "1.130.5",
53
- "@tamagui/use-controllable-state": "1.130.5",
54
- "@tamagui/use-did-finish-ssr": "1.130.5",
55
- "@tamagui/use-keyboard-visible": "1.130.5",
56
- "@tamagui/z-index-stack": "1.130.5"
40
+ "@tamagui/adapt": "1.130.7",
41
+ "@tamagui/animate-presence": "1.130.7",
42
+ "@tamagui/animations-react-native": "1.130.7",
43
+ "@tamagui/compose-refs": "1.130.7",
44
+ "@tamagui/constants": "1.130.7",
45
+ "@tamagui/core": "1.130.7",
46
+ "@tamagui/create-context": "1.130.7",
47
+ "@tamagui/helpers": "1.130.7",
48
+ "@tamagui/portal": "1.130.7",
49
+ "@tamagui/remove-scroll": "1.130.7",
50
+ "@tamagui/scroll-view": "1.130.7",
51
+ "@tamagui/stacks": "1.130.7",
52
+ "@tamagui/use-constant": "1.130.7",
53
+ "@tamagui/use-controllable-state": "1.130.7",
54
+ "@tamagui/use-did-finish-ssr": "1.130.7",
55
+ "@tamagui/use-keyboard-visible": "1.130.7",
56
+ "@tamagui/z-index-stack": "1.130.7"
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.5",
63
- "react": "*"
63
+ "@tamagui/build": "1.130.7",
64
+ "react": "*",
65
+ "react-native": "^0.79.2"
64
66
  },
65
67
  "publishConfig": {
66
68
  "access": "public"
@@ -234,6 +234,12 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
234
234
  useIsomorphicLayoutEffect(() => {
235
235
  if (!isAbleToPosition) return
236
236
  animateTo(position)
237
+
238
+ // reset scroll bridge
239
+ if (position === -1) {
240
+ scrollBridge.scrollLock = false
241
+ scrollBridge.scrollStartY = -1
242
+ }
237
243
  }, [isAbleToPosition, position])
238
244
 
239
245
  const disableDrag = props.disableDrag ?? controller?.disableDrag
@@ -318,26 +324,28 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
318
324
  return true
319
325
  }
320
326
 
321
- if (scrollBridge.scrollLock) {
322
- return false
323
- }
327
+ if (scrollBridge.hasScrollableContent === true) {
328
+ if (scrollBridge.scrollLock) {
329
+ return false
330
+ }
324
331
 
325
- const isScrolled = scrollBridge.y !== 0
332
+ const isScrolled = scrollBridge.y !== 0
326
333
 
327
- // Update the dragging direction
328
- const isDraggingUp = dy < 0
334
+ // Update the dragging direction
335
+ const isDraggingUp = dy < 0
329
336
 
330
- // we can treat near top instead of exactly to avoid trouble with springs
331
- const isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY
332
- if (isScrolled) {
333
- previouslyScrolling = true
334
- return false
335
- }
336
- // prevent drag once at top and pulling up
337
- if (isNearTop) {
338
- if (hasScrollView.current && isDraggingUp) {
337
+ // we can treat near top instead of exactly to avoid trouble with springs
338
+ const isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY
339
+ if (isScrolled) {
340
+ previouslyScrolling = true
339
341
  return false
340
342
  }
343
+ // prevent drag once at top and pulling up
344
+ if (isNearTop) {
345
+ if (hasScrollView.current && isDraggingUp) {
346
+ return false
347
+ }
348
+ }
341
349
  }
342
350
 
343
351
  // we could do some detection of other touchables and cancel here..
@@ -346,7 +354,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
346
354
 
347
355
  const granted = getShouldSet()
348
356
 
349
- // console.log('DEBUG', granted, scrollBridge.scrollLock, scrollBridge.y)
357
+ // console.log('DEBUG', { granted, dy }, { ...scrollBridge })
350
358
 
351
359
  if (granted) {
352
360
  scrollBridge.setParentDragging(true)
@@ -145,10 +145,14 @@ export const SheetScrollView = React.forwardRef<
145
145
  }
146
146
  }
147
147
 
148
+ useEffect(() => {
149
+ scrollBridge.hasScrollableContent = hasScrollableContent
150
+ }, [hasScrollableContent])
151
+
148
152
  return (
149
153
  <ScrollView
150
154
  onLayout={(e) => {
151
- parentHeight.current = e.nativeEvent.layout.height
155
+ parentHeight.current = Math.ceil(e.nativeEvent.layout.height)
152
156
  setIsScrollable()
153
157
  }}
154
158
  ref={composeRefs(scrollRef as any, ref)}
@@ -245,7 +249,8 @@ export const SheetScrollView = React.forwardRef<
245
249
  pointerEvents="none"
246
250
  zIndex={-1}
247
251
  onLayout={(e) => {
248
- contentHeight.current = e.nativeEvent.layout.height
252
+ // found that contentHeight can be 0.x higher than parent when not scrollable
253
+ contentHeight.current = Math.floor(e.nativeEvent.layout.height)
249
254
  setIsScrollable()
250
255
  }}
251
256
  />
package/src/types.tsx CHANGED
@@ -89,6 +89,7 @@ export type ScrollBridge = {
89
89
  paneY: number
90
90
  paneMinY: number
91
91
  scrollStartY: number
92
+ hasScrollableContent: boolean
92
93
  drag: (dy: number) => void
93
94
  release: (state: { dragAt: number; vy: number }) => void
94
95
  scrollLock: boolean
@@ -141,6 +141,7 @@ export function useSheetProviderProps(
141
141
  const parentDragListeners = new Set<Function>()
142
142
 
143
143
  const bridge: ScrollBridge = {
144
+ hasScrollableContent: false,
144
145
  enabled: false,
145
146
  y: 0,
146
147
  paneY: 0,
@@ -1 +1 @@
1
- {"version":3,"file":"SheetImplementationCustom.d.ts","sourceRoot":"","sources":["../src/SheetImplementationCustom.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAA2B,MAAM,OAAO,CAAA;AAO/C,OAAO,EAAsC,IAAI,EAAE,MAAM,cAAc,CAAA;AAIvE,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,SAAS,CAAA;AAWzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAmiBrC,CAAA"}
1
+ {"version":3,"file":"SheetImplementationCustom.d.ts","sourceRoot":"","sources":["../src/SheetImplementationCustom.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAA2B,MAAM,OAAO,CAAA;AAO/C,OAAO,EAAsC,IAAI,EAAE,MAAM,cAAc,CAAA;AAIvE,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,SAAS,CAAA;AAWzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA2iBrC,CAAA"}
@@ -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;;;;;;;;;;;;;;;;wCA8O3B,CAAA"}
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;;;;;;;;;;;;;;;;wCAmP3B,CAAA"}
package/types/types.d.ts CHANGED
@@ -69,6 +69,7 @@ export type ScrollBridge = {
69
69
  paneY: number;
70
70
  paneMinY: number;
71
71
  scrollStartY: number;
72
+ hasScrollableContent: boolean;
72
73
  drag: (dy: number) => void;
73
74
  release: (state: {
74
75
  dragAt: number;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"useSheetProviderProps.d.ts","sourceRoot":"","sources":["../src/useSheetProviderProps.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAKnD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,GAAG;IACzE,gBAAgB,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;CACzC,CAAA;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,cAAc,EACrB,OAAO,GAAE;IACP,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAA;CACpC;;;;;;;;;;;;;;;gCADwB,GAAG,KAAK,IAAI;;;;;;;wBAoCjC,MAAM;;;EAwJhB"}
1
+ {"version":3,"file":"useSheetProviderProps.d.ts","sourceRoot":"","sources":["../src/useSheetProviderProps.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAKnD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,GAAG;IACzE,gBAAgB,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;CACzC,CAAA;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,cAAc,EACrB,OAAO,GAAE;IACP,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAA;CACpC;;;;;;;;;;;;;;;gCADwB,GAAG,KAAK,IAAI;;;;;;;wBAoCjC,MAAM;;;EAyJhB"}