@tamagui/react-native-web-lite 2.0.0-rc.12 → 2.0.0-rc.12-1771037907660

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 (9) hide show
  1. package/dist/cjs/ScrollView/ScrollViewBase.cjs +4 -7
  2. package/dist/cjs/ScrollView/ScrollViewBase.js +3 -7
  3. package/dist/cjs/ScrollView/ScrollViewBase.js.map +1 -1
  4. package/dist/esm/ScrollView/ScrollViewBase.js +3 -7
  5. package/dist/esm/ScrollView/ScrollViewBase.js.map +1 -1
  6. package/dist/esm/ScrollView/ScrollViewBase.mjs +4 -7
  7. package/dist/esm/ScrollView/ScrollViewBase.mjs.map +1 -1
  8. package/package.json +7 -7
  9. package/src/ScrollView/ScrollViewBase.tsx +7 -7
package/dist/cjs/ScrollView/ScrollViewBase.cjs CHANGED
@@ -116,18 +116,18 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
116
116
  function handleScrollEnd(e) {
117
117
  scrollState.current.isScrolling = !1, onScroll && onScroll(normalizeScrollEvent(e));
118
118
  }
119
- const hideScrollbar = showsHorizontalScrollIndicator === !1 || showsVerticalScrollIndicator === !1;
119
+ const hideHorizontalScrollbar = showsHorizontalScrollIndicator === !1,
120
+ hideVerticalScrollbar = showsVerticalScrollIndicator === !1;
120
121
  return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_View.View, {
121
122
  ...rest,
123
+ className: "_dsp_contents" + (hideHorizontalScrollbar ? " _hsb-x" : "") + (hideVerticalScrollbar ? " _hsb-y" : ""),
122
124
  onScroll: handleScroll,
123
125
  onTouchMove: createPreventableScrollHandler(onTouchMove),
124
126
  onWheel: createPreventableScrollHandler(onWheel),
125
127
  ref: (0, import_react_native_web_internals.useMergeRefs)(scrollRef, forwardedRef),
126
128
  style: [style,
127
129
  // @ts-ignore
128
- !scrollEnabled && styles.scrollDisabled,
129
- // @ts-ignore
130
- hideScrollbar && styles.hideScrollbar]
130
+ !scrollEnabled && styles.scrollDisabled]
131
131
  });
132
132
  }),
133
133
  styles = {
@@ -135,9 +135,6 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
135
135
  overflowX: "hidden",
136
136
  overflowY: "hidden",
137
137
  touchAction: "none"
138
- },
139
- hideScrollbar: {
140
- scrollbarWidth: "none"
141
138
  }
142
139
  };
143
140
  var ScrollViewBase_default = ScrollViewBase;
package/dist/cjs/ScrollView/ScrollViewBase.js CHANGED
@@ -98,11 +98,12 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
98
98
  function handleScrollEnd(e) {
99
99
  scrollState.current.isScrolling = !1, onScroll && onScroll(normalizeScrollEvent(e));
100
100
  }
101
- const hideScrollbar = showsHorizontalScrollIndicator === !1 || showsVerticalScrollIndicator === !1;
101
+ const hideHorizontalScrollbar = showsHorizontalScrollIndicator === !1, hideVerticalScrollbar = showsVerticalScrollIndicator === !1;
102
102
  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
103
103
  import_View.View,
104
104
  {
105
105
  ...rest,
106
+ className: "_dsp_contents" + (hideHorizontalScrollbar ? " _hsb-x" : "") + (hideVerticalScrollbar ? " _hsb-y" : ""),
106
107
  onScroll: handleScroll,
107
108
  onTouchMove: createPreventableScrollHandler(onTouchMove),
108
109
  onWheel: createPreventableScrollHandler(onWheel),
@@ -110,9 +111,7 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
110
111
  style: [
111
112
  style,
112
113
  // @ts-ignore
113
- !scrollEnabled && styles.scrollDisabled,
114
- // @ts-ignore
115
- hideScrollbar && styles.hideScrollbar
114
+ !scrollEnabled && styles.scrollDisabled
116
115
  ]
117
116
  }
118
117
  );
@@ -121,9 +120,6 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
121
120
  overflowX: "hidden",
122
121
  overflowY: "hidden",
123
122
  touchAction: "none"
