@tamagui/remove-scroll 1.130.1 → 1.130.3

package/dist/cjs/RemoveScroll.cjs

@@ -1,9 +1,7 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
     for (var name in all) __defProp(target, name, {
       get: all[name],
@@ -17,32 +15,13 @@ var __export = (target, all) => {
     });
     return to;
   };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: !0
+}), mod);
 var RemoveScroll_exports = {};
 __export(RemoveScroll_exports, {
   RemoveScroll: () => RemoveScroll
 });
 module.exports = __toCommonJS(RemoveScroll_exports);
-var import_react = __toESM(require("react")),
-  import_jsx_runtime = require("react/jsx-runtime");
-const RemoveScroll = import_react.default.memo(props => {
-  const root = (0, import_react.useRef)(null);
-  return /* @__PURE__ */(0, import_jsx_runtime.jsx)("span", {
-    ref: root,
-    style: {
-      display: "contents"
-    },
-    children: props.children
-  });
-});
+var import_useDisableScroll = require("./useDisableScroll.cjs");
+const RemoveScroll = props => ((0, import_useDisableScroll.useDisableBodyScroll)(!!props.enabled), props.children);

package/dist/cjs/RemoveScroll.js

@@ -1,8 +1,7 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: !0 });
@@ -12,22 +11,12 @@ var __export = (target, all) => {
       !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
-  mod
-)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var RemoveScroll_exports = {};
 __export(RemoveScroll_exports, {
   RemoveScroll: () => RemoveScroll
 });
 module.exports = __toCommonJS(RemoveScroll_exports);
-var import_react = __toESM(require("react")), import_jsx_runtime = require("react/jsx-runtime");
-const RemoveScroll = import_react.default.memo((props) => {
-  const root = (0, import_react.useRef)(null);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { ref: root, style: { display: "contents" }, children: props.children });
-});
+var import_useDisableScroll = require("./useDisableScroll");
+const RemoveScroll = (props) => ((0, import_useDisableScroll.useDisableBodyScroll)(!!props.enabled), props.children);
 //# sourceMappingURL=RemoveScroll.js.map

package/dist/cjs/RemoveScroll.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/RemoveScroll.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8B,2BAgB1B;AARG,MAAM,eAAe,aAAAA,QAAM,KAAK,CAAC,UAA6B;AACnE,QAAM,WAAO,qBAAoB,IAAI;AAMrC,SACE,4CAAC,UAAK,KAAK,MAAM,OAAO,EAAE,SAAS,WAAW,GAC3C,gBAAM,UACT;AAEJ,CAAC;",
-  "names": ["React"]
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,8BAAqC;AAO9B,MAAM,eAAe,CAAC,eAC3B,8CAAqB,EAAQ,MAAM,OAAQ,GAEpC,MAAM;",
+  "names": []
 }

package/dist/cjs/RemoveScroll.native.js

@@ -15,14 +15,17 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var RemoveScroll_native_exports = {};
 __export(RemoveScroll_native_exports, {
-  RemoveScroll: () => RemoveScroll
+  RemoveScroll: () => RemoveScroll,
+  getAllowedScrollableNode: () => getAllowedScrollableNode
 });
 module.exports = __toCommonJS(RemoveScroll_native_exports);
 var RemoveScroll = function(props) {
   return props.children;
+}, getAllowedScrollableNode = function() {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RemoveScroll
+  RemoveScroll,
+  getAllowedScrollableNode
 });
 //# sourceMappingURL=RemoveScroll.native.js.map

package/dist/cjs/RemoveScroll.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/RemoveScroll.native.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAAO,IAAMA,eAAe,SAACC,OAAAA;SAAUA,MAAMC;;",
-  "names": ["RemoveScroll", "props", "children"]
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;AAAO,IAAMA,eAAe,SAACC,OAAAA;SAAoBA,MAAMC;GAC1CC,2BAA2B,WAAA;AAAY;",
+  "names": ["RemoveScroll", "props", "children", "getAllowedScrollableNode"]
 }

package/dist/cjs/useDisableScroll.cjs

@@ -20,44 +20,21 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var useDisableScroll_exports = {};
 __export(useDisableScroll_exports, {
-  useDisableScrollOutsideOf: () => useDisableScrollOutsideOf
+  useDisableBodyScroll: () => useDisableBodyScroll
 });
 module.exports = __toCommonJS(useDisableScroll_exports);
 var import_react = require("react");
 const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement,
-  preventDefault = e => {
-    e.preventDefault && e.preventDefault();
-  },
-  useDisableScrollOutsideOf = (nodeRef, options = {}) => {
-    const {
-      enabled,
-      keyboardKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40]
-    } = options;
+  useDisableBodyScroll = enabled => {
     (0, import_react.useEffect)(() => {
       if (!enabled || !canUseDOM()) return;
-      const node = nodeRef.current;
-      if (!node) return;
-      const scrollEl = document.scrollingElement;
-      if (!scrollEl || !(scrollEl instanceof HTMLElement)) return;
-      const previously = scrollEl.style.pointerEvents;
-      scrollEl.style.pointerEvents = "none";
-      const lockToScrollPos = [scrollEl.scrollLeft, scrollEl.scrollTop],
-        handleScroll = e => {
-          scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-        },
-        handleEvent = e => {
-          e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
+      const bodyEl = document.documentElement,
+        previousBodyStyle = {
+          scrollbarGutter: bodyEl.style.scrollbarGutter,
+          overflow: bodyEl.style.overflow
         };
-      return document.addEventListener("scroll", handleScroll, {
-        passive: !1
-      }), document.addEventListener("wheel", handleEvent, {
-        passive: !1
-      }), document.addEventListener("touchmove", handleEvent, {
-        passive: !1
-      }), document.addEventListener("keydown", handleEvent, {
-        passive: !1
-      }), () => {
-        scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
+      return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", () => {
+        Object.assign(bodyEl.style, previousBodyStyle);
       };
-    }, [enabled, nodeRef, keyboardKeys]);
+    }, [enabled]);
   };

package/dist/cjs/useDisableScroll.js

@@ -14,33 +14,21 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var useDisableScroll_exports = {};
 __export(useDisableScroll_exports, {
-  useDisableScrollOutsideOf: () => useDisableScrollOutsideOf
+  useDisableBodyScroll: () => useDisableBodyScroll
 });
 module.exports = __toCommonJS(useDisableScroll_exports);
 var import_react = require("react");
-const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement, preventDefault = (e) => {
-  e.preventDefault && e.preventDefault();
-}, useDisableScrollOutsideOf = (nodeRef, options = {}) => {
-  const { enabled, keyboardKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40] } = options;
+const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement, useDisableBodyScroll = (enabled) => {
   (0, import_react.useEffect)(() => {
     if (!enabled || !canUseDOM())
       return;
-    const node = nodeRef.current;
-    if (!node)
-      return;
-    const scrollEl = document.scrollingElement;
-    if (!scrollEl || !(scrollEl instanceof HTMLElement))
-      return;
-    const previously = scrollEl.style.pointerEvents;
-    scrollEl.style.pointerEvents = "none";
-    const lockToScrollPos = [scrollEl.scrollLeft, scrollEl.scrollTop], handleScroll = (e) => {
-      scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-    }, handleEvent = (e) => {
-      e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
+    const bodyEl = document.documentElement, previousBodyStyle = {
+      scrollbarGutter: bodyEl.style.scrollbarGutter,
+      overflow: bodyEl.style.overflow
     };
-    return document.addEventListener("scroll", handleScroll, { passive: !1 }), document.addEventListener("wheel", handleEvent, { passive: !1 }), document.addEventListener("touchmove", handleEvent, { passive: !1 }), document.addEventListener("keydown", handleEvent, { passive: !1 }), () => {
-      scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
+    return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", () => {
+      Object.assign(bodyEl.style, previousBodyStyle);
     };
-  }, [enabled, nodeRef, keyboardKeys]);
+  }, [enabled]);
 };
 //# sourceMappingURL=useDisableScroll.js.map

