antd-mobile 5.39.0 → 5.41.0-alpha.0

package/cjs/components/button/button.d.ts

@@ -15,7 +15,7 @@ export declare type ButtonProps = {
     type?: 'submit' | 'reset' | 'button';
     shape?: 'default' | 'rounded' | 'rectangular';
     children?: ReactNode;
-} & Pick<NativeButtonProps, 'onMouseDown' | 'onMouseUp' | 'onTouchStart' | 'onTouchEnd' | 'id'> & NativeProps<'--text-color' | '--background-color' | '--border-radius' | '--border-width' | '--border-style' | '--border-color'>;
+} & Pick<NativeButtonProps, 'onMouseDown' | 'onMouseUp' | 'onTouchStart' | 'onTouchEnd' | 'id' | 'form'> & NativeProps<'--text-color' | '--background-color' | '--border-radius' | '--border-width' | '--border-style' | '--border-color'>;
 export declare type ButtonRef = {
     nativeElement: HTMLButtonElement | null;
 };
@@ -32,7 +32,7 @@ export declare const Button: React.ForwardRefExoticComponent<{
     type?: "reset" | "submit" | "button" | undefined;
     shape?: "default" | "rounded" | "rectangular" | undefined;
     children?: ReactNode;
-} & Pick<NativeButtonProps, "id" | "onTouchStart" | "onMouseDown" | "onMouseUp" | "onTouchEnd"> & {
+} & Pick<NativeButtonProps, "form" | "id" | "onTouchStart" | "onMouseDown" | "onMouseUp" | "onTouchEnd"> & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--border-radius" | "--text-color" | "--background-color" | "--border-width" | "--border-style" | "--border-color", string>>) | undefined;
     tabIndex?: number | undefined;

package/cjs/components/button/button.js