124
- },
125
- hideScrollbar: {
126
- scrollbarWidth: "none"
127
123
  }
128
124
  };
129
125
  var ScrollViewBase_default = ScrollViewBase;
package/dist/cjs/ScrollView/ScrollViewBase.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/ScrollView/ScrollViewBase.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/dist/esm/ScrollView/ScrollViewBase.js CHANGED
@@ -73,11 +73,12 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
73
73
  function handleScrollEnd(e) {
74
74
  scrollState.current.isScrolling = !1, onScroll && onScroll(normalizeScrollEvent(e));
75
75
  }
76
- const hideScrollbar = showsHorizontalScrollIndicator === !1 || showsVerticalScrollIndicator === !1;
76
+ const hideHorizontalScrollbar = showsHorizontalScrollIndicator === !1, hideVerticalScrollbar = showsVerticalScrollIndicator === !1;
77
77
  return /* @__PURE__ */ jsx(
78
78
  View,
79
79
  {
80
80
  ...rest,
81
+ className: "_dsp_contents" + (hideHorizontalScrollbar ? " _hsb-x" : "") + (hideVerticalScrollbar ? " _hsb-y" : ""),
81
82
  onScroll: handleScroll,
82
83
  onTouchMove: createPreventableScrollHandler(onTouchMove),
83
84
  onWheel: createPreventableScrollHandler(onWheel),
@@ -85,9 +86,7 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
85
86
  style: [
86
87
  style,
87
88
  // @ts-ignore
88
- !scrollEnabled && styles.scrollDisabled,
89
- // @ts-ignore
90
- hideScrollbar && styles.hideScrollbar
89
+ !scrollEnabled && styles.scrollDisabled
91
90
  ]
92
91
  }
93
92
  );
@@ -96,9 +95,6 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
96
95
  overflowX: "hidden",
97
96
  overflowY: "hidden",
98
97
  touchAction: "none"
99
- },
100
- hideScrollbar: {
101
- scrollbarWidth: "none"
102
98
  }
103
99
  };
104
100
  var ScrollViewBase_default = ScrollViewBase;
