antd-mobile 5.0.0-rc.3 → 5.0.0-rc.7

package/2x/es/components/picker-view/column.d.ts

@@ -1,9 +1,10 @@
-import { FC } from 'react';
+import React from 'react';
 import { PickerColumnItem, PickerValue } from './index';
 interface Props {
+    index: number;
     column: PickerColumnItem[];
     value: PickerValue;
-    onSelect: (value: PickerValue) => void;
+    onSelect: (value: PickerValue, index: number) => void;
 }
-export declare const Column: FC<Props>;
+export declare const Column: React.NamedExoticComponent<Props>;
 export {};

package/2x/es/components/picker-view/column.js

@@ -1,16 +1,20 @@
-import React, { useLayoutEffect, useRef } from 'react';
+import React, { memo, useLayoutEffect, useRef } from 'react';
 import { useSpring, animated } from '@react-spring/web';
 import { useDrag } from '@use-gesture/react';
 import { convertPx } from '../../utils/convert-px';
 import { rubberbandIfOutOfBounds } from '../../utils/rubberband';
 import { bound } from '../../utils/bound';
+import isEqual from 'lodash/isEqual';
 var classPrefix = "adm-picker-view";
-export var Column = function Column(props) {
+export var Column = /*#__PURE__*/memo(function (props) {
   var itemHeight = convertPx(34);
   var value = props.value,
-      onSelect = props.onSelect,
       column = props.column;
 
+  function onSelect(val) {
+    props.onSelect(val, props.index);
+  }
+
   var _useSpring = useSpring(function () {
     return {
       from: {
@@ -36,20 +40,20 @@ export var Column = function Column(props) {
     var finalPosition = targetIndex * -itemHeight;
     api.start({
       y: finalPosition,
-      immediate: y.idle
+      immediate: y.goal !== finalPosition
     });
   }, [value, column]);
   useLayoutEffect(function () {
     if (column.length === 0) {
       if (value !== null) {
-        props.onSelect(null);
+        onSelect(null);
       }
     } else {
       if (!column.some(function (item) {
         return item.value === value;
       })) {
         var firstItem = column[0];
-        props.onSelect(firstItem.value);
+        onSelect(firstItem.value);
       }
     }
   }, [column, value]);
@@ -88,14 +92,53 @@ export var Column = function Column(props) {
       touch: true
     }
   });
+  var selectedIndex = null;
+
+  function renderAccessible() {
+    if (selectedIndex === null) {
+      return null;
+    }
+
+    var current = column[selectedIndex];
+    var previousIndex = selectedIndex - 1;
+    var nextIndex = selectedIndex + 1;
+    var previous = column[previousIndex];
+    var next = column[nextIndex];
+    return /*#__PURE__*/React.createElement("div", {
+      className: 'adm-picker-view-column-accessible'
+    }, /*#__PURE__*/React.createElement("div", {
+      className: 'adm-picker-view-column-accessible-current',
+      role: 'button',
+      "aria-label": current ? "\u5F53\u524D\u9009\u62E9\u7684\u662F\uFF1A" + current.label : '当前未选择'
+    }, "-"), /*#__PURE__*/React.createElement("div", null, previous && /*#__PURE__*/React.createElement("div", {
+      className: 'adm-picker-view-column-accessible-button',
+      onClick: function onClick() {
+        scrollSelect(previousIndex);
+      },
+      role: 'button',
+      "aria-label": "\u9009\u62E9\u4E0A\u4E00\u9879\uFF1A" + previous.label
+    }, "-")), /*#__PURE__*/React.createElement("div", null, next && /*#__PURE__*/React.createElement("div", {
+      className: 'adm-picker-view-column-accessible-button',
+      onClick: function onClick() {
+        scrollSelect(nextIndex);
+      },
+      role: 'button',
+      "aria-label": "\u9009\u62E9\u4E0B\u4E00\u9879\uFF1A" + next.label
+    }, "-")));
+  }
+
   return /*#__PURE__*/React.createElement("div", Object.assign({
     className: classPrefix + "-column"
   }, bind()), /*#__PURE__*/React.createElement(animated.div, {
     style: {
       y: y
     },
-    className: classPrefix + "-column-wheel"
+    className: classPrefix + "-column-wheel",
+    "aria-hidden": true
   }, column.map(function (item, index) {
+    var selected = props.value === item.value;
+    if (selected) selectedIndex = index;
+
     function handleClick() {
       draggingRef.current = false;
       scrollSelect(index);
@@ -103,10 +146,23 @@ export var Column = function Column(props) {
 
     return /*#__PURE__*/React.createElement("div", {
       key: item.value,
+      "data-selected": item.value === value,
       className: classPrefix + "-column-item",
-      onClick: handleClick
+      onClick: handleClick,
+      "aria-hidden": !selected,
+      "aria-label": selected ? 'active' : ''
     }, /*#__PURE__*/React.createElement("div", {
       className: classPrefix + "-column-item-label"
     }, item.label));
-  })));
-};
+  })), renderAccessible());
+}, function (prev, next) {
+  if (prev.value !== next.value) return false;
+  if (prev.onSelect !== next.onSelect) return false;
+
+  if (!isEqual(prev.column, next.column)) {
+    return false;
+  }
+
+  return true;
+});
+Column.displayName = 'Column';

