antd-mobile 5.24.0 → 5.24.2

package/2x/es/utils/render.js

@@ -1,6 +1,6 @@
 import { __awaiter } from "tslib";
-import * as ReactDOM from 'react-dom'; // Let compiler not to search module usage
-
+import * as ReactDOM from 'react-dom';
+// Let compiler not to search module usage
 const fullClone = Object.assign({}, ReactDOM);
 const {
   version,
@@ -8,33 +8,27 @@ const {
   unmountComponentAtNode
 } = fullClone;
 let createRoot;
-
 try {
   const mainVersion = Number((version || '').split('.')[0]);
-
   if (mainVersion >= 18 && fullClone.createRoot) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     createRoot = fullClone.createRoot;
   }
-} catch (e) {// Do nothing;
+} catch (e) {
+  // Do nothing;
 }
-
 function toggleWarning(skip) {
   const {
     __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
   } = fullClone;
-
   if (__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED && typeof __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED === 'object') {
     __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = skip;
   }
 }
-
 const MARK = '__antd_mobile_root__';
-
 function legacyRender(node, container) {
   reactRender(node, container);
 }
-
 function concurrentRender(node, container) {
   toggleWarning(true);
   const root = container[MARK] || createRoot(container);
@@ -42,36 +36,30 @@ function concurrentRender(node, container) {
   root.render(node);
   container[MARK] = root;
 }
-
 export function render(node, container) {
   if (createRoot) {
     concurrentRender(node, container);
     return;
   }
-
   legacyRender(node, container);
-} // ========================== Unmount =========================
-
+}
+// ========================== Unmount =========================
 function legacyUnmount(container) {
   return unmountComponentAtNode(container);
 }
-
 function concurrentUnmount(container) {
   return __awaiter(this, void 0, void 0, function* () {
     // Delay to unmount to avoid React 18 sync warning
     return Promise.resolve().then(() => {
       var _a;
-
       (_a = container[MARK]) === null || _a === void 0 ? void 0 : _a.unmount();
       delete container[MARK];
     });
   });
 }
-
 export function unmount(container) {
   if (createRoot) {
     return concurrentUnmount(container);
   }
-
   return legacyUnmount(container);
 }

package/2x/es/utils/shuffle.js

@@ -5,11 +5,9 @@
  */
 export function shuffle(array) {
   const result = [...array];
-
   for (let i = result.length; i > 0; i--) {
     const j = Math.floor(Math.random() * i);
     [result[i - 1], result[j]] = [result[j], result[i - 1]];
   }
-
   return result;
 }

package/2x/es/utils/supports-passive.js

@@ -1,6 +1,5 @@
 import { canUseDom } from './can-use-dom';
 export let supportsPassive = false;
-
 if (canUseDom) {
   try {
     const opts = {};
@@ -8,7 +7,6 @@ if (canUseDom) {
       get() {
         supportsPassive = true;
       }
-
     });
     window.addEventListener('test-passive', null, opts);
   } catch (e) {}

package/2x/es/utils/traverse-react-node.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { isFragment } from 'react-is';
 export function traverseReactNode(children, fn) {
   let i = 0;
-
   function handle(target) {
     React.Children.forEach(target, child => {
       if (!isFragment(child)) {
@@ -13,6 +12,5 @@ export function traverseReactNode(children, fn) {
       }
     });
   }
-
   handle(children);
 }

package/2x/es/utils/tree.js

@@ -11,6 +11,5 @@ export function getTreeDeep(treeData, childrenName = 'children') {
     });
     return deep;
   };
-
   return walker(treeData);
 }

package/2x/es/utils/undefined-fallback.js

@@ -1,9 +1,7 @@
 export function undefinedFallback(...items) {
   let i;
-
   for (i = 0; i < items.length; i++) {
     if (items[i] !== undefined) break;
   }
-
   return items[i];
 }

package/2x/es/utils/use-initialized.js

@@ -1,10 +1,8 @@
 import { useRef } from 'react';
 export function useInitialized(check) {
   const initializedRef = useRef(check);
-
   if (check) {
     initializedRef.current = true;
   }
-
   return !!initializedRef.current;
 }