package/dist/esm/ScrollView/ScrollViewBase.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/ScrollView/ScrollViewBase.tsx"],
4
- "mappings": "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",
4
+ "mappings": "AASA,SAAS,oBAAoB;AAC7B,YAAY,WAAW;AAGvB,SAAS,YAAY;AAyIjB;AAzHJ,SAAS,qBAAqB,GAAG;AAC/B,SAAO;AAAA,IACL,aAAa;AAAA,MACX,eAAe;AAAA,QACb,IAAI,IAAI;AACN,iBAAO,EAAE,OAAO;AAAA,QAClB;AAAA,QACA,IAAI,IAAI;AACN,iBAAO,EAAE,OAAO;AAAA,QAClB;AAAA,MACF;AAAA,MACA,aAAa;AAAA,QACX,IAAI,SAAS;AACX,iBAAO,EAAE,OAAO;AAAA,QAClB;AAAA,QACA,IAAI,QAAQ;AACV,iBAAO,EAAE,OAAO;AAAA,QAClB;AAAA,MACF;AAAA,MACA,mBAAmB;AAAA,QACjB,IAAI,SAAS;AACX,iBAAO,EAAE,OAAO;AAAA,QAClB;AAAA,QACA,IAAI,QAAQ;AACV,iBAAO,EAAE,OAAO;AAAA,QAClB;AAAA,MACF;AAAA,IACF;AAAA,IACA,WAAW,KAAK,IAAI;AAAA,EACtB;AACF;AAEA,SAAS,sBAAsB,UAAkB,eAAuB;AACtE,QAAM,oBAAoB,KAAK,IAAI,IAAI;AACvC,SAAO,gBAAgB,KAAK,qBAAqB;AACnD;AAKA,MAAM,iBAAiB,MAAM,WAAW,CAAC,OAAc,iBAAiB;AACtE,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,IAChB,sBAAsB;AAAA,IACtB;AAAA,IACA;AAAA,IACA;AAAA;AAAA,IAEA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI,OAEE,cAAc,MAAM,OAAO,EAAE,aAAa,IAAO,gBAAgB,EAAE,CAAC,GACpE,gBAAgB,MAAM,OAAO,IAAI,GACjC,YAAY,MAAM,OAAO,IAAI;AAEnC,WAAS,+BAA+B,SAAmB;AACzD,WAAO,CAAC,MAAc;AACpB,MAAI,iBACE,WACF,QAAQ,CAAC;AAAA,IAGf;AAAA,EACF;AAEA,WAAS,aAAa,GAAQ;AAC5B,MAAE,gBAAgB,GACd,EAAE,WAAW,UAAU,YACzB,EAAE,QAAQ,GAEN,cAAc,WAAW,QAC3B,aAAa,cAAc,OAAO,GAGpC,cAAc,UAAU,WAAW,MAAM;AACvC,sBAAgB,CAAC;AAAA,IACnB,GAAG,GAAG,GACF,YAAY,QAAQ,cAGpB,sBAAsB,YAAY,QAAQ,gBAAgB,mBAAmB,KAE7E,iBAAiB,CAAC,IAIpB,kBAAkB,CAAC;AAAA,EAGzB;AAEA,WAAS,kBAAkB,GAAW;AACpC,gBAAY,QAAQ,cAAc,IAClC,iBAAiB,CAAC;AAAA,EACpB;AAEA,WAAS,iBAAiB,GAAW;AACnC,gBAAY,QAAQ,iBAAiB,KAAK,IAAI,GAC1C,YACF,SAAS,qBAAqB,CAAC,CAAC;AAAA,EAEpC;AAEA,WAAS,gBAAgB,GAAW;AAClC,gBAAY,QAAQ,cAAc,IAC9B,YACF,SAAS,qBAAqB,CAAC,CAAC;AAAA,EAEpC;AAEA,QAAM,0BAA0B,mCAAmC,IAC7D,wBAAwB,iCAAiC;AAE/D,SACE;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ,WACE,mBACC,0BAA0B,YAAY,OACtC,wBAAwB,YAAY;AAAA,MAEvC,UAAU;AAAA,MACV,aAAa,+BAA+B,WAAkB;AAAA,MAC9D,SAAS,+BAA+B,OAAc;AAAA,MACtD,KAAK,aAAa,WAAW,YAAY;AAAA,MACzC,OAAO;AAAA,QACL;AAAA;AAAA,QAEA,CAAC,iBAAiB,OAAO;AAAA,MAC3B;AAAA;AAAA,EACF;AAEJ,CAAC,GAKK,SAAS;AAAA,EACb,gBAAgB;AAAA,IACd,WAAW;AAAA,IACX,WAAW;AAAA,IACX,aAAa;AAAA,EACf;AACF;AAGA,IAAO,yBAAQ;",
5
5
  "names": []
6
6
  }
package/dist/esm/ScrollView/ScrollViewBase.mjs CHANGED
@@ -79,18 +79,18 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
79
79
  function handleScrollEnd(e) {
80
80
  scrollState.current.isScrolling = !1, onScroll && onScroll(normalizeScrollEvent(e));
81
81
  }
82
- const hideScrollbar = showsHorizontalScrollIndicator === !1 || showsVerticalScrollIndicator === !1;
82
+ const hideHorizontalScrollbar = showsHorizontalScrollIndicator === !1,
83
+ hideVerticalScrollbar = showsVerticalScrollIndicator === !1;
83
84
  return /* @__PURE__ */jsx(View, {
84
85
  ...rest,
86
+ className: "_dsp_contents" + (hideHorizontalScrollbar ? " _hsb-x" : "") + (hideVerticalScrollbar ? " _hsb-y" : ""),
85
87
  onScroll: handleScroll,
86
88
  onTouchMove: createPreventableScrollHandler(onTouchMove),
87
89
  onWheel: createPreventableScrollHandler(onWheel),
88
90
  ref: useMergeRefs(scrollRef, forwardedRef),
89
91
  style: [style,
90
92
  // @ts-ignore
91
- !scrollEnabled && styles.scrollDisabled,
92
- // @ts-ignore
93
- hideScrollbar && styles.hideScrollbar]
93
+ !scrollEnabled && styles.scrollDisabled]
94
94
  });
95
95
  }),
