antd-mobile 0.0.0-dev-626cbf51f → 0.0.0-dev.bc248f5c7

package/2x/cjs/components/slider/slider.js

@@ -36,7 +36,8 @@ const defaultProps = {
   step: 1,
   ticks: false,
   range: false,
-  disabled: false
+  disabled: false,
+  popover: false
 };
 
 const Slider = p => {
@@ -150,13 +151,14 @@ const Slider = p => {
 
   const renderThumb = index => {
     return _react.default.createElement(_thumb.default, {
-      icon: icon,
       key: index,
       value: sliderValue[index],
       min: min,
       max: max,
       disabled: disabled,
       trackRef: trackRef,
+      icon: icon,
+      popover: props.popover,
       onDrag: (position, first, last) => {
         if (first) {
           dragLockRef.current += 1;
@@ -176,7 +178,8 @@ const Slider = p => {
             dragLockRef.current -= 1;
           }, 100);
         }
-      }
+      },
+      "aria-label": props['aria-label']
     });
   };
 

package/2x/cjs/components/slider/thumb-icon.js

@@ -13,26 +13,28 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const ThumbIcon = props => {
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("svg", {
-    viewBox: '0 0 20 20'
+    viewBox: '0 0 24 24',
+    xmlns: 'http://www.w3.org/2000/svg'
   }, _react.default.createElement("g", {
-    stroke: 'none',
-    strokeWidth: '1',
-    fill: 'none',
+    fill: 'currentColor',
     fillRule: 'evenodd'
-  }, _react.default.createElement("g", {
-    transform: 'translate(-604.000000, -656.000000)',
-    fill: '#999999'
-  }, _react.default.createElement("g", {
-    transform: 'translate(592.000000, 644.000000)'
-  }, _react.default.createElement("g", {
-    transform: 'translate(12.000000, 12.000000)'
-  }, _react.default.createElement("polygon", {
-    points: '0 3.33333333 2.22222222 3.33333333 2.22222222 17.7777778 0 17.7777778'
-  }), _react.default.createElement("polygon", {
-    points: '17.7777778 3.33333333 20 3.33333333 20 17.7777778 17.7777778 17.7777778'
-  }), _react.default.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'
-  })))))));
+  }, _react.default.createElement("rect", {
+    x: 10,
+    width: 4,
+    height: 24,
+    rx: 2
+  }), _react.default.createElement("rect", {
+    y: 4,
+    width: 4,
+    height: 16,
+    rx: 2
+  }), _react.default.createElement("rect", {
+    x: 20,
+    y: 4,
+    width: 4,
+    height: 16,
+    rx: 2
+  }))));
 };
 
 exports.ThumbIcon = ThumbIcon;

package/2x/cjs/components/slider/thumb.d.ts

@@ -1,4 +1,5 @@
-import React, { FC, RefObject } from 'react';
+import React, { FC, RefObject, ReactNode } from 'react';
+import { NativeProps } from '../../utils/native-props';
 declare type ThumbProps = {
     value: number;
     min: number;
@@ -7,6 +8,7 @@ declare type ThumbProps = {
     onDrag: (value: number, first: boolean, last: boolean) => void;
     trackRef: RefObject<HTMLDivElement>;
     icon?: React.ReactNode;
-};
+    popover: boolean | ((value: number) => ReactNode);
+} & NativeProps;
 declare const Thumb: FC<ThumbProps>;
 export default Thumb;

package/2x/cjs/components/slider/thumb.js

@@ -11,6 +11,10 @@ var _react2 = require("@use-gesture/react");
 
 var _thumbIcon = require("./thumb-icon");
 