@@ -55,6 +55,7 @@ const Button = (0, _react.forwardRef)((p, ref) => {
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("button", {
     ref: nativeButtonRef,
     type: props.type,
+    form: props.form,
     onClick: handleClick,
     className: (0, _classnames.default)(classPrefix, {
       [`${classPrefix}-${props.color}`]: props.color,

package/cjs/components/calendar-picker-view/calendar-picker-view.js

@@ -173,6 +173,9 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
             return contentWrapper(top);
           }
           if (props.selectionMode === 'range') {
+            if (isBegin && isEnd) {
+              return contentWrapper(locale.Calendar.startAndEnd);
+            }
             if (isBegin) {
               return contentWrapper(locale.Calendar.start);
             }

package/cjs/components/date-picker/date-picker-date-utils.d.ts

@@ -1,6 +1,6 @@
+import { RenderLabel } from '../date-picker-view/date-picker-view';
 import { PickerColumn } from '../picker';
 import type { DatePickerFilter } from './date-picker-utils';
-import { RenderLabel } from '../date-picker-view/date-picker-view';
 export declare type DatePrecision = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second';
 export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: DatePrecision, renderLabel: RenderLabel, filter: DatePickerFilter | undefined, tillNow?: boolean): PickerColumn[];
 export declare function convertDateToStringArray(date: Date | undefined | null): string[];

package/cjs/components/date-picker/date-picker-date-utils.js

@@ -7,9 +7,9 @@ exports.convertDateToStringArray = convertDateToStringArray;
 exports.convertStringArrayToDate = convertStringArrayToDate;
 exports.generateDatePickerColumns = generateDatePickerColumns;
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isLeapYear = _interopRequireDefault(require("dayjs/plugin/isLeapYear"));
 var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
 var _isoWeeksInYear = _interopRequireDefault(require("dayjs/plugin/isoWeeksInYear"));
-var _isLeapYear = _interopRequireDefault(require("dayjs/plugin/isLeapYear"));
 var _util = require("./util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_isoWeek.default);
@@ -44,6 +44,7 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
   const selectedDay = parseInt(selected[2]);
   const selectedHour = parseInt(selected[3]);
   const selectedMinute = parseInt(selected[4]);
+  const selectedSecond = parseInt(selected[5]);
   const isInMinYear = selectedYear === minYear;
   const isInMaxYear = selectedYear === maxYear;
   const isInMinMonth = isInMinYear && selectedMonth === minMonth;
@@ -76,7 +77,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = maxYear;
     const years = generateColumn(lower, upper, 'year');
     ret.push(years.map(v => ({
-      label: renderLabel('year', v),
+      label: renderLabel('year', v, {
+        selected: selectedYear === v
+      }),
       value: v.toString()
     })));
   }
@@ -85,7 +88,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = isInMaxYear ? maxMonth : 12;
     const months = generateColumn(lower, upper, 'month');
     ret.push(months.map(v => ({
-      label: renderLabel('month', v),
+      label: renderLabel('month', v, {
+        selected: selectedMonth === v
+      }),
       value: v.toString()
     })));
   }
@@ -94,7 +99,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = isInMaxMonth ? maxDay : firstDayInSelectedMonth.daysInMonth();
     const days = generateColumn(lower, upper, 'day');
     ret.push(days.map(v => ({
-      label: renderLabel('day', v),
+      label: renderLabel('day', v, {
+        selected: selectedDay === v
+      }),
       value: v.toString()
     })));
   }
@@ -103,7 +110,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = isInMaxDay ? maxHour : 23;
     const hours = generateColumn(lower, upper, 'hour');
     ret.push(hours.map(v => ({
-      label: renderLabel('hour', v),
+      label: renderLabel('hour', v, {
+        selected: selectedHour === v
+      }),
       value: v.toString()
     })));
   }
@@ -112,7 +121,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = isInMaxHour ? maxMinute : 59;
     const minutes = generateColumn(lower, upper, 'minute');
     ret.push(minutes.map(v => ({
-      label: renderLabel('minute', v),
+      label: renderLabel('minute', v, {
+        selected: selectedMinute === v
+      }),
       value: v.toString()
     })));
   }
@@ -121,14 +132,18 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = isInMaxMinute ? maxSecond : 59;
     const seconds = generateColumn(lower, upper, 'second');
     ret.push(seconds.map(v => ({
-      label: renderLabel('second', v),
+      label: renderLabel('second', v, {
+        selected: selectedSecond === v
+      }),
       value: v.toString()
     })));
   }
   // Till Now
   if (tillNow) {
     ret[0].push({
-      label: renderLabel('now', null),
+      label: renderLabel('now', null, {
+        selected: selected[0] === _util.TILL_NOW
+      }),
       value: _util.TILL_NOW
     });
     if (_util.TILL_NOW === (selected === null || selected === void 0 ? void 0 : selected[0])) {

package/cjs/components/date-picker/date-picker-quarter-utils.d.ts

@@ -2,6 +2,8 @@ import type { ReactNode } from 'react';
 import { PickerColumn } from '../picker';
 import type { DatePickerFilter } from './date-picker-utils';
 export declare type QuarterPrecision = 'year' | 'quarter';
-export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: QuarterPrecision, renderLabel: (type: QuarterPrecision, data: number) => ReactNode, filter: DatePickerFilter | undefined): PickerColumn[];
+export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: QuarterPrecision, renderLabel: (type: QuarterPrecision, data: number, info: {
+    selected: boolean;
+}) => ReactNode, filter: DatePickerFilter | undefined): PickerColumn[];
 export declare function convertDateToStringArray(date: Date | undefined | null): string[];
 export declare function convertStringArrayToDate<T extends string | number | null | undefined>(value: T[]): Date;

package/cjs/components/date-picker/date-picker-quarter-utils.js

@@ -26,6 +26,7 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
   const maxDay = (0, _dayjs.default)(max);
   const minQuarter = minDay.quarter();
   const maxQuarter = maxDay.quarter();