package/2x/es/components/picker-view/picker-view.css

@@ -5,6 +5,7 @@
   display: flex;
   position: relative;
   overflow: hidden;
+  background: var(--adm-color-white);
 }
 
 .adm-picker-view-column {
@@ -13,6 +14,7 @@
   user-select: none;
   touch-action: none;
   position: relative;
+  z-index: 0;
 }
 
 .adm-picker-view-column-wheel {
@@ -56,22 +58,61 @@
   white-space: nowrap;
 }
 
+.adm-picker-view-column-accessible {
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  opacity: 0;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+
+.adm-picker-view-column-accessible > * {
+  flex: 1;
+  text-overflow: ellipsis;
+}
+
+.adm-picker-view-column-accessible-current {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+}
+
+.adm-picker-view-column-accessible-button {
+  width: 100%;
+  height: 100%;
+}
+
 .adm-picker-view-mask {
   position: absolute;
+  z-index: 100;
   left: 0;
+  top: 0;
   width: 100%;
-  height: calc(50% - 24px);
+  height: 100%;
+  display: flex;
+  flex-direction: column;
   pointer-events: none;
 }
 
-.adm-picker-view-mask-top {
-  top: -10px;
+.adm-picker-view-mask-top,
+.adm-picker-view-mask-bottom {
+  flex: auto;
+}
+
+.adm-picker-view-mask-middle {
+  height: 68px;
+  box-sizing: border-box;
+  flex: none;
+  border-top: solid 2px var(--adm-border-color);
   border-bottom: solid 2px var(--adm-border-color);
+}
+
+.adm-picker-view-mask-top {
   background: linear-gradient(0deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
 }
 
 .adm-picker-view-mask-bottom {
-  bottom: -10px;
-  border-top: solid 2px var(--adm-border-color);
   background: linear-gradient(180deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
 }

package/2x/es/components/picker-view/picker-view.js

@@ -1,4 +1,4 @@
-import React, { memo, useEffect, useState } from 'react';
+import React, { memo, useCallback, useEffect, useState } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { Column } from './column';
 import { useColumns } from './use-columns';
@@ -32,35 +32,45 @@ export var PickerView = /*#__PURE__*/memo(function (p) {
 
     if (props.value === innerValue) return;
     setInnerValue(props.value);
-  }, [props.value]); // Reset `innerValue` after 1s in case user does not update `value` when `onChange` is called
-
-  useDebounceEffect(function () {
-    if (props.value !== undefined && props.value !== innerValue) {
-      setInnerValue(props.value);
-    }
-  }, [props.value, innerValue], {
-    wait: 1000,
-    leading: false,
-    trailing: true
-  });
+  }, [props.value]);
+  useEffect(function () {
+    if (props.value === innerValue) return;
+    var timeout = window.setTimeout(function () {
+      if (props.value !== undefined && props.value !== innerValue) {
+        setInnerValue(props.value);
+      }
+    }, 1000);
+    return function () {
+      window.clearTimeout(timeout);
+    };
+  }, [props.value, innerValue]);
   var columns = useColumns(props.columns, innerValue);
   var generateValueExtend = usePickerValueExtend(columns);
+  var handleSelect = useCallback(function (val, index) {
+    setInnerValue(function (prev) {
+      var next = [].concat(prev);
+      next[index] = val;
+      return next;
+    });
+  }, []);
   return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
     className: "" + classPrefix
   }, columns.map(function (column, index) {
     return /*#__PURE__*/React.createElement(Column, {
       key: index,
+      index: index,
       column: column,
       value: innerValue[index],
-      onSelect: function onSelect(val) {
-        var nextInnerValue = [].concat(innerValue);
-        nextInnerValue[index] = val;
-        setInnerValue(nextInnerValue);
-      }
+      onSelect: handleSelect
     });
   }), /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-mask " + classPrefix + "-mask-top"
+    className: classPrefix + "-mask"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-mask-top"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-mask-middle"
   }), /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-mask " + classPrefix + "-mask-bottom"