package/dist/cjs/useDisableScroll.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useDisableScroll.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC;AAElC,MAAM,YAAY,MAChB,OAAO,SAAW,OAAe,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,OAAO,SAAS,eAEpE,iBAAiB,CAAC,MAA+C;AACrE,EAAI,EAAE,kBACJ,EAAE,eAAe;AAErB,GAEa,4BAA4B,CACvC,SACA,UAKI,CAAC,MACF;AACH,QAAM,EAAE,SAAS,eAAe,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,EAAE,IAAI;AAEzE,8BAAU,MAAM;AACd,QAAI,CAAC,WAAW,CAAC,UAAU;AACzB;AAGF,UAAM,OAAO,QAAQ;AACrB,QAAI,CAAC;AACH;AAGF,UAAM,WAAW,SAAS;AAC1B,QAAI,CAAC,YAAY,EAAE,oBAAoB;AACrC;AAGF,UAAM,aAAa,SAAS,MAAM;AAClC,aAAS,MAAM,gBAAgB;AAE/B,UAAM,kBAAkB,CAAC,SAAS,YAAY,SAAS,SAAS,GAE1D,eAAe,CAAC,MAAa;AACjC,MAAI,aACF,EAAE,eAAe,GACjB,SAAS,SAAS,gBAAgB,CAAC,GAAG,gBAAgB,CAAC,CAAC;AAAA,IAE5D,GAEM,cAAc,CAAC,MAA+C;AAClE,MAAI,EAAE,kBAAkB,SAAS,EAAE,WAAW,QAAQ,KAAK,SAAS,EAAE,MAAM,MAIxE,aAAa,KAAK,CAAC,aAAa,SAAS,EAAE,OAAO,KAItD,eAAe,CAAC;AAAA,IAClB;AAEA,oBAAS,iBAAiB,UAAU,cAAc,EAAE,SAAS,GAAM,CAAC,GACpE,SAAS,iBAAiB,SAAS,aAAa,EAAE,SAAS,GAAM,CAAC,GAClE,SAAS,iBAAiB,aAAa,aAAa,EAAE,SAAS,GAAM,CAAC,GACtE,SAAS,iBAAiB,WAAW,aAAa,EAAE,SAAS,GAAM,CAAC,GAE7D,MAAM;AACX,eAAS,MAAM,gBAAgB,YAC/B,SAAS,oBAAoB,UAAU,YAAY,GACnD,SAAS,oBAAoB,SAAS,WAAW,GACjD,SAAS,oBAAoB,aAAa,WAAW,GACrD,SAAS,oBAAoB,WAAW,WAAW;AAAA,IACrD;AAAA,EACF,GAAG,CAAC,SAAS,SAAS,YAAY,CAAC;AACrC;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA0B;AAE1B,MAAM,YAAY,MAChB,OAAO,SAAW,OAAe,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,OAAO,SAAS,eAE7D,uBAAuB,CAAC,YAA2B;AAC9D,8BAAU,MAAM;AACd,QAAI,CAAC,WAAW,CAAC,UAAU;AACzB;AAIF,UAAM,SAAS,SAAS,iBAClB,oBAAoB;AAAA,MACxB,iBAAiB,OAAO,MAAM;AAAA,MAC9B,UAAU,OAAO,MAAM;AAAA,IACzB;AACA,kBAAO,MAAM,kBAAkB,UAC/B,OAAO,MAAM,WAAW,UAEjB,MAAM;AACX,aAAO,OAAO,OAAO,OAAO,iBAAiB;AAAA,IAC/C;AAAA,EACF,GAAG,CAAC,OAAO,CAAC;AACd;",
   "names": []
 }

package/dist/cjs/useDisableScroll.native.js

@@ -15,67 +15,28 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var useDisableScroll_exports = {};
 __export(useDisableScroll_exports, {
-  useDisableScrollOutsideOf: () => useDisableScrollOutsideOf
+  useDisableBodyScroll: () => useDisableBodyScroll
 });
 module.exports = __toCommonJS(useDisableScroll_exports);
 var import_react = require("react"), canUseDOM = function() {
   return typeof window < "u" && !!window.document && !!window.document.createElement;
-}, preventDefault = function(e) {
-  e.preventDefault && e.preventDefault();
-}, useDisableScrollOutsideOf = function(nodeRef) {
-  var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : (
-    // space: 32, page up: 33, page down: 34, end: 35, home: 36
-    // left: 37, up: 38, right: 39, down: 40
-    {}
-  ), { enabled, keyboardKeys = [
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40
-  ] } = options;
+}, useDisableBodyScroll = function(enabled) {
   (0, import_react.useEffect)(function() {
     if (!(!enabled || !canUseDOM())) {
-      var node = nodeRef.current;
-      if (node) {
-        var scrollEl = document.scrollingElement;
-        if (!(!scrollEl || !(scrollEl instanceof HTMLElement))) {
-          var previously = scrollEl.style.pointerEvents;
-          scrollEl.style.pointerEvents = "none";
-          var lockToScrollPos = [
-            scrollEl.scrollLeft,
-            scrollEl.scrollTop
-          ], handleScroll = function(e) {
-            scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-          }, handleEvent = function(e) {
-            e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
-          };
-          return document.addEventListener("scroll", handleScroll, {
-            passive: !1
-          }), document.addEventListener("wheel", handleEvent, {
-            passive: !1
-          }), document.addEventListener("touchmove", handleEvent, {
-            passive: !1
-          }), document.addEventListener("keydown", handleEvent, {
-            passive: !1
-          }), function() {
-            scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
-          };
-        }
-      }
+      var bodyEl = document.documentElement, previousBodyStyle = {
+        scrollbarGutter: bodyEl.style.scrollbarGutter,
+        overflow: bodyEl.style.overflow
+      };
+      return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", function() {
+        Object.assign(bodyEl.style, previousBodyStyle);
+      };
     }
   }, [
-    enabled,
-    nodeRef,
-    keyboardKeys
+    enabled
   ]);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  useDisableScrollOutsideOf
+  useDisableBodyScroll
 });
 //# sourceMappingURL=useDisableScroll.js.map

package/dist/cjs/useDisableScroll.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useDisableScroll.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;mBAAkC,kBAE5BA,YAAY,WAAA;SAChB,OAAOC,SAAW,OAAe,CAAC,CAACA,OAAOC,YAAY,CAAC,CAACD,OAAOC,SAASC;GAEpEC,iBAAiB,SAACC,GAAAA;AACtB,EAAIA,EAAED,kBACJC,EAAED,eAAc;AAEpB,GAEaE,4BAA4B,SACvCC,SAAAA;MACAC,UAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA;;;IAKI,CAAC;KAEC,EAAEC,SAASC,eAAe;IAAC;IAAI;IAAI;IAAI;IAAI;IAAI;IAAI;IAAI;IAAI;IAAG,IAAKF;AAEzEG,8BAAU,WAAA;AACR,QAAI,GAACF,WAAW,CAACT,UAAAA,IAIjB;UAAMY,OAAOL,QAAQM;AACrB,UAAKD,MAIL;YAAME,WAAWZ,SAASa;AAC1B,YAAI,GAACD,YAAY,EAAEA,oBAAoBE,eAIvC;cAAMC,aAAaH,SAASI,MAAMC;AAClCL,mBAASI,MAAMC,gBAAgB;AAE/B,cAAMC,kBAAkB;YAACN,SAASO;YAAYP,SAASQ;aAEjDC,eAAe,SAAClB,GAAAA;AACpB,YAAIS,aACFT,EAAED,eAAc,GAChBU,SAASU,SAASJ,gBAAgB,CAAA,GAAIA,gBAAgB,CAAA,CAAE;UAE5D,GAEMK,cAAc,SAACpB,GAAAA;AACnB,YAAIA,EAAEqB,kBAAkBC,SAAStB,EAAEqB,WAAWd,QAAQA,KAAKgB,SAASvB,EAAEqB,MAAM,MAIxE,aAAarB,KAAK,CAACK,aAAamB,SAASxB,EAAEyB,OAAO,KAItD1B,eAAeC,CAAAA;UACjB;AAEAH,0BAAS6B,iBAAiB,UAAUR,cAAc;YAAES,SAAS;UAAM,CAAA,GACnE9B,SAAS6B,iBAAiB,SAASN,aAAa;YAAEO,SAAS;UAAM,CAAA,GACjE9B,SAAS6B,iBAAiB,aAAaN,aAAa;YAAEO,SAAS;UAAM,CAAA,GACrE9B,SAAS6B,iBAAiB,WAAWN,aAAa;YAAEO,SAAS;UAAM,CAAA,GAE5D,WAAA;AACLlB,qBAASI,MAAMC,gBAAgBF,YAC/Bf,SAAS+B,oBAAoB,UAAUV,YAAAA,GACvCrB,SAAS+B,oBAAoB,SAASR,WAAAA,GACtCvB,SAAS+B,oBAAoB,aAAaR,WAAAA,GAC1CvB,SAAS+B,oBAAoB,WAAWR,WAAAA;UAC1C;;;;EACF,GAAG;IAAChB;IAASF;IAASG;GAAa;AACrC;",
-  "names": ["canUseDOM", "window", "document", "createElement", "preventDefault", "e", "useDisableScrollOutsideOf", "nodeRef", "options", "enabled", "keyboardKeys", "useEffect", "node", "current", "scrollEl", "scrollingElement", "HTMLElement", "previously", "style", "pointerEvents", "lockToScrollPos", "scrollLeft", "scrollTop", "handleScroll", "scrollTo", "handleEvent", "target", "Node", "contains", "includes", "keyCode", "addEventListener", "passive", "removeEventListener"]
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;mBAA0B,kBAEpBA,YAAY,WAAA;SAChB,OAAOC,SAAW,OAAe,CAAC,CAACA,OAAOC,YAAY,CAAC,CAACD,OAAOC,SAASC;GAE7DC,uBAAuB,SAACC,SAAAA;AACnCC,8BAAU,WAAA;AACR,QAAI,GAACD,WAAW,CAACL,UAAAA,IAKjB;UAAMO,SAASL,SAASM,iBAClBC,oBAAoB;QACxBC,iBAAiBH,OAAOI,MAAMD;QAC9BE,UAAUL,OAAOI,MAAMC;MACzB;AACAL,oBAAOI,MAAMD,kBAAkB,UAC/BH,OAAOI,MAAMC,WAAW,UAEjB,WAAA;AACLC,eAAOC,OAAOP,OAAOI,OAAOF,iBAAAA;MAC9B;;EACF,GAAG;IAACJ;GAAQ;AACd;",
+  "names": ["canUseDOM", "window", "document", "createElement", "useDisableBodyScroll", "enabled", "useEffect", "bodyEl", "documentElement", "previousBodyStyle", "scrollbarGutter", "style", "overflow", "Object", "assign"]
 }

package/dist/esm/RemoveScroll.js

@@ -1,9 +1,5 @@
-import React, { useRef } from "react";
-import { jsx } from "react/jsx-runtime";
-const RemoveScroll = React.memo((props) => {
-  const root = useRef(null);
-  return /* @__PURE__ */ jsx("span", { ref: root, style: { display: "contents" }, children: props.children });
-});
+import { useDisableBodyScroll } from "./useDisableScroll";
+const RemoveScroll = (props) => (useDisableBodyScroll(!!props.enabled), props.children);
 export {
   RemoveScroll
 };

