antd-mobile 5.0.0-rc.9 → 5.2.0

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

@@ -1,60 +1,50 @@
 import React, { useState, useRef, forwardRef, useImperativeHandle } from 'react';
 import classNames from 'classnames';
 import Input from '../input';
+import Button from '../button';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import { SearchOutline } from 'antd-mobile-icons';
 import { usePropsValue } from '../../utils/use-props-value';
 import { useConfig } from '../config-provider';
-var classPrefix = "adm-search-bar";
-var defaultProps = {
+const classPrefix = `adm-search-bar`;
+const defaultProps = {
   clearable: true,
   showCancelButton: false,
   defaultValue: '',
   clearOnCancel: true,
-  icon: /*#__PURE__*/React.createElement(SearchOutline, null)
+  icon: React.createElement(SearchOutline, null)
 };
-export var SearchBar = /*#__PURE__*/forwardRef(function (p, ref) {
-  var _classNames, _classNames2;
-
-  var _useConfig = useConfig(),
-      locale = _useConfig.locale;
-
-  var props = mergeProps(defaultProps, {
+export const SearchBar = forwardRef((p, ref) => {
+  const {
+    locale
+  } = useConfig();
+  const props = mergeProps(defaultProps, {
     cancelText: locale.common.cancel
   }, p);
+  const [value, setValue] = usePropsValue(props);
+  const [hasFocus, setHasFocus] = useState(false);
+  const inputRef = useRef(null);
+  useImperativeHandle(ref, () => ({
+    clear: () => {
+      var _a;
 
-  var _usePropsValue = usePropsValue(props),
-      value = _usePropsValue[0],
-      setValue = _usePropsValue[1];
-
-  var _useState = useState(false),
-      hasFocus = _useState[0],
-      setHasFocus = _useState[1];
-
-  var inputRef = useRef(null);
-  useImperativeHandle(ref, function () {
-    return {
-      clear: function clear() {
-        var _a;
-
-        return (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.clear();
-      },
-      focus: function focus() {
-        var _a;
+      return (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.clear();
+    },
+    focus: () => {
+      var _a;
 
-        return (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-      },
-      blur: function blur() {
-        var _a;
+      return (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    },
+    blur: () => {
+      var _a;
 
-        return (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.blur();
-      }
-    };
-  });
+      return (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+    }
+  }));
 
-  var renderCancelButton = function renderCancelButton() {
-    var isShowCancel = false;
+  const renderCancelButton = () => {
+    let isShowCancel = false;
 
     if (typeof props.showCancelButton === 'function') {
       isShowCancel = props.showCancelButton(hasFocus, value);
@@ -62,16 +52,18 @@ export var SearchBar = /*#__PURE__*/forwardRef(function (p, ref) {
       isShowCancel = props.showCancelButton && hasFocus;
     }
 
-    return isShowCancel && /*#__PURE__*/React.createElement("div", {
-      className: classPrefix + "-suffix"
-    }, /*#__PURE__*/React.createElement("a", {
-      onMouseDown: function onMouseDown(e) {
+    return isShowCancel && React.createElement("div", {
+      className: `${classPrefix}-suffix`,
+      onMouseDown: e => {
         e.preventDefault();
       },
-      onTouchStart: function onTouchStart(e) {
+      onTouchStart: e => {
         e.preventDefault();
-      },
-      onClick: function onClick() {
+      }
+    }, React.createElement(Button, {
+      fill: 'none',
+      className: `${classPrefix}-cancel-button`,
+      onClick: () => {
         var _a, _b, _c;
 
         if (props.clearOnCancel) {
@@ -84,27 +76,31 @@ export var SearchBar = /*#__PURE__*/forwardRef(function (p, ref) {
     }, props.cancelText));
   };
 
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
-    className: classNames(classPrefix, (_classNames = {}, _classNames[classPrefix + "-active"] = hasFocus, _classNames))
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-input-box"
-  }, props.icon && /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-input-box-icon"
-  }, props.icon), /*#__PURE__*/React.createElement(Input, {
+  return withNativeProps(props, React.createElement("div", {
+    className: classNames(classPrefix, {
+      [`${classPrefix}-active`]: hasFocus
+    })
+  }, React.createElement("div", {
+    className: `${classPrefix}-input-box`
+  }, props.icon && React.createElement("div", {
+    className: `${classPrefix}-input-box-icon`
+  }, props.icon), React.createElement(Input, {
     ref: inputRef,
-    className: classNames(classPrefix + "-input", (_classNames2 = {}, _classNames2[classPrefix + "-input-without-icon"] = !props.icon, _classNames2)),
+    className: classNames(`${classPrefix}-input`, {
+      [`${classPrefix}-input-without-icon`]: !props.icon
+    }),
     value: value,
     onChange: setValue,
     maxLength: props.maxLength,
     placeholder: props.placeholder,
     clearable: props.clearable,
-    onFocus: function onFocus(e) {
+    onFocus: e => {
       var _a;
 
       setHasFocus(true);
       (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },
-    onBlur: function onBlur(e) {
+    onBlur: e => {
       var _a;
 
       setHasFocus(false);
@@ -113,7 +109,7 @@ export var SearchBar = /*#__PURE__*/forwardRef(function (p, ref) {
     onClear: props.onClear,
     type: 'search',
     enterKeyHint: 'search',
-    onEnterPress: function onEnterPress() {
+    onEnterPress: () => {
       var _a, _b;
 
       (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.blur();

package/2x/es/components/selector/check-mark.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const CheckMark: React.MemoExoticComponent<() => JSX.Element>;

package/2x/es/components/selector/check-mark.js

@@ -0,0 +1,29 @@
+import React, { memo } from 'react';
+export const CheckMark = memo(() => {
+  return React.createElement("svg", {
+    width: '17px',
+    height: '13px',
+    viewBox: '0 0 17 13',
+    version: '1.1',
+    xmlns: 'http://www.w3.org/2000/svg'
+  }, React.createElement("g", {
+    stroke: 'none',
+    strokeWidth: '1',
+    fill: 'none',
+    fillRule: 'evenodd',
+    strokeLinecap: 'round',
+    strokeLinejoin: 'round'
+  }, React.createElement("g", {
+    transform: 'translate(-2832.000000, -1103.000000)',
+    stroke: '#FFFFFF',
+    strokeWidth: '3'
+  }, React.createElement("g", {
+    transform: 'translate(2610.000000, 955.000000)'
+  }, React.createElement("g", {
+    transform: 'translate(24.000000, 91.000000)'
+  }, React.createElement("g", {
+    transform: 'translate(179.177408, 36.687816)'
+  }, React.createElement("polyline", {
+    points: '34.2767388 22 24.797043 31.4796958 21 27.6826527'
+  })))))));
+});

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

@@ -1,17 +1,28 @@
 .adm-selector {
-  --color: var(--adm-color-text);
+  --color: #f5f5f5;
   --checked-color: #e7f1ff;
+  --text-color: var(--adm-color-text);
+  --checked-text-color: var(--adm-color-primary);
+  --border: none;
+  --checked-border: none;
+  --border-radius: 4px;
+  --padding: 16px 32px;
   overflow: hidden;
   font-size: 30px;
   line-height: 1.4;
 }
 
+.adm-selector .adm-space.adm-space {
+  --gap: 24px;
+}
+
 .adm-selector-item {
-  padding: 16px;
+  padding: var(--padding);
   position: relative;
-  background-color: #f5f5f5;
-  border-radius: 4px;
-  color: #333;
+  background-color: var(--color);
+  border: var(--border);
+  border-radius: var(--border-radius);
+  color: var(--text-color);
   opacity: 1;
   cursor: pointer;
   display: inline-block;
@@ -20,10 +31,16 @@
   vertical-align: top;
 }
 
+.adm-selector-item-description {
+  font-size: 26px;
+  color: var(--adm-color-weak);
+}
+
 .adm-selector-item-active,
 .adm-selector-item-multiple-active {
-  color: var(--adm-color-primary);
+  color: var(--checked-text-color);
   background-color: var(--checked-color);
+  border: var(--checked-border);
 }
 
 .adm-selector-item .adm-selector-check-mark-wrapper {
@@ -38,7 +55,7 @@
   border-right: solid 20px var(--adm-color-primary);
 }
 
-.adm-selector-item .adm-selector-check-mark-wrapper > img {
+.adm-selector-item .adm-selector-check-mark-wrapper > svg {
   position: absolute;
   left: 0;
   top: 0;

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

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export interface SelectorOption<V> {
     label: ReactNode;
+    description?: ReactNode;
     value: V;
     disabled?: boolean;
 }
@@ -15,5 +16,6 @@ export declare type SelectorProps<V> = {
     onChange?: (v: V[], extend: {
         items: SelectorOption<V>[];
     }) => void;
-} & NativeProps<'--checked-color'>;
+    showCheckMark?: boolean;
+} & NativeProps<'--color' | '--checked-color' | '--text-color' | '--checked-text-color' | '--border' | '--checked-border' | '--border-radius' | '--padding'>;
 export declare const Selector: <V extends string | number>(p: SelectorProps<V>) => React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)>;

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

@@ -5,72 +5,66 @@ import { mergeProps } from '../../utils/with-default-props';
 import Space from '../space';
 import Grid from '../grid';
 import { convertPx } from '../../utils/convert-px';
-import selectorCheckMarkImg from '../../assets/selector-check-mark.svg';
 import { usePropsValue } from '../../utils/use-props-value';
-var classPrefix = "adm-selector";
-var defaultProps = {
+import { CheckMark } from './check-mark';
+const classPrefix = `adm-selector`;
+const defaultProps = {
   multiple: false,
-  defaultValue: []
+  defaultValue: [],
+  showCheckMark: true
 };
-export var Selector = function Selector(p) {
-  var props = mergeProps(defaultProps, p);
-
-  var _usePropsValue = usePropsValue({
+export const Selector = p => {
+  const props = mergeProps(defaultProps, p);
+  const [value, setValue] = usePropsValue({
     value: props.value,
     defaultValue: props.defaultValue,
-    onChange: function onChange(val) {
+    onChange: val => {
       var _a;
 
-      var extend = {
+      const extend = {
         get items() {
-          return props.options.filter(function (option) {
-            return val.includes(option.value);
-          });
+          return props.options.filter(option => val.includes(option.value));
         }
 
       };
       (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, val, extend);
     }
-  }),
-      value = _usePropsValue[0],
-      setValue = _usePropsValue[1];
-
-  var items = props.options.map(function (option) {
-    var _classNames;
-
-    var active = (value || []).includes(option.value);
-    var disabled = option.disabled || props.disabled;
-    var itemCls = classNames(classPrefix + "-item", (_classNames = {}, _classNames[classPrefix + "-item-active"] = active && !props.multiple, _classNames[classPrefix + "-item-multiple-active"] = active && props.multiple, _classNames[classPrefix + "-item-disabled"] = disabled, _classNames));
-    return /*#__PURE__*/React.createElement("div", {
+  });
+  const items = props.options.map(option => {
+    const active = (value || []).includes(option.value);
+    const disabled = option.disabled || props.disabled;
+    const itemCls = classNames(`${classPrefix}-item`, {
+      [`${classPrefix}-item-active`]: active && !props.multiple,
+      [`${classPrefix}-item-multiple-active`]: active && props.multiple,
+      [`${classPrefix}-item-disabled`]: disabled
+    });
+    return React.createElement("div", {
       key: option.value,
       className: itemCls,
-      onClick: function onClick() {
+      onClick: () => {
         if (disabled) {
           return;
         }
 
         if (props.multiple) {
-          var val = active ? value.filter(function (v) {
-            return v !== option.value;
-          }) : [].concat(value, [option.value]);
+          const val = active ? value.filter(v => v !== option.value) : [...value, option.value];
           setValue(val);
         } else {
-          var _val = active ? [] : [option.value];
-
-          setValue(_val);
+          const val = active ? [] : [option.value];
+          setValue(val);
         }
       }
-    }, option.label, active && props.multiple && /*#__PURE__*/React.createElement("div", {
-      className: classPrefix + "-check-mark-wrapper"
-    }, /*#__PURE__*/React.createElement("img", {
-      src: selectorCheckMarkImg
-    })));
+    }, option.label, option.description && React.createElement("div", {
+      className: `${classPrefix}-item-description`
+    }, option.description), active && props.showCheckMark && React.createElement("div", {
+      className: `${classPrefix}-check-mark-wrapper`
+    }, React.createElement(CheckMark, null)));
   });
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+  return withNativeProps(props, React.createElement("div", {
     className: classPrefix
-  }, !props.columns && /*#__PURE__*/React.createElement(Space, {
+  }, !props.columns && React.createElement(Space, {
     wrap: true
-  }, items), props.columns && /*#__PURE__*/React.createElement(Grid, {
+  }, items), props.columns && React.createElement(Grid, {
     columns: props.columns,
     gap: convertPx(8)
   }, items)));

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

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

package/2x/es/components/side-bar/corner.js

@@ -0,0 +1,14 @@
+import React, { memo } from 'react';
+import { withNativeProps } from '../../utils/native-props';
+export const Corner = memo(props => withNativeProps(props, React.createElement("svg", {
+  viewBox: '0 0 30 30'
+}, React.createElement("g", {
+  stroke: 'none',
+  strokeWidth: '1',
+  fill: 'none',
+  fillRule: 'evenodd'
+}, React.createElement("path", {
+  d: 'M30,0 C13.4314575,3.04359188e-15 -2.02906125e-15,13.4314575 0,30 L0,30 L0,0 Z',
+  fill: 'var(--adm-color-white)',
+  transform: 'translate(15.000000, 15.000000) scale(-1, -1) translate(-15.000000, -15.000000) '
+})))));

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

@@ -1,60 +1,85 @@
 .adm-side-bar {
   --height: 100%;
-  --width: 192px;
+  --width: 210px;
   --item-border-radius: 16px;
+  --background-color: #f5f5f5;
   width: var(--width);
   height: var(--height);
   box-sizing: border-box;
-  font-size: 30px;
+  font-size: 26px;
   overflow-y: auto;
   transform: translateZ(0);
   -webkit-transform: translateZ(0);
+  background-color: var(--background-color);
+  display: flex;
+  flex-direction: column;
+}
+
+.adm-side-bar-items {
+  flex: none;
+  overflow: hidden;
+}
+
+.adm-side-bar-extra-space {
+  flex: auto;
+  overflow: hidden;
+  position: relative;
 }
 
 .adm-side-bar-item {
   display: flex;
   align-items: center;
-  min-height: 100px;
   box-sizing: border-box;
-  padding: 12px 44px;
+  padding: 32px 24px;
   position: relative;
   cursor: pointer;
-  background-color: #f5f5f5;
+  background-color: var(--background-color);
+  overflow: visible;
+}
+
+.adm-side-bar-item-highlight {
+  position: absolute;
+  height: 100%;
+  width: 4px;
+  left: -24px;
+  top: 0;
+  background: var(--adm-color-primary);
+  border-radius: 4px;
 }
 
 .adm-side-bar-item-active {
   color: var(--adm-color-primary);
-  background-color: white;
-  font-weight: bold;
+  background-color: var(--adm-color-white);
   position: relative;
 }
 
-.adm-side-bar-item-active + .adm-side-bar-item {
-  border-top-right-radius: var(--item-border-radius);
-}
-
-.adm-side-bar-item-active::before {
-  content: '';
+.adm-side-bar-item-corner {
   width: var(--item-border-radius);
   height: var(--item-border-radius);
-  background-color: white;
   position: absolute;
-  top: calc(var(--item-border-radius) * -1);
+  z-index: 100;
   right: 0;
+  user-select: none;
+  pointer-events: none;
 }
 
-.adm-side-bar-item-active::after {
-  content: '';
-  width: var(--item-border-radius);
-  height: var(--item-border-radius);
-  background-color: #f5f5f5;
-  border-bottom-right-radius: var(--item-border-radius);
-  position: absolute;
-  top: calc(var(--item-border-radius) * -1);
-  right: 0;
+.adm-side-bar-item-corner-top {
+  top: 0;
+  transform: rotate(-90deg);
+}
+
+.adm-side-bar-item-corner-bottom {
+  bottom: 0;
 }
 
 .adm-side-bar-item-disabled {
   cursor: not-allowed;
-  color: var(--adm-color-light);
+}
+
+.adm-side-bar-item-disabled .adm-side-bar-item-title {
+  opacity: 0.4;
+}
+
+.adm-side-bar-badge.adm-badge {
+  --right: -8px;
 }

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

@@ -10,5 +10,5 @@ export declare type SideBarProps = {
     activeKey?: string | null;
     defaultActiveKey?: string | null;
     onChange?: (key: string) => void;
-} & NativeProps<'--width' | '--height' | '--item-border-radius'>;
+} & NativeProps<'--width' | '--height' | '--item-border-radius' | '--background-color'>;
 export declare const SideBar: FC<SideBarProps>;

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

@@ -3,18 +3,19 @@ import classNames from 'classnames';
 import Badge from '../badge';
 import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
-var classPrefix = "adm-side-bar";
-export var SideBarItem = function SideBarItem() {
+import { Corner } from './corner';
+const classPrefix = `adm-side-bar`;
+export const SideBarItem = () => {
   return null;
 };
-export var SideBar = function SideBar(props) {
+export const SideBar = props => {
   var _a;
 
-  var firstActiveKey = null;
-  var items = [];
-  React.Children.forEach(props.children, function (child, index) {
-    if (! /*#__PURE__*/React.isValidElement(child)) return;
-    var key = child.key;
+  let firstActiveKey = null;
+  const items = [];
+  React.Children.forEach(props.children, (child, index) => {
+    if (!React.isValidElement(child)) return;
+    const key = child.key;
     if (typeof key !== 'string') return;
 
     if (index === 0) {
@@ -23,33 +24,54 @@ export var SideBar = function SideBar(props) {
 
     items.push(child);
   });
-
-  var _usePropsValue = usePropsValue({
+  const [activeKey, setActiveKey] = usePropsValue({
     value: props.activeKey,
     defaultValue: (_a = props.defaultActiveKey) !== null && _a !== void 0 ? _a : firstActiveKey,
-    onChange: props.onChange
-  }),
-      activeKey = _usePropsValue[0],
-      setActiveKey = _usePropsValue[1];
-
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
-    className: classNames(classPrefix)
-  }, items.map(function (item) {
-    var _classNames;
+    onChange: v => {
+      var _a;
 
-    var active = item.key === activeKey;
-    return withNativeProps(item.props, /*#__PURE__*/React.createElement("div", {
+      if (v === null) return;
+      (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, v);
+    }
+  });
+  const lastItem = items[items.length - 1];
+  const isLastItemActive = lastItem && lastItem.key === activeKey;
+  return withNativeProps(props, React.createElement("div", {
+    className: classPrefix
+  }, React.createElement("div", {
+    className: `${classPrefix}-items`
+  }, items.map((item, index) => {
+    const active = item.key === activeKey;
+    const isActiveNextSibling = items[index - 1] && items[index - 1].key === activeKey;
+    const isActivePreviousSibling = items[index + 1] && items[index + 1].key === activeKey;
+    return withNativeProps(item.props, React.createElement("div", {
       key: item.key,
-      onClick: function onClick() {
-        var key = item.key;
+      onClick: () => {
+        const {
+          key
+        } = item;
         if (key === undefined || key === null || item.props.disabled) return;
         setActiveKey(key.toString());
       },
-      className: classNames(classPrefix + "-item", (_classNames = {}, _classNames[classPrefix + "-item-active"] = active, _classNames[classPrefix + "-item-disabled"] = item.props.disabled, _classNames))
-    }, /*#__PURE__*/React.createElement(Badge, {
-      content: item.props.badge
-    }, /*#__PURE__*/React.createElement("div", {
-      className: classPrefix + "-item-title"
-    }, item.props.title))));
-  })));
+      className: classNames(`${classPrefix}-item`, {
+        [`${classPrefix}-item-active`]: active,
+        [`${classPrefix}-item-disabled`]: item.props.disabled
+      })
+    }, React.createElement(React.Fragment, null, isActiveNextSibling && React.createElement(Corner, {
+      className: `${classPrefix}-item-corner ${classPrefix}-item-corner-top`
+    }), isActivePreviousSibling && React.createElement(Corner, {
+      className: `${classPrefix}-item-corner ${classPrefix}-item-corner-bottom`
+    })), React.createElement(Badge, {
+      content: item.props.badge,
+      className: `${classPrefix}-badge`
+    }, React.createElement("div", {
+      className: `${classPrefix}-item-title`
+    }, active && React.createElement("div", {
+      className: `${classPrefix}-item-highlight`
+    }), item.props.title))));
+  })), React.createElement("div", {
+    className: classNames(`${classPrefix}-extra-space`, isLastItemActive && `${classPrefix}-item-active-next-sibling`)
+  }, isLastItemActive && React.createElement(Corner, {
+    className: `${classPrefix}-item-corner ${classPrefix}-item-corner-top`
+  }))));
 };