+  const selectedQuarter = parseInt(selected[1]);
   const generateColumn = (from, to, precision) => {
     let column = [];
     for (let i = from; i <= to; i++) {
@@ -48,7 +49,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = maxYear;
     const years = generateColumn(lower, upper, 'year');
     ret.push(years.map(v => ({
-      label: renderLabel('year', v),
+      label: renderLabel('year', v, {
+        selected: selectedYear === v
+      }),
       value: v.toString()
     })));
   }
@@ -57,7 +60,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = isInMaxYear ? maxQuarter : 4;
     const quarters = generateColumn(lower, upper, 'quarter');
     ret.push(quarters.map(v => ({
-      label: renderLabel('quarter', v),
+      label: renderLabel('quarter', v, {
+        selected: selectedQuarter === v
+      }),
       value: v.toString()
     })));
   }

package/cjs/components/date-picker/date-picker-week-utils.d.ts

@@ -2,6 +2,8 @@ import type { ReactNode } from 'react';
 import { PickerColumn } from '../picker';
 import type { DatePickerFilter } from './date-picker-utils';
 export declare type WeekPrecision = 'year' | 'week' | 'week-day';
-export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: WeekPrecision, renderLabel: (type: WeekPrecision, data: number) => ReactNode, filter: DatePickerFilter | undefined): PickerColumn[];
+export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: WeekPrecision, renderLabel: (type: WeekPrecision, data: number, info: {
+    selected: boolean;
+}) => ReactNode, filter: DatePickerFilter | undefined): PickerColumn[];
 export declare function convertDateToStringArray(date: Date | undefined | null): string[];
 export declare function convertStringArrayToDate<T extends string | number | null | undefined>(value: T[]): Date;

package/cjs/components/date-picker/date-picker-week-utils.js

@@ -34,6 +34,7 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
   const minWeekday = minDay.isoWeekday();
   const maxWeekday = maxDay.isoWeekday();
   const selectedWeek = parseInt(selected[1]);
+  const selectedWeekday = parseInt(selected[2]);
   const isInMinWeek = isInMinYear && selectedWeek === minWeek;
   const isInMaxWeek = isInMaxYear && selectedWeek === maxWeek;
   const selectedYearWeeks = (0, _dayjs.default)(`${selectedYear}-01-01`).isoWeeksInYear();
@@ -59,7 +60,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = maxYear;
     const years = generateColumn(lower, upper, 'year');
     ret.push(years.map(v => ({
-      label: renderLabel('year', v),
+      label: renderLabel('year', v, {
+        selected: selectedYear === v
+      }),
       value: v.toString()
     })));
   }
@@ -68,7 +71,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = isInMaxYear ? maxWeek : selectedYearWeeks;
     const weeks = generateColumn(lower, upper, 'week');
     ret.push(weeks.map(v => ({
-      label: renderLabel('week', v),
+      label: renderLabel('week', v, {
+        selected: selectedWeek === v
+      }),
       value: v.toString()
     })));
   }
@@ -77,7 +82,9 @@ function generateDatePickerColumns(selected, min, max, precision, renderLabel, f
     const upper = isInMaxWeek ? maxWeekday : 7;
     const weeks = generateColumn(lower, upper, 'week-day');
     ret.push(weeks.map(v => ({
-      label: renderLabel('week-day', v),
+      label: renderLabel('week-day', v, {
+        selected: selectedWeekday === v
+      }),
       value: v.toString()
     })));
   }
@@ -93,6 +100,7 @@ function convertStringArrayToDate(value) {
   const yearString = (_a = value[0]) !== null && _a !== void 0 ? _a : '1900';
   const weekString = (_b = value[1]) !== null && _b !== void 0 ? _b : '1';
   const weekdayString = (_c = value[2]) !== null && _c !== void 0 ? _c : '1';
-  const day = (0, _dayjs.default)(`${parseInt(yearString)}-01-01`).isoWeek(parseInt(weekString)).isoWeekday(parseInt(weekdayString)).hour(0).minute(0).second(0);
+  // See https://github.com/ant-design/ant-design-mobile/issues/6905
+  const day = (0, _dayjs.default)(`${parseInt(yearString)}-01-04`).isoWeek(parseInt(weekString)).isoWeekday(parseInt(weekdayString)).hour(0).minute(0).second(0);
   return day.toDate();
 }