+var _popover = require("../popover/popover");
+
+var _configProvider = require("../config-provider");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -27,6 +31,9 @@ const Thumb = props => {
     icon
   } = props;
   const prevValue = (0, _react.useRef)(value);
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
 
   const currentPosition = () => {
     return {
@@ -35,6 +42,7 @@ const Thumb = props => {
     };
   };
 
+  const [dragging, setDragging] = (0, _react.useState)(false);
   const bind = (0, _react2.useDrag)(state => {
     var _a;
 
@@ -49,20 +57,38 @@ const Thumb = props => {
     if (!sliderOffsetWith) return;
     const diff = x / Math.ceil(sliderOffsetWith) * (max - min);
     onDrag(prevValue.current + diff, state.first, state.last);
+    setDragging(!state.last);
   }, {
     axis: 'x',
     pointer: {
       touch: true
     }
   });
-  return _react.default.createElement("div", Object.assign({
-    className: `${classPrefix}-thumb-container`,
-    style: currentPosition()
-  }, bind()), _react.default.createElement("div", {
+  const renderPopoverContent = typeof props.popover === 'function' ? props.popover : props.popover ? value => value.toString() : null;
+
+  const thumbElement = _react.default.createElement("div", {
     className: `${classPrefix}-thumb`
   }, icon ? icon : _react.default.createElement(_thumbIcon.ThumbIcon, {
     className: `${classPrefix}-thumb-icon`
-  })));
+  }));
+
+  return _react.default.createElement("div", Object.assign({
+    className: `${classPrefix}-thumb-container`,
+    style: currentPosition()
+  }, bind(), {
+    role: 'slider',
+    "aria-label": props['aria-label'] || locale.Slider.name,
+    "aria-valuemax": max,
+    "aria-valuemin": min,
+    "aria-valuenow": value,
+    "aria-disabled": disabled
+  }), renderPopoverContent ? _react.default.createElement(_popover.Popover, {
+    content: renderPopoverContent(value),
+    placement: 'top',
+    visible: dragging,
+    getContainer: null,
+    mode: 'dark'
+  }, thumbElement) : thumbElement);
 };
 
 var _default = Thumb;

package/2x/cjs/components/space/space.patch.css

@@ -0,0 +1,16 @@
+.adm-space-vertical > .adm-space-item {
+  margin-bottom: 16px;
+}
+
+.adm-space-horizontal > .adm-space-item {
+  margin-right: 16px;
+}
+
+.adm-space-horizontal.adm-space-wrap {
+  flex-wrap: wrap;
+  margin-bottom: -16px;
+}
+
+.adm-space-horizontal.adm-space-wrap > .adm-space-item {
+  padding-bottom: 16px;
+}

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

@@ -1,9 +1,6 @@
 .adm-spin-loading {
   --color: var(--adm-color-weak);
   --size: 64px;
-  --pi: 3.14159265;
-  --radius: 15;
-  --circumference: calc(var(--radius) * var(--pi) * 2);
   width: var(--size);
   height: var(--size);
 }

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

@@ -13,6 +13,8 @@ var _withDefaultProps = require("../../utils/with-default-props");
 
 var _web = require("@react-spring/web");
 
