antd-mobile 5.0.0-rc.20 → 5.0.0-rc.24

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

@@ -1,13 +1,14 @@
 .adm-search-bar {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  --height: 56px;
+  --height: 64px;
   --padding-left: 16px;
   --background: #f5f5f5;
   --border-radius: 12px;
   --placeholder-color: var(--adm-color-weak);
   ---placeholder-color: var(--placeholder-color);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: var(--height);
 }
 
 .adm-search-bar .adm-search-bar-input-box {
@@ -23,23 +24,23 @@
 
 .adm-search-bar .adm-search-bar-input-box .adm-search-bar-input-box-icon {
   flex: none;
-  color: var(---placeholder-color);
+  color: var(--adm-color-light);
   font-size: 32px;
 }
 
 .adm-search-bar .adm-search-bar-input-box .adm-search-bar-input {
   flex: auto;
   padding: 8px 16px 8px 8px;
-  height: var(--height);
+  height: calc(var(--height) - 4px);
   box-sizing: border-box;
 }
 
-.adm-search-bar .adm-search-bar-input-box .adm-search-bar-input.adm-input-wrapper {
+.adm-search-bar .adm-search-bar-input-box .adm-search-bar-input.adm-input {
   --placeholder-color: var(---placeholder-color);
+  --font-size: 30px;
 }
 
-.adm-search-bar .adm-search-bar-input-box .adm-search-bar-input .adm-input {
-  font-size: 26px;
+.adm-search-bar .adm-search-bar-input-box .adm-search-bar-input .adm-input-element {
   line-height: 38px;
 }
 
@@ -56,6 +57,10 @@
   padding: 6px 24px;
 }
 
+.adm-search-bar-active .adm-input.adm-input.adm-input {
+  --placeholder-color: var(--adm-color-light);
+}
+
 .adm-search-bar-active .adm-search-bar-input-box {
   border-color: var(--adm-color-primary);
   background: var(--adm-color-white);

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

@@ -6,6 +6,10 @@
   line-height: 1.4;
 }
 
+.adm-selector .adm-space.adm-space {
+  --gap: 24px;
+}
+
 .adm-selector-item {
   padding: 16px 32px;
   position: relative;

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

@@ -10,6 +10,20 @@
   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 {
@@ -20,6 +34,7 @@
   position: relative;
   cursor: pointer;
   background-color: var(--background-color);
+  overflow: visible;
 }
 
 .adm-side-bar-item-highlight {
@@ -38,29 +53,23 @@
   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: var(--adm-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: var(--background-color);
-  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 {
@@ -69,4 +78,8 @@
 
 .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.js

@@ -3,6 +3,7 @@ import classNames from 'classnames';
 import Badge from '../badge';
 import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
+import { Corner } from './corner';
 const classPrefix = `adm-side-bar`;
 export const SideBarItem = () => {
   return null;
@@ -33,10 +34,16 @@ export const SideBar = props => {
       (_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: classNames(classPrefix)
-  }, items.map(item => {
+    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: () => {
@@ -50,12 +57,21 @@ export const SideBar = props => {
         [`${classPrefix}-item-active`]: active,
         [`${classPrefix}-item-disabled`]: item.props.disabled
       })
-    }, React.createElement(Badge, {
-      content: item.props.badge
+    }, 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`
+  }))));
 };

package/2x/es/components/spin-loading/spin-loading.css

@@ -1,9 +1,8 @@
 .adm-spin-loading {
   --color: var(--adm-color-weak);
   --size: 64px;
-  --track-width: calc(var(--size) / 16);
   --pi: 3.14159265;
-  --radius: calc(var(--size) / 2 - var(--track-width) / 2);
+  --radius: 15;
   --circumference: calc(var(--radius) * var(--pi) * 2);
   width: var(--size);
   height: var(--size);
@@ -17,13 +16,6 @@
 
 .adm-spin-loading-svg > .adm-spin-loading-fill {
   stroke: var(--color);
-  stroke-width: var(--track-width);
-  stroke-dasharray: var(--circumference);
-  stroke-linecap: square;
-  animation: adm-spin-loading-fill 1s infinite alternate-reverse linear;
-  r: var(--radius);
-  cx: calc(var(--size) / 2);
-  cy: calc(var(--size) / 2);
 }
 
 @keyframes adm-spin-loading-rotate {
@@ -34,14 +26,4 @@
   to {
     transform: rotate(360deg);
   }
-}
-
-@keyframes adm-spin-loading-fill {
-  from {
-    stroke-dashoffset: calc(var(--circumference) * (1 - 0.4));
-  }
-
-  to {
-    stroke-dashoffset: calc(var(--circumference) * (1 - 0.8));
-  }
 }

package/2x/es/components/spin-loading/spin-loading.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type SpinLoadingProps = {
     color?: 'default' | 'primary' | 'white' | (string & {});
-} & NativeProps<'--color' | '--size' | '--track-width'>;
+} & NativeProps<'--color' | '--size'>;
 export declare const SpinLoading: React.NamedExoticComponent<SpinLoadingProps>;

package/2x/es/components/spin-loading/spin-loading.js

@@ -1,6 +1,7 @@
 import React, { memo } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
+import { useSpring, animated } from '@react-spring/web';
 const classPrefix = 'adm-spin-loading';
 const colorRecord = {
   default: 'var(--adm-color-weak)',
@@ -10,19 +11,45 @@ const colorRecord = {
 const defaultProps = {
   color: 'default'
 };
+const circumference = 15 * 3.14159265358979 * 2;
 export const SpinLoading = memo(p => {
   var _a;
 
   const props = mergeProps(defaultProps, p);
-  return withNativeProps(props, React.createElement("div", {
+  const {
+    percent
+  } = useSpring({
+    loop: {
+      reverse: true
+    },
+    from: {
+      percent: 30
+    },
+    to: {
+      percent: 80
+    },
+    config: {
+      duration: 1200
+    }
+  });
+  return withNativeProps(props, React.createElement(animated.div, {
     className: classPrefix,
     style: {
-      '--color': (_a = colorRecord[props.color]) !== null && _a !== void 0 ? _a : props.color
+      '--color': (_a = colorRecord[props.color]) !== null && _a !== void 0 ? _a : props.color,
+      '--percent': percent
     }
   }, React.createElement("svg", {
-    className: `${classPrefix}-svg`
-  }, React.createElement("circle", {
+    className: `${classPrefix}-svg`,
+    viewBox: '0 0 32 32'
+  }, React.createElement(animated.circle, {
     className: `${classPrefix}-fill`,
-    fill: 'transparent'
+    fill: 'transparent',
+    strokeWidth: '2',
+    strokeDasharray: circumference,
+    strokeDashoffset: percent,
+    strokeLinecap: 'square',
+    r: 15,
+    cx: 16,
+    cy: 16
   }))));
 });

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

@@ -34,13 +34,10 @@
 
 .adm-stepper .adm-stepper-input {
   height: var(--height);
-  background-color: var(--input-background-color);
-}
-
-.adm-stepper .adm-stepper-input > input {
-  text-align: center;
-  font-size: var(--input-font-size);
-  color: var(--input-font-color);
+  --background-color: var(--input-background-color);
+  --font-size: var(--input-font-size);
+  --color: var(--input-font-color);
+  --text-align: center;
 }
 
 .adm-stepper-minus,

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

@@ -79,7 +79,6 @@ export const Stepper = p => {
 
   return withNativeProps(props, React.createElement("div", {
     className: classNames(classPrefix, {
-      [`${classPrefix}-disabled`]: disabled,
       [`${classPrefix}-active`]: hasFocus
     })
   }, React.createElement(Button, {
@@ -87,6 +86,7 @@ export const Stepper = p => {
     onClick: handleMinus,
     disabled: minusDisabled(),
     fill: 'none',
+    shape: 'rectangular',
     color: 'primary'
   }, React.createElement(MinusOutline, null)), React.createElement("div", {
     className: `${classPrefix}-middle`
@@ -115,6 +115,7 @@ export const Stepper = p => {
     onClick: handlePlus,
     disabled: plusDisabled(),
     fill: 'none',
+    shape: 'rectangular',
     color: 'primary'
   }, React.createElement(AddOutline, null))));
 };

package/2x/es/components/swipe-action/swipe-action.d.ts

@@ -14,7 +14,7 @@ export declare type Action = {
 export declare type SwipeActionProps = {
     rightActions?: Action[];
     leftActions?: Action[];
-    onAction?: (action: Action) => void;
+    onAction?: (action: Action, e: React.MouseEvent) => void;
     closeOnTouchOutside?: boolean;
     closeOnAction?: boolean;
     children: ReactNode;
@@ -22,7 +22,7 @@ export declare type SwipeActionProps = {
 export declare const SwipeAction: React.ForwardRefExoticComponent<{
     rightActions?: Action[] | undefined;
     leftActions?: Action[] | undefined;
-    onAction?: ((action: Action) => void) | undefined;
+    onAction?: ((action: Action, e: React.MouseEvent) => void) | undefined;
     closeOnTouchOutside?: boolean | undefined;
     closeOnAction?: boolean | undefined;
     children: ReactNode;

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

@@ -147,7 +147,7 @@ export const SwipeAction = forwardRef((p, ref) => {
         }
 
         (_a = action.onClick) === null || _a === void 0 ? void 0 : _a.call(action, e);
-        (_b = props.onAction) === null || _b === void 0 ? void 0 : _b.call(props, action);
+        (_b = props.onAction) === null || _b === void 0 ? void 0 : _b.call(props, action, e);
       }
     }, action.text);
   }

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

@@ -10,6 +10,7 @@ import PageIndicator from '../page-indicator';
 import { staged } from 'staged-components';
 import { useRefState } from '../../utils/use-ref-state';
 import { bound } from '../../utils/bound';
+import { useUpdateEffect } from 'ahooks';
 const defaultProps = {
   defaultIndex: 0,
   allowTouchMove: true,
@@ -71,6 +72,11 @@ export const Swiper = forwardRef(staged((p, ref) => {
     }
 
     const [current, setCurrent] = useState(props.defaultIndex);
+    useUpdateEffect(() => {
+      var _a;
+
+      (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, current);
+    }, [current]);
     const [dragging, setDragging, draggingRef] = useRefState(false);
 
     function boundIndex(current) {
@@ -156,25 +162,13 @@ export const Swiper = forwardRef(staged((p, ref) => {
     });
 
     function swipeTo(index, immediate = false) {
-      var _a, _b;
-
-      if (loop) {
-        const i = modulus(index, count);
-        setCurrent(i);
-        (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, i);
-        api.start({
-          position: index * 100,
-          immediate
-        });
-      } else {
-        const i = bound(index, 0, count - 1);
-        setCurrent(i);
-        (_b = props.onIndexChange) === null || _b === void 0 ? void 0 : _b.call(props, i);
-        api.start({
-          position: boundIndex(i) * 100,
-          immediate
-        });
-      }
+      const roundedIndex = Math.round(index);
+      const targetIndex = loop ? modulus(roundedIndex, count) : bound(roundedIndex, 0, count - 1);
+      setCurrent(targetIndex);
+      api.start({
+        position: (loop ? roundedIndex : boundIndex(roundedIndex)) * 100,
+        immediate
+      });
     }
 
     function swipeNext() {

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

@@ -6,8 +6,8 @@
 
 .adm-switch {
   --checked-color: var(--adm-color-primary);
-  --height: 60px;
-  --width: 100px;
+  --height: 62px;
+  --width: 102px;
   --border-width: 4px;
   display: inline-block;
   vertical-align: middle;
@@ -69,9 +69,14 @@
 .adm-switch-inner {
   position: relative;
   z-index: 1;
-  margin: 0 20px 0 calc(var(--height) - var(--border-width) + 10px);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 0 16px 0 calc(var(--height) - var(--border-width) + 8px);
+  height: 100%;
   color: var(--adm-color-weak);
   transition: margin 200ms;
+  font-size: 30px;
 }
 
 .adm-switch.adm-switch-checked .adm-switch-checkbox {

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

@@ -2,7 +2,7 @@
   --title-font-size: 34px;
   --content-padding: 24px;
   --active-line-height: 4px;
-  --active-line-border-radius: 0;
+  --active-line-border-radius: var(--active-line-height);
   position: relative;
 }
 

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

@@ -1,7 +1,7 @@
 .adm-tag {
   --border-radius: var(--adm-tag-border-radius, 4px);
-  padding: 6px 10px;
-  font-size: 24px;
+  padding: 4px 8px;
+  font-size: 22px;
   line-height: 1;
   font-weight: normal;
   background: var(--background-color);
@@ -9,7 +9,7 @@
   display: inline-block;
   white-space: nowrap;
   border-radius: var(--border-radius);
-  border: 1px solid var(--border-color);
+  border: 2px solid var(--border-color);
   box-sizing: border-box;
 }
 

package/2x/es/components/text-area/text-area.css

@@ -1,4 +1,4 @@
-.adm-text-area-wrapper {
+.adm-text-area {
   --font-size: 34px;
   --color: var(--adm-color-text);
   --placeholder-color: var(--adm-color-light);
@@ -8,7 +8,7 @@
   max-height: 100%;
 }
 
-.adm-text-area {
+.adm-text-area-element {
   font-family: var(--adm-font-family);
   resize: none;
   flex: auto;
@@ -29,35 +29,35 @@
   min-height: 1.5em;
 }
 
-.adm-text-area::placeholder {
+.adm-text-area-element::placeholder {
   color: var(--placeholder-color);
   font-family: inherit;
 }
 
-.adm-text-area:-webkit-autofill {
+.adm-text-area-element:-webkit-autofill {
   background-color: transparent;
 }
 
-.adm-text-area:disabled {
+.adm-text-area-element:disabled {
   color: var(--disabled-color);
   cursor: not-allowed;
   opacity: 1;
   -webkit-text-fill-color: var(--disabled-color);
 }
 
-.adm-text-area:read-only {
+.adm-text-area-element:read-only {
   cursor: default;
 }
 
-.adm-text-area:invalid {
+.adm-text-area-element:invalid {
   box-shadow: none;
 }
 
-.adm-text-area::-ms-clear {
+.adm-text-area-element::-ms-clear {
   display: none;
 }
 
-.adm-text-area[readonly] {
+.adm-text-area-element[readonly] {
   pointer-events: none;
 }
 

package/2x/es/components/text-area/text-area.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
-export declare type TextAreaProps = Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, 'autoComplete' | 'disabled' | 'readOnly' | 'onFocus' | 'onBlur'> & {
+export declare type TextAreaProps = Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, 'autoComplete' | 'disabled' | 'readOnly' | 'onFocus' | 'onBlur' | 'onCompositionStart' | 'onCompositionEnd'> & {
     onChange?: (val: string) => void;
     value?: string;
     defaultValue?: string;
@@ -20,7 +20,7 @@ export declare type TextAreaRef = {
     focus: () => void;
     blur: () => void;
 };
-export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "disabled" | "onFocus" | "onBlur" | "autoComplete" | "readOnly"> & {
+export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "disabled" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoComplete" | "readOnly"> & {
     onChange?: ((val: string) => void) | undefined;
     value?: string | undefined;
     defaultValue?: string | undefined;