package/cjs/components/date-picker-view/date-picker-view.d.ts

@@ -1,9 +1,11 @@
 import type { FC, ReactNode } from 'react';
-import type { PickerViewProps } from '../picker-view';
 import { NativeProps } from '../../utils/native-props';
-import type { Precision, DatePickerFilter } from '../date-picker/date-picker-utils';
+import type { DatePickerFilter, Precision } from '../date-picker/date-picker-utils';
 import type { PickerDate } from '../date-picker/util';
-export declare type RenderLabel = (type: Precision | 'now', data: number) => ReactNode;
+import type { PickerViewProps } from '../picker-view';
+export declare type RenderLabel = (type: Precision | 'now', data: number, info: {
+    selected: boolean;
+}) => ReactNode;
 export declare type DatePickerViewProps = Pick<PickerViewProps, 'style' | 'mouseWheel' | 'loading' | 'loadingContent'> & {
     value?: PickerDate;
     defaultValue?: PickerDate;

package/cjs/components/date-picker-view/date-picker-view.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DatePickerView = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _pickerView = _interopRequireDefault(require("../picker-view"));
 var _nativeProps = require("../../utils/native-props");
-var _withDefaultProps = require("../../utils/with-default-props");
 var _usePropsValue = require("../../utils/use-props-value");
+var _withDefaultProps = require("../../utils/with-default-props");
 var _datePickerUtils = require("../date-picker/date-picker-utils");
-var _useRenderLabel = _interopRequireDefault(require("./useRenderLabel"));
 var _util = require("../date-picker/util");
+var _pickerView = _interopRequireDefault(require("../picker-view"));
+var _useRenderLabel = _interopRequireDefault(require("./useRenderLabel"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }

package/cjs/components/date-picker-view/useRenderLabel.js

@@ -10,9 +10,9 @@ function useRenderLabel(renderLabel) {
   const {
     locale
   } = (0, _configProvider.useConfig)();
-  return (0, _react.useCallback)((type, data) => {
+  return (0, _react.useCallback)((type, data, info) => {
     if (renderLabel) {
-      return renderLabel(type, data);
+      return renderLabel(type, data, info);
     }
     // Default render
     switch (type) {

package/cjs/components/ellipsis/ellipsis.d.ts

@@ -11,5 +11,8 @@ export declare type EllipsisProps = {
     stopPropagationForActionButtons?: PropagationEvent[];
     onContentClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     defaultExpanded?: boolean;
+    onExpand?: (expanded: boolean, info: {
+        event: React.MouseEvent<HTMLAnchorElement, MouseEvent>;
+    }) => void;
 } & NativeProps;
 export declare const Ellipsis: FC<EllipsisProps>;

package/cjs/components/ellipsis/ellipsis.js

@@ -39,13 +39,21 @@ const Ellipsis = p => {
   // ========================== Expanded ==========================
   const [expanded, setExpanded] = _react.default.useState(defaultExpanded);
   const expandNode = expandText ? (0, _withStopPropagation.withStopPropagation)(stopPropagationForActionButtons, _react.default.createElement("a", {
-    onClick: () => {
+    onClick: e => {
+      var _a;
       setExpanded(true);
+      (_a = props.onExpand) === null || _a === void 0 ? void 0 : _a.call(props, true, {
+        event: e
+      });
     }
   }, expandText)) : null;
   const collapseNode = collapseText ? (0, _withStopPropagation.withStopPropagation)(stopPropagationForActionButtons, _react.default.createElement("a", {
-    onClick: () => {
+    onClick: e => {
+      var _a;
       setExpanded(false);
+      (_a = props.onExpand) === null || _a === void 0 ? void 0 : _a.call(props, false, {
+        event: e
+      });
     }
   }, collapseText)) : null;
   // ========================== Ellipsis ==========================

package/cjs/components/number-keyboard/number-keyboard.d.ts

@@ -14,5 +14,5 @@ export declare type NumberKeyboardProps = {
     onConfirm?: () => void;
     closeOnConfirm?: boolean;
     safeArea?: boolean;
-} & Pick<PopupProps, 'afterClose' | 'afterShow' | 'getContainer' | 'destroyOnClose' | 'forceRender' | 'stopPropagation'> & NativeProps;
+} & Pick<PopupProps, 'afterClose' | 'afterShow' | 'getContainer' | 'destroyOnClose' | 'forceRender' | 'stopPropagation'> & NativeProps<'--adm-safe-area-multiple'>;
 export declare const NumberKeyboard: FC<NumberKeyboardProps>;

package/cjs/components/popover/wrapper.d.ts

@@ -1,10 +1,7 @@
-import React from 'react';
-import type { ReactNode } from 'react';
-export declare class Wrapper extends React.Component<{
-    children?: ReactNode;
-}, {}> {
-    element: Element | null;
-    componentDidMount(): void;
-    componentDidUpdate(): void;
-    render(): React.ReactNode;
+import * as React from 'react';
+export interface WrapperRef {
+    element: HTMLElement;
 }
+export declare const Wrapper: React.ForwardRefExoticComponent<{
+    children?: React.ReactNode;
+} & React.RefAttributes<WrapperRef>>;

package/cjs/components/popover/wrapper.js

@@ -4,10 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Wrapper = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _reactDom = require("react-dom");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-class Wrapper extends _react.default.Component {
+var _findDOMNode = _interopRequireWildcard(require("rc-util/lib/Dom/findDOMNode"));
+var _ref = require("rc-util/lib/ref");
+var React = _interopRequireWildcard(require("react"));
+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; }
+class LegacyWrapper extends React.Component {
   constructor() {
     super(...arguments);
     this.element = null;
@@ -17,7 +19,7 @@ class Wrapper extends _react.default.Component {
   }
   componentDidUpdate() {
     // eslint-disable-next-line
-    const node = (0, _reactDom.findDOMNode)(this);
+    const node = (0, _findDOMNode.default)(this);
     if (node instanceof Element) {
       this.element = node;
     } else {
@@ -25,7 +27,31 @@ class Wrapper extends _react.default.Component {
     }
   }
   render() {
-    return _react.default.Children.only(this.props.children);
+    return this.props.children;
   }
 }
+const Wrapper = React.forwardRef(({
+  children
+}, ref) => {
+  const elementRef = React.useRef(null);
+  const legacyWrapperRef = React.createRef();
+  const child = React.Children.only(children);
+  const canUseRef = (0, _ref.supportRef)(children);
+  const getElement = () => {
+    var _a;
+    if (canUseRef) {
+      return (0, _findDOMNode.getDOM)(elementRef.current);
+    }
+    return (_a = legacyWrapperRef.current) === null || _a === void 0 ? void 0 : _a.element;
+  };
+  React.useImperativeHandle(ref, () => ({
+    element: getElement()
+  }));
+  const composedRef = (0, _ref.composeRef)(elementRef, (0, _ref.getNodeRef)(child));
+  return canUseRef ? React.cloneElement(child, {
+    ref: composedRef
+  }) : React.createElement(LegacyWrapper, {
+    ref: legacyWrapperRef
+  }, child);
+});
 exports.Wrapper = Wrapper;

package/cjs/components/space/space.css

@@ -19,12 +19,12 @@
 .adm-space-horizontal {
   flex-direction: row;
 }
+.adm-space-horizontal:not(:empty) {
+  margin-right: calc(var(--gap-horizontal) * -1);
+}
 .adm-space-horizontal > .adm-space-item {
   margin-right: var(--gap-horizontal);
 }
-.adm-space-horizontal > .adm-space-item:last-child {
-  margin-right: 0;
-}
 .adm-space-horizontal.adm-space-wrap {
   flex-wrap: wrap;
   margin-bottom: calc(var(--gap-vertical) * -1);

package/cjs/components/swiper/swiper.js

@@ -279,7 +279,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
         return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("div", {
           className: `${classPrefix}-slide-placeholder`,
           style: {
-            width: `${startIndex * 100}%`
+            [isVertical ? 'height' : 'width']: `${startIndex * 100}%`
           }
         }), items);
       }

package/cjs/components/tabs/tabs.js

@@ -4,22 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Tabs = exports.Tab = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
 var _web = require("@react-spring/web");
-var _nativeProps = require("../../utils/native-props");
-var _usePropsValue = require("../../utils/use-props-value");
-var _bound = require("../../utils/bound");
 var _ahooks = require("ahooks");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _react = _interopRequireWildcard(require("react"));
+var _bound = require("../../utils/bound");
+var _nativeProps = require("../../utils/native-props");
+var _shouldRender = require("../../utils/should-render");
+var _traverseReactNode = require("../../utils/traverse-react-node");
+var _useIsomorphicUpdateLayoutEffect = require("../../utils/use-isomorphic-update-layout-effect");
 var _useMutationEffect = require("../../utils/use-mutation-effect");
+var _usePropsValue = require("../../utils/use-props-value");
 var _useResizeEffect = require("../../utils/use-resize-effect");
 var _withDefaultProps = require("../../utils/with-default-props");
-var _useIsomorphicUpdateLayoutEffect = require("../../utils/use-isomorphic-update-layout-effect");
-var _shouldRender = require("../../utils/should-render");
-var _traverseReactNode = require("../../utils/traverse-react-node");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = `adm-tabs`;
 const Tab = () => {
   return null;
@@ -35,6 +35,7 @@ const Tabs = p => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const tabListContainerRef = (0, _react.useRef)(null);
   const activeLineRef = (0, _react.useRef)(null);
+  const tabRefs = (0, _react.useRef)({});
   const keyToIndexRecord = {};
   let firstActiveKey = null;
   const panes = [];
@@ -176,7 +177,7 @@ const Tabs = p => {
   });
   const {
     run: updateMask
-  } = (0, _ahooks.useThrottleFn)((immediate = false) => {
+  } = (0, _ahooks.useThrottleFn)(immediate => {
     const container = tabListContainerRef.current;
     if (!container) return;
     const scrollLeft = container.scrollLeft;
@@ -207,6 +208,34 @@ const Tabs = p => {
   (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     updateMask(true);
   }, []);
+  const handleKeyDown = e => {
+    const keys = Object.keys(keyToIndexRecord);
+    const currentIndex = keyToIndexRecord[activeKey];
+    const isNext = isRTL ? e.key === 'ArrowLeft' : e.key === 'ArrowRight';
+    const isPrev = isRTL ? e.key === 'ArrowRight' : e.key === 'ArrowLeft';
+    const offsetDirection = isNext ? 1 : -1;
+    const findNextEnabledTab = (startIndex, direction) => {
+      const length = keys.length;
+      for (let i = 0; i < length; i++) {
+        const index = (startIndex + direction * (i + 1) + length) % length;
+        const key = keys[index];
+        const pane = panes.find(p => p.key === key);
+        if (!(pane === null || pane === void 0 ? void 0 : pane.props.disabled)) return key;
+      }
+      return keys[startIndex];
+    };
+    const currentKey = findNextEnabledTab(currentIndex, offsetDirection);
+    if (isNext || isPrev) {
+      e.preventDefault();
+      setActiveKey(currentKey);
+    }
+  };
+  (0, _react.useEffect)(() => {
+    var _a;
+    if (activeKey && tabRefs.current[activeKey]) {
+      (_a = tabRefs.current[activeKey]) === null || _a === void 0 ? void 0 : _a.focus();
+    }
+  }, [activeKey]);
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix,
     style: {
@@ -229,6 +258,7 @@ const Tabs = p => {
     ref: tabListContainerRef,
     scrollLeft: scrollLeft,
     onScroll: updateMask,
+    onKeyDown: handleKeyDown,
     role: 'tablist'
   }, _react.default.createElement(_web.animated.div, {
     ref: activeLineRef,
@@ -243,6 +273,10 @@ const Tabs = p => {
       [`${classPrefix}-tab-wrapper-stretch`]: props.stretch
     })
   }, _react.default.createElement("div", {
+    role: 'tab',
+    "aria-selected": pane.key === activeKey,
+    tabIndex: pane.key === activeKey ? 0 : -1,
+    ref: el => tabRefs.current[pane.key] = el,
     onClick: () => {
       const {
         key
@@ -256,9 +290,7 @@ const Tabs = p => {
     className: (0, _classnames.default)(`${classPrefix}-tab`, {
       [`${classPrefix}-tab-active`]: pane.key === activeKey,
       [`${classPrefix}-tab-disabled`]: pane.props.disabled
-    }),
-    role: 'tab',
-    "aria-selected": pane.key === activeKey
+    })
   }, pane.props.title)))))), panes.map(pane => {
     if (pane.props.children === undefined) {
       return null;

package/cjs/components/virtual-input/virtual-input.css

@@ -26,8 +26,10 @@
   z-index: 1;
   width: 100%;
   max-width: 100%;
+  min-height: 1.5em;
   overflow-y: hidden;
   overflow-x: scroll;
+  letter-spacing: 1px;
   scrollbar-width: none;
 }
 .adm-virtual-input-content::-webkit-scrollbar {
@@ -50,6 +52,7 @@
   height: 1.3em;
   vertical-align: top;
   margin-right: 1px;
+  position: absolute;
 }
 .adm-virtual-input-caret {
   width: 100%;
@@ -62,7 +65,6 @@
   outline: none;
 }
 .adm-virtual-input:focus .adm-virtual-input-caret {
-  display: block;
   animation-name: adm-caret-blink;
   animation-duration: 1s;
   animation-timing-function: linear;
@@ -71,6 +73,9 @@
 .adm-virtual-input-disabled {
   color: var(--disabled-color);
 }
+.adm-virtual-input-caret-dragging .adm-virtual-input-caret {
+  animation: none !important;
+}
 @keyframes adm-caret-blink {
   from {
     opacity: 1;

package/cjs/components/virtual-input/virtual-input.d.ts

@@ -3,6 +3,10 @@ import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 import type { InputProps } from '../input';
 import { NumberKeyboardProps } from '../number-keyboard';
+export declare type Cursor = {
+    movable?: boolean;
+    onMove?: (position: number) => void;
+};
 export declare type VirtualInputProps = {
     onFocus?: () => void;
     onBlur?: () => void;
@@ -10,6 +14,7 @@ export declare type VirtualInputProps = {
     keyboard?: ReactElement<NumberKeyboardProps>;
     clearable?: boolean;
     onClear?: () => void;
+    cursor?: Cursor;
 } & Pick<InputProps, 'value' | 'onChange' | 'placeholder' | 'disabled' | 'clearIcon'> & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color' | '--text-align' | '--caret-width' | '--caret-color'>;
 export declare type VirtualInputRef = {
     focus: () => void;
@@ -22,6 +27,7 @@ export declare const VirtualInput: React.ForwardRefExoticComponent<{
     keyboard?: ReactElement<NumberKeyboardProps, string | React.JSXElementConstructor<any>> | undefined;
     clearable?: boolean | undefined;
     onClear?: (() => void) | undefined;
+    cursor?: Cursor | undefined;
 } & Pick<InputProps, "value" | "onChange" | "disabled" | "placeholder" | "clearIcon"> & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--caret-width" | "--caret-color", string>>) | undefined;