96
96
  styles = {
@@ -98,9 +98,6 @@ const ScrollViewBase = React.forwardRef((props, forwardedRef) => {
98
98
  overflowX: "hidden",
99
99
  overflowY: "hidden",
100
100
  touchAction: "none"
101
- },
102
- hideScrollbar: {
103
- scrollbarWidth: "none"
104
101
  }
105
102
  };
106
103
  var ScrollViewBase_default = ScrollViewBase;
package/dist/esm/ScrollView/ScrollViewBase.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["useMergeRefs","React","View","jsx","normalizeScrollEvent","e","nativeEvent","contentOffset","x","target","scrollLeft","y","scrollTop","contentSize","height","scrollHeight","width","scrollWidth","layoutMeasurement","offsetHeight","offsetWidth","timeStamp","Date","now","shouldEmitScrollEvent","lastTick","eventThrottle","timeSinceLastTick","ScrollViewBase","forwardRef","props","forwardedRef","onScroll","onTouchMove","onWheel","scrollEnabled","scrollEventThrottle","showsHorizontalScrollIndicator","showsVerticalScrollIndicator","style","onMomentumScrollBegin","onMomentumScrollEnd","onScrollBeginDrag","onScrollEndDrag","rest","scrollState","useRef","isScrolling","scrollLastTick","scrollTimeout","scrollRef","createPreventableScrollHandler","handler","handleScroll","stopPropagation","current","persist","clearTimeout","setTimeout","handleScrollEnd","handleScrollTick","handleScrollStart","hideScrollbar","ref","styles","scrollDisabled","overflowX","overflowY","touchAction","scrollbarWidth","ScrollViewBase_default"],"sources":["../../../src/ScrollView/ScrollViewBase.tsx"],"sourcesContent":[null],"mappings":"AASA,SAASA,YAAA,QAAoB;AAC7B,YAAYC,KAAA,MAAW;AAGvB,SAASC,IAAA,QAAY;AAyIjB,SAAAC,GAAA;AAzHJ,SAASC,qBAAqBC,CAAA,EAAG;EAC/B,OAAO;IACLC,WAAA,EAAa;MACXC,aAAA,EAAe;QACb,IAAIC,EAAA,EAAI;UACN,OAAOH,CAAA,CAAEI,MAAA,CAAOC,UAAA;QAClB;QACA,IAAIC,EAAA,EAAI;UACN,OAAON,CAAA,CAAEI,MAAA,CAAOG,SAAA;QAClB;MACF;MACAC,WAAA,EAAa;QACX,IAAIC,OAAA,EAAS;UACX,OAAOT,CAAA,CAAEI,MAAA,CAAOM,YAAA;QAClB;QACA,IAAIC,MAAA,EAAQ;UACV,OAAOX,CAAA,CAAEI,MAAA,CAAOQ,WAAA;QAClB;MACF;MACAC,iBAAA,EAAmB;QACjB,IAAIJ,OAAA,EAAS;UACX,OAAOT,CAAA,CAAEI,MAAA,CAAOU,YAAA;QAClB;QACA,IAAIH,MAAA,EAAQ;UACV,OAAOX,CAAA,CAAEI,MAAA,CAAOW,WAAA;QAClB;MACF;IACF;IACAC,SAAA,EAAWC,IAAA,CAAKC,GAAA,CAAI;EACtB;AACF;AAEA,SAASC,sBAAsBC,QAAA,EAAkBC,aAAA,EAAuB;EACtE,MAAMC,iBAAA,GAAoBL,IAAA,CAAKC,GAAA,CAAI,IAAIE,QAAA;EACvC,OAAOC,aAAA,GAAgB,KAAKC,iBAAA,IAAqBD,aAAA;AACnD;AAKA,MAAME,cAAA,GAAiB3B,KAAA,CAAM4B,UAAA,CAAW,CAACC,KAAA,EAAcC,YAAA,KAAiB;IACtE,MAAM;QACJC,QAAA;QACAC,WAAA;QACAC,OAAA;QACAC,aAAA,GAAgB;QAChBC,mBAAA,GAAsB;QACtBC,8BAAA;QACAC,4BAAA;QACAC,KAAA;QAAA;QAEAC,qBAAA;QACAC,mBAAA;QACAC,iBAAA;QACAC,eAAA;QACA,GAAGC;MACL,IAAId,KAAA;MAEEe,WAAA,GAAc5C,KAAA,CAAM6C,MAAA,CAAO;QAAEC,WAAA,EAAa;QAAOC,cAAA,EAAgB;MAAE,CAAC;MACpEC,aAAA,GAAgBhD,KAAA,CAAM6C,MAAA,CAAO,IAAI;MACjCI,SAAA,GAAYjD,KAAA,CAAM6C,MAAA,CAAO,IAAI;IAEnC,SAASK,+BAA+BC,OAAA,EAAmB;MACzD,OAAQ/C,CAAA,IAAc;QAChB8B,aAAA,IACEiB,OAAA,IACFA,OAAA,CAAQ/C,CAAC;MAGf;IACF;IAEA,SAASgD,aAAahD,CAAA,EAAQ;MAC5BA,CAAA,CAAEiD,eAAA,CAAgB,GACdjD,CAAA,CAAEI,MAAA,KAAWyC,SAAA,CAAUK,OAAA,KACzBlD,CAAA,CAAEmD,OAAA,CAAQ,GAENP,aAAA,CAAcM,OAAA,IAAW,QAC3BE,YAAA,CAAaR,aAAA,CAAcM,OAAO,GAGpCN,aAAA,CAAcM,OAAA,GAAUG,UAAA,CAAW,MAAM;QACvCC,eAAA,CAAgBtD,CAAC;MACnB,GAAG,GAAG,GACFwC,WAAA,CAAYU,OAAA,CAAQR,WAAA,GAGpBvB,qBAAA,CAAsBqB,WAAA,CAAYU,OAAA,CAAQP,cAAA,EAAgBZ,mBAAmB,KAE7EwB,gBAAA,CAAiBvD,CAAC,IAIpBwD,iBAAA,CAAkBxD,CAAC;IAGzB;IAEA,SAASwD,kBAAkBxD,CAAA,EAAW;MACpCwC,WAAA,CAAYU,OAAA,CAAQR,WAAA,GAAc,IAClCa,gBAAA,CAAiBvD,CAAC;IACpB;IAEA,SAASuD,iBAAiBvD,CAAA,EAAW;MACnCwC,WAAA,CAAYU,OAAA,CAAQP,cAAA,GAAiB1B,IAAA,CAAKC,GAAA,CAAI,GAC1CS,QAAA,IACFA,QAAA,CAAS5B,oBAAA,CAAqBC,CAAC,CAAC;IAEpC;IAEA,SAASsD,gBAAgBtD,CAAA,EAAW;MAClCwC,WAAA,CAAYU,OAAA,CAAQR,WAAA,GAAc,IAC9Bf,QAAA,IACFA,QAAA,CAAS5B,oBAAA,CAAqBC,CAAC,CAAC;IAEpC;IAEA,MAAMyD,aAAA,GACJzB,8BAAA,KAAmC,MAASC,4BAAA,KAAiC;IAE/E,OACE,eAAAnC,GAAA,CAACD,IAAA;MACE,GAAG0C,IAAA;MACJZ,QAAA,EAAUqB,YAAA;MACVpB,WAAA,EAAakB,8BAAA,CAA+BlB,WAAkB;MAC9DC,OAAA,EAASiB,8BAAA,CAA+BjB,OAAc;MACtD6B,GAAA,EAAK/D,YAAA,CAAakD,SAAA,EAAWnB,YAAY;MACzCQ,KAAA,EAAO,CACLA,KAAA;MAAA;MAEA,CAACJ,aAAA,IAAiB6B,MAAA,CAAOC,cAAA;MAAA;MAEzBH,aAAA,IAAiBE,MAAA,CAAOF,aAAA;IAC1B,CACF;EAEJ,CAAC;EAKKE,MAAA,GAAS;IACbC,cAAA,EAAgB;MACdC,SAAA,EAAW;MACXC,SAAA,EAAW;MACXC,WAAA,EAAa;IACf;IACAN,aAAA,EAAe;MACbO,cAAA,EAAgB;IAClB;EACF;AAGA,IAAOC,sBAAA,GAAQ1C,cAAA","ignoreList":[]}
1
+ {"version":3,"names":["useMergeRefs","React","View","jsx","normalizeScrollEvent","e","nativeEvent","contentOffset","x","target","scrollLeft","y","scrollTop","contentSize","height","scrollHeight","width","scrollWidth","layoutMeasurement","offsetHeight","offsetWidth","timeStamp","Date","now","shouldEmitScrollEvent","lastTick","eventThrottle","timeSinceLastTick","ScrollViewBase","forwardRef","props","forwardedRef","onScroll","onTouchMove","onWheel","scrollEnabled","scrollEventThrottle","showsHorizontalScrollIndicator","showsVerticalScrollIndicator","style","onMomentumScrollBegin","onMomentumScrollEnd","onScrollBeginDrag","onScrollEndDrag","rest","scrollState","useRef","isScrolling","scrollLastTick","scrollTimeout","scrollRef","createPreventableScrollHandler","handler","handleScroll","stopPropagation","current","persist","clearTimeout","setTimeout","handleScrollEnd","handleScrollTick","handleScrollStart","hideHorizontalScrollbar","hideVerticalScrollbar","className","ref","styles","scrollDisabled","overflowX","overflowY","touchAction","ScrollViewBase_default"],"sources":["../../../src/ScrollView/ScrollViewBase.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/react-native-web-lite",
3
- "version": "2.0.0-rc.12",
3
+ "version": "2.0.0-rc.12-1771037907660",
4
4
  "description": "React Native for Web",
5
5
  "keywords": [
6
6
  "react",
@@ -76,16 +76,16 @@
76
76
  "clean:build": "tamagui-build clean:build"
77
77
  },
78
78
  "dependencies": {
79
- "@tamagui/normalize-css-color": "2.0.0-rc.12",
80
- "@tamagui/react-native-use-pressable": "2.0.0-rc.12",
81
- "@tamagui/react-native-use-responder-events": "2.0.0-rc.12",
82
- "@tamagui/react-native-web-internals": "2.0.0-rc.12",
83
- "@tamagui/web": "2.0.0-rc.12",
79
+ "@tamagui/normalize-css-color": "2.0.0-rc.12-1771037907660",
80
+ "@tamagui/react-native-use-pressable": "2.0.0-rc.12-1771037907660",
81
+ "@tamagui/react-native-use-responder-events": "2.0.0-rc.12-1771037907660",
82
+ "@tamagui/react-native-web-internals": "2.0.0-rc.12-1771037907660",
83
+ "@tamagui/web": "2.0.0-rc.12-1771037907660",
84
84
  "invariant": "^2.2.4",
85
85
  "memoize-one": "^6.0.0"
86
86
  },
87
87
  "devDependencies": {
88
- "@tamagui/build": "2.0.0-rc.12",
88
+ "@tamagui/build": "2.0.0-rc.12-1771037907660",
89
89
  "react": ">=19",
90
90
  "react-dom": "*"
91
91
  },
package/src/ScrollView/ScrollViewBase.tsx CHANGED
@@ -144,12 +144,17 @@ const ScrollViewBase = React.forwardRef((props: Props, forwardedRef) => {
144
144
  }
145
145
  }
146
146
 
147
- const hideScrollbar =
148
- showsHorizontalScrollIndicator === false || showsVerticalScrollIndicator === false
147
+ const hideHorizontalScrollbar = showsHorizontalScrollIndicator === false
148
+ const hideVerticalScrollbar = showsVerticalScrollIndicator === false
149
149
 
150
150
  return (
151
151
  <View
152
152
  {...rest}
153
+ className={
154
+ '_dsp_contents' +
155
+ (hideHorizontalScrollbar ? ' _hsb-x' : '') +
156
+ (hideVerticalScrollbar ? ' _hsb-y' : '')
157
+ }
153
158
  onScroll={handleScroll}
154
159
  onTouchMove={createPreventableScrollHandler(onTouchMove as any)}
155
160
  onWheel={createPreventableScrollHandler(onWheel as any)}
@@ -158,8 +163,6 @@ const ScrollViewBase = React.forwardRef((props: Props, forwardedRef) => {
158
163
  style,
159
164
  // @ts-ignore
160
165
  !scrollEnabled && styles.scrollDisabled,
161
- // @ts-ignore
162
- hideScrollbar && styles.hideScrollbar,
163
166
  ]}
164
167
  />
165
168
  )
@@ -174,9 +177,6 @@ const styles = {
174
177
  overflowY: 'hidden',
175
178
  touchAction: 'none',
176
179
  },
177
- hideScrollbar: {
178
- scrollbarWidth: 'none',
179
- },
180
180
  }
181
181
 
182
182
  export { ScrollViewBase }