package/dist/esm/RemoveScroll.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/RemoveScroll.tsx"],
-  "mappings": "AAAA,OAAO,SAAS,cAAc;AAgB1B;AARG,MAAM,eAAe,MAAM,KAAK,CAAC,UAA6B;AACnE,QAAM,OAAO,OAAoB,IAAI;AAMrC,SACE,oBAAC,UAAK,KAAK,MAAM,OAAO,EAAE,SAAS,WAAW,GAC3C,gBAAM,UACT;AAEJ,CAAC;",
+  "mappings": "AACA,SAAS,4BAA4B;AAO9B,MAAM,eAAe,CAAC,WAC3B,qBAAqB,EAAQ,MAAM,OAAQ,GAEpC,MAAM;",
   "names": []
 }

package/dist/esm/RemoveScroll.mjs

@@ -1,14 +1,4 @@
-import React, { useRef } from "react";
-import { jsx } from "react/jsx-runtime";
-const RemoveScroll = React.memo(props => {
-  const root = useRef(null);
-  return /* @__PURE__ */jsx("span", {
-    ref: root,
-    style: {
-      display: "contents"
-    },
-    children: props.children
-  });
-});
+import { useDisableBodyScroll } from "./useDisableScroll.mjs";
+const RemoveScroll = props => (useDisableBodyScroll(!!props.enabled), props.children);
 export { RemoveScroll };
 //# sourceMappingURL=RemoveScroll.mjs.map

package/dist/esm/RemoveScroll.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","useRef","jsx","RemoveScroll","memo","props","root","ref","style","display","children"],"sources":["../../src/RemoveScroll.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,IAASC,MAAA,QAAc;AAgB1B,SAAAC,GAAA;AARG,MAAMC,YAAA,GAAeH,KAAA,CAAMI,IAAA,CAAMC,KAAA,IAA6B;EACnE,MAAMC,IAAA,GAAOL,MAAA,CAAoB,IAAI;EAMrC,OACE,eAAAC,GAAA,CAAC;IAAKK,GAAA,EAAKD,IAAA;IAAME,KAAA,EAAO;MAAEC,OAAA,EAAS;IAAW;IAC3CC,QAAA,EAAAL,KAAA,CAAMK;EAAA,CACT;AAEJ,CAAC","ignoreList":[]}
+{"version":3,"names":["useDisableBodyScroll","RemoveScroll","props","enabled","children"],"sources":["../../src/RemoveScroll.tsx"],"sourcesContent":[null],"mappings":"AACA,SAASA,oBAAA,QAA4B;AAO9B,MAAMC,YAAA,GAAgBC,KAAA,KAC3BF,oBAAA,CAAqB,EAAQE,KAAA,CAAMC,OAAQ,GAEpCD,KAAA,CAAME,QAAA","ignoreList":[]}

package/dist/esm/RemoveScroll.native.js

@@ -1,5 +1,6 @@
 var RemoveScroll = function (props) {
-  return props.children;
-};
-export { RemoveScroll };
+    return props.children;
+  },
+  getAllowedScrollableNode = function () {};
+export { RemoveScroll, getAllowedScrollableNode };
 //# sourceMappingURL=RemoveScroll.native.js.map

package/dist/esm/RemoveScroll.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["RemoveScroll","props","children"],"sources":["../../src/RemoveScroll.native.tsx"],"sourcesContent":[null],"mappings":"AAAO,IAAMA,YAAA,GAAe,SAAAA,CAACC,KAAA;SAAUA,KAAA,CAAMC,QAAA","ignoreList":[]}
+{"version":3,"names":["RemoveScroll","props","children","getAllowedScrollableNode"],"sources":["../../src/RemoveScroll.native.tsx"],"sourcesContent":[null],"mappings":"AAAO,IAAMA,YAAA,GAAe,SAAAA,CAACC,KAAA;WAAoBA,KAAA,CAAMC,QAAA;;EAC1CC,wBAAA,GAA2B,SAAAA,CAAA,GAAY","ignoreList":[]}

package/dist/esm/useDisableScroll.js

@@ -1,30 +1,18 @@
 import { useEffect } from "react";
-const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement, preventDefault = (e) => {
-  e.preventDefault && e.preventDefault();
-}, useDisableScrollOutsideOf = (nodeRef, options = {}) => {
-  const { enabled, keyboardKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40] } = options;
+const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement, useDisableBodyScroll = (enabled) => {
   useEffect(() => {
     if (!enabled || !canUseDOM())
       return;
-    const node = nodeRef.current;
-    if (!node)
-      return;
-    const scrollEl = document.scrollingElement;
-    if (!scrollEl || !(scrollEl instanceof HTMLElement))
-      return;
-    const previously = scrollEl.style.pointerEvents;
-    scrollEl.style.pointerEvents = "none";
-    const lockToScrollPos = [scrollEl.scrollLeft, scrollEl.scrollTop], handleScroll = (e) => {
-      scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-    }, handleEvent = (e) => {
-      e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
+    const bodyEl = document.documentElement, previousBodyStyle = {
+      scrollbarGutter: bodyEl.style.scrollbarGutter,
+      overflow: bodyEl.style.overflow
     };
-    return document.addEventListener("scroll", handleScroll, { passive: !1 }), document.addEventListener("wheel", handleEvent, { passive: !1 }), document.addEventListener("touchmove", handleEvent, { passive: !1 }), document.addEventListener("keydown", handleEvent, { passive: !1 }), () => {
-      scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
+    return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", () => {
+      Object.assign(bodyEl.style, previousBodyStyle);
     };
-  }, [enabled, nodeRef, keyboardKeys]);
+  }, [enabled]);
 };
 export {
-  useDisableScrollOutsideOf
+  useDisableBodyScroll
 };
 //# sourceMappingURL=useDisableScroll.js.map

package/dist/esm/useDisableScroll.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useDisableScroll.ts"],
-  "mappings": "AAAA,SAAS,iBAAyB;AAElC,MAAM,YAAY,MAChB,OAAO,SAAW,OAAe,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,OAAO,SAAS,eAEpE,iBAAiB,CAAC,MAA+C;AACrE,EAAI,EAAE,kBACJ,EAAE,eAAe;AAErB,GAEa,4BAA4B,CACvC,SACA,UAKI,CAAC,MACF;AACH,QAAM,EAAE,SAAS,eAAe,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,EAAE,IAAI;AAEzE,YAAU,MAAM;AACd,QAAI,CAAC,WAAW,CAAC,UAAU;AACzB;AAGF,UAAM,OAAO,QAAQ;AACrB,QAAI,CAAC;AACH;AAGF,UAAM,WAAW,SAAS;AAC1B,QAAI,CAAC,YAAY,EAAE,oBAAoB;AACrC;AAGF,UAAM,aAAa,SAAS,MAAM;AAClC,aAAS,MAAM,gBAAgB;AAE/B,UAAM,kBAAkB,CAAC,SAAS,YAAY,SAAS,SAAS,GAE1D,eAAe,CAAC,MAAa;AACjC,MAAI,aACF,EAAE,eAAe,GACjB,SAAS,SAAS,gBAAgB,CAAC,GAAG,gBAAgB,CAAC,CAAC;AAAA,IAE5D,GAEM,cAAc,CAAC,MAA+C;AAClE,MAAI,EAAE,kBAAkB,SAAS,EAAE,WAAW,QAAQ,KAAK,SAAS,EAAE,MAAM,MAIxE,aAAa,KAAK,CAAC,aAAa,SAAS,EAAE,OAAO,KAItD,eAAe,CAAC;AAAA,IAClB;AAEA,oBAAS,iBAAiB,UAAU,cAAc,EAAE,SAAS,GAAM,CAAC,GACpE,SAAS,iBAAiB,SAAS,aAAa,EAAE,SAAS,GAAM,CAAC,GAClE,SAAS,iBAAiB,aAAa,aAAa,EAAE,SAAS,GAAM,CAAC,GACtE,SAAS,iBAAiB,WAAW,aAAa,EAAE,SAAS,GAAM,CAAC,GAE7D,MAAM;AACX,eAAS,MAAM,gBAAgB,YAC/B,SAAS,oBAAoB,UAAU,YAAY,GACnD,SAAS,oBAAoB,SAAS,WAAW,GACjD,SAAS,oBAAoB,aAAa,WAAW,GACrD,SAAS,oBAAoB,WAAW,WAAW;AAAA,IACrD;AAAA,EACF,GAAG,CAAC,SAAS,SAAS,YAAY,CAAC;AACrC;",
+  "mappings": "AAAA,SAAS,iBAAiB;AAE1B,MAAM,YAAY,MAChB,OAAO,SAAW,OAAe,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,OAAO,SAAS,eAE7D,uBAAuB,CAAC,YAA2B;AAC9D,YAAU,MAAM;AACd,QAAI,CAAC,WAAW,CAAC,UAAU;AACzB;AAIF,UAAM,SAAS,SAAS,iBAClB,oBAAoB;AAAA,MACxB,iBAAiB,OAAO,MAAM;AAAA,MAC9B,UAAU,OAAO,MAAM;AAAA,IACzB;AACA,kBAAO,MAAM,kBAAkB,UAC/B,OAAO,MAAM,WAAW,UAEjB,MAAM;AACX,aAAO,OAAO,OAAO,OAAO,iBAAiB;AAAA,IAC/C;AAAA,EACF,GAAG,CAAC,OAAO,CAAC;AACd;",
   "names": []
 }

package/dist/esm/useDisableScroll.mjs

@@ -1,40 +1,17 @@
 import { useEffect } from "react";
 const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement,