+var _reduceAndRestoreMotion = require("../../utils/reduce-and-restore-motion");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -31,17 +33,19 @@ const SpinLoading = (0, _react.memo)(p => {
   var _a;
 
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const motionReduced = (0, _reduceAndRestoreMotion.useMotionReduced)();
   const {
     percent
   } = (0, _web.useSpring)({
+    cancel: motionReduced,
     loop: {
       reverse: true
     },
     from: {
-      percent: 30
+      percent: 80
     },
     to: {
-      percent: 80
+      percent: 30
     },
     config: {
       duration: 1200

package/2x/cjs/components/spin-loading/spin-loading.patch.css

@@ -0,0 +1,14 @@
+.adm-spin-loading {
+  width: 64px;
+  height: 64px;
+}
+
+.adm-spin-loading-svg {
+  width: 100%;
+  height: 100%;
+  animation: adm-spin-loading-rotate 0.8s infinite linear;
+}
+
+.adm-spin-loading-svg > .adm-spin-loading-fill {
+  stroke: #999999;
+}

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

@@ -3,14 +3,14 @@
   --input-width: 88px;
   --input-font-size: var(--adm-font-size-main);
   --input-font-color: var(--adm-color-text);
-  --input-background-color: #f5f5f5;
+  --input-background-color: var(--adm-color-box);
   --border-radius: 4px;
   --border: none;
   --border-inner: solid 4px transparent;
   --active-border: var(--border);
-  --button-font-size: 30px;
+  --button-font-size: var(--adm-font-size-7);
   --button-text-color: var(--adm-color-primary);
-  --button-background-color: #f5f5f5;
+  --button-background-color: var(--adm-color-box);
   --button-width: var(--height);
   display: flex;
   align-items: center;

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

@@ -25,6 +25,8 @@ var _button = _interopRequireDefault(require("../button"));
 
 var _big = _interopRequireDefault(require("big.js"));
 
+var _configProvider = require("../config-provider");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -48,6 +50,9 @@ const Stepper = p => {
     min,
     inputReadOnly
   } = props;
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
   const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
   const [inputValue, setInputValue] = (0, _react.useState)(() => convertValueToText(value, props.digits));
 
@@ -129,7 +134,8 @@ const Stepper = p => {
     disabled: minusDisabled(),
     fill: 'none',
     shape: 'rectangular',
-    color: 'primary'
+    color: 'primary',
+    "aria-label": locale.Stepper.decrease
   }, _react.default.createElement(_antdMobileIcons.MinusOutline, null)), _react.default.createElement("div", {
     className: `${classPrefix}-middle`
   }, _react.default.createElement(_input.default, {
@@ -151,14 +157,19 @@ const Stepper = p => {
       setHasFocus(false);
       (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },
-    readOnly: inputReadOnly
+    readOnly: inputReadOnly,
+    role: 'spinbutton',
+    "aria-valuenow": Number(inputValue),
+    "aria-valuemax": max,
+    "aria-valuemin": min
   })), _react.default.createElement(_button.default, {
     className: `${classPrefix}-plus`,
     onClick: handlePlus,
     disabled: plusDisabled(),
     fill: 'none',
     shape: 'rectangular',
-    color: 'primary'
+    color: 'primary',
+    "aria-label": locale.Stepper.increase
   }, _react.default.createElement(_antdMobileIcons.AddOutline, null))));
 };
 

package/2x/cjs/components/steps/steps.css

@@ -17,7 +17,7 @@
 .adm-step .adm-step-indicator .adm-step-icon-container {
   position: absolute;
   z-index: 1;
-  background: var(--adm-color-white);
+  background: var(--adm-color-background);
   color: var(--icon-color);
 }
 
@@ -62,8 +62,8 @@
 }
 
 .adm-steps {
-  --title-font-size: 26px;
-  --description-font-size: 24px;
+  --title-font-size: var(--adm-font-size-main);
+  --description-font-size: var(--adm-font-size-4);
   --indicator-margin-right: 0;
   --icon-size: 36px;
   width: 100%;

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

@@ -1,6 +1,7 @@
 .adm-swipe-action {
-  --background: #ffffff;
+  --background: var(--adm-color-background);
   background: var(--background);
+  cursor: -webkit-grab;
   cursor: grab;
   overflow: hidden;
   touch-action: pan-y;

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

@@ -20,6 +20,7 @@ export declare type SwipeActionProps = {
     closeOnAction?: boolean;
     children: ReactNode;
     stopPropagation?: PropagationEvent[];
+    onActionsReveal?: (side: 'left' | 'right') => void;
 } & NativeProps<'--background'>;
 export declare const SwipeAction: React.ForwardRefExoticComponent<{
     rightActions?: Action[] | undefined;
@@ -29,5 +30,10 @@ export declare const SwipeAction: React.ForwardRefExoticComponent<{
     closeOnAction?: boolean | undefined;
     children: ReactNode;
     stopPropagation?: "click"[] | undefined;
-} & NativeProps<"--background"> & React.RefAttributes<SwipeActionRef>>;
+    onActionsReveal?: ((side: 'left' | 'right') => void) | undefined;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--background", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<SwipeActionRef>>;
 export {};

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

@@ -27,6 +27,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const classPrefix = `adm-swipe-action`;
 const defaultProps = {
   rightActions: [],
   leftActions: [],
@@ -65,6 +66,8 @@ const SwipeAction = (0, _react.forwardRef)((p, ref) => {
   }), []);
   const draggingRef = (0, _react.useRef)(false);
   const bind = (0, _react2.useDrag)(state => {
+    var _a;
+
     draggingRef.current = true;
     const [offsetX] = state.offset;
 
@@ -81,9 +84,15 @@ const SwipeAction = (0, _react.forwardRef)((p, ref) => {
         position = 0;
       }
 
+      const targetX = (0, _nearest.nearest)([-rightWidth, 0, leftWidth], position);
       api.start({
-        x: (0, _nearest.nearest)([-rightWidth, 0, leftWidth], position)
+        x: targetX
       });
+
+      if (targetX !== 0) {
+        (_a = p.onActionsReveal) === null || _a === void 0 ? void 0 : _a.call(p, targetX > 0 ? 'left' : 'right');
+      }
+
       window.setTimeout(() => {
         draggingRef.current = false;
       });
@@ -119,6 +128,8 @@ const SwipeAction = (0, _react.forwardRef)((p, ref) => {
 
   (0, _react.useImperativeHandle)(ref, () => ({
     show: (side = 'right') => {
+      var _a;
+
       if (side === 'right') {
         api.start({
           x: -getRightWidth()
@@ -128,6 +139,8 @@ const SwipeAction = (0, _react.forwardRef)((p, ref) => {
           x: getLeftWidth()
         });
       }
+
+      (_a = p.onActionsReveal) === null || _a === void 0 ? void 0 : _a.call(p, side);
     },
     close
   }));
@@ -158,7 +171,7 @@ const SwipeAction = (0, _react.forwardRef)((p, ref) => {
     const color = (_a = action.color) !== null && _a !== void 0 ? _a : 'light';
     return _react.default.createElement(_button.default, {
       key: action.key,
-      className: 'adm-swipe-action-action-button',
+      className: `${classPrefix}-action-button`,
       style: {
         '--background-color': (_b = colorRecord[color]) !== null && _b !== void 0 ? _b : color
       },
@@ -176,7 +189,7 @@ const SwipeAction = (0, _react.forwardRef)((p, ref) => {
   }
 
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", Object.assign({
-    className: 'adm-swipe-action'
+    className: classPrefix
   }, bind(), {
     ref: rootRef,
     onClickCapture: e => {
@@ -186,15 +199,15 @@ const SwipeAction = (0, _react.forwardRef)((p, ref) => {
       }
     }
   }), _react.default.createElement(_web.animated.div, {
-    className: 'adm-swipe-action-track',
+    className: `${classPrefix}-track`,
     style: {
       x
     }
   }, (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, _react.default.createElement("div", {
-    className: 'adm-swipe-action-actions adm-swipe-action-actions-left',
+    className: `${classPrefix}-actions ${classPrefix}-actions-left`,
     ref: leftRef
   }, props.leftActions.map(renderAction))), _react.default.createElement("div", {
-    className: 'adm-swipe-action-content',
+    className: `${classPrefix}-content`,
     onClickCapture: e => {
       if (x.goal !== 0) {
         e.preventDefault();
@@ -209,7 +222,7 @@ const SwipeAction = (0, _react.forwardRef)((p, ref) => {
       pointerEvents: x.to(v => v !== 0 && x.goal !== 0 ? 'none' : 'auto')
     }
   }, props.children)), (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, _react.default.createElement("div", {
-    className: 'adm-swipe-action-actions adm-swipe-action-actions-right',
+    className: `${classPrefix}-actions ${classPrefix}-actions-right`,
     ref: rightRef
   }, props.rightActions.map(renderAction))))));
 });

package/2x/cjs/components/swiper/index.d.ts

@@ -16,10 +16,18 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | undefined;
-} & import("../../utils/native-props").NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
+} & {
+    className?: string | undefined;
+    style?: (import("react").CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & import("react").AriaAttributes & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
     Item: import("react").FC<{
         onClick?: ((e: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
         children?: import("react").ReactNode;
-    } & import("../../utils/native-props").NativeProps<never>>;
+    } & {
+        className?: string | undefined;
+        style?: (import("react").CSSProperties & Partial<Record<never, string>>) | undefined;
+        tabIndex?: number | undefined;
+    } & import("react").AriaAttributes>;
 };
 export default _default;

package/2x/cjs/components/swiper/swiper.css

@@ -22,6 +22,7 @@
 }
 
 .adm-swiper-track-allow-touch-move {
+  cursor: -webkit-grab;
   cursor: grab;
 }
 

package/2x/cjs/components/swiper/swiper.d.ts

@@ -37,4 +37,8 @@ export declare const Swiper: React.ForwardRefExoticComponent<{
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | undefined;
-} & NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & React.RefAttributes<SwiperRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<SwiperRef>>;

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

@@ -37,6 +37,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const classPrefix = `adm-swiper`;
 const defaultProps = {
   defaultIndex: 0,
   allowTouchMove: true,
@@ -140,7 +141,14 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
         });
       }
     }), [count]);
+    const forceDragCancelRef = (0, _react.useRef)(() => {});
     const bind = (0, _react2.useDrag)(state => {
+      forceDragCancelRef.current = () => {
+        state.cancel();
+        setDragging(false);
+      };
+
+      if (!state.intentional) return;
       const slidePixels = getSlidePixels();
       if (!slidePixels) return;
       const paramIndex = isVertical ? 1 : 0;
@@ -169,6 +177,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
         const slidePixels = getSlidePixels();
         return [position.get() / 100 * slidePixels, position.get() / 100 * slidePixels];
       },
+      triggerAllEvents: true,
       bounds: () => {
         if (loop) return {};
         const slidePixels = getSlidePixels();
@@ -237,10 +246,10 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
     function renderTrackInner() {
       if (loop) {
         return _react.default.createElement("div", {
-          className: 'adm-swiper-track-inner'
+          className: `${classPrefix}-track-inner`
         }, _react.default.Children.map(validChildren, (child, index) => {
           return _react.default.createElement(_web.animated.div, {
-            className: 'adm-swiper-slide',
+            className: `${classPrefix}-slide`,
             style: {
               [isVertical ? 'y' : 'x']: position.to(position => {
                 let finalPosition = -position + index * 100;
@@ -255,13 +264,13 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
         }));
       } else {
         return _react.default.createElement(_web.animated.div, {
-          className: 'adm-swiper-track-inner',
+          className: `${classPrefix}-track-inner`,
           style: {
             [isVertical ? 'y' : 'x']: position.to(position => `${-position}%`)
           }
         }, _react.default.Children.map(validChildren, child => {
           return _react.default.createElement("div", {
-            className: 'adm-swiper-slide'
+            className: `${classPrefix}-slide`
           }, child);
         }));
       }
@@ -272,20 +281,22 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
       '--track-offset': `${props.trackOffset}%`
     };
     return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-      className: (0, _classnames.default)('adm-swiper', `adm-swiper-${props.direction}`),
+      className: (0, _classnames.default)(classPrefix, `${classPrefix}-${props.direction}`),
       style: style
     }, _react.default.createElement("div", Object.assign({
       ref: trackRef,
-      className: (0, _classnames.default)('adm-swiper-track', {
-        'adm-swiper-track-allow-touch-move': props.allowTouchMove
+      className: (0, _classnames.default)(`${classPrefix}-track`, {
+        [`${classPrefix}-track-allow-touch-move`]: props.allowTouchMove
       }),
       onClickCapture: e => {
         if (draggingRef.current) {
           e.stopPropagation();
         }
+
+        forceDragCancelRef.current();
       }
     }, props.allowTouchMove ? bind() : {}), renderTrackInner()), props.indicator === undefined ? _react.default.createElement("div", {
-      className: 'adm-swiper-indicator'
+      className: `${classPrefix}-indicator`
     }, _react.default.createElement(_pageIndicator.default, Object.assign({}, props.indicatorProps, {
       total: count,
       current: current,

package/2x/cjs/components/swiper/swiper.patch.css

@@ -0,0 +1,26 @@
+.adm-swiper {
+  display: block;
+  width: 100%;
+  height: auto;
+  border-radius: 0;
+}
+
+.adm-swiper-track {
+  padding: 0;
+}
+
+.adm-swiper-horizontal .adm-swiper-track {
+  transform: translateX(0%);
+}
+
+.adm-swiper-horizontal .adm-swiper-track-inner {
+  width: 100%;
+}
+
+.adm-swiper-vertical .adm-swiper-track {
+  transform: translateY(0%);
+}
+
+.adm-swiper-vertical .adm-swiper-track-inner {
+  height: 100%;
+}

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

@@ -29,7 +29,7 @@
   height: var(--height);
   box-sizing: border-box;
   border-radius: 62px;
-  background: #e5e5e5;
+  background: var(--adm-color-border);
   z-index: 0;
   overflow: hidden;
   line-height: var(--height);
@@ -44,7 +44,7 @@
   height: calc(var(--height) - 2 * var(--border-width));
   border-radius: calc(var(--height) - 2 * var(--border-width));
   box-sizing: border-box;
-  background: #fff;
+  background: var(--adm-color-background);
   z-index: 1;
   transition: all 200ms;
   transform: scale(1);
@@ -57,7 +57,7 @@
   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;
+  background: var(--adm-color-white);
   position: absolute;
   z-index: 2;
   top: var(--border-width);
@@ -76,7 +76,7 @@
   height: 100%;
   color: var(--adm-color-weak);
   transition: margin 200ms;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
 }
 
 .adm-switch.adm-switch-checked .adm-switch-checkbox {