react-modal-sheet 3.3.0 → 3.4.1

package/dist/index.js

@@ -3,7 +3,6 @@
 var React2 = require('react');
 var reactDom = require('react-dom');
 var framerMotion = require('framer-motion');
-var utils = require('@react-aria/utils');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -25,104 +24,85 @@ var REDUCED_MOTION_TWEEN_CONFIG = {
 var DEFAULT_DRAG_CLOSE_THRESHOLD = 0.6;
 var DEFAULT_DRAG_VELOCITY_THRESHOLD = 500;
 
-// src/utils.ts
-function getClosest(nums, goal) {
-  let closest = nums[0];
-  let minDifference = Math.abs(nums[0] - goal);
-  for (let i = 1; i < nums.length; i++) {
-    const difference = Math.abs(nums[i] - goal);
-    if (difference < minDifference) {
-      closest = nums[i];
-      minDifference = difference;
-    }
-  }
-  return closest;
-}
-function applyRootStyles(rootId) {
-  const body = document.querySelector("body");
-  const root = document.querySelector(`#${rootId}`);
-  if (root) {
-    const p = 24;
-    const h = window.innerHeight;
-    const s = (h - p) / h;
+// src/hooks.tsx
+var useIsomorphicLayoutEffect = IS_SSR ? React2.useEffect : React2.useLayoutEffect;
+function useModalEffect({
+  y,
+  rootId,
+  sheetRef
+}) {
+  const heightRef = React2.useRef(IS_SSR ? 0 : window.innerHeight);
+  function setup() {
+    const root = document.querySelector(`#${rootId}`);
+    const body = document.querySelector("body");
+    if (!root)
+      return;
     body.style.backgroundColor = "#000";
     root.style.overflow = "hidden";
-    root.style.willChange = "transform";
-    root.style.transition = "transform 200ms ease-in-out, border-radius 200ms linear";
-    root.style.transform = `translateY(calc(env(safe-area-inset-top) + ${p / 2}px)) scale(${s})`;
-    root.style.borderTopRightRadius = "10px";
-    root.style.borderTopLeftRadius = "10px";
+    root.style.transitionTimingFunction = "cubic-bezier(0.32, 0.72, 0, 1)";
+    root.style.transitionProperty = "transform, border-radius";
+    root.style.transitionDuration = "0.5s";
+    root.style.transformOrigin = "center top";
   }
-}
-function cleanupRootStyles(rootId) {
-  const body = document.querySelector("body");
-  const root = document.getElementById(rootId);
-  function onTransitionEnd() {
-    root.style.removeProperty("overflow");
-    root.style.removeProperty("will-change");
-    root.style.removeProperty("transition");
-    body.style.removeProperty("background-color");
-    root.removeEventListener("transitionend", onTransitionEnd);
-  }
-  if (root) {
-    root.style.removeProperty("border-top-right-radius");
-    root.style.removeProperty("border-top-left-radius");
-    root.style.removeProperty("transform");
-    root.addEventListener("transitionend", onTransitionEnd);
-  }
-}
-function inDescendingOrder(arr) {
-  for (let i = 0; i < arr.length; i++) {
-    if (arr[i + 1] > arr[i])
-      return false;
-  }
-  return true;
-}
-function validateSnapTo({
-  snapTo,
-  sheetHeight
-}) {
-  if (snapTo < 0) {
-    console.warn(
-      `Snap point is out of bounds. Sheet height is ${sheetHeight} but snap point is ${sheetHeight + Math.abs(snapTo)}.`
-    );
+  function cleanup() {
+    const root = document.querySelector(`#${rootId}`);
+    const body = document.querySelector("body");
+    if (!root)
+      return;
+    setTimeout(() => {
+      body.style.removeProperty("background-color");
+      root.style.removeProperty("overflow");
+      root.style.removeProperty("transition-timing-function");
+      root.style.removeProperty("transition-property");
+      root.style.removeProperty("transition-duration");
+      root.style.removeProperty("transform-origin");
+      root.style.removeProperty("transform");
+      root.style.removeProperty("border-top-right-radius");
+      root.style.removeProperty("border-top-left-radius");
+    }, 100);
   }
-  return Math.max(Math.round(snapTo), 0);
-}
-function mergeRefs(refs) {
-  return (value) => {
-    refs.forEach((ref) => {
-      if (typeof ref === "function") {
-        ref(value);
-      } else if (ref) {
-        ref.current = value;
-      }
-    });
-  };
-}
-function isTouchDevice() {
-  if (typeof window === "undefined")
-    return false;
-  return "ontouchstart" in window || navigator.maxTouchPoints > 0;
-}
-
-// src/hooks.tsx
-var useIsomorphicLayoutEffect = IS_SSR ? React2.useEffect : React2.useLayoutEffect;
-function useModalEffect(isOpen, rootId) {
-  const prevOpen = usePrevious(isOpen);
+  useIsomorphicLayoutEffect(() => {
+    return () => {
+      if (rootId)
+        cleanup();
+    };
+  }, []);
   React2.useEffect(() => {
-    if (rootId && !prevOpen && isOpen) {
-      applyRootStyles(rootId);
-    } else if (rootId && !isOpen && prevOpen) {
-      cleanupRootStyles(rootId);
+    const root = document.querySelector(`#${rootId}`);
+    if (!root)
+      return;
+    function onCompleted() {
+      if (y.get() - 10 >= heightRef.current)
+        cleanup();
     }
-  }, [isOpen, prevOpen]);
-  React2.useEffect(() => {
+    const removeStartListener = y.on("animationStart", () => {
+      var _a;
+      heightRef.current = ((_a = sheetRef.current) == null ? void 0 : _a.offsetHeight) || window.innerHeight;
+      setup();
+    });
+    const removeChangeListener = y.on("change", (value) => {
+      if (root) {
+        const progress = Math.max(0, 1 - value / heightRef.current);
+        const pageWidth = window.innerWidth;
+        const scale = (pageWidth - 16) / pageWidth;
+        const ty = framerMotion.transform(progress, [0, 1], [0, 24]);
+        const s = framerMotion.transform(progress, [0, 1], [1, scale]);
+        const borderRadius = framerMotion.transform(progress, [0, 1], [0, 10]);
+        const inset = "env(safe-area-inset-top)";
+        root.style.transform = `scale(${s}) translate3d(0, calc(${inset} + ${ty}px), 0)`;
+        root.style.borderTopRightRadius = `${borderRadius}px`;
+        root.style.borderTopLeftRadius = `${borderRadius}px`;
+      }
+    });
+    const removeCompleteListener = y.on("animationComplete", onCompleted);
+    const removeCancelListener = y.on("animationCancel", onCompleted);
     return () => {
-      if (rootId && isOpen)
-        cleanupRootStyles(rootId);
+      removeStartListener();
+      removeChangeListener();
+      removeCompleteListener();
+      removeCancelListener();
     };
-  }, [isOpen]);
+  }, [y, rootId]);
 }
 function useEventCallbacks(isOpen, callbacks) {
   const prevOpen = usePrevious(isOpen);
@@ -149,8 +129,8 @@ function useEventCallbacks(isOpen, callbacks) {
 }
 function useDimensions() {
   const [dimensions, setDimensions] = React2.useState({
-    height: framerMotion.isBrowser ? window.innerHeight : 0,
-    width: framerMotion.isBrowser ? window.innerWidth : 0
+    height: !IS_SSR ? window.innerHeight : 0,
+    width: !IS_SSR ? window.innerWidth : 0
   });
   useIsomorphicLayoutEffect(() => {
     function handler() {
@@ -227,7 +207,120 @@ var useSheetScrollerContext = () => {
     throw Error("Sheet scroller context error");
   return context;
 };
-var visualViewport = typeof window !== "undefined" ? window.visualViewport : void 0;
+
+// src/utils.ts
+function getClosest(nums, goal) {
+  let closest = nums[0];
+  let minDifference = Math.abs(nums[0] - goal);
+  for (let i = 1; i < nums.length; i++) {
+    const difference = Math.abs(nums[i] - goal);
+    if (difference < minDifference) {
+      closest = nums[i];
+      minDifference = difference;
+    }
+  }
+  return closest;
+}
+function inDescendingOrder(arr) {
+  for (let i = 0; i < arr.length; i++) {
+    if (arr[i + 1] > arr[i])
+      return false;
+  }
+  return true;
+}
+function validateSnapTo({
+  snapTo,
+  sheetHeight
+}) {
+  if (snapTo < 0) {
+    console.warn(
+      `Snap point is out of bounds. Sheet height is ${sheetHeight} but snap point is ${sheetHeight + Math.abs(snapTo)}.`
+    );
+  }
+  return Math.max(Math.round(snapTo), 0);
+}
+function mergeRefs(refs) {
+  return (value) => {
+    refs.forEach((ref) => {
+      if (typeof ref === "function") {
+        ref(value);
+      } else if (ref) {
+        ref.current = value;
+      }
+    });
+  };
+}
+function isTouchDevice() {
+  if (typeof window === "undefined")
+    return false;
+  return "ontouchstart" in window || navigator.maxTouchPoints > 0;
+}
+function testPlatform(re) {
+  var _a;
+  return typeof window !== "undefined" && window.navigator != null ? re.test(
+    // @ts-expect-error
+    // eslint-disable-next-line @typescript-eslint/dot-notation
+    ((_a = window.navigator["userAgentData"]) == null ? void 0 : _a.platform) || window.navigator.platform
+  ) : false;
+}
+function cached(fn) {
+  let res = null;
+  return () => {
+    if (res == null) {
+      res = fn();
+    }
+    return res;
+  };
+}
+var isMac = cached(function() {
+  return testPlatform(/^Mac/i);
+});
+var isIPhone = cached(function() {
+  return testPlatform(/^iPhone/i);
+});
+var isIPad = cached(function() {
+  return testPlatform(/^iPad/i) || // iPadOS 13 lies and says it's a Mac, but we can distinguish by detecting touch support.
+  isMac() && navigator.maxTouchPoints > 1;
+});
+var isIOS = cached(function() {
+  return isIPhone() || isIPad();
+});
+
+// src/use-prevent-scroll.ts
+var KEYBOARD_BUFFER = 24;
+function chain(...callbacks) {
+  return (...args) => {
+    for (const callback of callbacks) {
+      if (typeof callback === "function") {
+        callback(...args);
+      }
+    }
+  };
+}
+var visualViewport = typeof document !== "undefined" && window.visualViewport;
+function isScrollable(node, checkForOverflow) {
+  if (!node) {
+    return false;
+  }
+  const style = window.getComputedStyle(node);
+  let isScrollable2 = /(auto|scroll)/.test(
+    style.overflow + style.overflowX + style.overflowY
+  );
+  if (isScrollable2 && checkForOverflow) {
+    isScrollable2 = node.scrollHeight !== node.clientHeight || node.scrollWidth !== node.clientWidth;
+  }
+  return isScrollable2;
+}
+function getScrollParent(node, checkForOverflow) {
+  let scrollableNode = node;
+  if (isScrollable(scrollableNode, checkForOverflow)) {
+    scrollableNode = scrollableNode.parentElement;
+  }
+  while (scrollableNode && !isScrollable(scrollableNode, checkForOverflow)) {
+    scrollableNode = scrollableNode.parentElement;
+  }
+  return scrollableNode || document.scrollingElement || document.documentElement;
+}
 var nonTextInputTypes = /* @__PURE__ */ new Set([
   "checkbox",
   "radio",
@@ -243,13 +336,13 @@ var preventScrollCount = 0;
 var restore;
 function usePreventScroll(options = {}) {
   const { isDisabled } = options;
-  utils.useLayoutEffect(() => {
+  useIsomorphicLayoutEffect(() => {
     if (isDisabled) {
       return;
     }
     preventScrollCount++;
     if (preventScrollCount === 1) {
-      if (utils.isIOS()) {
+      if (isIOS()) {
         restore = preventScrollMobileSafari();
       } else {
         restore = preventScrollStandard();
@@ -258,13 +351,13 @@ function usePreventScroll(options = {}) {
     return () => {
       preventScrollCount--;
       if (preventScrollCount === 0) {
-        restore();
+        restore == null ? void 0 : restore();
       }
     };
   }, [isDisabled]);
 }
 function preventScrollStandard() {
-  return utils.chain(
+  return chain(
     setStyle(
       document.documentElement,
       "paddingRight",
@@ -277,7 +370,7 @@ function preventScrollMobileSafari() {
   let scrollable;
   let lastY = 0;
   const onTouchStart = (e) => {
-    scrollable = utils.getScrollParent(e.target);
+    scrollable = getScrollParent(e.target, true);
     if (scrollable === document.documentElement && scrollable === document.body) {
       return;
     }
@@ -287,7 +380,7 @@ function preventScrollMobileSafari() {
     if (scrollable === void 0) {
       return;
     }
-    if (scrollable === document.documentElement || scrollable === document.body) {
+    if (!scrollable || scrollable === document.documentElement || scrollable === document.body) {
       e.preventDefault();
       return;
     }
@@ -327,9 +420,7 @@ function preventScrollMobileSafari() {
           } else {
             visualViewport.addEventListener(
               "resize",
-              () => {
-                scrollIntoView(target);
-              },
+              () => scrollIntoView(target),
               { once: true }
             );
           }
@@ -342,7 +433,7 @@ function preventScrollMobileSafari() {
   };
   const scrollX = window.pageXOffset;
   const scrollY = window.pageYOffset;
-  const restoreStyles = utils.chain(
+  const restoreStyles = chain(
     setStyle(
       document.documentElement,
       "paddingRight",
@@ -352,7 +443,7 @@ function preventScrollMobileSafari() {
     setStyle(document.body, "marginTop", `-${scrollY}px`)
   );
   window.scrollTo(0, 0);
-  const removeEvents = utils.chain(
+  const removeEvents = chain(
     addEvent(document, "touchstart", onTouchStart, {
       passive: false,
       capture: true
@@ -390,11 +481,13 @@ function addEvent(target, event, handler, options) {
 function scrollIntoView(target) {
   const root = document.scrollingElement || document.documentElement;
   while (target && target !== root) {
-    const scrollable = utils.getScrollParent(target);
+    const scrollable = getScrollParent(target);
     if (scrollable !== document.documentElement && scrollable !== document.body && scrollable !== target) {
       const scrollableTop = scrollable.getBoundingClientRect().top;
       const targetTop = target.getBoundingClientRect().top;
-      if (targetTop > scrollableTop + target.clientHeight) {
+      const targetBottom = target.getBoundingClientRect().bottom;
+      const keyboardHeight = scrollable.getBoundingClientRect().bottom + KEYBOARD_BUFFER;
+      if (targetBottom > keyboardHeight) {
         scrollable.scrollTop += targetTop - scrollableTop;
       }
     }
@@ -618,7 +711,11 @@ var Sheet = React2.forwardRef(
         }
       }
     }));
-    useModalEffect(isOpen, rootId);
+    useModalEffect({
+      y,
+      rootId,
+      sheetRef
+    });
     usePreventScroll({ isDisabled: disableScrollLocking || !isOpen });
     const dragProps = React2.useMemo(() => {
       const dragProps2 = {
@@ -798,8 +895,8 @@ var SheetScroller = React2.forwardRef(
     const sheetScrollerContext = useSheetScrollerContext();
     function determineDragState(element) {
       const { scrollTop, scrollHeight, clientHeight } = element;
-      const isScrollable = scrollHeight > clientHeight;
-      if (!isScrollable)
+      const isScrollable2 = scrollHeight > clientHeight;
+      if (!isScrollable2)
         return;
       const isAtTop = scrollTop <= 0;
       const isAtBottom = scrollHeight - scrollTop === clientHeight;
@@ -812,9 +909,15 @@ var SheetScroller = React2.forwardRef(
     }
     function onScroll(e) {
       determineDragState(e.currentTarget);
+      if (rest.onScroll) {
+        rest.onScroll(e);
+      }
     }
     function onTouchStart(e) {
       determineDragState(e.currentTarget);
+      if (rest.onTouchStart) {
+        rest.onTouchStart(e);
+      }
     }
     const scrollProps = isTouchDevice() ? { onScroll, onTouchStart } : void 0;
     return /* @__PURE__ */ React2__default.default.createElement(