antd-mobile 5.37.0 → 5.38.0

package/2x/es/components/calendar-picker-view/calendar-picker-view.js

@@ -1,16 +1,20 @@
-import React, { forwardRef, useState, useImperativeHandle, useMemo } from 'react';
-import { withNativeProps } from '../../utils/native-props';
-import dayjs from 'dayjs';
 import classNames from 'classnames';
-import { mergeProps } from '../../utils/with-default-props';
-import { useConfig } from '../config-provider';
+import dayjs from 'dayjs';
 import isoWeek from 'dayjs/plugin/isoWeek';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
+import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
-import { convertValueToRange, convertPageToDayjs } from './convert';
+import { mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
+import { convertPageToDayjs, convertValueToRange } from './convert';
+import useSyncScroll from './useSyncScroll';
 dayjs.extend(isoWeek);
 dayjs.extend(isSameOrBefore);
 const classPrefix = 'adm-calendar-picker-view';
+export const Context = React.createContext({
+  visible: false
+});
 const defaultProps = {
   weekStartsOn: 'Sunday',
   defaultValue: null,
@@ -20,6 +24,7 @@ const defaultProps = {
 };
 export const CalendarPickerView = forwardRef((p, ref) => {
   var _a;
+  const bodyRef = useRef(null);
   const today = dayjs();
   const props = mergeProps(defaultProps, p);
   const {
@@ -44,6 +49,34 @@ export const CalendarPickerView = forwardRef((p, ref) => {
   });
   const [intermediate, setIntermediate] = useState(false);
   const [current, setCurrent] = useState(() => dayjs(dateRange ? dateRange[0] : today).date(1));
+  const onDateChange = v => {
+    if (v) {
+      setCurrent(dayjs(v[0]).date(1));
+    }
+    setDateRange(v);
+  };
+  const showHeader = props.title !== false;
+  // =============================== Scroll ===============================
+  const context = useContext(Context);
+  const scrollTo = useSyncScroll(current, context.visible, bodyRef);
+  // ============================== Boundary ==============================
+  // 记录默认的 min 和 max，并在外部的值超出边界时自动扩充
+  const [defaultMin, setDefaultMin] = useState(current);
+  const [defaultMax, setDefaultMax] = useState(() => current.add(6, 'month'));
+  useEffect(() => {
+    if (dateRange) {
+      const [startDate, endDate] = dateRange;
+      if (!props.min && startDate && dayjs(startDate).isBefore(defaultMin)) {
+        setDefaultMin(dayjs(startDate).date(1));
+      }
+      if (!props.max && endDate && dayjs(endDate).isAfter(defaultMax)) {
+        setDefaultMax(dayjs(endDate).endOf('month'));
+      }
+    }
+  }, [dateRange]);
+  const maxDay = useMemo(() => props.max ? dayjs(props.max) : defaultMax, [props.max, defaultMax]);
+  const minDay = useMemo(() => props.min ? dayjs(props.min) : defaultMin, [props.min, defaultMin]);
+  // ================================ Refs ================================
   useImperativeHandle(ref, () => ({
     jumpTo: pageOrPageGenerator => {
       let page;
@@ -55,20 +88,23 @@ export const CalendarPickerView = forwardRef((p, ref) => {
       } else {
         page = pageOrPageGenerator;
       }
-      setCurrent(convertPageToDayjs(page));
+      const next = convertPageToDayjs(page);
+      setCurrent(next);
+      scrollTo(next);
     },
     jumpToToday: () => {
-      setCurrent(dayjs().date(1));
+      const next = dayjs().date(1);
+      setCurrent(next);
+      scrollTo(next);
     },
     getDateRange: () => dateRange
   }));
+  // =============================== Render ===============================
   const header = React.createElement("div", {
     className: `${classPrefix}-header`
   }, React.createElement("div", {
     className: `${classPrefix}-title`
   }, (_a = props.title) !== null && _a !== void 0 ? _a : locale.Calendar.title));
-  const maxDay = useMemo(() => props.max ? dayjs(props.max) : current.add(6, 'month'), [props.max, current]);
-  const minDay = useMemo(() => props.min ? dayjs(props.min) : current, [props.min, current]);
   function renderBody() {
     var _a;
     const cells = [];
@@ -76,13 +112,21 @@ export const CalendarPickerView = forwardRef((p, ref) => {
     // 遍历月份
     while (monthIterator.isSameOrBefore(maxDay, 'month')) {
       const year = monthIterator.year();
-      const month = monthIterator.month();
+      const month = monthIterator.month() + 1;
       const renderMap = {
         year,
-        month: month + 1
+        month
       };
+      const yearMonth = `${year}-${month}`;
+      // 获取需要预先填充的空格，如果是 7 天则不需要填充
+      const presetEmptyCellCount = props.weekStartsOn === 'Monday' ? monthIterator.date(1).isoWeekday() - 1 : monthIterator.date(1).isoWeekday();
+      const presetEmptyCells = presetEmptyCellCount == 7 ? null : Array(presetEmptyCellCount).fill(null).map((_, index) => React.createElement("div", {
+        key: index,
+        className: `${classPrefix}-cell`
+      }));
       cells.push(React.createElement("div", {
-        key: `${year}-${month}`
+        key: yearMonth,
+        "data-year-month": yearMonth
       }, React.createElement("div", {
         className: `${classPrefix}-title`
       }, (_a = locale.Calendar.yearAndMonth) === null || _a === void 0 ? void 0 : _a.replace(/\${(.*?)}/g, (_, variable) => {
@@ -90,10 +134,7 @@ export const CalendarPickerView = forwardRef((p, ref) => {
         return (_a = renderMap[variable]) === null || _a === void 0 ? void 0 : _a.toString();
       })), React.createElement("div", {
         className: `${classPrefix}-cells`
-      }, Array(props.weekStartsOn === 'Monday' ? monthIterator.date(1).isoWeekday() - 1 : monthIterator.date(1).isoWeekday()).fill(null).map((_, index) => React.createElement("div", {
-        key: index,
-        className: `${classPrefix}-cell`
-      })), Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
+      }, presetEmptyCells, Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
         var _a;
         const d = monthIterator.date(index + 1);
         let isSelect = false;
@@ -153,27 +194,27 @@ export const CalendarPickerView = forwardRef((p, ref) => {
             }
             if (props.selectionMode === 'single') {
               if (props.allowClear && shouldClear()) {
-                setDateRange(null);
+                onDateChange(null);
                 return;
               }
-              setDateRange([date, date]);
+              onDateChange([date, date]);
             } else if (props.selectionMode === 'range') {
               if (!dateRange) {
-                setDateRange([date, date]);
+                onDateChange([date, date]);
                 setIntermediate(true);
                 return;
               }
               if (shouldClear()) {
-                setDateRange(null);
+                onDateChange(null);
                 setIntermediate(false);
                 return;
               }
               if (intermediate) {
                 const another = dateRange[0];
-                setDateRange(another > date ? [date, another] : [another, date]);
+                onDateChange(another > date ? [date, another] : [another, date]);
                 setIntermediate(false);
               } else {
-                setDateRange([date, date]);
+                onDateChange([date, date]);
                 setIntermediate(true);
               }
             }
@@ -191,7 +232,8 @@ export const CalendarPickerView = forwardRef((p, ref) => {
     return cells;
   }
   const body = React.createElement("div", {
-    className: `${classPrefix}-body`
+    className: `${classPrefix}-body`,
+    ref: bodyRef
   }, renderBody());
   const mark = React.createElement("div", {
     className: `${classPrefix}-mark`
@@ -201,5 +243,5 @@ export const CalendarPickerView = forwardRef((p, ref) => {
   }, item)));
   return withNativeProps(props, React.createElement("div", {
     className: classPrefix
-  }, header, mark, body));
+  }, showHeader && header, mark, body));
 });

package/2x/es/components/calendar-picker-view/useSyncScroll.d.ts

@@ -0,0 +1,2 @@
+import type { Dayjs } from 'dayjs';
+export default function useSyncScroll(current: Dayjs, visible: boolean, bodyRef: React.RefObject<HTMLDivElement>): (date: Dayjs) => void;

package/2x/es/components/calendar-picker-view/useSyncScroll.js

@@ -0,0 +1,33 @@
+import { useEvent } from 'rc-util';
+import { useEffect, useRef } from 'react';
+export default function useSyncScroll(current, visible, bodyRef) {
+  const rafRef = useRef();
+  const clean = () => {
+    if (rafRef.current) {
+      cancelAnimationFrame(rafRef.current);
+    }
+  };
+  const scrollTo = useEvent(date => {
+    clean();
+    rafRef.current = requestAnimationFrame(() => {
+      if (bodyRef.current) {
+        const yearMonth = date.format('YYYY-M');
+        const target = bodyRef.current.querySelector(`[data-year-month="${yearMonth}"]`);
+        if (target) {
+          // Scroll to the top of view
+          target.scrollIntoView({
+            block: 'start',
+            inline: 'nearest'
+          });
+        }
+      }
+    });
+  });
+  useEffect(() => {
+    if (visible && current) {
+      scrollTo(current);
+      return clean;
+    }
+  }, [current, visible]);
+  return scrollTo;
+}

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

@@ -9,6 +9,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  gap: var(--adm-card-header-gap, 16px);
   box-sizing: border-box;
   padding: var(--adm-card-header-padding-block, 24px) 0;
 }

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

@@ -1,8 +1,9 @@
+import type { CSSProperties, FC, ReactNode } from 'react';
 import React from 'react';
-import type { FC, ReactNode, CSSProperties } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type CardProps = {
     title?: ReactNode;
+    icon?: ReactNode;
     extra?: ReactNode;
     headerStyle?: CSSProperties;
     headerClassName?: string;

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

@@ -1,5 +1,5 @@
-import React from 'react';
 import classNames from 'classnames';
+import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
 const classPrefix = `adm-card`;
 export const Card = props => {
@@ -11,9 +11,13 @@ export const Card = props => {
       className: classNames(`${classPrefix}-header`, props.headerClassName),
       style: props.headerStyle,
       onClick: props.onHeaderClick
-    }, React.createElement("div", {
+    }, props.icon && React.createElement("div", {
+      className: `${classPrefix}-header-icon`
+    }, props.icon), React.createElement("div", {
       className: `${classPrefix}-header-title`
-    }, props.title), props.extra);
+    }, props.title), props.extra && React.createElement("div", {
+      className: `${classPrefix}-header-extra`
+    }, props.extra));
   };
   const renderBody = () => {
     if (!props.children) {

package/2x/es/components/card/card.patch.css

@@ -16,6 +16,14 @@
   font-size: 30px;
 }
 
+.adm-card-header-icon {
+  margin-right: 16px;
+}
+
+.adm-card-header-extra {
+  margin-left: 16px;
+}
+
 .adm-card-body {
   padding: 24px 0;
 }

package/2x/es/components/date-picker/date-picker-quarter-utils.d.ts

@@ -0,0 +1,7 @@
+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 convertDateToStringArray(date: Date | undefined | null): string[];
+export declare function convertStringArrayToDate<T extends string | number | null | undefined>(value: T[]): Date;

package/2x/es/components/date-picker/date-picker-quarter-utils.js

@@ -0,0 +1,68 @@
+import dayjs from 'dayjs';
+import quarterOfYear from 'dayjs/plugin/quarterOfYear';
+dayjs.extend(quarterOfYear);
+const precisionRankRecord = {
+  year: 0,
+  quarter: 1
+};
+export function generateDatePickerColumns(selected, min, max, precision, renderLabel, filter) {
+  const ret = [];
+  const minYear = min.getFullYear();
+  const maxYear = max.getFullYear();
+  const rank = precisionRankRecord[precision];
+  const selectedYear = parseInt(selected[0]);
+  const isInMinYear = selectedYear === minYear;
+  const isInMaxYear = selectedYear === maxYear;
+  const minDay = dayjs(min);
+  const maxDay = dayjs(max);
+  const minQuarter = minDay.quarter();
+  const maxQuarter = maxDay.quarter();
+  const generateColumn = (from, to, precision) => {
+    let column = [];
+    for (let i = from; i <= to; i++) {
+      column.push(i);
+    }
+    const prefix = selected.slice(0, precisionRankRecord[precision]);
+    const currentFilter = filter === null || filter === void 0 ? void 0 : filter[precision];
+    if (currentFilter && typeof currentFilter === 'function') {
+      column = column.filter(i => currentFilter(i, {
+        get date() {
+          const stringArray = [...prefix, i.toString()];
+          return convertStringArrayToDate(stringArray);
+        }
+      }));
+    }
+    return column;
+  };
+  if (rank >= precisionRankRecord.year) {
+    const lower = minYear;
+    const upper = maxYear;
+    const years = generateColumn(lower, upper, 'year');
+    ret.push(years.map(v => ({
+      label: renderLabel('year', v),
+      value: v.toString()
+    })));
+  }
+  if (rank >= precisionRankRecord.quarter) {
+    const lower = isInMinYear ? minQuarter : 1;
+    const upper = isInMaxYear ? maxQuarter : 4;
+    const quarters = generateColumn(lower, upper, 'quarter');
+    ret.push(quarters.map(v => ({
+      label: renderLabel('quarter', v),
+      value: v.toString()
+    })));
+  }
+  return ret;
+}
+export function convertDateToStringArray(date) {
+  if (!date) return [];
+  const day = dayjs(date);
+  return [day.year().toString(), day.quarter().toString()];
+}
+export function convertStringArrayToDate(value) {
+  var _a, _b;
+  const yearString = (_a = value[0]) !== null && _a !== void 0 ? _a : '1900';
+  const quarterString = (_b = value[1]) !== null && _b !== void 0 ? _b : '1';
+  const day = dayjs().year(parseInt(yearString)).quarter(parseInt(quarterString)).hour(0).minute(0).second(0);
+  return day.toDate();
+}

package/2x/es/components/date-picker/date-picker-utils.d.ts

@@ -1,7 +1,8 @@
+import { RenderLabel } from '../date-picker-view/date-picker-view';
 import type { DatePrecision } from './date-picker-date-utils';
+import type { QuarterPrecision } from './date-picker-quarter-utils';
 import type { WeekPrecision } from './date-picker-week-utils';
-import { RenderLabel } from '../date-picker-view/date-picker-view';
-export declare type Precision = DatePrecision | WeekPrecision;
+export declare type Precision = DatePrecision | WeekPrecision | QuarterPrecision;
 export declare type DatePickerFilter = Partial<Record<Precision, (val: number, extend: {
     date: Date;
 }) => boolean>>;

package/2x/es/components/date-picker/date-picker-utils.js

@@ -1,4 +1,5 @@
 import * as dateUtils from './date-picker-date-utils';
+import * as quarterUtils from './date-picker-quarter-utils';
 import * as weekUtils from './date-picker-week-utils';
 import { TILL_NOW } from './util';
 const precisionLengthRecord = {
@@ -12,6 +13,8 @@ const precisionLengthRecord = {
 export const convertDateToStringArray = (date, precision) => {
   if (precision.includes('week')) {
     return weekUtils.convertDateToStringArray(date);
+  } else if (precision.includes('quarter')) {
+    return quarterUtils.convertDateToStringArray(date);
   } else {
     const datePrecision = precision;
     const stringArray = dateUtils.convertDateToStringArray(date);
@@ -27,6 +30,8 @@ export const convertStringArrayToDate = (value, precision) => {
   }
   if (precision.includes('week')) {
     return weekUtils.convertStringArrayToDate(value);
+  } else if (precision.includes('quarter')) {
+    return quarterUtils.convertStringArrayToDate(value);
   } else {
     return dateUtils.convertStringArrayToDate(value);
   }
@@ -34,6 +39,8 @@ export const convertStringArrayToDate = (value, precision) => {
 export const generateDatePickerColumns = (selected, min, max, precision, renderLabel, filter, tillNow) => {
   if (precision.startsWith('week')) {
     return weekUtils.generateDatePickerColumns(selected, min, max, precision, renderLabel, filter);
+  } else if (precision.startsWith('quarter')) {
+    return quarterUtils.generateDatePickerColumns(selected, min, max, precision, renderLabel, filter);
   } else {
     return dateUtils.generateDatePickerColumns(selected, min, max, precision, renderLabel, filter, tillNow);
   }

package/2x/es/components/image-uploader/image-uploader.js

@@ -218,14 +218,14 @@ export const ImageUploader = forwardRef((p, ref) => {
   }, React.createElement("span", {
     className: `${classPrefix}-upload-button-icon`
   }, React.createElement(AddOutline, null))), !props.disableUpload && React.createElement("input", {
+    "aria-label": locale.ImageUploader.upload,
     ref: inputRef,
     capture: props.capture,
     accept: props.accept,
     multiple: props.multiple,
     type: 'file',
     className: `${classPrefix}-input`,
-    onChange: onChange,
-    "aria-hidden": true
+    onChange: onChange
   })));
   useImperativeHandle(ref, () => ({
     get nativeElement() {

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

@@ -4,7 +4,7 @@ declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttribute
 declare type AriaProps = {
     role?: string;
 };
-export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick' | 'step' | 'id' | 'placeholder' | 'readOnly' | 'disabled' | 'enterKeyHint'> & {
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'onPaste' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick' | 'step' | 'id' | 'placeholder' | 'readOnly' | 'disabled' | 'enterKeyHint'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -22,7 +22,7 @@ export declare type InputRef = {
     blur: () => void;
     nativeElement: HTMLInputElement | null;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "id" | "onClick" | "disabled" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "type" | "step" | "autoFocus" | "placeholder" | "autoCapitalize" | "autoCorrect" | "inputMode" | "name" | "readOnly" | "autoComplete" | "enterKeyHint" | "maxLength" | "minLength"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "id" | "onClick" | "disabled" | "onPaste" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "type" | "step" | "autoFocus" | "placeholder" | "autoCapitalize" | "autoCorrect" | "inputMode" | "name" | "readOnly" | "autoComplete" | "enterKeyHint" | "maxLength" | "minLength"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;

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

@@ -87,6 +87,7 @@ export const Input = forwardRef((props, ref) => {
       checkValue();
       (_a = mergedProps.onBlur) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
     },
+    onPaste: mergedProps.onPaste,
     id: mergedProps.id,
     placeholder: mergedProps.placeholder,
     disabled: mergedProps.disabled,

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

@@ -2,22 +2,22 @@ import { LeftOutline } from 'antd-mobile-icons';
 import classNames from 'classnames';
 import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
-import { mergeProps } from '../../utils/with-default-props';
+import { mergeProp, mergeProps } from '../../utils/with-default-props';
 import { useConfig } from '../config-provider';
 const classPrefix = `adm-nav-bar`;
-const defaultProps = {
-  backIcon: true
-};
+const defaultBackIcon = React.createElement(LeftOutline, null);
 export const NavBar = props => {
   const {
     navBar: componentConfig = {}
   } = useConfig();
-  const mergedProps = mergeProps(defaultProps, componentConfig, props);
+  const mergedProps = mergeProps(componentConfig, props);
   const {
     back,
     backIcon,
     backArrow
   } = mergedProps;
+  const mergedDefaultBackIcon = componentConfig.backIcon || defaultBackIcon;
+  const mergedBackIcon = mergeProp(defaultBackIcon, componentConfig.backIcon, backArrow === true ? mergedDefaultBackIcon : backArrow, backIcon === true ? mergedDefaultBackIcon : backIcon);
   return withNativeProps(mergedProps, React.createElement("div", {
     className: classNames(classPrefix)
   }, React.createElement("div", {
@@ -26,9 +26,9 @@ export const NavBar = props => {
   }, back !== null && React.createElement("div", {
     className: `${classPrefix}-back`,
     onClick: mergedProps.onBack
-  }, (backIcon || backArrow) && React.createElement("span", {
+  }, mergedBackIcon && React.createElement("span", {
     className: `${classPrefix}-back-arrow`
-  }, backIcon === true || backArrow === true ? componentConfig.backIcon || React.createElement(LeftOutline, null) : backIcon || backArrow), React.createElement("span", {
+  }, mergedBackIcon), React.createElement("span", {
     "aria-hidden": 'true'
   }, back)), mergedProps.left), React.createElement("div", {
     className: `${classPrefix}-title`

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

@@ -5,6 +5,8 @@
   --font-size: var(--adm-font-size-7);
   --icon-font-size: var(--adm-font-size-10);
   --height: 80px;
+  --adm-notice-bar-border-radius: 8px;
+  --adm-notice-bar-border-width: 2px;
   height: var(--height);
   box-sizing: border-box;
   font-size: var(--font-size);
@@ -12,9 +14,9 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  border: solid 2px var(--border-color);
-  border-left: none;
-  border-right: none;
+  border: solid var(--adm-notice-bar-border-width) var(--border-color);
+  border-left-width: 0;
+  border-right-width: 0;
   background-color: var(--background-color);
   color: var(--text-color);
 }
@@ -32,7 +34,7 @@
 .adm-notice-bar.adm-notice-bar-error {
   --background-color: var(--adm-color-danger);
   --border-color: #d9281e;
-  --text-color: #ffffff;
+  --text-color: #fff;
 }
 
 .adm-notice-bar.adm-notice-bar-info {
@@ -41,6 +43,12 @@
   --text-color: var(--adm-color-primary);
 }
 
+.adm-notice-bar.adm-notice-bar-success {
+  --background-color: #d1fff0;
+  --border-color: #a8f0d8;
+  --text-color: var(--adm-color-success);
+}
+
 .adm-notice-bar .adm-notice-bar-left {
   flex-shrink: 0;
   margin-right: 16px;
@@ -89,4 +97,22 @@
   padding-top: 16px;
   padding-bottom: 16px;
   line-height: 44px;
+}
+
+.adm-notice-bar-neutral {
+  border-radius: var(--adm-notice-bar-border-radius);
+}
+
+.adm-notice-bar-rounded {
+  border-radius: 2000px;
+}
+
+.adm-notice-bar-bordered {
+  border-left-width: var(--adm-notice-bar-border-width);
+  border-right-width: var(--adm-notice-bar-border-width);
+}
+
+.adm-notice-bar-without-border {
+  border-top-width: 0;
+  border-bottom-width: 0;
 }

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

@@ -3,7 +3,7 @@ import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type NoticeBarProps = {
     /** The type of the NoticeBar */
-    color?: 'default' | 'alert' | 'error' | 'info';
+    color?: 'default' | 'alert' | 'error' | 'success' | 'info';
     /** TDelay to start scrolling, unit ms */
     delay?: number;
     /** Scroll speed, unit px/s */
@@ -24,5 +24,9 @@ export declare type NoticeBarProps = {
     icon?: ReactNode;
     /** Whether to display multiple lines */
     wrap?: boolean;
+    /** Block shape */
+    shape?: 'rectangular' | 'neutral' | 'rounded';
+    /** Border visibility */
+    bordered?: 'block' | boolean;
 } & 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

@@ -13,7 +13,9 @@ const defaultProps = {
   delay: 2000,
   speed: 50,
   icon: React.createElement(SoundOutline, null),
-  wrap: false
+  wrap: false,
+  shape: 'rectangular',
+  bordered: 'block'
 };
 export const NoticeBar = memo(props => {
   const {
@@ -69,8 +71,10 @@ export const NoticeBar = memo(props => {
   });
   if (!visible) return null;
   return withNativeProps(mergedProps, React.createElement("div", {
-    className: classNames(classPrefix, `${classPrefix}-${mergedProps.color}`, {
-      [`${classPrefix}-wrap`]: mergedProps.wrap
+    className: classNames(classPrefix, `${classPrefix}-${mergedProps.color}`, `${classPrefix}-${mergedProps.shape}`, {
+      [`${classPrefix}-wrap`]: mergedProps.wrap,
+      [`${classPrefix}-bordered`]: mergedProps.bordered === true,
+      [`${classPrefix}-without-border`]: mergedProps.bordered === false
     }),
     onClick: mergedProps.onClick
   }, mergedProps.icon && React.createElement("span", {

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

@@ -3,7 +3,7 @@ import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { InputProps, InputRef } from '../input';
 export declare type SearchBarRef = InputRef;
-export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'onClear' | 'onCompositionStart' | 'onCompositionEnd'> & {
+export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'onClear' | 'onCompositionStart' | 'onCompositionEnd' | 'autoFocus'> & {
     value?: string;
     defaultValue?: string;
     maxLength?: number;
@@ -22,7 +22,7 @@ export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'on
     onChange?: (val: string) => void;
     onCancel?: () => void;
 } & NativeProps<'--background' | '--border-radius' | '--placeholder-color' | '--height' | '--padding-left'>;
-export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps, "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onClear"> & {
+export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps, "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoFocus" | "onClear"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     maxLength?: number | undefined;

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

@@ -87,6 +87,7 @@ export const SearchBar = forwardRef((props, ref) => {
     value: value,
     onChange: setValue,
     maxLength: mergedProps.maxLength,
+    autoFocus: mergedProps.autoFocus,
     placeholder: mergedProps.placeholder,
     clearable: mergedProps.clearable,
     onlyShowClearWhenFocus: mergedProps.onlyShowClearWhenFocus,

package/2x/es/components/segmented/index.d.ts

@@ -0,0 +1,4 @@
+import './segmented.less';
+import { Segmented } from './segmented';
+export type { SegmentedProps, SegmentedValue } from './segmented';
+export default Segmented;

package/2x/es/components/segmented/index.js

@@ -0,0 +1,3 @@
+import "./segmented.css";
+import { Segmented } from './segmented';
+export default Segmented;