antd-mobile 5.14.1 → 5.15.0

package/es/components/toast/toast.js

@@ -23,10 +23,14 @@ export const InternalToast = p => {
 
     switch (icon) {
       case 'success':
-        return React.createElement(CheckOutline, null);
+        return React.createElement(CheckOutline, {
+          className: `${classPrefix}-icon-success`
+        });
 
       case 'fail':
-        return React.createElement(CloseOutline, null);
+        return React.createElement(CloseOutline, {
+          className: `${classPrefix}-icon-fail`
+        });
 
       case 'loading':
         return React.createElement(SpinLoading, {

package/es/components/water-mark/water-mark.js

@@ -44,13 +44,14 @@ export const WaterMark = p => {
         const img = new Image();
         img.crossOrigin = 'anonymous';
         img.referrerPolicy = 'no-referrer';
-        img.src = image;
 
         img.onload = () => {
           ctx.drawImage(img, -imageWidth * ratio / 2, -imageHeight * ratio / 2, imageWidth * ratio, imageHeight * ratio);
           ctx.restore();
           setBase64Url(canvas.toDataURL());
         };
+
+        img.src = image;
       } else if (content) {
         ctx.textBaseline = 'middle';
         ctx.textAlign = 'center'; // 文字绕中间旋转
@@ -65,7 +66,7 @@ export const WaterMark = p => {
         setBase64Url(canvas.toDataURL());
       }
     } else {
-      throw new Error('当前环境不支持Canvas');
+      throw new Error('Canvas is not supported in the current environment');
     }
   }, [gapX, gapY, rotate, fontStyle, fontWeight, width, height, fontFamily, fontColor, image, content, fontSize]);
   return withNativeProps(props, React.createElement("div", {

package/es/global/global.css

@@ -12,7 +12,6 @@
   --adm-font-size-8: 16px;
   --adm-font-size-9: 17px;
   --adm-font-size-10: 18px;
-  --adm-hd: 1;
   --adm-color-primary: #1677ff;
   --adm-color-success: #00b578;
   --adm-color-warning: #ff8f1f;

package/es/global/theme-default.css

@@ -12,7 +12,6 @@
   --adm-font-size-8: 16px;
   --adm-font-size-9: 17px;
   --adm-font-size-10: 18px;
-  --adm-hd: 1;
   --adm-color-primary: #1677ff;
   --adm-color-success: #00b578;
   --adm-color-warning: #ff8f1f;

package/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/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/es/utils/use-props-value.js

@@ -15,12 +15,8 @@ export function usePropsValue(options) {
 
   const setState = useMemoizedFn(v => {
     const nextValue = typeof v === 'function' ? v(stateRef.current) : v;
-
-    if (value === undefined) {
-      stateRef.current = nextValue;
-      update();
-    }
-
+    stateRef.current = nextValue;
+    update();
     onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
   });
   return [stateRef.current, setState];

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "antd-mobile",
-  "version": "5.14.1",
+  "version": "5.15.0",
   "dependencies": {
     "@floating-ui/dom": "^0.5.2",
     "@react-spring/web": "^9.4.5",
     "@use-gesture/react": "10.2.15",
-    "ahooks": "^3.4.0",
-    "antd-mobile-icons": "^0.2.2",
+    "ahooks": "^3.4.1",
+    "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.6",
+    "rc-field-form": "~1.26.7",
     "react-is": "^17.0.2",
     "staged-components": "^1.1.3",
     "tslib": "^2.4.0",