antd-mobile 5.0.0-rc.6 → 5.0.0

package/es/components/index-bar/sidebar.js

@@ -1,64 +1,62 @@
 import React, { useState } from 'react';
 import classNames from 'classnames';
-var classPrefix = "adm-index-bar";
-export var Sidebar = function Sidebar(props) {
-  var _classNames;
-
-  var _useState = useState(false),
-      interacting = _useState[0],
-      setInteracting = _useState[1];
-
-  return /*#__PURE__*/React.createElement("div", {
-    className: classNames(classPrefix + "-sidebar", (_classNames = {}, _classNames[classPrefix + "-sidebar-interacting"] = interacting, _classNames)),
-    onMouseDown: function onMouseDown() {
+const classPrefix = `adm-index-bar`;
+export const Sidebar = props => {
+  const [interacting, setInteracting] = useState(false);
+  return React.createElement("div", {
+    className: classNames(`${classPrefix}-sidebar`, {
+      [`${classPrefix}-sidebar-interacting`]: interacting
+    }),
+    onMouseDown: () => {
       setInteracting(true);
     },
-    onMouseUp: function onMouseUp() {
+    onMouseUp: () => {
       setInteracting(false);
     },
-    onTouchStart: function onTouchStart() {
+    onTouchStart: () => {
       setInteracting(true);
     },
-    onTouchEnd: function onTouchEnd() {
+    onTouchEnd: () => {
       setInteracting(false);
     },
-    onTouchMove: function onTouchMove(e) {
+    onTouchMove: e => {
       if (!interacting) return;
-      var _e$touches$ = e.touches[0],
-          clientX = _e$touches$.clientX,
-          clientY = _e$touches$.clientY;
-      var target = document.elementFromPoint(clientX, clientY);
+      const {
+        clientX,
+        clientY
+      } = e.touches[0];
+      const target = document.elementFromPoint(clientX, clientY);
       if (!target) return;
-      var index = target.dataset['index'];
+      const index = target.dataset['index'];
 
       if (index) {
         props.onActive(index);
       }
     }
-  }, props.indexes.map(function (index) {
-    var _classNames2;
-
-    var active = index === props.activeIndex;
-    return /*#__PURE__*/React.createElement("div", {
-      className: classPrefix + "-sidebar-row",
-      onMouseDown: function onMouseDown() {
+  }, props.indexes.map(index => {
+    const active = index === props.activeIndex;
+    return React.createElement("div", {
+      className: `${classPrefix}-sidebar-row`,
+      onMouseDown: () => {
         props.onActive(index);
       },
-      onTouchStart: function onTouchStart() {
+      onTouchStart: () => {
         props.onActive(index);
       },
-      onMouseEnter: function onMouseEnter() {
+      onMouseEnter: () => {
         if (interacting) {
           props.onActive(index);
         }
       },
       "data-index": index,
       key: index
-    }, interacting && active && /*#__PURE__*/React.createElement("div", {
-      className: classPrefix + "-sidebar-bubble"
-    }, index), /*#__PURE__*/React.createElement("div", {
-      className: classNames(classPrefix + "-sidebar-item", (_classNames2 = {}, _classNames2[classPrefix + "-sidebar-item-active"] = active, _classNames2)),
+    }, interacting && active && React.createElement("div", {
+      className: `${classPrefix}-sidebar-bubble`
+    }, index), React.createElement("div", {
+      className: classNames(`${classPrefix}-sidebar-item`, {
+        [`${classPrefix}-sidebar-item-active`]: active
+      }),
       "data-index": index
-    }, /*#__PURE__*/React.createElement("div", null, index)));
+    }, React.createElement("div", null, index)));
   }));
 };

package/es/components/infinite-scroll/infinite-scroll.js

@@ -1,42 +1,41 @@
 import { mergeProps } from '../../utils/with-default-props';
 import React, { useEffect, useRef } from 'react';
-import { useLockFn, usePersistFn } from 'ahooks';
+import { useLockFn, useMemoizedFn } from 'ahooks';
 import { withNativeProps } from '../../utils/native-props';
 import { getScrollParent } from '../../utils/get-scroll-parent';
-import Loading from '../loading';
+import DotLoading from '../dot-loading';
 
 function isWindow(element) {
   return element === window;
 }
 
-var classPrefix = "adm-infinite-scroll";
+const classPrefix = `adm-infinite-scroll`;
 
-var InfiniteScrollContent = function InfiniteScrollContent(_ref) {
-  var hasMore = _ref.hasMore;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, hasMore ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "\u52A0\u8F7D\u4E2D"), /*#__PURE__*/React.createElement(Loading, null)) : /*#__PURE__*/React.createElement("span", null, "\u6CA1\u6709\u66F4\u591A\u4E86"));
+const InfiniteScrollContent = ({
+  hasMore
+}) => {
+  return React.createElement(React.Fragment, null, hasMore ? React.createElement(React.Fragment, null, React.createElement("span", null, "\u52A0\u8F7D\u4E2D"), React.createElement(DotLoading, null)) : React.createElement("span", null, "\u6CA1\u6709\u66F4\u591A\u4E86"));
 };
 
-export var InfiniteScroll = function InfiniteScroll(p) {
-  var props = mergeProps({
+export const InfiniteScroll = p => {
+  const props = mergeProps({
     threshold: 250
   }, p);
-  var doLoadMore = useLockFn(function () {
-    return props.loadMore();
-  });
-  var elementRef = useRef(null);
-  var checkTimeoutRef = useRef();
-  var check = usePersistFn(function () {
+  const doLoadMore = useLockFn(() => props.loadMore());
+  const elementRef = useRef(null);
+  const checkTimeoutRef = useRef();
+  const check = useMemoizedFn(() => {
     window.clearTimeout(checkTimeoutRef.current);
-    checkTimeoutRef.current = window.setTimeout(function () {
+    checkTimeoutRef.current = window.setTimeout(() => {
       if (!props.hasMore) return;
-      var element = elementRef.current;
+      const element = elementRef.current;
       if (!element) return;
       if (!element.offsetParent) return;
-      var parent = getScrollParent(element);
+      const parent = getScrollParent(element);
       if (!parent) return;
-      var rect = element.getBoundingClientRect();
-      var elementTop = rect.top;
-      var current = isWindow(parent) ? window.innerHeight : parent.getBoundingClientRect().bottom;
+      const rect = element.getBoundingClientRect();
+      const elementTop = rect.top;
+      const current = isWindow(parent) ? window.innerHeight : parent.getBoundingClientRect().bottom;
 
       if (current >= elementTop - props.threshold) {
         doLoadMore();
@@ -44,13 +43,13 @@ export var InfiniteScroll = function InfiniteScroll(p) {
     });
   }); // 确保在内容不足时会自动触发加载事件
 
-  useEffect(function () {
+  useEffect(() => {
     check();
   });
-  useEffect(function () {
-    var element = elementRef.current;
+  useEffect(() => {
+    const element = elementRef.current;
     if (!element) return;
-    var parent = getScrollParent(element);
+    const parent = getScrollParent(element);
     if (!parent) return;
 
     function onScroll() {
@@ -58,14 +57,14 @@ export var InfiniteScroll = function InfiniteScroll(p) {
     }
 
     parent.addEventListener('scroll', onScroll);
-    return function () {
+    return () => {
       parent.removeEventListener('scroll', onScroll);
     };
   }, []);
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+  return withNativeProps(props, React.createElement("div", {
     className: classPrefix,
     ref: elementRef
-  }, props.children && props.children, !props.children && /*#__PURE__*/React.createElement(InfiniteScrollContent, {
+  }, props.children && props.children, !props.children && React.createElement(InfiniteScrollContent, {
     hasMore: props.hasMore
   })));
 };

package/es/components/input/input.css

@@ -1,17 +1,23 @@
-.adm-input-wrapper {
+.adm-input {
   --font-size: 17px;
   --color: var(--adm-color-text);
   --placeholder-color: var(--adm-color-light);
-  --disabled-color: var(--adm-color-weak);
   --text-align: left;
+  --background-color: transparent;
   display: flex;
   justify-content: flex-start;
   align-items: center;
   width: 100%;
   max-width: 100%;
   max-height: 100%;
+  min-height: 24px;
+  background-color: var(--background-color);
 }
-.adm-input {
+.adm-input-disabled {
+  opacity: 0.4;
+  cursor: not-allowed;
+}
+.adm-input-element {
   flex: auto;
   display: inline-block;
   box-sizing: border-box;
@@ -30,53 +36,50 @@
   min-height: 1.5em;
   text-align: var(--text-align);
 }
-.adm-input::placeholder {
+.adm-input-element::placeholder {
   color: var(--placeholder-color);
   font-family: inherit;
 }
-.adm-input:-webkit-autofill {
+.adm-input-element:-webkit-autofill {
   background-color: transparent;
 }
-.adm-input:disabled {
-  color: var(--disabled-color);
-  cursor: not-allowed;
-  opacity: 1;
-  -webkit-text-fill-color: var(--disabled-color);
-}
-.adm-input:read-only {
+.adm-input-element:read-only {
   cursor: default;
 }
-.adm-input:invalid {
+.adm-input-element:invalid {
   box-shadow: none;
 }
-.adm-input::-ms-clear {
+.adm-input-element::-ms-clear {
   display: none;
 }
-.adm-input::-webkit-search-cancel-button {
+.adm-input-element::-webkit-search-cancel-button {
   display: none;
 }
-.adm-input::-webkit-search-decoration {
+.adm-input-element::-webkit-search-decoration {
   display: none;
 }
-.adm-input[type='date'],
-.adm-input[type='time'],
-.adm-input[type='datetime-local'] {
+.adm-input-element[type='date'],
+.adm-input-element[type='time'],
+.adm-input-element[type='datetime-local'] {
   min-height: 1.5em;
 }
-.adm-input[type='search'] {
+.adm-input-element[type='search'] {
   -webkit-appearance: none;
 }
-.adm-input[readonly] {
+.adm-input-element[readonly] {
   pointer-events: none;
 }
 .adm-input-clear {
   flex: none;
   margin-left: 8px;
-  color: var(--placeholder-color);
-  padding: 3px;
+  color: var(--adm-color-light);
+  padding: 4px;
   cursor: pointer;
 }
+.adm-input-clear:active {
+  color: var(--adm-color-weak);
+}
 .adm-input-clear .antd-mobile-icon {
   display: block;
-  font-size: 14px;
+  font-size: 15px;
 }

package/es/components/input/input.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
-export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'max' | 'min' | 'autoComplete' | 'pattern' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp'> & {
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'pattern' | 'inputMode' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -13,13 +13,15 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     id?: string;
     onEnterPress?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
     enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
-} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color' | '--text-align'>;
+    min?: number;
+    max?: number;
+} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--text-align'>;
 export declare type InputRef = {
     clear: () => void;
     focus: () => void;
     blur: () => void;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "pattern" | "max" | "min" | "type" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "autoComplete" | "maxLength" | "minLength"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "pattern" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "maxLength" | "minLength"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;
@@ -31,5 +33,7 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedH
     id?: string | undefined;
     onEnterPress?: ((e: React.KeyboardEvent<HTMLInputElement>) => void) | undefined;
     enterKeyHint?: "enter" | "search" | "done" | "go" | "next" | "previous" | "send" | undefined;
-} & NativeProps<"--font-size" | "--color" | "--placeholder-color" | "--disabled-color" | "--text-align"> & React.RefAttributes<InputRef>>;
+    min?: number | undefined;
+    max?: number | undefined;
+} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align"> & React.RefAttributes<InputRef>>;
 export {};

package/es/components/input/input.js

@@ -1,43 +1,37 @@
-import React, { useState, forwardRef, useImperativeHandle, useRef, useLayoutEffect } from 'react';
+import React, { useState, forwardRef, useImperativeHandle, useRef } from 'react';
 import { usePropsValue } from '../../utils/use-props-value';
 import { CloseCircleFill } from 'antd-mobile-icons';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
-var classPrefix = "adm-input";
-var defaultProps = {
+import classNames from 'classnames';
+import { useIsomorphicLayoutEffect } from 'ahooks';
+import { bound } from '../../utils/bound';
+const classPrefix = `adm-input`;
+const defaultProps = {
   defaultValue: ''
 };
-export var Input = /*#__PURE__*/forwardRef(function (p, ref) {
-  var props = mergeProps(defaultProps, p);
-
-  var _usePropsValue = usePropsValue(props),
-      value = _usePropsValue[0],
-      setValue = _usePropsValue[1];
-
-  var _useState = useState(false),
-      hasFocus = _useState[0],
-      setHasFocus = _useState[1];
-
-  var nativeInputRef = useRef(null);
-  useImperativeHandle(ref, function () {
-    return {
-      clear: function clear() {
-        setValue('');
-      },
-      focus: function focus() {
-        var _a;
+export const Input = forwardRef((p, ref) => {
+  const props = mergeProps(defaultProps, p);
+  const [value, setValue] = usePropsValue(props);
+  const [hasFocus, setHasFocus] = useState(false);
+  const nativeInputRef = useRef(null);
+  useImperativeHandle(ref, () => ({
+    clear: () => {
+      setValue('');
+    },
+    focus: () => {
+      var _a;
 
-        (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-      },
-      blur: function blur() {
-        var _a;
+      (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    },
+    blur: () => {
+      var _a;
 
-        (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.blur();
-      }
-    };
-  });
+      (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+    }
+  }));
 
-  var handleKeydown = function handleKeydown(e) {
+  const handleKeydown = e => {
     var _a;
 
     if (props.onEnterPress && (e.code === 'Enter' || e.keyCode === 13)) {
@@ -47,36 +41,50 @@ export var Input = /*#__PURE__*/forwardRef(function (p, ref) {
     (_a = props.onKeyDown) === null || _a === void 0 ? void 0 : _a.call(props, e);
   };
 
-  useLayoutEffect(function () {
+  useIsomorphicLayoutEffect(() => {
     var _a;
 
     if (!props.enterKeyHint) return;
     (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.setAttribute('enterkeyhint', props.enterKeyHint);
-    return function () {
+    return () => {
       var _a;
 
       (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.removeAttribute('enterkeyhint');
     };
   }, [props.enterKeyHint]);
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-wrapper"
-  }, /*#__PURE__*/React.createElement("input", {
+
+  function checkValue() {
+    let nextValue = value;
+
+    if (props.type === 'number') {
+      nextValue = bound(parseFloat(nextValue), props.min, props.max).toString();
+    }
+
+    if (nextValue !== value) {
+      setValue(nextValue);
+    }
+  }
+
+  return withNativeProps(props, React.createElement("div", {
+    className: classNames(`${classPrefix}`, props.disabled && `${classPrefix}-disabled`)
+  }, React.createElement("input", {
     ref: nativeInputRef,
-    className: classPrefix,
+    className: `${classPrefix}-element`,
     value: value,
-    onChange: function onChange(e) {
+    onChange: e => {
       setValue(e.target.value);
     },
-    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);
+      checkValue();
       (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },
     id: props.id,
@@ -89,21 +97,24 @@ export var Input = /*#__PURE__*/forwardRef(function (p, ref) {
     min: props.min,
     autoComplete: props.autoComplete,
     pattern: props.pattern,
+    inputMode: props.inputMode,
     type: props.type,
     autoCapitalize: props.autoCapitalize,
     autoCorrect: props.autoCorrect,
     onKeyDown: handleKeydown,
-    onKeyUp: props.onKeyUp
-  }), props.clearable && !!value && hasFocus && /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-clear",
-    onMouseDown: function onMouseDown(e) {
+    onKeyUp: props.onKeyUp,
+    onCompositionStart: props.onCompositionStart,
+    onCompositionEnd: props.onCompositionEnd
+  }), props.clearable && !!value && !props.readOnly && React.createElement("div", {
+    className: `${classPrefix}-clear`,
+    onMouseDown: e => {
       e.preventDefault();
     },
-    onClick: function onClick() {
+    onClick: () => {
       var _a;
 
       setValue('');
       (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props);
     }
-  }, /*#__PURE__*/React.createElement(CloseCircleFill, null))));
+  }, React.createElement(CloseCircleFill, null))));
 });

package/es/components/jumbo-tabs/jumbo-tabs.css

@@ -1,4 +1,5 @@
 .adm-jumbo-tabs {
+  --gap: 8px;
   position: relative;
 }
 .adm-jumbo-tabs-header {
@@ -12,6 +13,7 @@
   align-items: center;
   position: relative;
   overflow-x: scroll;
+  padding: 0 var(--gap);
   scrollbar-width: none;
 }
 .adm-jumbo-tabs-tab-list::-webkit-scrollbar {
@@ -19,7 +21,7 @@
 }
 .adm-jumbo-tabs-tab-wrapper {
   flex: auto;
-  padding: 0 12px;
+  padding: 0 calc(var(--gap) / 2);
   text-align: center;
 }
 .adm-jumbo-tabs-tab {
@@ -36,6 +38,7 @@
 }
 .adm-jumbo-tabs-tab-title {
   line-height: 24px;
+  padding: 0 4px;
 }
 .adm-jumbo-tabs-tab-description {
   width: min-content;