antd-mobile 5.0.0-rc.19 → 5.0.0-rc.22

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

@@ -3,5 +3,5 @@ import { NativeProps } from '../../utils/native-props';
 export declare type ListProps = {
     header?: ReactNode;
     mode?: 'default' | 'card';
-} & NativeProps<'--header-font-size' | '--prefix-width' | '--prefix-padding-right' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom' | '--padding-left' | '--font-size'>;
+} & NativeProps<'--header-font-size' | '--prefix-width' | '--prefix-padding-right' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom' | '--padding-left' | '--padding-right' | '--font-size'>;
 export declare const List: FC<ListProps>;

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

@@ -21,10 +21,21 @@
 
 .adm-modal-main {
   width: 100%;
+  max-height: 70vh;
   font-size: 28px;
   background-color: white;
   border-radius: 16px;
   overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.adm-modal-main > * {
+  flex: none;
+}
+
+.adm-modal-main > .adm-modal-image-container {
+  flex: auto;
 }
 
 .adm-modal-main .adm-modal-body {
@@ -86,4 +97,8 @@
 
 .adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
   opacity: 0.7;
+}
+
+.adm-modal-image-container {
+  overflow-y: auto;
 }

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

@@ -71,11 +71,13 @@ export const Modal = p => {
     style: Object.assign({}, style),
     onClick: e => e.stopPropagation(),
     className: `${classPrefix}-main`
-  }, !!props.image && React.createElement(Image, {
+  }, !!props.image && React.createElement("div", {
+    className: `${classPrefix}-image-container`
+  }, React.createElement(Image, {
     src: props.image,
     alt: 'modal header image',
     width: '100%'
-  }), React.createElement("div", {
+  })), React.createElement("div", {
     style: props.bodyStyle,
     className: classNames(`${classPrefix}-body`, props.bodyClassName)
   }, props.showCloseButton && React.createElement("a", {

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

@@ -24,14 +24,14 @@
 .adm-nav-bar-back {
   display: flex;
   align-items: center;
-  margin-right: 24px;
+  margin-right: 32px;
   padding: 12px 0;
   cursor: pointer;
 }
 
 .adm-nav-bar-back-arrow {
-  font-size: 36px;
-  margin-right: 12px;
+  font-size: 48px;
+  margin-right: 8px;
 }
 
 .adm-nav-bar-left {

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

@@ -1,15 +1,18 @@
 .adm-notice-bar {
-  height: 60px;
+  --background-color: #ababab;
+  --border-color: #999999;
+  --text-color: #ffffff;
+  --font-size: 30px;
+  --icon-font-size: 36px;
+  --height: 76px;
+  height: var(--height);
   box-sizing: border-box;
-  font-size: 28px;
-  line-height: 60px;
+  font-size: var(--font-size);
+  line-height: var(--height);
   padding: 0 24px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  --background-color: #b2b2b2;
-  --border-color: #a0a0a0;
-  --text-color: #ffffff;
   border: solid 2px var(--border-color);
   border-left: none;
   border-right: none;
@@ -39,9 +42,11 @@
   --text-color: #1677ff;
 }
 
-.adm-notice-bar .adm-notice-bar-left:not(:empty) {
+.adm-notice-bar .adm-notice-bar-left {
   flex-shrink: 0;
   margin-right: 16px;
+  font-size: var(--icon-font-size);
+  line-height: var(--height);
 }
 
 .adm-notice-bar .adm-notice-bar-content {
@@ -57,11 +62,14 @@
   width: auto;
   transition-timing-function: linear;
   position: absolute;
-  padding: 0 8px;
   white-space: nowrap;
 }
 
 .adm-notice-bar .adm-notice-bar-right {
   flex-shrink: 0;
   margin-left: 24px;
+}
+
+.adm-notice-bar-close-icon {
+  font-size: 36px;
 }

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

@@ -17,5 +17,5 @@ export declare type NoticeBarProps = {
     extra?: React.ReactNode;
     /** 左侧广播图标 */
     icon?: React.ReactNode;
-} & NativeProps<'--background-color' | '--border-color' | '--text-color'>;
+} & NativeProps<'--background-color' | '--border-color' | '--text-color' | '--font-size' | '--icon-font-size' | '--height'>;
 export declare const NoticeBar: React.NamedExoticComponent<NoticeBarProps>;

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

@@ -10,7 +10,8 @@ const classPrefix = `adm-notice-bar`;
 const defaultProps = {
   color: 'default',
   delay: 2000,
-  speed: 50
+  speed: 50,
+  icon: React.createElement(SoundOutline, null)
 };
 export const NoticeBar = memo(p => {
   const props = mergeProps(defaultProps, p);
@@ -67,9 +68,9 @@ export const NoticeBar = memo(p => {
   if (!visible) return null;
   return withNativeProps(props, React.createElement("div", {
     className: classNames(classPrefix, `${classPrefix}-${props.color}`)
-  }, React.createElement("span", {
+  }, props.icon && React.createElement("span", {
     className: `${classPrefix}-left`
-  }, 'icon' in props ? props.icon : React.createElement(SoundOutline, null)), React.createElement("span", {
+  }, props.icon), React.createElement("span", {
     ref: containerRef,
     className: `${classPrefix}-content`
   }, React.createElement("span", {
@@ -82,6 +83,7 @@ export const NoticeBar = memo(p => {
   }, props.content)), (props.closeable || props.extra) && React.createElement("span", {
     className: `${classPrefix}-right`
   }, props.extra, props.closeable && React.createElement(CloseOutline, {
+    className: `${classPrefix}-close-icon`,
     onClick: () => {
       var _a;
 

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

@@ -13,13 +13,13 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 12px 16px;
+  padding: 8px 8px;
 }
 
 .adm-picker-header-button {
   font-size: 30px;
   display: inline-block;
-  padding: 8px 8px;
+  padding: 16px 16px;
 }
 
 .adm-picker-header-title {
@@ -38,4 +38,9 @@
 
 .adm-picker-body > .adm-picker-view {
   --height: 100%;
+}
+
+.adm-picker-popup .adm-popup-body {
+  border-top-left-radius: 16px;
+  border-top-right-radius: 16px;
 }

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

@@ -83,6 +83,7 @@ export const Picker = memo(p => {
     onChange: onChange
   }))));
   const popupElement = React.createElement(Popup, {
+    className: `${classPrefix}-popup`,
     visible: props.visible,
     position: 'bottom',
     onMaskClick: () => {

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

@@ -110,9 +110,9 @@
 }
 
 .adm-picker-view-mask-top {
-  background: linear-gradient(0deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
+  background: linear-gradient(0deg, rgba(255, 255, 255, 0.6) 0%, rgba(255, 255, 255, 0.8) 50%, #ffffff);
 }
 
 .adm-picker-view-mask-bottom {
-  background: linear-gradient(180deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.6) 0%, rgba(255, 255, 255, 0.8) 50%, #ffffff);
 }

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

@@ -30,7 +30,10 @@ export const Popover = forwardRef((p, ref) => {
       visible
     };
   }, [visible]);
-  return withStopPropagation(props.stopPropagation, React.createElement(Tooltip, Object.assign({}, props, {
+  const overlay = withStopPropagation(props.stopPropagation, React.createElement("div", {
+    className: `${classPrefix}-inner-content`
+  }, props.content));
+  return React.createElement(Tooltip, Object.assign({}, props, {
     overlayClassName: classNames(`${classPrefix}-${mode}`, props.overlayClassName),
     destroyTooltipOnHide: props.destroyOnHide,
     prefixCls: classPrefix,
@@ -52,8 +55,6 @@ export const Popover = forwardRef((p, ref) => {
       },
       motionDeadline: 200
     },
-    overlay: React.createElement("div", {
-      className: `${classPrefix}-inner-content`
-    }, props.content)
-  }), props.children));
+    overlay: overlay
+  }), props.children);
 });

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

@@ -15,7 +15,7 @@
 
 .adm-radio .adm-radio-icon {
   flex: none;
-  border: 2px solid #ccc;
+  border: 2px solid var(--adm-color-light);
   border-radius: var(--icon-size);
   box-sizing: border-box;
   display: flex;
@@ -46,13 +46,13 @@
 }
 
 .adm-radio.adm-radio-disabled .adm-radio-content {
-  color: var(--adm-color-weak);
+  opacity: 0.4;
 }
 
 .adm-radio.adm-radio-disabled .adm-radio-icon {
-  color: #ccc;
-  border-color: #ccc;
-  background-color: #ebedf0;
+  color: #b7b7b7;
+  border-color: var(--adm-color-light);
+  background-color: #f5f5f5;
 }
 
 .adm-radio .adm-radio-custom-icon {

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

@@ -1,9 +1,6 @@
 .adm-result {
-  --bg-color: var(--adm-color-white);
-  --color: var(--adm-color-text);
-  --adm-color-weak: var(--adm-color-weak);
   padding: 64px 24px;
-  background-color: var(--bg-color);
+  background-color: var(--adm-color-white);
 }
 
 .adm-result-icon {
@@ -19,7 +16,7 @@
 }
 
 .adm-result-title {
-  color: var(--color);
+  color: var(--adm-color-text);
   font-size: 36px;
   line-height: 1.4;
   text-align: center;

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 {
+  --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

@@ -6,10 +6,24 @@
   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 {
@@ -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))));
 };