antd-mobile 5.0.0-rc.27 → 5.0.0-rc.28

package/es/components/form/form-item.d.ts

@@ -7,7 +7,7 @@ import type { FormLayout } from './index';
 declare type RenderChildren<Values = any> = (form: FormInstance<Values>) => React.ReactNode;
 declare type ChildrenType<Values = any> = RenderChildren<Values> | React.ReactNode;
 declare type RcFieldProps = Omit<FieldProps, 'children'>;
-export declare type FormItemProps = Pick<RcFieldProps, 'dependencies' | 'valuePropName' | 'name' | 'rules' | 'messageVariables' | 'trigger' | 'validateTrigger' | 'shouldUpdate' | 'initialValue'> & Pick<ListItemProps, 'style' | 'onClick' | 'extra' | 'arrow'> & {
+export declare type FormItemProps = Pick<RcFieldProps, 'dependencies' | 'valuePropName' | 'name' | 'rules' | 'messageVariables' | 'trigger' | 'validateTrigger' | 'shouldUpdate' | 'initialValue'> & Pick<ListItemProps, 'style' | 'onClick' | 'extra' | 'arrow' | 'description'> & {
     label?: React.ReactNode;
     help?: React.ReactNode;
     hasFeedback?: boolean;

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

@@ -7,6 +7,8 @@ import { devWarning } from '../../utils/dev-log';
 import { FormContext, NoStyleItemContext } from './context';
 import { toArray } from './utils';
 import List from '../list';
+import Popover from '../popover';
+import { QuestionCircleOutline } from 'antd-mobile-icons';
 const NAME_SPLIT = '__SPLIT__';
 const classPrefix = `adm-form-item`;
 const MemoInput = React.memo(({
@@ -26,7 +28,8 @@ const FormItemLayout = props => {
     htmlFor,
     hidden,
     errors,
-    arrow
+    arrow,
+    description
   } = props;
   const context = useContext(FormContext);
   const hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
@@ -39,17 +42,21 @@ const FormItemLayout = props => {
     className: `${classPrefix}-label-required`
   }, "*"), help && React.createElement("span", {
     className: `${classPrefix}-label-help`
-  }, help)) : null;
-  const descriptionElement = feedback && React.createElement("div", {
+  }, React.createElement(Popover, {
+    content: help,
+    mode: 'dark',
+    trigger: 'click'
+  }, React.createElement(QuestionCircleOutline, null)))) : null;
+  const descriptionElement = feedback || description ? React.createElement(React.Fragment, null, description, React.createElement("div", {
     className: `${classPrefix}-footer`
-  }, feedback);
+  }, feedback)) : null;
   return React.createElement(List.Item, {
     style: style,
     title: layout === 'vertical' && labelElement,
     prefix: layout === 'horizontal' && labelElement,
     extra: extra,
     description: descriptionElement,
-    className: classNames(classPrefix, className, {
+    className: classNames(classPrefix, className, `${classPrefix}-${layout}`, {
       [`${classPrefix}-hidden`]: hidden
     }),
     disabled: disabled,
@@ -73,6 +80,7 @@ export const FormItem = props => {
     noStyle,
     hidden,
     layout,
+    description,
     // Field 相关
     disabled,
     rules,
@@ -85,7 +93,7 @@ export const FormItem = props => {
     dependencies,
     arrow
   } = props,
-        fieldProps = __rest(props, ["className", "style", "label", "help", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "arrow"]);
+        fieldProps = __rest(props, ["className", "style", "label", "help", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "description", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "arrow"]);
 
   const {
     validateTrigger: contextValidateTrigger
@@ -134,6 +142,7 @@ export const FormItem = props => {
       label: label,
       extra: extra,
       help: help,
+      description: description,
       required: isRequired,
       disabled: disabled,
       hasFeedback: hasFeedback,

package/es/components/form/form.css

@@ -2,13 +2,6 @@
   --padding-left: 16px;
   --padding-right: 12px;
 }
-.adm-form-horizontal .adm-list.adm-list {
-  --prefix-width: 6em;
-  --align-items: stretch;
-}
-.adm-form-horizontal .adm-list.adm-list .adm-list-item-content-extra {
-  align-self: center;
-}
 .adm-form .adm-form-footer {
   padding: 20px 12px;
 }

package/es/components/form/form.js

@@ -51,7 +51,7 @@ export const Form = forwardRef((p, ref) => {
   });
   collect();
   return React.createElement(RcForm, Object.assign({
-    className: classNames(classPrefix, `${classPrefix}-${layout}`, className),
+    className: classNames(classPrefix, className),
     style: style,
     ref: ref
   }, formProps), React.createElement(FormContext.Provider, {

package/es/components/form/index.css

@@ -2,13 +2,6 @@
   --padding-left: 16px;
   --padding-right: 12px;
 }
-.adm-form-horizontal .adm-list.adm-list {
-  --prefix-width: 6em;
-  --align-items: stretch;
-}
-.adm-form-horizontal .adm-list.adm-list .adm-list-item-content-extra {
-  align-self: center;
-}
 .adm-form .adm-form-footer {
   padding: 20px 12px;
 }
@@ -21,6 +14,7 @@
   line-height: 1.5;
   box-sizing: border-box;
   position: relative;
+  color: #666666;
 }
 .adm-form-item-label-required {
   position: absolute;
@@ -30,6 +24,9 @@
   color: var(--adm-color-danger);
   user-select: none;
 }
+.adm-form-item-label-help {
+  margin-left: 4px;
+}
 .adm-form-item-footer {
   color: var(--adm-color-danger);
   margin-top: 4px;
@@ -37,14 +34,18 @@
 .adm-form-item.adm-form-item-hidden {
   display: none;
 }
-.adm-form-vertical .adm-form-item-label {
-  font-size: 15px;
-  margin-bottom: 4px;
+.adm-form-item.adm-form-item-horizontal.adm-list-item {
+  --align-items: stretch;
+  --prefix-width: 6em;
 }
-.adm-form-horizontal .adm-list-item-content-prefix {
+.adm-form-item.adm-form-item-horizontal .adm-list-item-content-prefix {
   padding-top: 12px;
   padding-bottom: 12px;
 }
-.adm-form-item-label {
-  color: #666666;
+.adm-form-item.adm-form-item-horizontal .adm-list-item-content-extra {
+  align-self: center;
+}
+.adm-form-item.adm-form-item-vertical .adm-form-item-label {
+  font-size: 15px;
+  margin-bottom: 4px;
 }

package/es/components/image-uploader/image-uploader.d.ts

@@ -19,7 +19,7 @@ export declare type ImageUploaderProps = {
     showUpload?: boolean;
     deletable?: boolean;
     capture?: InputHTMLAttributes<unknown>['capture'];
-    onPreview?: (index: number) => void;
+    onPreview?: (index: number, item: ImageUploadItem) => void;
     beforeUpload?: (file: File[]) => Promise<File[]> | File[];
     upload: (file: File) => Promise<ImageUploadItem>;
     onDelete?: (item: ImageUploadItem) => boolean | Promise<boolean> | void;

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

@@ -144,7 +144,7 @@ export const ImageUploader = p => {
           previewImage(index);
         }
 
-        onPreview && onPreview(index);
+        onPreview && onPreview(index, fileItem);
       },
       onDelete: () => __awaiter(void 0, void 0, void 0, function* () {
         var _c;

package/es/components/input/input.css

@@ -10,6 +10,7 @@
   width: 100%;
   max-width: 100%;
   max-height: 100%;
+  min-height: 24px;
   background-color: var(--background-color);
 }
 .adm-input-disabled {

package/es/components/popover/index.d.ts

@@ -13,7 +13,7 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     stopPropagation?: "click"[] | undefined;
     content: import("react").ReactNode;
 } & Pick<import("rc-tooltip/lib/Tooltip").TooltipProps, "visible" | "align" | "defaultVisible" | "onVisibleChange"> & import("../../utils/native-props").NativeProps<"--z-index"> & import("react").RefAttributes<import("./popover").PopoverRef>> & {
-    Menu: import("react").ForwardRefExoticComponent<Pick<import("./popover").PopoverProps, "children" | "style" | "visible" | "className" | "tabIndex" | "mode" | "align" | "getContainer" | "stopPropagation" | "trigger" | "defaultVisible" | "onVisibleChange" | "placement" | "destroyOnHide"> & {
+    Menu: import("react").ForwardRefExoticComponent<Pick<import("./popover").PopoverProps, "children" | "style" | "visible" | "className" | "tabIndex" | "mode" | "align" | "getContainer" | "stopPropagation" | "defaultVisible" | "onVisibleChange" | "trigger" | "placement" | "destroyOnHide"> & {
         actions: import("./popover-menu").Action[];
         onAction?: ((item: import("./popover-menu").Action) => void) | undefined;
     } & import("react").RefAttributes<import("./popover").PopoverRef>>;

package/es/components/popover/popover-menu.d.ts

@@ -11,7 +11,7 @@ export declare type PopoverMenuProps = Omit<PopoverProps, 'content'> & {
     actions: Action[];
     onAction?: (item: Action) => void;
 };
-export declare const PopoverMenu: React.ForwardRefExoticComponent<Pick<PopoverProps, "children" | "style" | "visible" | "className" | "tabIndex" | "mode" | "align" | "getContainer" | "stopPropagation" | "trigger" | "defaultVisible" | "onVisibleChange" | "placement" | "destroyOnHide"> & {
+export declare const PopoverMenu: React.ForwardRefExoticComponent<Pick<PopoverProps, "children" | "style" | "visible" | "className" | "tabIndex" | "mode" | "align" | "getContainer" | "stopPropagation" | "defaultVisible" | "onVisibleChange" | "trigger" | "placement" | "destroyOnHide"> & {
     actions: Action[];
     onAction?: ((item: Action) => void) | undefined;
 } & React.RefAttributes<PopoverRef>>;

package/es/components/progress-bar/progress-bar.css

@@ -1,7 +1,7 @@
 .adm-progress-bar {
   --track-width: var(--adm-progress-bar-track-width, 3px);
   --track-color: var(--adm-progress-bar-track-color, #e5e5e5);
-  --fill-color: var(--adm-progress-bar-fill-color, #1677ff);
+  --fill-color: var(--adm-progress-bar-fill-color, var(--adm-color-primary));
 }
 .adm-progress-bar-trail {
   background: var(--track-color);

package/es/components/progress-circle/progress-circle.css

@@ -1,9 +1,9 @@
 /*进度圈*/
 .adm-progress-circle {
-  --track-width: 3px;
-  --size: 50px;
-  --track-color: #e5e5e5;
-  --fill-color: #1677ff;
+  --track-width: var(--adm-progress-circle-track-width, 3px);
+  --size: var(--adm-progress-circle-size, 50px);
+  --track-color: var(--adm-progress-circle-track-color, #e5e5e5);
+  --fill-color: var(--adm-progress-circle-fill-color, var(--adm-color-primary));
   --percent: 0;
   --pi: 3.14159265;
   --radius: calc(var(--size) / 2 - var(--track-width) / 2);

package/es/components/progress-circle/progress-circle.js

@@ -4,8 +4,7 @@ import { mergeProps } from '../../utils/with-default-props';
 const classPrefix = `adm-progress-circle`;
 export const ProgressCircle = p => {
   const props = mergeProps({
-    percent: 0,
-    strokeColor: '#1677FF'
+    percent: 0
   }, p);
   const style = {
     '--percent': props.percent.toString()

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

@@ -3,7 +3,7 @@ import { mergeProps } from '../../utils/with-default-props';
 import { animated, useSpring } from '@react-spring/web';
 import { useDrag } from '@use-gesture/react';
 import { getScrollParent } from '../../utils/get-scroll-parent';
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { supportsPassive } from '../../utils/supports-passive';
 import { convertPx } from '../../utils/convert-px';
 import { rubberbandIfOutOfBounds } from '../../utils/rubberband';
@@ -36,7 +36,13 @@ export const PullToRefresh = p => {
     }
   }));
   const elementRef = useRef(null);
-  const pullingRef = useRef(false);
+  const pullingRef = useRef(false); //防止下拉时抖动
+
+  useEffect(() => {
+    var _a;
+
+    (_a = elementRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('touchmove', () => {});
+  }, []);
 
   function doRefresh() {
     return __awaiter(this, void 0, void 0, function* () {

package/es/components/radio/radio.js

@@ -5,6 +5,8 @@ import { RadioGroupContext } from './group-context';
 import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
 import { CheckIcon } from '../checkbox/check-icon';
+import { devWarning } from '../../utils/dev-log';
+import { isDev } from '../../utils/is-dev';
 const classPrefix = `adm-radio`;
 const defaultProps = {
   defaultChecked: false
@@ -23,6 +25,16 @@ export const Radio = p => {
   } = props;
 
   if (groupContext && value !== undefined) {
+    if (isDev) {
+      if (p.checked !== undefined) {
+        devWarning('Radio', 'When used within `Radio.Group`, the `checked` prop of `Radio` will not work.');
+      }
+
+      if (p.defaultChecked !== undefined) {
+        devWarning('Radio', 'When used within `Radio.Group`, the `defaultChecked` prop of `Radio` will not work.');
+      }
+    }
+
     checked = groupContext.value.includes(value);
 
     setChecked = checked => {

package/es/components/rate/rate.css

@@ -1,6 +1,7 @@
 .adm-rate {
   --star-size: 24px;
   --active-color: #ffd21e;
+  --inactive-color: var(--adm-color-light);
   display: inline-flex;
 }
 .adm-rate-box {
@@ -10,7 +11,7 @@
   padding: calc(var(--star-size) / 8);
   line-height: var(--star-size);
   font-size: var(--star-size);
-  color: var(--adm-color-light);
+  color: var(--inactive-color);
   text-align: center;
   overflow: hidden;
   cursor: pointer;

package/es/components/rate/rate.d.ts

@@ -9,5 +9,5 @@ export declare type RateProps = {
     readOnly?: boolean;
     value?: number;
     onChange?: (value: number) => void;
-} & NativeProps<'--star-size' | '--active-color'>;
+} & NativeProps<'--star-size' | '--active-color' | '--inactive-color'>;
 export declare const Rate: FC<RateProps>;

package/es/components/slider/slider.css

@@ -15,6 +15,7 @@
 }
 .adm-slider-fill {
   position: absolute;
+  z-index: 1;
   height: 4px;
   background-color: var(--fill-color);
 }
@@ -37,24 +38,27 @@
   background-color: var(--fill-color);
 }
 .adm-slider-thumb {
-  touch-action: none;
-  position: absolute;
   width: 22px;
   height: 22px;
+  margin: 5px;
   border-radius: 50%;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  background: #fff url('../../assets/slider-thumb.svg') no-repeat center center;
-  background-size: 10px 10px;
+  background: var(--adm-color-white);
   box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.12), 0 1.5px 3px -2px rgba(0, 0, 0, 0.25);
 }
 .adm-slider-thumb:focus {
   outline: none;
 }
+.adm-slider-thumb-icon {
+  width: 10px;
+  height: 10px;
+  margin: 6px;
+  user-select: none;
+}
 .adm-slider-thumb-container {
+  cursor: grab;
   touch-action: none;
   position: absolute;
+  z-index: 2;
   width: 32px;
   height: 32px;
   border-radius: 50%;

package/es/components/slider/thumb-icon.d.ts

@@ -0,0 +1,3 @@
+import { FC } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare const ThumbIcon: FC<NativeProps>;

package/es/components/slider/thumb-icon.js

@@ -0,0 +1,25 @@
+import React from 'react';
+import { withNativeProps } from '../../utils/native-props';
+export const ThumbIcon = props => {
+  return withNativeProps(props, React.createElement("svg", {
+    viewBox: '0 0 20 20'
+  }, React.createElement("g", {
+    stroke: 'none',
+    strokeWidth: '1',
+    fill: 'none',
+    fillRule: 'evenodd'
+  }, React.createElement("g", {
+    transform: 'translate(-604.000000, -656.000000)',
+    fill: '#999999'
+  }, React.createElement("g", {
+    transform: 'translate(592.000000, 644.000000)'
+  }, React.createElement("g", {
+    transform: 'translate(12.000000, 12.000000)'
+  }, React.createElement("polygon", {
+    points: '0 3.33333333 2.22222222 3.33333333 2.22222222 17.7777778 0 17.7777778'
+  }), React.createElement("polygon", {
+    points: '17.7777778 3.33333333 20 3.33333333 20 17.7777778 17.7777778 17.7777778'
+  }), React.createElement("path", {
+    d: 'M10.8888889,0 L9.11111111,0 C8.98888889,0 8.88888889,0.107142857 8.88888889,0.238095238 L8.88888889,19.7619048 C8.88888889,19.8928571 8.98888889,20 9.11111111,20 L10.8888889,20 C11.0111111,20 11.1111111,19.8928571 11.1111111,19.7619048 L11.1111111,0.238095238 C11.1111111,0.107142857 11.0111111,0 10.8888889,0 Z'
+  })))))));
+};

package/es/components/slider/thumb.js

@@ -1,5 +1,6 @@
 import React, { useRef } from 'react';
 import { useDrag } from '@use-gesture/react';
+import { ThumbIcon } from './thumb-icon';
 const classPrefix = `adm-slider`;
 
 const Thumb = props => {
@@ -44,7 +45,9 @@ const Thumb = props => {
     style: currentPosition()
   }, bind()), React.createElement("div", {
     className: `${classPrefix}-thumb`
-  }));
+  }, React.createElement(ThumbIcon, {
+    className: `${classPrefix}-thumb-icon`
+  })));
 };
 
 export default Thumb;

package/es/components/tabs/tabs.js

@@ -135,16 +135,16 @@ export const Tabs = p => {
   }
 
   useIsomorphicLayoutEffect(() => {
-    animate(true);
+    animate(!x.isAnimating);
   }, []);
   useUpdateLayoutEffect(() => {
     animate();
   }, [activeKey]);
   useResizeEffect(() => {
-    animate(true);
+    animate(!x.isAnimating);
   }, tabListContainerRef);
   useMutationEffect(() => {
-    animate(true);
+    animate(!x.isAnimating);
   }, tabListContainerRef, {
     subtree: true,
     childList: true,

package/es/components/text-area/text-area.js

@@ -2,6 +2,7 @@ import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react
 import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
+import { devError } from '../../utils/dev-log';
 const classPrefix = 'adm-text-area';
 const defaultProps = {
   rows: 2,
@@ -16,7 +17,14 @@ export const TextArea = forwardRef((p, ref) => {
     showCount,
     maxLength
   } = props;
-  const [value, setValue] = usePropsValue(props);
+  const [value, setValue] = usePropsValue(Object.assign(Object.assign({}, props), {
+    value: props.value === null ? '' : props.value
+  }));
+
+  if (props.value === null) {
+    devError('TextArea', '`value` prop on `TextArea` should not be `null`. Consider using an empty string to clear the component.');
+  }
+
   const nativeTextAreaRef = useRef(null);
   useImperativeHandle(ref, () => ({
     clear: () => {

package/es/utils/is-dev.js

@@ -1 +1 @@
-export const isDev = process.env.NODE_ENV === 'development';
+export const isDev = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.0.0-rc.27",
+  "version": "5.0.0-rc.28",
   "dependencies": {
     "@react-spring/web": "^9.4.3",
     "@types/resize-observer-browser": "^0.1.7",
@@ -39,5 +39,6 @@
     "url": "git+https://github.com/ant-design/ant-design-mobile.git",
     "branch": "master",
     "platform": "github"
-  }
+  },
+  "packageManager": "yarn@3.1.1"
 }