antd-mobile 0.0.0-dev-626cbf51f → 0.0.0-dev.bc248f5c7

package/2x/es/utils/reduce-and-restore-motion.js

@@ -0,0 +1,36 @@
+import { Globals } from '@react-spring/web';
+import { useSyncExternalStore } from 'use-sync-external-store/shim';
+let reduced = false;
+const subscribers = new Set();
+
+function notify() {
+  subscribers.forEach(subscriber => {
+    subscriber();
+  });
+}
+
+export function reduceMotion() {
+  reduced = true;
+  notify();
+  Globals.assign({
+    skipAnimation: true
+  });
+}
+export function restoreMotion() {
+  reduced = false;
+  notify();
+  Globals.assign({
+    skipAnimation: false
+  });
+}
+export function isMotionReduced() {
+  return reduced;
+}
+export function useMotionReduced() {
+  return useSyncExternalStore(onStoreChange => {
+    subscribers.add(onStoreChange);
+    return () => {
+      subscribers.delete(onStoreChange);
+    };
+  }, isMotionReduced);
+}

package/2x/es/utils/render-imperatively.d.ts

@@ -4,7 +4,10 @@ declare type ImperativeProps = {
     onClose?: () => void;
     afterClose?: () => void;
 };
-export declare function renderImperatively(element: ReactElement<ImperativeProps>): {
+declare type TargetElement = ReactElement<ImperativeProps>;
+export declare type ImperativeHandler = {
     close: () => void;
+    replace: (element: TargetElement) => void;
 };
+export declare function renderImperatively(element: TargetElement): ImperativeHandler;
 export {};

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

@@ -4,6 +4,8 @@ export function renderImperatively(element) {
   const Wrapper = React.forwardRef((_, ref) => {
     const [visible, setVisible] = useState(false);
     const closedRef = useRef(false);
+    const [elementToRender, setElementToRender] = useState(element);
+    const keyRef = useRef(0);
     useEffect(() => {
       if (!closedRef.current) {
         setVisible(true);
@@ -17,20 +19,28 @@ export function renderImperatively(element) {
 
       closedRef.current = true;
       setVisible(false);
-      (_b = (_a = element.props).onClose) === null || _b === void 0 ? void 0 : _b.call(_a);
+      (_b = (_a = elementToRender.props).onClose) === null || _b === void 0 ? void 0 : _b.call(_a);
     }
 
     function afterClose() {
       var _a, _b;
 
       unmount();
-      (_b = (_a = element.props).afterClose) === null || _b === void 0 ? void 0 : _b.call(_a);
+      (_b = (_a = elementToRender.props).afterClose) === null || _b === void 0 ? void 0 : _b.call(_a);
     }
 
     useImperativeHandle(ref, () => ({
-      close: onClose
+      close: onClose,
+      replace: element => {
+        var _a, _b;
+
+        keyRef.current++;
+        (_b = (_a = elementToRender.props).afterClose) === null || _b === void 0 ? void 0 : _b.call(_a);
+        setElementToRender(element);
+      }
     }));
-    return React.cloneElement(element, Object.assign(Object.assign({}, element.props), {
+    return React.cloneElement(elementToRender, Object.assign(Object.assign({}, elementToRender.props), {
+      key: keyRef.current,
       visible,
       onClose,
       afterClose
@@ -40,14 +50,16 @@ export function renderImperatively(element) {
   const unmount = renderToBody(React.createElement(Wrapper, {
     ref: wrapperRef
   }));
+  return {
+    close: () => {
+      var _a;
 
-  function close() {
-    var _a;
-
-    (_a = wrapperRef.current) === null || _a === void 0 ? void 0 : _a.close();
-  }
+      (_a = wrapperRef.current) === null || _a === void 0 ? void 0 : _a.close();
+    },
+    replace: element => {
+      var _a;
 
-  return {
-    close
+      (_a = wrapperRef.current) === null || _a === void 0 ? void 0 : _a.replace(element);
+    }
   };
 }

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

@@ -12,13 +12,23 @@ let createRoot;
 try {
   const mainVersion = Number((version || '').split('.')[0]);
 
-  if (mainVersion >= 18) {
+  if (mainVersion >= 18 && fullClone.createRoot) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    createRoot = require('react-dom/client').createRoot;
+    createRoot = fullClone.createRoot;
   }
 } 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) {
@@ -26,7 +36,9 @@ function legacyRender(node, container) {
 }
 
 function concurrentRender(node, container) {
+  toggleWarning(true);
   const root = container[MARK] || createRoot(container);
+  toggleWarning(false);
   root.render(node);
   container[MARK] = root;
 }

package/2x/es/utils/use-drag-and-pinch.d.ts

@@ -1 +1 @@
-export declare const useDragAndPinch: <Config extends import("@use-gesture/react").UserGestureConfig = import("@use-gesture/react").UserGestureConfig>(_handlers: Partial<import("@use-gesture/react").NativeHandlers<import("@use-gesture/react").EventTypes> & import("@use-gesture/react").UserHandlers<import("@use-gesture/react").EventTypes>>, _config?: Config | undefined) => Config["target"] extends object ? void : (...args: any[]) => import("@use-gesture/react").ReactDOMAttributes;
+export declare const useDragAndPinch: <Config extends import("@use-gesture/react").UserGestureConfig = import("@use-gesture/react").UserGestureConfig>(_handlers: Partial<import("@use-gesture/react").NativeHandlers<import("@use-gesture/react").EventTypes> & import("@use-gesture/react").UserHandlers<import("@use-gesture/react").EventTypes>>, _config?: Config | undefined) => Config["target"] extends object ? void : (...args: any[]) => import("@use-gesture/react/dist/declarations/src/types").ReactDOMAttributes;

package/2x/es/utils/use-inner-visible.d.ts

@@ -0,0 +1 @@
+export declare function useInnerVisible(outerVisible: boolean): boolean;

package/2x/es/utils/use-inner-visible.js

@@ -0,0 +1,9 @@
+import { useState } from 'react';
+import { useIsomorphicLayoutEffect } from 'ahooks';
+export function useInnerVisible(outerVisible) {
+  const [innerVisible, setInnerVisible] = useState(outerVisible);
+  useIsomorphicLayoutEffect(() => {
+    setInnerVisible(outerVisible);
+  }, [outerVisible]);
+  return innerVisible;
+}

package/2x/es/utils/use-props-value.d.ts

@@ -4,5 +4,5 @@ declare type Options<T> = {
     defaultValue: T;
     onChange?: (v: T) => void;
 };
-export declare function usePropsValue<T>(options: Options<T>): readonly [T, (v: SetStateAction<T>) => void];
+export declare function usePropsValue<T>(options: Options<T>): readonly [T, (v: SetStateAction<T>, forceTrigger?: boolean) => void];
 export {};

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

@@ -13,15 +13,13 @@ export function usePropsValue(options) {
     stateRef.current = value;
   }
 
-  const setState = useMemoizedFn(v => {
+  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;
-
-    if (value === undefined) {
-      stateRef.current = nextValue;
-      update();
-    }
-
-    onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
+    if (!forceTrigger && nextValue === stateRef.current) return;
+    stateRef.current = nextValue;
+    update();
+    return onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
   });
   return [stateRef.current, setState];
 }

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

@@ -6,11 +6,13 @@ export function useResizeEffect(effect, targetRef) {
     if (!target) return;
 
     if (window.ResizeObserver) {
+      let animationFrame;
       const observer = new ResizeObserver(() => {
-        fn(target);
+        animationFrame = window.requestAnimationFrame(() => fn(target));
       });
       observer.observe(target);
       return () => {
+        window.cancelAnimationFrame(animationFrame);
         observer.disconnect();
       };
     } else {

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

@@ -33,7 +33,7 @@ export const useTabListScroll = (targetRef, activeIndex) => {
       from: {
         scrollLeft: containerScrollLeft
       },
-      immediate
+      immediate: immediate && !scrollLeft.isAnimating
     });
   }
 

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

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

package/2x/package.json

@@ -1,25 +1,22 @@
 {
   "name": "antd-mobile",
-  "version": "0.0.0-dev-626cbf51f",
+  "version": "0.0.0-dev.bc248f5c7",
   "dependencies": {
-    "@floating-ui/dom": "^0.4.5",
+    "@floating-ui/dom": "^0.5.2",
     "@react-spring/web": "^9.4.5",
-    "@types/big.js": "^6.1.3",
-    "@types/react-is": "^17.0.3",
-    "@types/react-virtualized": "^9.21.21",
-    "@types/resize-observer-browser": "^0.1.7",
-    "@use-gesture/react": "^10.2.12",
-    "ahooks": "^3.3.10",
-    "antd-mobile-icons": "^0.2.2",
+    "@use-gesture/react": "10.2.17",
+    "ahooks": "^3.5.2",
+    "antd-mobile-icons": "^0.3.0",
     "antd-mobile-v5-count": "^1.0.1",
     "big.js": "^6.1.1",
     "classnames": "^2.3.1",
-    "dayjs": "^1.11.2",
+    "dayjs": "^1.11.3",
     "lodash": "^4.17.21",
-    "rc-field-form": "^1.26.4",
+    "rc-field-form": "~1.27.0",
     "react-is": "^17.0.2",
-    "staged-components": "^1.1.2",
-    "tslib": "^2.3.1"
+    "staged-components": "^1.1.3",
+    "tslib": "^2.4.0",
+    "use-sync-external-store": "^1.1.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
@@ -43,6 +40,5 @@
     "url": "git+https://github.com/ant-design/ant-design-mobile.git",
     "branch": "master",
     "platform": "github"
-  },
-  "packageManager": "yarn@3.2.0"
+  }
 }