-  preventDefault = e => {
-    e.preventDefault && e.preventDefault();
-  },
-  useDisableScrollOutsideOf = (nodeRef, options = {}) => {
-    const {
-      enabled,
-      keyboardKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40]
-    } = options;
+  useDisableBodyScroll = enabled => {
     useEffect(() => {
       if (!enabled || !canUseDOM()) return;
-      const node = nodeRef.current;
-      if (!node) return;
-      const scrollEl = document.scrollingElement;
-      if (!scrollEl || !(scrollEl instanceof HTMLElement)) return;
-      const previously = scrollEl.style.pointerEvents;
-      scrollEl.style.pointerEvents = "none";
-      const lockToScrollPos = [scrollEl.scrollLeft, scrollEl.scrollTop],
-        handleScroll = e => {
-          scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-        },
-        handleEvent = e => {
-          e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
+      const bodyEl = document.documentElement,
+        previousBodyStyle = {
+          scrollbarGutter: bodyEl.style.scrollbarGutter,
+          overflow: bodyEl.style.overflow
         };
-      return document.addEventListener("scroll", handleScroll, {
-        passive: !1
-      }), document.addEventListener("wheel", handleEvent, {
-        passive: !1
-      }), document.addEventListener("touchmove", handleEvent, {
-        passive: !1
-      }), document.addEventListener("keydown", handleEvent, {
-        passive: !1
-      }), () => {
-        scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
+      return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", () => {
+        Object.assign(bodyEl.style, previousBodyStyle);
       };
-    }, [enabled, nodeRef, keyboardKeys]);
+    }, [enabled]);
   };
-export { useDisableScrollOutsideOf };
+export { useDisableBodyScroll };
 //# sourceMappingURL=useDisableScroll.mjs.map

package/dist/esm/useDisableScroll.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","canUseDOM","window","document","createElement","preventDefault","e","useDisableScrollOutsideOf","nodeRef","options","enabled","keyboardKeys","node","current","scrollEl","scrollingElement","HTMLElement","previously","style","pointerEvents","lockToScrollPos","scrollLeft","scrollTop","handleScroll","scrollTo","handleEvent","target","Node","contains","includes","keyCode","addEventListener","passive","removeEventListener"],"sources":["../../src/useDisableScroll.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAyB;AAElC,MAAMC,SAAA,GAAYA,CAAA,KAChB,OAAOC,MAAA,GAAW,OAAe,CAAC,CAACA,MAAA,CAAOC,QAAA,IAAY,CAAC,CAACD,MAAA,CAAOC,QAAA,CAASC,aAAA;EAEpEC,cAAA,GAAkBC,CAAA,IAA+C;IACjEA,CAAA,CAAED,cAAA,IACJC,CAAA,CAAED,cAAA,CAAe;EAErB;EAEaE,yBAAA,GAA4BA,CACvCC,OAAA,EACAC,OAAA,GAKI,CAAC,MACF;IACH,MAAM;MAAEC,OAAA;MAASC,YAAA,GAAe,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE;IAAE,IAAIF,OAAA;IAEzET,SAAA,CAAU,MAAM;MACd,IAAI,CAACU,OAAA,IAAW,CAACT,SAAA,CAAU,GACzB;MAGF,MAAMW,IAAA,GAAOJ,OAAA,CAAQK,OAAA;MACrB,IAAI,CAACD,IAAA,EACH;MAGF,MAAME,QAAA,GAAWX,QAAA,CAASY,gBAAA;MAC1B,IAAI,CAACD,QAAA,IAAY,EAAEA,QAAA,YAAoBE,WAAA,GACrC;MAGF,MAAMC,UAAA,GAAaH,QAAA,CAASI,KAAA,CAAMC,aAAA;MAClCL,QAAA,CAASI,KAAA,CAAMC,aAAA,GAAgB;MAE/B,MAAMC,eAAA,GAAkB,CAACN,QAAA,CAASO,UAAA,EAAYP,QAAA,CAASQ,SAAS;QAE1DC,YAAA,GAAgBjB,CAAA,IAAa;UAC7BQ,QAAA,KACFR,CAAA,CAAED,cAAA,CAAe,GACjBS,QAAA,CAASU,QAAA,CAASJ,eAAA,CAAgB,CAAC,GAAGA,eAAA,CAAgB,CAAC,CAAC;QAE5D;QAEMK,WAAA,GAAenB,CAAA,IAA+C;UAC9DA,CAAA,CAAEoB,MAAA,YAAkBC,IAAA,KAASrB,CAAA,CAAEoB,MAAA,KAAWd,IAAA,IAAQA,IAAA,CAAKgB,QAAA,CAAStB,CAAA,CAAEoB,MAAM,MAIxE,aAAapB,CAAA,IAAK,CAACK,YAAA,CAAakB,QAAA,CAASvB,CAAA,CAAEwB,OAAO,KAItDzB,cAAA,CAAeC,CAAC;QAClB;MAEA,OAAAH,QAAA,CAAS4B,gBAAA,CAAiB,UAAUR,YAAA,EAAc;QAAES,OAAA,EAAS;MAAM,CAAC,GACpE7B,QAAA,CAAS4B,gBAAA,CAAiB,SAASN,WAAA,EAAa;QAAEO,OAAA,EAAS;MAAM,CAAC,GAClE7B,QAAA,CAAS4B,gBAAA,CAAiB,aAAaN,WAAA,EAAa;QAAEO,OAAA,EAAS;MAAM,CAAC,GACtE7B,QAAA,CAAS4B,gBAAA,CAAiB,WAAWN,WAAA,EAAa;QAAEO,OAAA,EAAS;MAAM,CAAC,GAE7D,MAAM;QACXlB,QAAA,CAASI,KAAA,CAAMC,aAAA,GAAgBF,UAAA,EAC/Bd,QAAA,CAAS8B,mBAAA,CAAoB,UAAUV,YAAY,GACnDpB,QAAA,CAAS8B,mBAAA,CAAoB,SAASR,WAAW,GACjDtB,QAAA,CAAS8B,mBAAA,CAAoB,aAAaR,WAAW,GACrDtB,QAAA,CAAS8B,mBAAA,CAAoB,WAAWR,WAAW;MACrD;IACF,GAAG,CAACf,OAAA,EAASF,OAAA,EAASG,YAAY,CAAC;EACrC","ignoreList":[]}
+{"version":3,"names":["useEffect","canUseDOM","window","document","createElement","useDisableBodyScroll","enabled","bodyEl","documentElement","previousBodyStyle","scrollbarGutter","style","overflow","Object","assign"],"sources":["../../src/useDisableScroll.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAE1B,MAAMC,SAAA,GAAYA,CAAA,KAChB,OAAOC,MAAA,GAAW,OAAe,CAAC,CAACA,MAAA,CAAOC,QAAA,IAAY,CAAC,CAACD,MAAA,CAAOC,QAAA,CAASC,aAAA;EAE7DC,oBAAA,GAAwBC,OAAA,IAA2B;IAC9DN,SAAA,CAAU,MAAM;MACd,IAAI,CAACM,OAAA,IAAW,CAACL,SAAA,CAAU,GACzB;MAIF,MAAMM,MAAA,GAASJ,QAAA,CAASK,eAAA;QAClBC,iBAAA,GAAoB;UACxBC,eAAA,EAAiBH,MAAA,CAAOI,KAAA,CAAMD,eAAA;UAC9BE,QAAA,EAAUL,MAAA,CAAOI,KAAA,CAAMC;QACzB;MACA,OAAAL,MAAA,CAAOI,KAAA,CAAMD,eAAA,GAAkB,UAC/BH,MAAA,CAAOI,KAAA,CAAMC,QAAA,GAAW,UAEjB,MAAM;QACXC,MAAA,CAAOC,MAAA,CAAOP,MAAA,CAAOI,KAAA,EAAOF,iBAAiB;MAC/C;IACF,GAAG,CAACH,OAAO,CAAC;EACd","ignoreList":[]}

package/dist/esm/useDisableScroll.native.js

@@ -2,48 +2,19 @@ import { useEffect } from "react";
 var canUseDOM = function () {
     return typeof window < "u" && !!window.document && !!window.document.createElement;
   },
-  preventDefault = function (e) {
-    e.preventDefault && e.preventDefault();
-  },
-  useDisableScrollOutsideOf = function (nodeRef) {
-    var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] :
-      // space: 32, page up: 33, page down: 34, end: 35, home: 36
-      // left: 37, up: 38, right: 39, down: 40
-      {},
-      {
-        enabled,
-        keyboardKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40]
-      } = options;
+  useDisableBodyScroll = function (enabled) {
     useEffect(function () {
       if (!(!enabled || !canUseDOM())) {
-        var node = nodeRef.current;
-        if (node) {
-          var scrollEl = document.scrollingElement;
-          if (!(!scrollEl || !(scrollEl instanceof HTMLElement))) {
-            var previously = scrollEl.style.pointerEvents;
-            scrollEl.style.pointerEvents = "none";
-            var lockToScrollPos = [scrollEl.scrollLeft, scrollEl.scrollTop],
-              handleScroll = function (e) {
-                scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-              },
-              handleEvent = function (e) {
-                e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
-              };
-            return document.addEventListener("scroll", handleScroll, {
-              passive: !1
-            }), document.addEventListener("wheel", handleEvent, {
-              passive: !1
-            }), document.addEventListener("touchmove", handleEvent, {
-              passive: !1
-            }), document.addEventListener("keydown", handleEvent, {
-              passive: !1
-            }), function () {
-              scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
-            };
-          }
-        }
+        var bodyEl = document.documentElement,
+          previousBodyStyle = {
+            scrollbarGutter: bodyEl.style.scrollbarGutter,
+            overflow: bodyEl.style.overflow
+          };
+        return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", function () {
+          Object.assign(bodyEl.style, previousBodyStyle);
+        };
       }
-    }, [enabled, nodeRef, keyboardKeys]);
+    }, [enabled]);
   };
