antd-mobile 5.9.4-dev.1 → 5.9.5

package/2x/cjs/components/dialog/dialog.d.ts

@@ -22,5 +22,6 @@ export declare type DialogProps = {
     maskStyle?: React.CSSProperties;
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
+    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Dialog: FC<DialogProps>;

package/2x/cjs/components/dialog/dialog.js

@@ -43,7 +43,8 @@ const defaultProps = {
   closeOnAction: false,
   closeOnMaskClick: false,
   stopPropagation: ['click'],
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 
 const Dialog = p => {
@@ -122,7 +123,8 @@ const Dialog = p => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: (0, _classnames.default)(cls('mask'), props.maskClassName)
+    className: (0, _classnames.default)(cls('mask'), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), _react.default.createElement("div", {
     className: cls('wrap'),
     style: {

package/2x/cjs/components/form/form-item.js

@@ -29,6 +29,8 @@ var _antdMobileIcons = require("antd-mobile-icons");
 
 var _configProvider = require("../config-provider");
 
+var _undefinedFallback = require("../../utils/undefined-fallback");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -169,7 +171,7 @@ const FormItem = props => {
   const {
     validateTrigger: contextValidateTrigger
   } = (0, _react.useContext)(_FieldContext.default);
-  const mergedValidateTrigger = validateTrigger !== undefined ? validateTrigger : contextValidateTrigger;
+  const mergedValidateTrigger = (0, _undefinedFallback.undefinedFallback)(validateTrigger, contextValidateTrigger, trigger);
 
   const updateRef = _react.default.useRef(0);
 

package/2x/cjs/components/modal/modal.d.ts

@@ -23,5 +23,6 @@ export declare type ModalProps = {
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
     showCloseButton?: boolean;
+    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Modal: FC<ModalProps>;

package/2x/cjs/components/modal/modal.js

@@ -48,7 +48,8 @@ const defaultProps = {
   closeOnMaskClick: false,
   stopPropagation: ['click'],
   showCloseButton: false,
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 
 const Modal = p => {
@@ -128,7 +129,8 @@ const Modal = p => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: (0, _classnames.default)(cls('mask'), props.maskClassName)
+    className: (0, _classnames.default)(cls('mask'), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), _react.default.createElement("div", {
     className: cls('wrap'),
     style: {

package/2x/cjs/components/number-keyboard/number-keyboard.js

@@ -157,9 +157,6 @@ const NumberKeyboard = p => {
           onBackspacePressEnd();
         }
       },
-      onMouseUp: e => {
-        onKeyPress(e, key);
-      },
       title: key,
       role: 'button'
     }, key === 'BACKSPACE' ? _react.default.createElement(_antdMobileIcons.TextDeletionOutline, null) : key);
@@ -196,13 +193,11 @@ const NumberKeyboard = p => {
       onKeyPress(e, 'BACKSPACE');
       onBackspacePressEnd();
     },
-    onMouseUp: e => onKeyPress(e, 'BACKSPACE'),
     title: 'BACKSPACE',
     role: 'button'
   }, _react.default.createElement(_antdMobileIcons.TextDeletionOutline, null)), _react.default.createElement("div", {
     className: `${classPrefix}-key extra-key ok-key`,
     onTouchEnd: e => onKeyPress(e, 'OK'),
-    onMouseUp: e => onKeyPress(e, 'OK'),
     role: 'button'
   }, confirmText))), props.safeArea && _react.default.createElement("div", {
     className: `${classPrefix}-footer`

package/2x/cjs/utils/undefined-fallback.d.ts

@@ -0,0 +1,3 @@
+export declare function undefinedFallback<T>(a: T | undefined, b: T): T;
+export declare function undefinedFallback<T>(a: T | undefined, b: T | undefined, c: T): T;
+export declare function undefinedFallback<T>(a: T | undefined, b: T | undefined, c: T | undefined, d: T): T;

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

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.undefinedFallback = undefinedFallback;
+
+function undefinedFallback(...items) {
+  let i;
+
+  for (i = 0; i < items.length; i++) {
+    if (items[i] !== undefined) break;
+  }
+
+  return items[i];
+}

package/2x/es/components/dialog/dialog.d.ts

@@ -22,5 +22,6 @@ export declare type DialogProps = {
     maskStyle?: React.CSSProperties;
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
+    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Dialog: FC<DialogProps>;

package/2x/es/components/dialog/dialog.js

@@ -17,7 +17,8 @@ const defaultProps = {
   closeOnAction: false,
   closeOnMaskClick: false,
   stopPropagation: ['click'],
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 export const Dialog = p => {
   const props = mergeProps(defaultProps, p);
@@ -93,7 +94,8 @@ export const Dialog = p => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: classNames(cls('mask'), props.maskClassName)
+    className: classNames(cls('mask'), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), React.createElement("div", {
     className: cls('wrap'),
     style: {

package/2x/es/components/form/form-item.js

@@ -10,6 +10,7 @@ import List from '../list';
 import Popover from '../popover';
 import { QuestionCircleOutline } from 'antd-mobile-icons';
 import { useConfig } from '../config-provider';
+import { undefinedFallback } from '../../utils/undefined-fallback';
 const NAME_SPLIT = '__SPLIT__';
 const classPrefix = `adm-form-item`;
 const MemoInput = React.memo(({
@@ -142,7 +143,7 @@ export const FormItem = props => {
   const {
     validateTrigger: contextValidateTrigger
   } = useContext(FieldContext);
-  const mergedValidateTrigger = validateTrigger !== undefined ? validateTrigger : contextValidateTrigger;
+  const mergedValidateTrigger = undefinedFallback(validateTrigger, contextValidateTrigger, trigger);
   const updateRef = React.useRef(0);
   updateRef.current += 1;
   const [subMetas, setSubMetas] = useState({});

package/2x/es/components/modal/modal.d.ts

@@ -23,5 +23,6 @@ export declare type ModalProps = {
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
     showCloseButton?: boolean;
+    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Modal: FC<ModalProps>;

package/2x/es/components/modal/modal.js

@@ -20,7 +20,8 @@ const defaultProps = {
   closeOnMaskClick: false,
   stopPropagation: ['click'],
   showCloseButton: false,
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 export const Modal = p => {
   const props = mergeProps(defaultProps, p);
@@ -97,7 +98,8 @@ export const Modal = p => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: classNames(cls('mask'), props.maskClassName)
+    className: classNames(cls('mask'), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), React.createElement("div", {
     className: cls('wrap'),
     style: {

package/2x/es/components/number-keyboard/number-keyboard.js

@@ -134,9 +134,6 @@ export const NumberKeyboard = p => {
           onBackspacePressEnd();
         }
       },
-      onMouseUp: e => {
-        onKeyPress(e, key);
-      },
       title: key,
       role: 'button'
     }, key === 'BACKSPACE' ? React.createElement(TextDeletionOutline, null) : key);
@@ -173,13 +170,11 @@ export const NumberKeyboard = p => {
       onKeyPress(e, 'BACKSPACE');
       onBackspacePressEnd();
     },
-    onMouseUp: e => onKeyPress(e, 'BACKSPACE'),
     title: 'BACKSPACE',
     role: 'button'
   }, React.createElement(TextDeletionOutline, null)), React.createElement("div", {
     className: `${classPrefix}-key extra-key ok-key`,
     onTouchEnd: e => onKeyPress(e, 'OK'),
-    onMouseUp: e => onKeyPress(e, 'OK'),
     role: 'button'
   }, confirmText))), props.safeArea && React.createElement("div", {
     className: `${classPrefix}-footer`

package/2x/es/utils/undefined-fallback.d.ts

@@ -0,0 +1,3 @@
+export declare function undefinedFallback<T>(a: T | undefined, b: T): T;
+export declare function undefinedFallback<T>(a: T | undefined, b: T | undefined, c: T): T;
+export declare function undefinedFallback<T>(a: T | undefined, b: T | undefined, c: T | undefined, d: T): T;

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

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

package/2x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.9.4-dev.1",
+  "version": "5.9.5",
   "dependencies": {
     "@floating-ui/dom": "^0.4.2",
     "@react-spring/web": "^9.4.4",

package/bundle/antd-mobile.cjs.js

@@ -11556,7 +11556,8 @@ const defaultProps$G = {
   closeOnAction: false,
   closeOnMaskClick: false,
   stopPropagation: ["click"],
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 const Dialog = (p) => {
   const props = mergeProps(defaultProps$G, p);
@@ -11629,7 +11630,8 @@ const Dialog = (p) => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : void 0,
     style: props.maskStyle,
-    className: classNames__default["default"](cls$1("mask"), props.maskClassName)
+    className: classNames__default["default"](cls$1("mask"), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), React__default["default"].createElement("div", {
     className: cls$1("wrap"),
     style: {
@@ -13329,6 +13331,14 @@ const PopoverMenu = React$1.forwardRef((props, ref) => {
 var Popover = attachPropertiesToComponent(Popover$1, {
   Menu: PopoverMenu
 });
+function undefinedFallback(...items) {
+  let i;
+  for (i = 0; i < items.length; i++) {
+    if (items[i] !== void 0)
+      break;
+  }
+  return items[i];
+}
 const NAME_SPLIT = "__SPLIT__";
 const classPrefix$H = `adm-form-item`;
 const MemoInput = React__default["default"].memo(({
@@ -13448,7 +13458,7 @@ const FormItem = (props) => {
   const {
     validateTrigger: contextValidateTrigger
   } = React$1.useContext(default_1);
-  const mergedValidateTrigger = validateTrigger !== void 0 ? validateTrigger : contextValidateTrigger;
+  const mergedValidateTrigger = undefinedFallback(validateTrigger, contextValidateTrigger, trigger);
   const updateRef = React__default["default"].useRef(0);
   updateRef.current += 1;
   const [subMetas, setSubMetas] = React$1.useState({});
@@ -14725,7 +14735,8 @@ const defaultProps$q = {
   closeOnMaskClick: false,
   stopPropagation: ["click"],
   showCloseButton: false,
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 const Modal = (p) => {
   const props = mergeProps(defaultProps$q, p);
@@ -14799,7 +14810,8 @@ const Modal = (p) => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : void 0,
     style: props.maskStyle,
-    className: classNames__default["default"](cls("mask"), props.maskClassName)
+    className: classNames__default["default"](cls("mask"), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), React__default["default"].createElement("div", {
     className: cls("wrap"),
     style: {
@@ -15131,9 +15143,6 @@ const NumberKeyboard = (p) => {
           onBackspacePressEnd();
         }
       },
-      onMouseUp: (e) => {
-        onKeyPress(e, key);
-      },
       title: key,
       role: "button"
     }, key === "BACKSPACE" ? React__default["default"].createElement(antdMobileIcons.TextDeletionOutline, null) : key);
@@ -15169,13 +15178,11 @@ const NumberKeyboard = (p) => {
       onKeyPress(e, "BACKSPACE");
       onBackspacePressEnd();
     },
-    onMouseUp: (e) => onKeyPress(e, "BACKSPACE"),
     title: "BACKSPACE",
     role: "button"
   }, React__default["default"].createElement(antdMobileIcons.TextDeletionOutline, null)), React__default["default"].createElement("div", {
     className: `${classPrefix$r}-key extra-key ok-key`,
     onTouchEnd: (e) => onKeyPress(e, "OK"),
-    onMouseUp: (e) => onKeyPress(e, "OK"),
     role: "button"
   }, confirmText))), props.safeArea && React__default["default"].createElement("div", {
     className: `${classPrefix$r}-footer`

package/bundle/antd-mobile.es.js

@@ -11547,7 +11547,8 @@ const defaultProps$G = {
   closeOnAction: false,
   closeOnMaskClick: false,
   stopPropagation: ["click"],
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 const Dialog = (p) => {
   const props = mergeProps(defaultProps$G, p);
@@ -11620,7 +11621,8 @@ const Dialog = (p) => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : void 0,
     style: props.maskStyle,
-    className: classNames(cls$1("mask"), props.maskClassName)
+    className: classNames(cls$1("mask"), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), React$1.createElement("div", {
     className: cls$1("wrap"),
     style: {
@@ -13320,6 +13322,14 @@ const PopoverMenu = forwardRef((props, ref) => {
 var Popover = attachPropertiesToComponent(Popover$1, {
   Menu: PopoverMenu
 });
+function undefinedFallback(...items) {
+  let i;
+  for (i = 0; i < items.length; i++) {
+    if (items[i] !== void 0)
+      break;
+  }
+  return items[i];
+}
 const NAME_SPLIT = "__SPLIT__";
 const classPrefix$H = `adm-form-item`;
 const MemoInput = React$1.memo(({
@@ -13439,7 +13449,7 @@ const FormItem = (props) => {
   const {
     validateTrigger: contextValidateTrigger
   } = useContext(default_1);
-  const mergedValidateTrigger = validateTrigger !== void 0 ? validateTrigger : contextValidateTrigger;
+  const mergedValidateTrigger = undefinedFallback(validateTrigger, contextValidateTrigger, trigger);
   const updateRef = React$1.useRef(0);
   updateRef.current += 1;
   const [subMetas, setSubMetas] = useState({});
@@ -14716,7 +14726,8 @@ const defaultProps$q = {
   closeOnMaskClick: false,
   stopPropagation: ["click"],
   showCloseButton: false,
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 const Modal = (p) => {
   const props = mergeProps(defaultProps$q, p);
@@ -14790,7 +14801,8 @@ const Modal = (p) => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : void 0,
     style: props.maskStyle,
-    className: classNames(cls("mask"), props.maskClassName)
+    className: classNames(cls("mask"), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), React$1.createElement("div", {
     className: cls("wrap"),
     style: {
@@ -15122,9 +15134,6 @@ const NumberKeyboard = (p) => {
           onBackspacePressEnd();
         }
       },
-      onMouseUp: (e) => {
-        onKeyPress(e, key);
-      },
       title: key,
       role: "button"
     }, key === "BACKSPACE" ? React$1.createElement(TextDeletionOutline, null) : key);
@@ -15160,13 +15169,11 @@ const NumberKeyboard = (p) => {
       onKeyPress(e, "BACKSPACE");
       onBackspacePressEnd();
     },
-    onMouseUp: (e) => onKeyPress(e, "BACKSPACE"),
     title: "BACKSPACE",
     role: "button"
   }, React$1.createElement(TextDeletionOutline, null)), React$1.createElement("div", {
     className: `${classPrefix$r}-key extra-key ok-key`,
     onTouchEnd: (e) => onKeyPress(e, "OK"),
-    onMouseUp: (e) => onKeyPress(e, "OK"),
     role: "button"
   }, confirmText))), props.safeArea && React$1.createElement("div", {
     className: `${classPrefix$r}-footer`

package/cjs/components/dialog/dialog.d.ts

@@ -22,5 +22,6 @@ export declare type DialogProps = {
     maskStyle?: React.CSSProperties;
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
+    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Dialog: FC<DialogProps>;

package/cjs/components/dialog/dialog.js

@@ -43,7 +43,8 @@ const defaultProps = {
   closeOnAction: false,
   closeOnMaskClick: false,
   stopPropagation: ['click'],
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 
 const Dialog = p => {
@@ -122,7 +123,8 @@ const Dialog = p => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: (0, _classnames.default)(cls('mask'), props.maskClassName)
+    className: (0, _classnames.default)(cls('mask'), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), _react.default.createElement("div", {
     className: cls('wrap'),
     style: {

package/cjs/components/form/form-item.js

@@ -29,6 +29,8 @@ var _antdMobileIcons = require("antd-mobile-icons");
 
 var _configProvider = require("../config-provider");
 
+var _undefinedFallback = require("../../utils/undefined-fallback");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -169,7 +171,7 @@ const FormItem = props => {
   const {
     validateTrigger: contextValidateTrigger
   } = (0, _react.useContext)(_FieldContext.default);
-  const mergedValidateTrigger = validateTrigger !== undefined ? validateTrigger : contextValidateTrigger;
+  const mergedValidateTrigger = (0, _undefinedFallback.undefinedFallback)(validateTrigger, contextValidateTrigger, trigger);
 
   const updateRef = _react.default.useRef(0);
 

package/cjs/components/modal/modal.d.ts

@@ -23,5 +23,6 @@ export declare type ModalProps = {
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
     showCloseButton?: boolean;
+    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Modal: FC<ModalProps>;

package/cjs/components/modal/modal.js

@@ -48,7 +48,8 @@ const defaultProps = {
   closeOnMaskClick: false,
   stopPropagation: ['click'],
   showCloseButton: false,
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 
 const Modal = p => {
@@ -128,7 +129,8 @@ const Modal = p => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: (0, _classnames.default)(cls('mask'), props.maskClassName)
+    className: (0, _classnames.default)(cls('mask'), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), _react.default.createElement("div", {
     className: cls('wrap'),
     style: {

package/cjs/components/number-keyboard/number-keyboard.js

@@ -157,9 +157,6 @@ const NumberKeyboard = p => {
           onBackspacePressEnd();
         }
       },
-      onMouseUp: e => {
-        onKeyPress(e, key);
-      },
       title: key,
       role: 'button'
     }, key === 'BACKSPACE' ? _react.default.createElement(_antdMobileIcons.TextDeletionOutline, null) : key);
@@ -196,13 +193,11 @@ const NumberKeyboard = p => {
       onKeyPress(e, 'BACKSPACE');
       onBackspacePressEnd();
     },
-    onMouseUp: e => onKeyPress(e, 'BACKSPACE'),
     title: 'BACKSPACE',
     role: 'button'
   }, _react.default.createElement(_antdMobileIcons.TextDeletionOutline, null)), _react.default.createElement("div", {
     className: `${classPrefix}-key extra-key ok-key`,
     onTouchEnd: e => onKeyPress(e, 'OK'),
-    onMouseUp: e => onKeyPress(e, 'OK'),
     role: 'button'
   }, confirmText))), props.safeArea && _react.default.createElement("div", {
     className: `${classPrefix}-footer`

package/cjs/utils/undefined-fallback.d.ts

@@ -0,0 +1,3 @@
+export declare function undefinedFallback<T>(a: T | undefined, b: T): T;
+export declare function undefinedFallback<T>(a: T | undefined, b: T | undefined, c: T): T;
+export declare function undefinedFallback<T>(a: T | undefined, b: T | undefined, c: T | undefined, d: T): T;

package/cjs/utils/undefined-fallback.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.undefinedFallback = undefinedFallback;
+
+function undefinedFallback(...items) {
+  let i;
+
+  for (i = 0; i < items.length; i++) {
+    if (items[i] !== undefined) break;
+  }
+
+  return items[i];
+}

package/es/components/dialog/dialog.d.ts

@@ -22,5 +22,6 @@ export declare type DialogProps = {
     maskStyle?: React.CSSProperties;
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
+    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Dialog: FC<DialogProps>;

package/es/components/dialog/dialog.js

@@ -17,7 +17,8 @@ const defaultProps = {
   closeOnAction: false,
   closeOnMaskClick: false,
   stopPropagation: ['click'],
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 export const Dialog = p => {
   const props = mergeProps(defaultProps, p);
@@ -93,7 +94,8 @@ export const Dialog = p => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: classNames(cls('mask'), props.maskClassName)
+    className: classNames(cls('mask'), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), React.createElement("div", {
     className: cls('wrap'),
     style: {

package/es/components/form/form-item.js

@@ -10,6 +10,7 @@ import List from '../list';
 import Popover from '../popover';
 import { QuestionCircleOutline } from 'antd-mobile-icons';
 import { useConfig } from '../config-provider';
+import { undefinedFallback } from '../../utils/undefined-fallback';
 const NAME_SPLIT = '__SPLIT__';
 const classPrefix = `adm-form-item`;
 const MemoInput = React.memo(({
@@ -142,7 +143,7 @@ export const FormItem = props => {
   const {
     validateTrigger: contextValidateTrigger
   } = useContext(FieldContext);
-  const mergedValidateTrigger = validateTrigger !== undefined ? validateTrigger : contextValidateTrigger;
+  const mergedValidateTrigger = undefinedFallback(validateTrigger, contextValidateTrigger, trigger);
   const updateRef = React.useRef(0);
   updateRef.current += 1;
   const [subMetas, setSubMetas] = useState({});

package/es/components/modal/modal.d.ts

@@ -23,5 +23,6 @@ export declare type ModalProps = {
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
     showCloseButton?: boolean;
+    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Modal: FC<ModalProps>;

package/es/components/modal/modal.js

@@ -20,7 +20,8 @@ const defaultProps = {
   closeOnMaskClick: false,
   stopPropagation: ['click'],
   showCloseButton: false,
-  getContainer: null
+  getContainer: null,
+  disableBodyScroll: true
 };
 export const Modal = p => {
   const props = mergeProps(defaultProps, p);
@@ -97,7 +98,8 @@ export const Modal = p => {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: classNames(cls('mask'), props.maskClassName)
+    className: classNames(cls('mask'), props.maskClassName),
+    disableBodyScroll: props.disableBodyScroll
   }), React.createElement("div", {
     className: cls('wrap'),
     style: {

package/es/components/number-keyboard/number-keyboard.js

@@ -134,9 +134,6 @@ export const NumberKeyboard = p => {
           onBackspacePressEnd();
         }
       },
-      onMouseUp: e => {
-        onKeyPress(e, key);
-      },
       title: key,
       role: 'button'
     }, key === 'BACKSPACE' ? React.createElement(TextDeletionOutline, null) : key);
@@ -173,13 +170,11 @@ export const NumberKeyboard = p => {
       onKeyPress(e, 'BACKSPACE');
       onBackspacePressEnd();
     },
-    onMouseUp: e => onKeyPress(e, 'BACKSPACE'),
     title: 'BACKSPACE',
     role: 'button'
   }, React.createElement(TextDeletionOutline, null)), React.createElement("div", {
     className: `${classPrefix}-key extra-key ok-key`,
     onTouchEnd: e => onKeyPress(e, 'OK'),
-    onMouseUp: e => onKeyPress(e, 'OK'),
     role: 'button'
   }, confirmText))), props.safeArea && React.createElement("div", {
     className: `${classPrefix}-footer`

package/es/utils/undefined-fallback.d.ts

@@ -0,0 +1,3 @@
+export declare function undefinedFallback<T>(a: T | undefined, b: T): T;
+export declare function undefinedFallback<T>(a: T | undefined, b: T | undefined, c: T): T;
+export declare function undefinedFallback<T>(a: T | undefined, b: T | undefined, c: T | undefined, d: T): T;