package/2x/es/utils/use-lock-scroll.d.ts

@@ -1,2 +1,2 @@
 import { RefObject } from 'react';
-export declare function useLockScroll(rootRef: RefObject<HTMLElement>, shouldLock: boolean): void;
+export declare function useLockScroll(rootRef: RefObject<HTMLElement>, shouldLock: boolean | 'strict'): void;

package/2x/es/utils/use-lock-scroll.js

@@ -3,61 +3,70 @@ import { useEffect } from 'react';
 import { getScrollParent } from './get-scroll-parent';
 import { supportsPassive } from './supports-passive';
 let totalLockCount = 0;
-const BODY_LOCK_CLASS = 'adm-overflow-hidden'; // 移植自vant：https://github.com/youzan/vant/blob/HEAD/src/composables/use-lock-scroll.ts
-
+const BODY_LOCK_CLASS = 'adm-overflow-hidden';
+function getScrollableElement(el) {
+  let current = el === null || el === void 0 ? void 0 : el.parentElement;
+  while (current) {
+    if (current.clientHeight < current.scrollHeight) {
+      return current;
+    }
+    current = current.parentElement;
+  }
+  return null;
+}
+// 移植自vant：https://github.com/youzan/vant/blob/HEAD/src/composables/use-lock-scroll.ts
 export function useLockScroll(rootRef, shouldLock) {
   const touch = useTouch();
-
   const onTouchMove = event => {
     touch.move(event);
     const direction = touch.deltaY.current > 0 ? '10' : '01';
     const el = getScrollParent(event.target, rootRef.current);
     if (!el) return;
+    // This has perf cost but we have to compatible with iOS 12
+    if (shouldLock === 'strict') {
+      const scrollableParent = getScrollableElement(event.target);
+      if (scrollableParent === document.body || scrollableParent === document.documentElement) {
+        event.preventDefault();
+        return;
+      }
+    }
     const {
       scrollHeight,
       offsetHeight,
       scrollTop
     } = el;
     let status = '11';
-
     if (scrollTop === 0) {
       status = offsetHeight >= scrollHeight ? '00' : '01';
     } else if (scrollTop + offsetHeight >= scrollHeight) {
       status = '10';
     }
-
     if (status !== '11' && touch.isVertical() && !(parseInt(status, 2) & parseInt(direction, 2))) {
       if (event.cancelable) {
         event.preventDefault();
       }
     }
   };
-
   const lock = () => {
     document.addEventListener('touchstart', touch.start);
     document.addEventListener('touchmove', onTouchMove, supportsPassive ? {
       passive: false
     } : false);
-
     if (!totalLockCount) {
       document.body.classList.add(BODY_LOCK_CLASS);
     }
-
     totalLockCount++;
   };
-
   const unlock = () => {
     if (totalLockCount) {
       document.removeEventListener('touchstart', touch.start);
       document.removeEventListener('touchmove', onTouchMove);
       totalLockCount--;
-
       if (!totalLockCount) {
         document.body.classList.remove(BODY_LOCK_CLASS);
       }
     }
   };
-
   useEffect(() => {
     if (shouldLock) {
       lock();

package/2x/es/utils/use-props-value.js

@@ -8,11 +8,9 @@ export function usePropsValue(options) {
   } = options;
   const update = useUpdate();
   const stateRef = useRef(value !== undefined ? value : defaultValue);
-
   if (value !== undefined) {
     stateRef.current = value;
   }
-
   const setState = useMemoizedFn((v, forceTrigger = false) => {
     // `forceTrigger` means trigger `onChange` even if `v` is the same as `stateRef.current`
     const nextValue = typeof v === 'function' ? v(stateRef.current) : v;

package/2x/es/utils/use-resize-effect.js

@@ -4,7 +4,6 @@ export function useResizeEffect(effect, targetRef) {
   useIsomorphicLayoutEffect(() => {
     const target = targetRef.current;
     if (!target) return;
-
     if (window.ResizeObserver) {
       let animationFrame;
       const observer = new ResizeObserver(() => {

package/2x/es/utils/use-tab-list-scroll.js

@@ -13,7 +13,6 @@ export const useTabListScroll = (targetRef, activeIndex) => {
       clamp: true
     }
   }));
-
   function animate(immediate = false) {
     const container = targetRef.current;
     if (!container) return;
@@ -36,7 +35,6 @@ export const useTabListScroll = (targetRef, activeIndex) => {
       immediate: immediate && !scrollLeft.isAnimating
     });
   }
-
   useIsomorphicLayoutEffect(() => {
     animate(true);
   }, []);

package/2x/es/utils/use-touch.js

@@ -1,18 +1,14 @@
 import { useRef } from 'react';
 const MIN_DISTANCE = 10;
-
 function getDirection(x, y) {
   if (x > y && x > MIN_DISTANCE) {
     return 'horizontal';
   }
-
   if (y > x && y > MIN_DISTANCE) {
     return 'vertical';
   }
-
   return '';
 }
-
 export function useTouch() {
   const startX = useRef(0);
   const startY = useRef(0);
@@ -21,11 +17,8 @@ export function useTouch() {
   const offsetX = useRef(0);
   const offsetY = useRef(0);
   const direction = useRef('');
-
   const isVertical = () => direction.current === 'vertical';
-
   const isHorizontal = () => direction.current === 'horizontal';
-
   const reset = () => {
     deltaX.current = 0;
     deltaY.current = 0;
@@ -33,26 +26,22 @@ export function useTouch() {
     offsetY.current = 0;
     direction.current = '';
   };
-
   const start = event => {
     reset();
     startX.current = event.touches[0].clientX;
     startY.current = event.touches[0].clientY;
   };
-
   const move = event => {
-    const touch = event.touches[0]; // Fix: Safari back will set clientX to negative number
-
+    const touch = event.touches[0];
+    // Fix: Safari back will set clientX to negative number
     deltaX.current = touch.clientX < 0 ? 0 : touch.clientX - startX.current;
     deltaY.current = touch.clientY - startY.current;
     offsetX.current = Math.abs(deltaX.current);
     offsetY.current = Math.abs(deltaY.current);
-
     if (!direction.current) {
       direction.current = getDirection(offsetX.current, offsetY.current);
     }
   };
-
   return {
     move,
     start,

package/2x/es/utils/with-cache.js

@@ -4,7 +4,6 @@ export function withCache(generate) {
     if (cache === null) {
       cache = generate();
     }
-
     return cache;
   };
 }

package/2x/es/utils/with-default-props.js

@@ -3,12 +3,9 @@ export function mergeProps(...items) {
   function customizer(objValue, srcValue) {
     return srcValue === undefined ? objValue : srcValue;
   }
-
   let ret = Object.assign({}, items[0]);
-
   for (let i = 1; i < items.length; i++) {
     ret = assignWith(ret, items[i], customizer);
   }
-
   return ret;
 }

package/2x/es/utils/with-stop-propagation.js

@@ -4,17 +4,13 @@ const eventToPropRecord = {
 };
 export function withStopPropagation(events, element) {
   const props = Object.assign({}, element.props);
-
   for (const key of events) {
     const prop = eventToPropRecord[key];
-
     props[prop] = function (e) {
       var _a, _b;
-
       e.stopPropagation();
       (_b = (_a = element.props)[prop]) === null || _b === void 0 ? void 0 : _b.call(_a, e);
     };
   }
-
   return React.cloneElement(element, props);
 }

package/2x/package.json

@@ -1,10 +1,10 @@
 {
   "name": "antd-mobile",
-  "version": "5.24.0",
+  "version": "5.24.2",
   "dependencies": {
     "@floating-ui/dom": "^1.0.0",
     "@react-spring/web": "^9.4.5",
-    "@use-gesture/react": "10.2.17",
+    "@use-gesture/react": "10.2.20",
     "ahooks": "^3.7.0",
     "antd-mobile-icons": "^0.3.0",
     "antd-mobile-v5-count": "^1.0.1",