-export { useDisableScrollOutsideOf };
+export { useDisableBodyScroll };
 //# sourceMappingURL=useDisableScroll.native.js.map

package/dist/esm/useDisableScroll.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","canUseDOM","window","document","createElement","preventDefault","e","useDisableScrollOutsideOf","nodeRef","options","arguments","length","enabled","keyboardKeys","node","current","scrollEl","scrollingElement"],"sources":["../../src/useDisableScroll.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAyB;AAElC,IAAAC,SAAM,YAAAA,CAAA,EACJ;IAGI,OAAE,OAAAC,MACJ,GAAE,SAAAA,MAAe,CAAAC,QAAA,MAAAD,MAAA,CAAAC,QAAA,CAAAC,aAAA;EAErB;EAEaC,cAAA,YAAAA,CAAAC,CAAA,EACX;IAQAA,CAAA,CAAAD,cAAQ,IAASC,CAAA,CAAAD,cAAgB,CAAI;EAErC;EAAAE,yBAAgB,YAAAA,CAAAC,OAAA;IACd,IAAAC,OAAK,GAAAC,SAAY,CAAAC,MAAU,QAAAD,SAAA,iBAAAA,SAAA;MACzB;MAGF;MACA,EACE;MAAA;QAAAE,OAAA;QAAAC,YAAA,IAGF,IACA,IACE,IAGF,IACA,IAEA,IAGE,EAAI,EAIN,IAGE,EAAI;MASN,IAAAJ,OAAA;IAEAT,SAAA,aAAS;MAMP,OAAAY,OAAS,IAAM,CAAAX,SAAA,KAAgB;QAKjC,IAAAa,IAAA,GAAAN,OAAA,CAAAO,OAAA;QACE,IAAAD,IAAA,EAAS;UACf,IAAAE,QAAA,GAAAb,QAAA,CAAAc,gBAAA","ignoreList":[]}
+{"version":3,"names":["useEffect","canUseDOM","window","document","createElement","useDisableBodyScroll","enabled","bodyEl","documentElement","previousBodyStyle","scrollbarGutter","style","overflow","Object","assign"],"sources":["../../src/useDisableScroll.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAE1B,IAAAC,SAAM,YAAAA,CAAA,EACJ;IAGA,cAAUC,MAAM,YAAAA,MAAA,CAAAC,QAAA,MAAAD,MAAA,CAAAC,QAAA,CAAAC,aAAA;EACd;EAAAC,oBAAiB,YAAAA,CAAUC,OAAA;IACzBN,SAAA;MAIF,MAAM,CAAAM,OAAA,IAAS,CAAAL,SAAS;QAEtB,IAAAM,MAAA,GAAAJ,QAAiB,CAAAK,eAAa;UAAAC,iBAAA;YAC9BC,eAAiB,EAAAH,MAAM,CAAAI,KAAA,CAAAD,eAAA;YACzBE,QAAA,EAAAL,MAAA,CAAAI,KAAA,CAAAC;UACA;QAIE,OAAOL,MAAA,CAAOI,KAAA,CAAAD,eAAc,WAAiB,EAAAH,MAAA,CAAAI,KAAA,CAAAC,QAAA;UAC/CC,MAAA,CAAAC,MAAA,CAAAP,MAAA,CAAAI,KAAA,EAAAF,iBAAA;QACE;MACN","ignoreList":[]}

package/dist/jsx/RemoveScroll.js

@@ -1,9 +1,5 @@
-import React, { useRef } from "react";
-import { jsx } from "react/jsx-runtime";
-const RemoveScroll = React.memo((props) => {
-  const root = useRef(null);
-  return /* @__PURE__ */ jsx("span", { ref: root, style: { display: "contents" }, children: props.children });
-});
+import { useDisableBodyScroll } from "./useDisableScroll";
+const RemoveScroll = (props) => (useDisableBodyScroll(!!props.enabled), props.children);
 export {
   RemoveScroll
 };

package/dist/jsx/RemoveScroll.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/RemoveScroll.tsx"],
-  "mappings": "AAAA,OAAO,SAAS,cAAc;AAgB1B;AARG,MAAM,eAAe,MAAM,KAAK,CAAC,UAA6B;AACnE,QAAM,OAAO,OAAoB,IAAI;AAMrC,SACE,oBAAC,UAAK,KAAK,MAAM,OAAO,EAAE,SAAS,WAAW,GAC3C,gBAAM,UACT;AAEJ,CAAC;",
+  "mappings": "AACA,SAAS,4BAA4B;AAO9B,MAAM,eAAe,CAAC,WAC3B,qBAAqB,EAAQ,MAAM,OAAQ,GAEpC,MAAM;",
   "names": []
 }

package/dist/jsx/RemoveScroll.mjs

@@ -1,14 +1,4 @@
-import React, { useRef } from "react";
-import { jsx } from "react/jsx-runtime";
-const RemoveScroll = React.memo(props => {
-  const root = useRef(null);
-  return /* @__PURE__ */jsx("span", {
-    ref: root,
-    style: {
-      display: "contents"
-    },
-    children: props.children
-  });
-});
+import { useDisableBodyScroll } from "./useDisableScroll.mjs";
+const RemoveScroll = props => (useDisableBodyScroll(!!props.enabled), props.children);
 export { RemoveScroll };
 //# sourceMappingURL=RemoveScroll.mjs.map

package/dist/jsx/RemoveScroll.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","useRef","jsx","RemoveScroll","memo","props","root","ref","style","display","children"],"sources":["../../src/RemoveScroll.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,IAASC,MAAA,QAAc;AAgB1B,SAAAC,GAAA;AARG,MAAMC,YAAA,GAAeH,KAAA,CAAMI,IAAA,CAAMC,KAAA,IAA6B;EACnE,MAAMC,IAAA,GAAOL,MAAA,CAAoB,IAAI;EAMrC,OACE,eAAAC,GAAA,CAAC;IAAKK,GAAA,EAAKD,IAAA;IAAME,KAAA,EAAO;MAAEC,OAAA,EAAS;IAAW;IAC3CC,QAAA,EAAAL,KAAA,CAAMK;EAAA,CACT;AAEJ,CAAC","ignoreList":[]}
+{"version":3,"names":["useDisableBodyScroll","RemoveScroll","props","enabled","children"],"sources":["../../src/RemoveScroll.tsx"],"sourcesContent":[null],"mappings":"AACA,SAASA,oBAAA,QAA4B;AAO9B,MAAMC,YAAA,GAAgBC,KAAA,KAC3BF,oBAAA,CAAqB,EAAQE,KAAA,CAAMC,OAAQ,GAEpCD,KAAA,CAAME,QAAA","ignoreList":[]}

package/dist/jsx/RemoveScroll.native.js

@@ -1,7 +1,9 @@
 var RemoveScroll = function(props) {
   return props.children;
+}, getAllowedScrollableNode = function() {
 };
 export {
-  RemoveScroll
+  RemoveScroll,
+  getAllowedScrollableNode
 };
 //# sourceMappingURL=RemoveScroll.native.js.map

package/dist/jsx/RemoveScroll.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/RemoveScroll.native.tsx"],
-  "mappings": "AAAO,IAAMA,eAAe,SAACC,OAAAA;SAAUA,MAAMC;;",
-  "names": ["RemoveScroll", "props", "children"]
+  "mappings": "AAAO,IAAMA,eAAe,SAACC,OAAAA;SAAoBA,MAAMC;GAC1CC,2BAA2B,WAAA;AAAY;",
+  "names": ["RemoveScroll", "props", "children", "getAllowedScrollableNode"]
 }

package/dist/jsx/useDisableScroll.js

@@ -1,30 +1,18 @@
 import { useEffect } from "react";
-const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement, preventDefault = (e) => {
-  e.preventDefault && e.preventDefault();
-}, useDisableScrollOutsideOf = (nodeRef, options = {}) => {
-  const { enabled, keyboardKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40] } = options;
+const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement, useDisableBodyScroll = (enabled) => {
   useEffect(() => {
     if (!enabled || !canUseDOM())
       return;
-    const node = nodeRef.current;
-    if (!node)
-      return;
-    const scrollEl = document.scrollingElement;
-    if (!scrollEl || !(scrollEl instanceof HTMLElement))
-      return;
-    const previously = scrollEl.style.pointerEvents;
-    scrollEl.style.pointerEvents = "none";
-    const lockToScrollPos = [scrollEl.scrollLeft, scrollEl.scrollTop], handleScroll = (e) => {
-      scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-    }, handleEvent = (e) => {
-      e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
+    const bodyEl = document.documentElement, previousBodyStyle = {
+      scrollbarGutter: bodyEl.style.scrollbarGutter,
+      overflow: bodyEl.style.overflow
     };
-    return document.addEventListener("scroll", handleScroll, { passive: !1 }), document.addEventListener("wheel", handleEvent, { passive: !1 }), document.addEventListener("touchmove", handleEvent, { passive: !1 }), document.addEventListener("keydown", handleEvent, { passive: !1 }), () => {
-      scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
+    return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", () => {
+      Object.assign(bodyEl.style, previousBodyStyle);
     };
-  }, [enabled, nodeRef, keyboardKeys]);
+  }, [enabled]);
 };
 export {
-  useDisableScrollOutsideOf
+  useDisableBodyScroll
 };
 //# sourceMappingURL=useDisableScroll.js.map

