antd-mobile 5.0.0-rc.8 → 5.0.0-rc.9

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

@@ -13,8 +13,8 @@ export declare type CascaderProps = {
     onClose?: () => void;
     visible?: boolean;
     title?: ReactNode;
-    confirmText?: string;
-    cancelText?: string;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
     children?: (items: (CascaderOption | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
 export declare const Cascader: FC<CascaderProps>;

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

@@ -5,6 +5,7 @@
 .adm-form-item-label {
   display: block;
   height: 100%;
+  line-height: 1.5;
   box-sizing: border-box;
   color: #666;
   position: relative;

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

@@ -65,7 +65,7 @@ var FormItemLayout = function FormItemLayout(props) {
       hidden = props.hidden,
       errors = props.errors;
   var context = (0, _react.useContext)(_context.FormContext);
-  var hasFeedback = props.hasFeedback || context.hasFeedback;
+  var hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
   var layout = props.layout || context.layout;
   var feedback = hasFeedback && errors && errors.length > 0 ? errors[0] : null;
   var labelElement = label ? /*#__PURE__*/_react["default"].createElement("label", {

package/2x/cjs/components/form/index.css

@@ -13,6 +13,7 @@
 .adm-form-item-label {
   display: block;
   height: 100%;
+  line-height: 1.5;
   box-sizing: border-box;
   color: #666;
   position: relative;

package/2x/cjs/components/image-uploader/image-uploader.js

@@ -190,14 +190,7 @@ var ImageUploader = function ImageUploader(p) {
                             });
                           });
                           updateValue(function (prev) {
-                            var newVal = {
-                              url: result.url
-                            };
-
-                            if (result.extra !== undefined) {
-                              newVal.extra = result.extra;
-                            }
-
+                            var newVal = Object.assign({}, result);
                             return [].concat(prev, [newVal]);
                           });
                           _context.next = 12;

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

@@ -12,8 +12,8 @@ export declare type PickerProps = {
     onClose?: () => void;
     visible?: boolean;
     title?: ReactNode;
-    confirmText?: string;
-    cancelText?: string;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
     children?: (items: (PickerColumnItem | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
 export declare const Picker: React.NamedExoticComponent<PickerProps>;

package/2x/cjs/components/pull-to-refresh/pull-to-refresh.d.ts

@@ -9,6 +9,7 @@ export declare type PullToRefreshProps = {
     completeDelay?: number;
     headHeight?: number;
     threshold?: number;
+    disabled?: boolean;
     renderText?: (status: PullStatus) => ReactNode;
 };
 export declare const defaultProps: {
@@ -17,6 +18,7 @@ export declare const defaultProps: {
     refreshingText: string;
     completeText: string;
     completeDelay: number;
+    disabled: boolean;
     onRefresh: () => void;
 };
 export declare const PullToRefresh: FC<PullToRefreshProps>;

package/2x/cjs/components/pull-to-refresh/pull-to-refresh.js

@@ -66,6 +66,7 @@ var defaultProps = {
   refreshingText: '加载中……',
   completeText: '刷新成功',
   completeDelay: 500,
+  disabled: false,
   onRefresh: function onRefresh() {}
 };
 exports.defaultProps = defaultProps;
@@ -244,6 +245,7 @@ var PullToRefresh = function PullToRefresh(p) {
     },
     axis: 'y',
     target: elementRef,
+    enabled: !props.disabled,
     eventOptions: _supportsPassive.supportsPassive ? {
       passive: false
     } : false

package/2x/cjs/components/side-bar/side-bar.d.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type SideBarItemProps = {
-    title?: string;
+    title?: ReactNode;
     disabled?: boolean;
     badge?: ReactNode;
 } & NativeProps;

package/2x/cjs/components/tabs/tabs.css

@@ -1,6 +1,8 @@
 .adm-tabs {
   --title-font-size: 34px;
   --content-padding: 24px;
+  --active-line-height: 4px;
+  --active-line-border-radius: 0;
   position: relative;
 }
 
@@ -53,9 +55,10 @@
 .adm-tabs-tab-line {
   position: absolute;
   bottom: 0;
-  height: 4px;
+  height: var(--active-line-height);
   color: var(--adm-color-primary);
   background: var(--adm-color-primary);
+  border-radius: var(--active-line-border-radius);
 }
 
 .adm-tabs-content {

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

@@ -12,5 +12,5 @@ export declare type TabsProps = {
     activeLineMode?: 'auto' | 'full' | 'fixed';
     stretch?: boolean;
     onChange?: (key: string) => void;
-} & NativeProps<'--fixed-active-line-width' | '--title-font-size' | '--content-padding'>;
+} & NativeProps<'--fixed-active-line-width' | '--active-line-height' | '--active-line-border-radius' | '--title-font-size' | '--content-padding'>;
 export declare const Tabs: FC<TabsProps>;

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

@@ -13,8 +13,8 @@ export declare type CascaderProps = {
     onClose?: () => void;
     visible?: boolean;
     title?: ReactNode;
-    confirmText?: string;
-    cancelText?: string;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
     children?: (items: (CascaderOption | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
 export declare const Cascader: FC<CascaderProps>;

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

@@ -5,6 +5,7 @@
 .adm-form-item-label {
   display: block;
   height: 100%;
+  line-height: 1.5;
   box-sizing: border-box;
   color: #666;
   position: relative;

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

@@ -43,7 +43,7 @@ var FormItemLayout = function FormItemLayout(props) {
       hidden = props.hidden,
       errors = props.errors;
   var context = useContext(FormContext);
-  var hasFeedback = props.hasFeedback || context.hasFeedback;
+  var hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
   var layout = props.layout || context.layout;
   var feedback = hasFeedback && errors && errors.length > 0 ? errors[0] : null;
   var labelElement = label ? /*#__PURE__*/React.createElement("label", {

package/2x/es/components/form/index.css

@@ -13,6 +13,7 @@
 .adm-form-item-label {
   display: block;
   height: 100%;
+  line-height: 1.5;
   box-sizing: border-box;
   color: #666;
   position: relative;

package/2x/es/components/image-uploader/image-uploader.js

@@ -167,14 +167,7 @@ export var ImageUploader = function ImageUploader(p) {
                             });
                           });
                           updateValue(function (prev) {
-                            var newVal = {
-                              url: result.url
-                            };
-
-                            if (result.extra !== undefined) {
-                              newVal.extra = result.extra;
-                            }
-
+                            var newVal = Object.assign({}, result);
                             return [].concat(prev, [newVal]);
                           });
                           _context.next = 12;

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

@@ -12,8 +12,8 @@ export declare type PickerProps = {
     onClose?: () => void;
     visible?: boolean;
     title?: ReactNode;
-    confirmText?: string;
-    cancelText?: string;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
     children?: (items: (PickerColumnItem | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
 export declare const Picker: React.NamedExoticComponent<PickerProps>;

package/2x/es/components/pull-to-refresh/pull-to-refresh.d.ts

@@ -9,6 +9,7 @@ export declare type PullToRefreshProps = {
     completeDelay?: number;
     headHeight?: number;
     threshold?: number;
+    disabled?: boolean;
     renderText?: (status: PullStatus) => ReactNode;
 };
 export declare const defaultProps: {
@@ -17,6 +18,7 @@ export declare const defaultProps: {
     refreshingText: string;
     completeText: string;
     completeDelay: number;
+    disabled: boolean;
     onRefresh: () => void;
 };
 export declare const PullToRefresh: FC<PullToRefreshProps>;

package/2x/es/components/pull-to-refresh/pull-to-refresh.js

@@ -46,6 +46,7 @@ export var defaultProps = {
   refreshingText: '加载中……',
   completeText: '刷新成功',
   completeDelay: 500,
+  disabled: false,
   onRefresh: function onRefresh() {}
 };
 export var PullToRefresh = function PullToRefresh(p) {
@@ -222,6 +223,7 @@ export var PullToRefresh = function PullToRefresh(p) {
     },
     axis: 'y',
     target: elementRef,
+    enabled: !props.disabled,
     eventOptions: supportsPassive ? {
       passive: false
     } : false

package/2x/es/components/side-bar/side-bar.d.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type SideBarItemProps = {
-    title?: string;
+    title?: ReactNode;
     disabled?: boolean;
     badge?: ReactNode;
 } & NativeProps;

package/2x/es/components/tabs/tabs.css

@@ -1,6 +1,8 @@
 .adm-tabs {
   --title-font-size: 34px;
   --content-padding: 24px;
+  --active-line-height: 4px;
+  --active-line-border-radius: 0;
   position: relative;
 }
 
@@ -53,9 +55,10 @@
 .adm-tabs-tab-line {
   position: absolute;
   bottom: 0;
-  height: 4px;
+  height: var(--active-line-height);
   color: var(--adm-color-primary);
   background: var(--adm-color-primary);
+  border-radius: var(--active-line-border-radius);
 }
 
 .adm-tabs-content {

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

@@ -12,5 +12,5 @@ export declare type TabsProps = {
     activeLineMode?: 'auto' | 'full' | 'fixed';
     stretch?: boolean;
     onChange?: (key: string) => void;
-} & NativeProps<'--fixed-active-line-width' | '--title-font-size' | '--content-padding'>;
+} & NativeProps<'--fixed-active-line-width' | '--active-line-height' | '--active-line-border-radius' | '--title-font-size' | '--content-padding'>;
 export declare const Tabs: FC<TabsProps>;

package/2x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.0.0-rc.8",
+  "version": "5.0.0-rc.9",
   "dependencies": {
     "@react-spring/web": "^9.3.2",
     "@types/resize-observer-browser": "^0.1.6",

package/cjs/components/cascader/cascader.d.ts

@@ -13,8 +13,8 @@ export declare type CascaderProps = {
     onClose?: () => void;
     visible?: boolean;
     title?: ReactNode;
-    confirmText?: string;
-    cancelText?: string;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
     children?: (items: (CascaderOption | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
 export declare const Cascader: FC<CascaderProps>;

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

@@ -4,6 +4,7 @@
 .adm-form-item-label {
   display: block;
   height: 100%;
+  line-height: 1.5;
   box-sizing: border-box;
   color: #666;
   position: relative;

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

@@ -65,7 +65,7 @@ var FormItemLayout = function FormItemLayout(props) {
       hidden = props.hidden,
       errors = props.errors;
   var context = (0, _react.useContext)(_context.FormContext);
-  var hasFeedback = props.hasFeedback || context.hasFeedback;
+  var hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
   var layout = props.layout || context.layout;
   var feedback = hasFeedback && errors && errors.length > 0 ? errors[0] : null;
   var labelElement = label ? /*#__PURE__*/_react["default"].createElement("label", {

package/cjs/components/form/index.css

@@ -10,6 +10,7 @@
 .adm-form-item-label {
   display: block;
   height: 100%;
+  line-height: 1.5;
   box-sizing: border-box;
   color: #666;
   position: relative;

package/cjs/components/image-uploader/image-uploader.js

@@ -190,14 +190,7 @@ var ImageUploader = function ImageUploader(p) {
                             });
                           });
                           updateValue(function (prev) {
-                            var newVal = {
-                              url: result.url
-                            };
-
-                            if (result.extra !== undefined) {
-                              newVal.extra = result.extra;
-                            }
-
+                            var newVal = Object.assign({}, result);
                             return [].concat(prev, [newVal]);
                           });
                           _context.next = 12;

package/cjs/components/picker/picker.d.ts

@@ -12,8 +12,8 @@ export declare type PickerProps = {
     onClose?: () => void;
     visible?: boolean;
     title?: ReactNode;
-    confirmText?: string;
-    cancelText?: string;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
     children?: (items: (PickerColumnItem | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
 export declare const Picker: React.NamedExoticComponent<PickerProps>;

package/cjs/components/pull-to-refresh/pull-to-refresh.d.ts

@@ -9,6 +9,7 @@ export declare type PullToRefreshProps = {
     completeDelay?: number;
     headHeight?: number;
     threshold?: number;
+    disabled?: boolean;
     renderText?: (status: PullStatus) => ReactNode;
 };
 export declare const defaultProps: {
@@ -17,6 +18,7 @@ export declare const defaultProps: {
     refreshingText: string;
     completeText: string;
     completeDelay: number;
+    disabled: boolean;
     onRefresh: () => void;
 };
 export declare const PullToRefresh: FC<PullToRefreshProps>;

package/cjs/components/pull-to-refresh/pull-to-refresh.js

@@ -66,6 +66,7 @@ var defaultProps = {
   refreshingText: '加载中……',
   completeText: '刷新成功',
   completeDelay: 500,
+  disabled: false,
   onRefresh: function onRefresh() {}
 };
 exports.defaultProps = defaultProps;
@@ -244,6 +245,7 @@ var PullToRefresh = function PullToRefresh(p) {
     },
     axis: 'y',
     target: elementRef,
+    enabled: !props.disabled,
     eventOptions: _supportsPassive.supportsPassive ? {
       passive: false
     } : false

package/cjs/components/side-bar/side-bar.d.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type SideBarItemProps = {
-    title?: string;
+    title?: ReactNode;
     disabled?: boolean;
     badge?: ReactNode;
 } & NativeProps;

package/cjs/components/tabs/tabs.css

@@ -1,6 +1,8 @@
 .adm-tabs {
   --title-font-size: 17px;
   --content-padding: 12px;
+  --active-line-height: 2px;
+  --active-line-border-radius: 0;
   position: relative;
 }
 .adm-tabs-header {
@@ -44,9 +46,10 @@
 .adm-tabs-tab-line {
   position: absolute;
   bottom: 0;
-  height: 2px;
+  height: var(--active-line-height);
   color: var(--adm-color-primary);
   background: var(--adm-color-primary);
+  border-radius: var(--active-line-border-radius);
 }
 .adm-tabs-content {
   padding: var(--content-padding);

package/cjs/components/tabs/tabs.d.ts

@@ -12,5 +12,5 @@ export declare type TabsProps = {
     activeLineMode?: 'auto' | 'full' | 'fixed';
     stretch?: boolean;
     onChange?: (key: string) => void;
-} & NativeProps<'--fixed-active-line-width' | '--title-font-size' | '--content-padding'>;
+} & NativeProps<'--fixed-active-line-width' | '--active-line-height' | '--active-line-border-radius' | '--title-font-size' | '--content-padding'>;
 export declare const Tabs: FC<TabsProps>;

package/es/components/cascader/cascader.d.ts

@@ -13,8 +13,8 @@ export declare type CascaderProps = {
     onClose?: () => void;
     visible?: boolean;
     title?: ReactNode;
-    confirmText?: string;
-    cancelText?: string;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
     children?: (items: (CascaderOption | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
 export declare const Cascader: FC<CascaderProps>;

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

@@ -4,6 +4,7 @@
 .adm-form-item-label {
   display: block;
   height: 100%;
+  line-height: 1.5;
   box-sizing: border-box;
   color: #666;
   position: relative;

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

@@ -43,7 +43,7 @@ var FormItemLayout = function FormItemLayout(props) {
       hidden = props.hidden,
       errors = props.errors;
   var context = useContext(FormContext);
-  var hasFeedback = props.hasFeedback || context.hasFeedback;
+  var hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
   var layout = props.layout || context.layout;
   var feedback = hasFeedback && errors && errors.length > 0 ? errors[0] : null;
   var labelElement = label ? /*#__PURE__*/React.createElement("label", {

package/es/components/form/index.css

@@ -10,6 +10,7 @@
 .adm-form-item-label {
   display: block;
   height: 100%;
+  line-height: 1.5;
   box-sizing: border-box;
   color: #666;
   position: relative;

package/es/components/image-uploader/image-uploader.js

@@ -167,14 +167,7 @@ export var ImageUploader = function ImageUploader(p) {
                             });
                           });
                           updateValue(function (prev) {
-                            var newVal = {
-                              url: result.url
-                            };
-
-                            if (result.extra !== undefined) {
-                              newVal.extra = result.extra;
-                            }
-
+                            var newVal = Object.assign({}, result);
                             return [].concat(prev, [newVal]);
                           });
                           _context.next = 12;

package/es/components/picker/picker.d.ts

@@ -12,8 +12,8 @@ export declare type PickerProps = {
     onClose?: () => void;
     visible?: boolean;
     title?: ReactNode;
-    confirmText?: string;
-    cancelText?: string;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
     children?: (items: (PickerColumnItem | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
 export declare const Picker: React.NamedExoticComponent<PickerProps>;

package/es/components/pull-to-refresh/pull-to-refresh.d.ts

@@ -9,6 +9,7 @@ export declare type PullToRefreshProps = {
     completeDelay?: number;
     headHeight?: number;
     threshold?: number;
+    disabled?: boolean;
     renderText?: (status: PullStatus) => ReactNode;
 };
 export declare const defaultProps: {
@@ -17,6 +18,7 @@ export declare const defaultProps: {
     refreshingText: string;
     completeText: string;
     completeDelay: number;
+    disabled: boolean;
     onRefresh: () => void;
 };
 export declare const PullToRefresh: FC<PullToRefreshProps>;

package/es/components/pull-to-refresh/pull-to-refresh.js

@@ -46,6 +46,7 @@ export var defaultProps = {
   refreshingText: '加载中……',
   completeText: '刷新成功',
   completeDelay: 500,
+  disabled: false,
   onRefresh: function onRefresh() {}
 };
 export var PullToRefresh = function PullToRefresh(p) {
@@ -222,6 +223,7 @@ export var PullToRefresh = function PullToRefresh(p) {
     },
     axis: 'y',
     target: elementRef,
+    enabled: !props.disabled,
     eventOptions: supportsPassive ? {
       passive: false
     } : false

package/es/components/side-bar/side-bar.d.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type SideBarItemProps = {
-    title?: string;
+    title?: ReactNode;
     disabled?: boolean;
     badge?: ReactNode;
 } & NativeProps;

package/es/components/tabs/tabs.css

@@ -1,6 +1,8 @@
 .adm-tabs {
   --title-font-size: 17px;
   --content-padding: 12px;
+  --active-line-height: 2px;
+  --active-line-border-radius: 0;
   position: relative;
 }
 .adm-tabs-header {
@@ -44,9 +46,10 @@
 .adm-tabs-tab-line {
   position: absolute;
   bottom: 0;
-  height: 2px;
+  height: var(--active-line-height);
   color: var(--adm-color-primary);
   background: var(--adm-color-primary);
+  border-radius: var(--active-line-border-radius);
 }
 .adm-tabs-content {
   padding: var(--content-padding);

package/es/components/tabs/tabs.d.ts

@@ -12,5 +12,5 @@ export declare type TabsProps = {
     activeLineMode?: 'auto' | 'full' | 'fixed';
     stretch?: boolean;
     onChange?: (key: string) => void;
-} & NativeProps<'--fixed-active-line-width' | '--title-font-size' | '--content-padding'>;
+} & NativeProps<'--fixed-active-line-width' | '--active-line-height' | '--active-line-border-radius' | '--title-font-size' | '--content-padding'>;
 export declare const Tabs: FC<TabsProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.0.0-rc.8",
+  "version": "5.0.0-rc.9",
   "dependencies": {
     "@react-spring/web": "^9.3.2",
     "@types/resize-observer-browser": "^0.1.6",