-  })));
-});
+    className: classPrefix + "-mask-bottom"
+  }))));
+});
+PickerView.displayName = 'PickerView';

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

@@ -1,10 +1,12 @@
 .adm-progress-bar {
   --track-width: var(--adm-progress-bar-track-width, 6px);
+  --track-color: var(--adm-progress-bar-track-color, #e5e5e5);
   --fill-color: var(--adm-progress-bar-fill-color, #1677ff);
 }
 
 .adm-progress-bar-trail {
-  background: #e5e5e5;
+  background: var(--track-color);
+  overflow: hidden;
   height: var(--track-width);
   border-radius: var(--track-width);
 }

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

@@ -2,5 +2,5 @@ import { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ProgressBarProps = {
     percent?: number;
-} & NativeProps<'--track-width' | '--fill-color'>;
+} & NativeProps<'--track-width' | '--track-color' | '--fill-color'>;
 export declare const ProgressBar: FC<ProgressBarProps>;

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

@@ -16,6 +16,7 @@
   text-align: center;
   overflow: hidden;
   cursor: pointer;
+  box-sizing: border-box;
 }
 
 .adm-rate-star-half {

package/2x/es/components/search-bar/search-bar.css

@@ -29,6 +29,7 @@
   flex: auto;
   padding: 8px 16px 8px 8px;
   height: 56px;
+  box-sizing: border-box;
 }
 
 .adm-search-bar .adm-search-bar-input-box .adm-search-bar-input.adm-input-wrapper {
@@ -40,6 +41,10 @@
   line-height: 38px;
 }
 
+.adm-search-bar .adm-search-bar-input-box .adm-search-bar-input.adm-search-bar-input-without-icon {
+  padding-left: 16px;
+}
+
 .adm-search-bar .adm-search-bar-suffix {
   flex: none;
   margin-left: 32px;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { InputRef, InputProps } from '../input';
 import { NativeProps } from '../../utils/native-props';
 export declare type SearchBarRef = InputRef;
@@ -10,6 +10,7 @@ export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'on
     clearable?: boolean;
     showCancelButton?: boolean | ((focus: boolean, value: string) => boolean);
     cancelText?: string;
+    icon?: ReactNode;
     clearOnCancel?: boolean;
     onSearch?: (val: string) => void;
     onChange?: (val: string) => void;
@@ -23,6 +24,7 @@ export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps,
     clearable?: boolean | undefined;
     showCancelButton?: boolean | ((focus: boolean, value: string) => boolean) | undefined;
     cancelText?: string | undefined;
+    icon?: ReactNode;
     clearOnCancel?: boolean | undefined;
     onSearch?: ((val: string) => void) | undefined;
     onChange?: ((val: string) => void) | undefined;

package/2x/es/components/search-bar/search-bar.js

@@ -11,10 +11,11 @@ var defaultProps = {
   clearable: true,
   showCancelButton: false,
   defaultValue: '',
-  clearOnCancel: true
+  clearOnCancel: true,
+  icon: /*#__PURE__*/React.createElement(SearchOutline, null)
 };
 export var SearchBar = /*#__PURE__*/forwardRef(function (p, ref) {
-  var _classNames;
+  var _classNames, _classNames2;
 
   var _useConfig = useConfig(),
       locale = _useConfig.locale;
@@ -87,11 +88,11 @@ export var SearchBar = /*#__PURE__*/forwardRef(function (p, ref) {
     className: classNames(classPrefix, (_classNames = {}, _classNames[classPrefix + "-active"] = hasFocus, _classNames))
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-input-box"
-  }, /*#__PURE__*/React.createElement("div", {
+  }, props.icon && /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-input-box-icon"
-  }, /*#__PURE__*/React.createElement(SearchOutline, null)), /*#__PURE__*/React.createElement(Input, {
+  }, props.icon), /*#__PURE__*/React.createElement(Input, {
     ref: inputRef,
-    className: classPrefix + "-input",
+    className: classNames(classPrefix + "-input", (_classNames2 = {}, _classNames2[classPrefix + "-input-without-icon"] = !props.icon, _classNames2)),
     value: value,
     onChange: setValue,
     maxLength: props.maxLength,

package/2x/es/components/side-bar/side-bar.css

@@ -4,6 +4,7 @@
   --item-border-radius: 16px;
   width: var(--width);
   height: var(--height);
+  box-sizing: border-box;
   font-size: 30px;
   overflow-y: auto;
   transform: translateZ(0);
@@ -14,6 +15,7 @@
   display: flex;
   align-items: center;
   min-height: 100px;
+  box-sizing: border-box;
   padding: 12px 44px;
   position: relative;
   cursor: pointer;

package/2x/es/components/swipe-action/swipe-action.css

@@ -16,7 +16,8 @@
   display: flex;
   justify-content: center;
   align-items: stretch;
-  width: fit-content;
+  width: auto;
+  white-space: nowrap;
 }
 
 .adm-swipe-action-actions-right {

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

@@ -6,6 +6,9 @@
 
 .adm-switch {
   --checked-color: var(--adm-color-primary);
+  --height: 60px;
+  --width: 100px;
+  --border-width: 4px;
   display: inline-block;
   vertical-align: middle;
   box-sizing: border-box;
@@ -22,24 +25,24 @@
 }
 
 .adm-switch-checkbox {
-  min-width: 102px;
-  height: 62px;
+  min-width: var(--width);
+  height: var(--height);
   box-sizing: border-box;
   border-radius: 62px;
   background: #e5e5e5;
   z-index: 0;
   overflow: hidden;
-  line-height: 62px;
+  line-height: var(--height);
 }
 
 .adm-switch-checkbox:before {
   content: ' ';
   position: absolute;
-  left: 4px;
-  top: 4px;
-  width: calc(100% - 2 * 4px);
-  height: 54px;
-  border-radius: 54px;
+  left: var(--border-width);
+  top: var(--border-width);
+  width: calc(100% - 2 * var(--border-width));
+  height: calc(var(--height) - 2 * var(--border-width));
+  border-radius: calc(var(--height) - 2 * var(--border-width));
   box-sizing: border-box;
   background: #fff;
   z-index: 1;
@@ -51,14 +54,14 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 54px;
-  height: 54px;
-  border-radius: 54px;
+  width: calc(var(--height) - 2 * var(--border-width));
+  height: calc(var(--height) - 2 * var(--border-width));
+  border-radius: calc(var(--height) - 2 * var(--border-width));
   background: #fff;
   position: absolute;
   z-index: 2;
-  top: 4px;
-  left: 4px;
+  top: var(--border-width);
+  left: var(--border-width);
   transition: all 200ms;
   box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.2), 0 4px 23px 0 rgba(0, 0, 0, 0.08), -2px 4px 4px 0 rgba(0, 0, 0, 0.1);
 }
@@ -66,7 +69,7 @@
 .adm-switch-inner {
   position: relative;
   z-index: 1;
-  margin: 0 20px 0 68px;
+  margin: 0 20px 0 calc(var(--height) - var(--border-width) + 10px);
   color: var(--adm-color-weak);
   transition: margin 200ms;
 }
@@ -80,11 +83,11 @@
 }
 
 .adm-switch.adm-switch-checked .adm-switch-handle {
-  left: calc(100% - (62px - 4px));
+  left: calc(100% - (var(--height) - var(--border-width)));
 }
 
 .adm-switch.adm-switch-checked .adm-switch-inner {
-  margin: 0 68px 0 20px;
+  margin: 0 calc(var(--height) - var(--border-width) + 10px) 0 20px;
   color: var(--adm-color-white);
 }
 

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

@@ -9,5 +9,5 @@ export declare type SwitchProps = {
     onChange?: (checked: boolean) => void;
     checkedText?: ReactNode;
     uncheckedText?: ReactNode;
-} & NativeProps<'--checked-color'>;
+} & NativeProps<'--checked-color' | '--width' | '--height' | '--border-width'>;
 export declare const Switch: FC<SwitchProps>;

package/2x/es/components/toast/index.d.ts

@@ -1,8 +1,9 @@
 import './toast.less';
-import { clear, show } from './methods';
+import { clear, show, config } from './methods';
 export type { ToastShowProps } from './methods';
 declare const Toast: {
     show: typeof show;
     clear: typeof clear;
+    config: typeof config;
 };
 export default Toast;

package/2x/es/components/toast/index.js

@@ -1,7 +1,8 @@
 import "./toast.css";
-import { clear, show } from './methods';
+import { clear, show, config } from './methods';
 var Toast = {
   show: show,
-  clear: clear
+  clear: clear,
+  config: config
 };
 export default Toast;

package/2x/es/components/toast/methods.d.ts

@@ -2,3 +2,4 @@ import { ToastProps } from './toast';
 export declare type ToastShowProps = Omit<ToastProps, 'visible'>;
 export declare function show(p: ToastShowProps | string): void;
 export declare function clear(): void;
+export declare function config(val: Pick<ToastProps, 'duration' | 'position' | 'maskClickable'>): void;

package/2x/es/components/toast/methods.js

@@ -14,7 +14,9 @@ function unmount(container) {
 }
 
 var defaultProps = {
-  duration: 2000
+  duration: 2000,
+  position: 'center',
+  maskClickable: true
 };
 export function show(p) {
   var props = mergeProps(defaultProps, typeof p === 'string' ? {
@@ -74,4 +76,17 @@ export function clear() {
     if (!container) break;
     unmount(container);
   }
+}
+export function config(val) {
+  if (val.duration !== undefined) {
+    defaultProps.duration = val.duration;
+  }
+
+  if (val.position !== undefined) {
+    defaultProps.position = val.position;
+  }
+
+  if (val.maskClickable !== undefined) {
+    defaultProps.maskClickable = val.maskClickable;
+  }
 }

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

@@ -2,7 +2,7 @@
   position: absolute;
   top: 50%;
   left: 50%;
-  width: fit-content;
+  width: auto;
   min-width: 192px;
   max-width: 70%;
   max-height: 70%;
@@ -15,6 +15,7 @@
   pointer-events: all;
   font-size: 30px;
   line-height: 1.5;
+  box-sizing: border-box;
 }
 
 .adm-toast-mask .adm-toast-wrap-text {

package/2x/es/components/tree-select/tree-select.css

@@ -28,6 +28,7 @@
   display: flex;
   align-items: center;
   min-height: 100px;
+  box-sizing: border-box;
   padding: 12px 24px;
   position: relative;
 }

package/2x/es/components/virtual-input/virtual-input.js

@@ -34,9 +34,7 @@ export var VirtualInput = /*#__PURE__*/forwardRef(function (p, ref) {
 
     var content = contentRef.current;
     if (!content) return;
-    content.scrollTo({
-      left: content.clientWidth
-    });
+    content.scrollLeft = content.clientWidth;
   }
 
   useLayoutEffect(function () {
@@ -92,9 +90,10 @@ export var VirtualInput = /*#__PURE__*/forwardRef(function (p, ref) {
     className: classPrefix + "-caret"
   }))), props.clearable && !!value && hasFocus && /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-clear",
-    onClick: function onClick() {
+    onClick: function onClick(e) {
       var _a;
 
+      e.stopPropagation();
       setValue('');
       (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props);
     }

package/2x/es/global/global.css

@@ -24,10 +24,6 @@ body {
   font-family: var(--adm-font-family);
 }
 
-* {
-  box-sizing: border-box;
-}
-
 a,
 button {
   cursor: pointer;