package/dist/jsx/useDisableScroll.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useDisableScroll.ts"],
-  "mappings": "AAAA,SAAS,iBAAyB;AAElC,MAAM,YAAY,MAChB,OAAO,SAAW,OAAe,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,OAAO,SAAS,eAEpE,iBAAiB,CAAC,MAA+C;AACrE,EAAI,EAAE,kBACJ,EAAE,eAAe;AAErB,GAEa,4BAA4B,CACvC,SACA,UAKI,CAAC,MACF;AACH,QAAM,EAAE,SAAS,eAAe,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,EAAE,IAAI;AAEzE,YAAU,MAAM;AACd,QAAI,CAAC,WAAW,CAAC,UAAU;AACzB;AAGF,UAAM,OAAO,QAAQ;AACrB,QAAI,CAAC;AACH;AAGF,UAAM,WAAW,SAAS;AAC1B,QAAI,CAAC,YAAY,EAAE,oBAAoB;AACrC;AAGF,UAAM,aAAa,SAAS,MAAM;AAClC,aAAS,MAAM,gBAAgB;AAE/B,UAAM,kBAAkB,CAAC,SAAS,YAAY,SAAS,SAAS,GAE1D,eAAe,CAAC,MAAa;AACjC,MAAI,aACF,EAAE,eAAe,GACjB,SAAS,SAAS,gBAAgB,CAAC,GAAG,gBAAgB,CAAC,CAAC;AAAA,IAE5D,GAEM,cAAc,CAAC,MAA+C;AAClE,MAAI,EAAE,kBAAkB,SAAS,EAAE,WAAW,QAAQ,KAAK,SAAS,EAAE,MAAM,MAIxE,aAAa,KAAK,CAAC,aAAa,SAAS,EAAE,OAAO,KAItD,eAAe,CAAC;AAAA,IAClB;AAEA,oBAAS,iBAAiB,UAAU,cAAc,EAAE,SAAS,GAAM,CAAC,GACpE,SAAS,iBAAiB,SAAS,aAAa,EAAE,SAAS,GAAM,CAAC,GAClE,SAAS,iBAAiB,aAAa,aAAa,EAAE,SAAS,GAAM,CAAC,GACtE,SAAS,iBAAiB,WAAW,aAAa,EAAE,SAAS,GAAM,CAAC,GAE7D,MAAM;AACX,eAAS,MAAM,gBAAgB,YAC/B,SAAS,oBAAoB,UAAU,YAAY,GACnD,SAAS,oBAAoB,SAAS,WAAW,GACjD,SAAS,oBAAoB,aAAa,WAAW,GACrD,SAAS,oBAAoB,WAAW,WAAW;AAAA,IACrD;AAAA,EACF,GAAG,CAAC,SAAS,SAAS,YAAY,CAAC;AACrC;",
+  "mappings": "AAAA,SAAS,iBAAiB;AAE1B,MAAM,YAAY,MAChB,OAAO,SAAW,OAAe,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,OAAO,SAAS,eAE7D,uBAAuB,CAAC,YAA2B;AAC9D,YAAU,MAAM;AACd,QAAI,CAAC,WAAW,CAAC,UAAU;AACzB;AAIF,UAAM,SAAS,SAAS,iBAClB,oBAAoB;AAAA,MACxB,iBAAiB,OAAO,MAAM;AAAA,MAC9B,UAAU,OAAO,MAAM;AAAA,IACzB;AACA,kBAAO,MAAM,kBAAkB,UAC/B,OAAO,MAAM,WAAW,UAEjB,MAAM;AACX,aAAO,OAAO,OAAO,OAAO,iBAAiB;AAAA,IAC/C;AAAA,EACF,GAAG,CAAC,OAAO,CAAC;AACd;",
   "names": []
 }

package/dist/jsx/useDisableScroll.mjs

@@ -1,40 +1,17 @@
 import { useEffect } from "react";
 const canUseDOM = () => typeof window < "u" && !!window.document && !!window.document.createElement,
-  preventDefault = e => {
-    e.preventDefault && e.preventDefault();
-  },
-  useDisableScrollOutsideOf = (nodeRef, options = {}) => {
-    const {
-      enabled,
-      keyboardKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40]
-    } = options;
+  useDisableBodyScroll = enabled => {
     useEffect(() => {
       if (!enabled || !canUseDOM()) return;
-      const node = nodeRef.current;
-      if (!node) return;
-      const scrollEl = document.scrollingElement;
-      if (!scrollEl || !(scrollEl instanceof HTMLElement)) return;
-      const previously = scrollEl.style.pointerEvents;
-      scrollEl.style.pointerEvents = "none";
-      const lockToScrollPos = [scrollEl.scrollLeft, scrollEl.scrollTop],
-        handleScroll = e => {
-          scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-        },
-        handleEvent = e => {
-          e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
+      const bodyEl = document.documentElement,
+        previousBodyStyle = {
+          scrollbarGutter: bodyEl.style.scrollbarGutter,
+          overflow: bodyEl.style.overflow
         };
-      return document.addEventListener("scroll", handleScroll, {
-        passive: !1
-      }), document.addEventListener("wheel", handleEvent, {
-        passive: !1
-      }), document.addEventListener("touchmove", handleEvent, {
-        passive: !1
-      }), document.addEventListener("keydown", handleEvent, {
-        passive: !1
-      }), () => {
-        scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
+      return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", () => {
+        Object.assign(bodyEl.style, previousBodyStyle);
       };
-    }, [enabled, nodeRef, keyboardKeys]);
+    }, [enabled]);
   };
-export { useDisableScrollOutsideOf };
+export { useDisableBodyScroll };
 //# sourceMappingURL=useDisableScroll.mjs.map

package/dist/jsx/useDisableScroll.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","canUseDOM","window","document","createElement","preventDefault","e","useDisableScrollOutsideOf","nodeRef","options","enabled","keyboardKeys","node","current","scrollEl","scrollingElement","HTMLElement","previously","style","pointerEvents","lockToScrollPos","scrollLeft","scrollTop","handleScroll","scrollTo","handleEvent","target","Node","contains","includes","keyCode","addEventListener","passive","removeEventListener"],"sources":["../../src/useDisableScroll.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAyB;AAElC,MAAMC,SAAA,GAAYA,CAAA,KAChB,OAAOC,MAAA,GAAW,OAAe,CAAC,CAACA,MAAA,CAAOC,QAAA,IAAY,CAAC,CAACD,MAAA,CAAOC,QAAA,CAASC,aAAA;EAEpEC,cAAA,GAAkBC,CAAA,IAA+C;IACjEA,CAAA,CAAED,cAAA,IACJC,CAAA,CAAED,cAAA,CAAe;EAErB;EAEaE,yBAAA,GAA4BA,CACvCC,OAAA,EACAC,OAAA,GAKI,CAAC,MACF;IACH,MAAM;MAAEC,OAAA;MAASC,YAAA,GAAe,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE;IAAE,IAAIF,OAAA;IAEzET,SAAA,CAAU,MAAM;MACd,IAAI,CAACU,OAAA,IAAW,CAACT,SAAA,CAAU,GACzB;MAGF,MAAMW,IAAA,GAAOJ,OAAA,CAAQK,OAAA;MACrB,IAAI,CAACD,IAAA,EACH;MAGF,MAAME,QAAA,GAAWX,QAAA,CAASY,gBAAA;MAC1B,IAAI,CAACD,QAAA,IAAY,EAAEA,QAAA,YAAoBE,WAAA,GACrC;MAGF,MAAMC,UAAA,GAAaH,QAAA,CAASI,KAAA,CAAMC,aAAA;MAClCL,QAAA,CAASI,KAAA,CAAMC,aAAA,GAAgB;MAE/B,MAAMC,eAAA,GAAkB,CAACN,QAAA,CAASO,UAAA,EAAYP,QAAA,CAASQ,SAAS;QAE1DC,YAAA,GAAgBjB,CAAA,IAAa;UAC7BQ,QAAA,KACFR,CAAA,CAAED,cAAA,CAAe,GACjBS,QAAA,CAASU,QAAA,CAASJ,eAAA,CAAgB,CAAC,GAAGA,eAAA,CAAgB,CAAC,CAAC;QAE5D;QAEMK,WAAA,GAAenB,CAAA,IAA+C;UAC9DA,CAAA,CAAEoB,MAAA,YAAkBC,IAAA,KAASrB,CAAA,CAAEoB,MAAA,KAAWd,IAAA,IAAQA,IAAA,CAAKgB,QAAA,CAAStB,CAAA,CAAEoB,MAAM,MAIxE,aAAapB,CAAA,IAAK,CAACK,YAAA,CAAakB,QAAA,CAASvB,CAAA,CAAEwB,OAAO,KAItDzB,cAAA,CAAeC,CAAC;QAClB;MAEA,OAAAH,QAAA,CAAS4B,gBAAA,CAAiB,UAAUR,YAAA,EAAc;QAAES,OAAA,EAAS;MAAM,CAAC,GACpE7B,QAAA,CAAS4B,gBAAA,CAAiB,SAASN,WAAA,EAAa;QAAEO,OAAA,EAAS;MAAM,CAAC,GAClE7B,QAAA,CAAS4B,gBAAA,CAAiB,aAAaN,WAAA,EAAa;QAAEO,OAAA,EAAS;MAAM,CAAC,GACtE7B,QAAA,CAAS4B,gBAAA,CAAiB,WAAWN,WAAA,EAAa;QAAEO,OAAA,EAAS;MAAM,CAAC,GAE7D,MAAM;QACXlB,QAAA,CAASI,KAAA,CAAMC,aAAA,GAAgBF,UAAA,EAC/Bd,QAAA,CAAS8B,mBAAA,CAAoB,UAAUV,YAAY,GACnDpB,QAAA,CAAS8B,mBAAA,CAAoB,SAASR,WAAW,GACjDtB,QAAA,CAAS8B,mBAAA,CAAoB,aAAaR,WAAW,GACrDtB,QAAA,CAAS8B,mBAAA,CAAoB,WAAWR,WAAW;MACrD;IACF,GAAG,CAACf,OAAA,EAASF,OAAA,EAASG,YAAY,CAAC;EACrC","ignoreList":[]}
+{"version":3,"names":["useEffect","canUseDOM","window","document","createElement","useDisableBodyScroll","enabled","bodyEl","documentElement","previousBodyStyle","scrollbarGutter","style","overflow","Object","assign"],"sources":["../../src/useDisableScroll.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAE1B,MAAMC,SAAA,GAAYA,CAAA,KAChB,OAAOC,MAAA,GAAW,OAAe,CAAC,CAACA,MAAA,CAAOC,QAAA,IAAY,CAAC,CAACD,MAAA,CAAOC,QAAA,CAASC,aAAA;EAE7DC,oBAAA,GAAwBC,OAAA,IAA2B;IAC9DN,SAAA,CAAU,MAAM;MACd,IAAI,CAACM,OAAA,IAAW,CAACL,SAAA,CAAU,GACzB;MAIF,MAAMM,MAAA,GAASJ,QAAA,CAASK,eAAA;QAClBC,iBAAA,GAAoB;UACxBC,eAAA,EAAiBH,MAAA,CAAOI,KAAA,CAAMD,eAAA;UAC9BE,QAAA,EAAUL,MAAA,CAAOI,KAAA,CAAMC;QACzB;MACA,OAAAL,MAAA,CAAOI,KAAA,CAAMD,eAAA,GAAkB,UAC/BH,MAAA,CAAOI,KAAA,CAAMC,QAAA,GAAW,UAEjB,MAAM;QACXC,MAAA,CAAOC,MAAA,CAAOP,MAAA,CAAOI,KAAA,EAAOF,iBAAiB;MAC/C;IACF,GAAG,CAACH,OAAO,CAAC;EACd","ignoreList":[]}

package/dist/jsx/useDisableScroll.native.js

@@ -1,61 +1,22 @@
 import { useEffect } from "react";
 var canUseDOM = function() {
   return typeof window < "u" && !!window.document && !!window.document.createElement;
-}, preventDefault = function(e) {
-  e.preventDefault && e.preventDefault();
-}, useDisableScrollOutsideOf = function(nodeRef) {
-  var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : (
-    // space: 32, page up: 33, page down: 34, end: 35, home: 36
-    // left: 37, up: 38, right: 39, down: 40
-    {}
-  ), { enabled, keyboardKeys = [
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40
-  ] } = options;
+}, useDisableBodyScroll = function(enabled) {
   useEffect(function() {
     if (!(!enabled || !canUseDOM())) {
-      var node = nodeRef.current;
-      if (node) {
-        var scrollEl = document.scrollingElement;
-        if (!(!scrollEl || !(scrollEl instanceof HTMLElement))) {
-          var previously = scrollEl.style.pointerEvents;
-          scrollEl.style.pointerEvents = "none";
-          var lockToScrollPos = [
-            scrollEl.scrollLeft,
-            scrollEl.scrollTop
-          ], handleScroll = function(e) {
-            scrollEl && (e.preventDefault(), scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1]));
-          }, handleEvent = function(e) {
-            e.target instanceof Node && (e.target === node || node.contains(e.target)) || "keyCode" in e && !keyboardKeys.includes(e.keyCode) || preventDefault(e);
-          };
-          return document.addEventListener("scroll", handleScroll, {
-            passive: !1
-          }), document.addEventListener("wheel", handleEvent, {
-            passive: !1
-          }), document.addEventListener("touchmove", handleEvent, {
-            passive: !1
-          }), document.addEventListener("keydown", handleEvent, {
-            passive: !1
-          }), function() {
-            scrollEl.style.pointerEvents = previously, document.removeEventListener("scroll", handleScroll), document.removeEventListener("wheel", handleEvent), document.removeEventListener("touchmove", handleEvent), document.removeEventListener("keydown", handleEvent);
-          };
-        }
-      }
+      var bodyEl = document.documentElement, previousBodyStyle = {
+        scrollbarGutter: bodyEl.style.scrollbarGutter,
+        overflow: bodyEl.style.overflow
+      };
+      return bodyEl.style.scrollbarGutter = "stable", bodyEl.style.overflow = "hidden", function() {
+        Object.assign(bodyEl.style, previousBodyStyle);
+      };
     }
   }, [
-    enabled,
-    nodeRef,
-    keyboardKeys
+    enabled
   ]);
 };
 export {
-  useDisableScrollOutsideOf
+  useDisableBodyScroll
 };
 //# sourceMappingURL=useDisableScroll.js.map

package/dist/jsx/useDisableScroll.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useDisableScroll.ts"],
-  "mappings": "AAAA,SAASA,iBAAyB;AAElC,IAAMC,YAAY,WAAA;SAChB,OAAOC,SAAW,OAAe,CAAC,CAACA,OAAOC,YAAY,CAAC,CAACD,OAAOC,SAASC;GAEpEC,iBAAiB,SAACC,GAAAA;AACtB,EAAIA,EAAED,kBACJC,EAAED,eAAc;AAEpB,GAEaE,4BAA4B,SACvCC,SAAAA;MACAC,UAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA;;;IAKI,CAAC;KAEC,EAAEC,SAASC,eAAe;IAAC;IAAI;IAAI;IAAI;IAAI;IAAI;IAAI;IAAI;IAAI;IAAG,IAAKF;AAEzET,YAAU,WAAA;AACR,QAAI,GAACU,WAAW,CAACT,UAAAA,IAIjB;UAAMW,OAAOJ,QAAQK;AACrB,UAAKD,MAIL;YAAME,WAAWX,SAASY;AAC1B,YAAI,GAACD,YAAY,EAAEA,oBAAoBE,eAIvC;cAAMC,aAAaH,SAASI,MAAMC;AAClCL,mBAASI,MAAMC,gBAAgB;AAE/B,cAAMC,kBAAkB;YAACN,SAASO;YAAYP,SAASQ;aAEjDC,eAAe,SAACjB,GAAAA;AACpB,YAAIQ,aACFR,EAAED,eAAc,GAChBS,SAASU,SAASJ,gBAAgB,CAAA,GAAIA,gBAAgB,CAAA,CAAE;UAE5D,GAEMK,cAAc,SAACnB,GAAAA;AACnB,YAAIA,EAAEoB,kBAAkBC,SAASrB,EAAEoB,WAAWd,QAAQA,KAAKgB,SAAStB,EAAEoB,MAAM,MAIxE,aAAapB,KAAK,CAACK,aAAakB,SAASvB,EAAEwB,OAAO,KAItDzB,eAAeC,CAAAA;UACjB;AAEAH,0BAAS4B,iBAAiB,UAAUR,cAAc;YAAES,SAAS;UAAM,CAAA,GACnE7B,SAAS4B,iBAAiB,SAASN,aAAa;YAAEO,SAAS;UAAM,CAAA,GACjE7B,SAAS4B,iBAAiB,aAAaN,aAAa;YAAEO,SAAS;UAAM,CAAA,GACrE7B,SAAS4B,iBAAiB,WAAWN,aAAa;YAAEO,SAAS;UAAM,CAAA,GAE5D,WAAA;AACLlB,qBAASI,MAAMC,gBAAgBF,YAC/Bd,SAAS8B,oBAAoB,UAAUV,YAAAA,GACvCpB,SAAS8B,oBAAoB,SAASR,WAAAA,GACtCtB,SAAS8B,oBAAoB,aAAaR,WAAAA,GAC1CtB,SAAS8B,oBAAoB,WAAWR,WAAAA;UAC1C;;;;EACF,GAAG;IAACf;IAASF;IAASG;GAAa;AACrC;",
-  "names": ["useEffect", "canUseDOM", "window", "document", "createElement", "preventDefault", "e", "useDisableScrollOutsideOf", "nodeRef", "options", "enabled", "keyboardKeys", "node", "current", "scrollEl", "scrollingElement", "HTMLElement", "previously", "style", "pointerEvents", "lockToScrollPos", "scrollLeft", "scrollTop", "handleScroll", "scrollTo", "handleEvent", "target", "Node", "contains", "includes", "keyCode", "addEventListener", "passive", "removeEventListener"]
+  "mappings": "AAAA,SAASA,iBAAiB;AAE1B,IAAMC,YAAY,WAAA;SAChB,OAAOC,SAAW,OAAe,CAAC,CAACA,OAAOC,YAAY,CAAC,CAACD,OAAOC,SAASC;GAE7DC,uBAAuB,SAACC,SAAAA;AACnCN,YAAU,WAAA;AACR,QAAI,GAACM,WAAW,CAACL,UAAAA,IAKjB;UAAMM,SAASJ,SAASK,iBAClBC,oBAAoB;QACxBC,iBAAiBH,OAAOI,MAAMD;QAC9BE,UAAUL,OAAOI,MAAMC;MACzB;AACAL,oBAAOI,MAAMD,kBAAkB,UAC/BH,OAAOI,MAAMC,WAAW,UAEjB,WAAA;AACLC,eAAOC,OAAOP,OAAOI,OAAOF,iBAAAA;MAC9B;;EACF,GAAG;IAACH;GAAQ;AACd;",
+  "names": ["useEffect", "canUseDOM", "window", "document", "createElement", "useDisableBodyScroll", "enabled", "bodyEl", "documentElement", "previousBodyStyle", "scrollbarGutter", "style", "overflow", "Object", "assign"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/remove-scroll",
-  "version": "1.130.1",
+  "version": "1.130.3",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -32,7 +32,7 @@
     }
   },
   "devDependencies": {
-    "@tamagui/build": "1.130.1",
+    "@tamagui/build": "1.130.3",
     "react": "*"
   },
   "publishConfig": {

package/src/RemoveScroll.native.tsx

@@ -1 +1,2 @@
-export const RemoveScroll = (props) => props.children
+export const RemoveScroll = (props: any): any => props.children
+export const getAllowedScrollableNode = (): any => {}

package/src/RemoveScroll.tsx

@@ -1,21 +1,13 @@
-import React, { useRef } from 'react'
-import { useDisableScrollOutsideOf } from './useDisableScroll'
+import { type ReactNode, useEffect, useRef } from 'react'
+import { useDisableBodyScroll } from './useDisableScroll'
 
 export type RemoveScrollProps = {
   enabled?: boolean
   children?: React.ReactNode
 }
 
-export const RemoveScroll = React.memo((props: RemoveScrollProps) => {
-  const root = useRef<HTMLElement>(null)
+export const RemoveScroll = (props: RemoveScrollProps): ReactNode => {
+  useDisableBodyScroll(Boolean(props.enabled))
 
-  // useDisableScrollOutsideOf(root, {
-  //   enabled: Boolean(props.enabled),
-  // })
-
-  return (
-    <span ref={root} style={{ display: 'contents' }}>
-      {props.children}
-    </span>
-  )
-})
+  return props.children
+}

package/src/useDisableScroll.ts

@@ -1,75 +1,25 @@
-import { useEffect, useRef } from 'react'
+import { useEffect } from 'react'
 
 const canUseDOM = () =>
   typeof window !== 'undefined' && !!window.document && !!window.document.createElement
 
-const preventDefault = (e: WheelEvent | TouchEvent | KeyboardEvent) => {
-  if (e.preventDefault) {
-    e.preventDefault()
-  }
-}
-
-export const useDisableScrollOutsideOf = (
-  nodeRef: React.RefObject<HTMLElement | null>,
-  options: {
-    enabled?: boolean
-    // space: 32, page up: 33, page down: 34, end: 35, home: 36
-    // left: 37, up: 38, right: 39, down: 40
-    keyboardKeys?: number[]
-  } = {}
-) => {
-  const { enabled, keyboardKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40] } = options
-
+export const useDisableBodyScroll = (enabled: boolean): void => {
   useEffect(() => {
     if (!enabled || !canUseDOM()) {
       return
     }
 
-    const node = nodeRef.current
-    if (!node) {
-      return
-    }
-
-    const scrollEl = document.scrollingElement
-    if (!scrollEl || !(scrollEl instanceof HTMLElement)) {
-      return
-    }
-
-    const previously = scrollEl.style.pointerEvents
-    scrollEl.style.pointerEvents = 'none'
-
-    const lockToScrollPos = [scrollEl.scrollLeft, scrollEl.scrollTop]
-
-    const handleScroll = (e: Event) => {
-      if (scrollEl) {
-        e.preventDefault()
-        scrollEl.scrollTo(lockToScrollPos[0], lockToScrollPos[1])
-      }
-    }
-
-    const handleEvent = (e: WheelEvent | TouchEvent | KeyboardEvent) => {
-      if (e.target instanceof Node && (e.target === node || node.contains(e.target))) {
-        return
-      }
-
-      if ('keyCode' in e && !keyboardKeys.includes(e.keyCode)) {
-        return
-      }
-
-      preventDefault(e)
+    // for 99% browsers this can replace all the events
+    const bodyEl = document.documentElement
+    const previousBodyStyle = {
+      scrollbarGutter: bodyEl.style.scrollbarGutter,
+      overflow: bodyEl.style.overflow,
     }
-
-    document.addEventListener('scroll', handleScroll, { passive: false })
-    document.addEventListener('wheel', handleEvent, { passive: false })
-    document.addEventListener('touchmove', handleEvent, { passive: false })
-    document.addEventListener('keydown', handleEvent, { passive: false })
+    bodyEl.style.scrollbarGutter = 'stable'
+    bodyEl.style.overflow = 'hidden'
 
     return () => {
-      scrollEl.style.pointerEvents = previously
-      document.removeEventListener('scroll', handleScroll)
-      document.removeEventListener('wheel', handleEvent)
-      document.removeEventListener('touchmove', handleEvent)
-      document.removeEventListener('keydown', handleEvent)
+      Object.assign(bodyEl.style, previousBodyStyle)
     }
-  }, [enabled, nodeRef, keyboardKeys])
+  }, [enabled])
 }

package/types/RemoveScroll.d.ts

@@ -1,7 +1,8 @@
-import React from 'react';
+import { type ReactNode } from "react";
 export type RemoveScrollProps = {
-    enabled?: boolean;
-    children?: React.ReactNode;
+	enabled?: boolean;
+	children?: React.ReactNode;
 };
-export declare const RemoveScroll: React.MemoExoticComponent<(props: RemoveScrollProps) => import("react/jsx-runtime").JSX.Element>;
+export declare const RemoveScroll: (props: RemoveScrollProps) => ReactNode;
+
 //# sourceMappingURL=RemoveScroll.d.ts.map

package/types/RemoveScroll.d.ts.map

@@ -1 +1,13 @@
-{"version":3,"file":"RemoveScroll.d.ts","sourceRoot":"","sources":["../src/RemoveScroll.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAA;AAGrC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,YAAY,oCAAsB,iBAAiB,6CAY9D,CAAA"}
+{
+  "mappings": "AAAA,cAAc,iBAAoC,OAAO;AAGzD,YAAY,oBAAoB;CAC9B;CACA,WAAW,MAAM;AAClB;AAED,OAAO,cAAM,eAAgBA,OAAO,sBAAoB",
+  "names": [
+    "props: RemoveScrollProps"
+  ],
+  "sources": [
+    "src/RemoveScroll.tsx"
+  ],
+  "sourcesContent": [
+    "import { type ReactNode, useEffect, useRef } from 'react'\nimport { useDisableBodyScroll } from './useDisableScroll'\n\nexport type RemoveScrollProps = {\n  enabled?: boolean\n  children?: React.ReactNode\n}\n\nexport const RemoveScroll = (props: RemoveScrollProps): ReactNode => {\n  useDisableBodyScroll(Boolean(props.enabled))\n\n  return props.children\n}\n"
+  ],
+  "version": 3
+}

package/types/RemoveScroll.native.d.ts

@@ -1,2 +1,4 @@
 export declare const RemoveScroll: (props: any) => any;
+export declare const getAllowedScrollableNode: () => any;
+
 //# sourceMappingURL=RemoveScroll.native.d.ts.map

package/types/RemoveScroll.native.d.ts.map

@@ -1 +1,13 @@
-{"version":3,"file":"RemoveScroll.native.d.ts","sourceRoot":"","sources":["../src/RemoveScroll.native.tsx"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,GAAI,UAAK,QAAmB,CAAA"}
+{
+  "mappings": "AAAA,OAAO,cAAM,eAAgBA;AAC7B,OAAO,cAAM",
+  "names": [
+    "props: any"
+  ],
+  "sources": [
+    "src/RemoveScroll.native.tsx"
+  ],
+  "sourcesContent": [
+    "export const RemoveScroll = (props: any): any => props.children\nexport const getAllowedScrollableNode = (): any => {}\n"
+  ],
+  "version": 3
+}

package/types/index.d.ts

@@ -1,2 +1,3 @@
-export * from './RemoveScroll';
+export * from "./RemoveScroll";
+
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1,11 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA"}
+{
+  "mappings": "AAAA,cAAc",
+  "names": [],
+  "sources": [
+    "src/index.ts"
+  ],
+  "sourcesContent": [
+    "export * from './RemoveScroll'\n"
+  ],
+  "version": 3
+}

package/types/useDisableScroll.d.ts

@@ -1,5 +1,3 @@
-export declare const useDisableScrollOutsideOf: (nodeRef: React.RefObject<HTMLElement | null>, options?: {
-    enabled?: boolean;
-    keyboardKeys?: number[];
-}) => void;
+export declare const useDisableBodyScroll: (enabled: boolean) => void;
+
 //# sourceMappingURL=useDisableScroll.d.ts.map

package/types/useDisableScroll.d.ts.map

@@ -1 +1,13 @@
-{"version":3,"file":"useDisableScroll.d.ts","sourceRoot":"","sources":["../src/useDisableScroll.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,yBAAyB,GACpC,SAAS,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,EAC5C,UAAS;IACP,OAAO,CAAC,EAAE,OAAO,CAAA;IAGjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB,SAwDP,CAAA"}
+{
+  "mappings": "AAKA,OAAO,cAAM,uBAAwBA",
+  "names": [
+    "enabled: boolean"
+  ],
+  "sources": [
+    "src/useDisableScroll.ts"
+  ],
+  "sourcesContent": [
+    "import { useEffect } from 'react'\n\nconst canUseDOM = () =>\n  typeof window !== 'undefined' && !!window.document && !!window.document.createElement\n\nexport const useDisableBodyScroll = (enabled: boolean): void => {\n  useEffect(() => {\n    if (!enabled || !canUseDOM()) {\n      return\n    }\n\n    // for 99% browsers this can replace all the events\n    const bodyEl = document.documentElement\n    const previousBodyStyle = {\n      scrollbarGutter: bodyEl.style.scrollbarGutter,\n      overflow: bodyEl.style.overflow,\n    }\n    bodyEl.style.scrollbarGutter = 'stable'\n    bodyEl.style.overflow = 'hidden'\n\n    return () => {\n      Object.assign(bodyEl.style, previousBodyStyle)\n    }\n  }, [enabled])\n}\n"
+  ],
+  "version": 3
+}