antd-mobile 5.36.0 → 5.37.0

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

@@ -4,38 +4,43 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NavBar = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
 var _antdMobileIcons = require("antd-mobile-icons");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _react = _interopRequireDefault(require("react"));
 var _nativeProps = require("../../utils/native-props");
 var _withDefaultProps = require("../../utils/with-default-props");
+var _configProvider = require("../config-provider");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = `adm-nav-bar`;
 const defaultProps = {
-  backArrow: true
+  backIcon: true
 };
-const NavBar = p => {
-  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+const NavBar = props => {
+  const {
+    navBar: componentConfig = {}
+  } = (0, _configProvider.useConfig)();
+  const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, props);
   const {
     back,
+    backIcon,
     backArrow
-  } = props;
-  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+  } = mergedProps;
+  return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
     className: (0, _classnames.default)(classPrefix)
   }, _react.default.createElement("div", {
     className: `${classPrefix}-left`,
     role: 'button'
   }, back !== null && _react.default.createElement("div", {
     className: `${classPrefix}-back`,
-    onClick: props.onBack
-  }, backArrow && _react.default.createElement("span", {
+    onClick: mergedProps.onBack
+  }, (backIcon || backArrow) && _react.default.createElement("span", {
     className: `${classPrefix}-back-arrow`
-  }, backArrow === true ? _react.default.createElement(_antdMobileIcons.LeftOutline, null) : backArrow), _react.default.createElement("span", {
+  }, backIcon === true || backArrow === true ? componentConfig.backIcon || _react.default.createElement(_antdMobileIcons.LeftOutline, null) : backIcon || backArrow), _react.default.createElement("span", {
     "aria-hidden": 'true'
-  }, back)), props.left), _react.default.createElement("div", {
+  }, back)), mergedProps.left), _react.default.createElement("div", {
     className: `${classPrefix}-title`
-  }, props.children), _react.default.createElement("div", {
+  }, mergedProps.children), _react.default.createElement("div", {
     className: `${classPrefix}-right`
-  }, props.right)));
+  }, mergedProps.right)));
 };
 exports.NavBar = NavBar;

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

@@ -80,9 +80,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-}
-
-.adm-notice-bar-close-icon {
   font-size: var(--adm-font-size-10);
 }
 

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

@@ -1,5 +1,5 @@
-import React from 'react';
 import type { ReactNode } from 'react';
+import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type NoticeBarProps = {
     /** The type of the NoticeBar */
@@ -12,6 +12,8 @@ export declare type NoticeBarProps = {
     content: ReactNode;
     /** Whether it can be closed */
     closeable?: boolean;
+    /** Custom close icon */
+    closeIcon?: ReactNode;
     /** Callback when closed */
     onClose?: () => void;
     /** Event when click */

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

@@ -4,35 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NoticeBar = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _antdMobileIcons = require("antd-mobile-icons");
 var _ahooks = require("ahooks");
-var _withDefaultProps = require("../../utils/with-default-props");
+var _antdMobileIcons = require("antd-mobile-icons");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _react = _interopRequireWildcard(require("react"));
 var _nativeProps = require("../../utils/native-props");
-var _useResizeEffect = require("../../utils/use-resize-effect");
 var _useMutationEffect = require("../../utils/use-mutation-effect");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _useResizeEffect = require("../../utils/use-resize-effect");
+var _withDefaultProps = require("../../utils/with-default-props");
+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; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = `adm-notice-bar`;
 const defaultProps = {
   color: 'default',
   delay: 2000,
   speed: 50,
-  wrap: false,
-  icon: _react.default.createElement(_antdMobileIcons.SoundOutline, null)
+  icon: _react.default.createElement(_antdMobileIcons.SoundOutline, null),
+  wrap: false
 };
-const NoticeBar = (0, _react.memo)(p => {
-  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+const NoticeBar = (0, _react.memo)(props => {
+  const {
+    noticeBar: componentConfig = {}
+  } = (0, _configProvider.useConfig)();
+  const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, props);
+  const closeIcon = (0, _withDefaultProps.mergeProp)(_react.default.createElement(_antdMobileIcons.CloseOutline, {
+    className: `${classPrefix}-close-icon`
+  }), componentConfig.closeIcon, props.closeIcon);
   const containerRef = (0, _react.useRef)(null);
   const textRef = (0, _react.useRef)(null);
   const [visible, setVisible] = (0, _react.useState)(true);
-  const speed = props.speed;
+  const speed = mergedProps.speed;
   const delayLockRef = (0, _react.useRef)(true);
   const animatingRef = (0, _react.useRef)(false);
   function start() {
-    if (delayLockRef.current || props.wrap) return;
+    if (delayLockRef.current || mergedProps.wrap) return;
     const container = containerRef.current;
     const text = textRef.current;
     if (!container || !text) return;
@@ -58,7 +65,7 @@ const NoticeBar = (0, _react.memo)(p => {
   (0, _ahooks.useTimeout)(() => {
     delayLockRef.current = false;
     start();
-  }, props.delay);
+  }, mergedProps.delay);
   (0, _useResizeEffect.useResizeEffect)(() => {
     start();
   }, containerRef);
@@ -70,14 +77,14 @@ const NoticeBar = (0, _react.memo)(p => {
     characterData: true
   });
   if (!visible) return null;
-  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: (0, _classnames.default)(classPrefix, `${classPrefix}-${props.color}`, {
-      [`${classPrefix}-wrap`]: props.wrap
+  return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
+    className: (0, _classnames.default)(classPrefix, `${classPrefix}-${mergedProps.color}`, {
+      [`${classPrefix}-wrap`]: mergedProps.wrap
     }),
-    onClick: props.onClick
-  }, props.icon && _react.default.createElement("span", {
+    onClick: mergedProps.onClick
+  }, mergedProps.icon && _react.default.createElement("span", {
     className: `${classPrefix}-left`
-  }, props.icon), _react.default.createElement("span", {
+  }, mergedProps.icon), _react.default.createElement("span", {
     ref: containerRef,
     className: `${classPrefix}-content`
   }, _react.default.createElement("span", {
@@ -87,17 +94,15 @@ const NoticeBar = (0, _react.memo)(p => {
     },
     ref: textRef,
     className: `${classPrefix}-content-inner`
-  }, props.content)), (props.closeable || props.extra) && _react.default.createElement("span", {
+  }, mergedProps.content)), (mergedProps.closeable || mergedProps.extra) && _react.default.createElement("span", {
     className: `${classPrefix}-right`
-  }, props.extra, props.closeable && _react.default.createElement("div", {
+  }, mergedProps.extra, mergedProps.closeable && _react.default.createElement("div", {
     className: `${classPrefix}-close`,
     onClick: () => {
       var _a;
       setVisible(false);
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      (_a = mergedProps.onClose) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
     }
-  }, _react.default.createElement(_antdMobileIcons.CloseOutline, {
-    className: `${classPrefix}-close-icon`
-  })))));
+  }, closeIcon))));
 });
 exports.NoticeBar = NoticeBar;

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

@@ -1,6 +1,6 @@
 import type { FC } from 'react';
-import { PopupProps } from '../popup';
 import { NativeProps } from '../../utils/native-props';
+import { PopupProps } from '../popup';
 export declare type NumberKeyboardProps = {
     visible?: boolean;
     title?: string;

package/2x/cjs/components/number-keyboard/number-keyboard.js

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NumberKeyboard = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
+var _ahooks = require("ahooks");
 var _antdMobileIcons = require("antd-mobile-icons");
-var _withDefaultProps = require("../../utils/with-default-props");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _react = _interopRequireWildcard(require("react"));
+var _nativeProps = require("../../utils/native-props");
 var _shuffle = require("../../utils/shuffle");
+var _withDefaultProps = require("../../utils/with-default-props");
+var _configProvider = require("../config-provider");
 var _popup = _interopRequireDefault(require("../popup"));
-var _nativeProps = require("../../utils/native-props");
 var _safeArea = _interopRequireDefault(require("../safe-area"));
-var _ahooks = require("ahooks");
-var _configProvider = require("../config-provider");
-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-number-keyboard';
 const defaultProps = {
   defaultVisible: false,
@@ -66,13 +66,13 @@ const NumberKeyboard = p => {
     var _a;
     (_a = props.onDelete) === null || _a === void 0 ? void 0 : _a.call(props);
   });
-  const onBackspacePressStart = () => {
+  const startContinueClear = () => {
     timeoutRef.current = window.setTimeout(() => {
       onDelete();
       intervalRef.current = window.setInterval(onDelete, 150);
     }, 700);
   };
-  const onBackspacePressEnd = () => {
+  const stopContinueClear = () => {
     clearTimeout(timeoutRef.current);
     clearInterval(intervalRef.current);
   };
@@ -131,14 +131,15 @@ const NumberKeyboard = p => {
       key: key,
       className: className,
       onTouchStart: () => {
+        stopContinueClear();
         if (key === 'BACKSPACE') {
-          onBackspacePressStart();
+          startContinueClear();
         }
       },
       onTouchEnd: e => {
         onKeyPress(e, key);
         if (key === 'BACKSPACE') {
-          onBackspacePressEnd();
+          stopContinueClear();
         }
       }
     }, ariaProps), key === 'BACKSPACE' ? _react.default.createElement(_antdMobileIcons.TextDeletionOutline, null) : key);
@@ -170,11 +171,11 @@ const NumberKeyboard = p => {
   }, _react.default.createElement("div", {
     className: `${classPrefix}-key ${classPrefix}-key-extra ${classPrefix}-key-bs`,
     onTouchStart: () => {
-      onBackspacePressStart();
+      startContinueClear();
     },
     onTouchEnd: e => {
       onKeyPress(e, 'BACKSPACE');
-      onBackspacePressEnd();
+      stopContinueClear();
     },
     onContextMenu: e => {
       // Long press should not trigger native context menu

package/2x/cjs/components/popup/popup-base-props.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
-import type { CSSProperties } from 'react';
+import React, { CSSProperties, ReactNode } from 'react';
 import { GetContainer } from '../../utils/render-to-container';
 import { MaskProps } from '../mask';
 import { PropagationEvent } from '../../utils/with-stop-propagation';
@@ -9,6 +8,7 @@ export declare type PopupBaseProps = {
     bodyClassName?: string;
     bodyStyle?: CSSProperties;
     closeOnMaskClick?: boolean;
+    closeIcon?: ReactNode;
     destroyOnClose?: boolean;
     disableBodyScroll?: boolean;
     forceRender?: boolean;
@@ -25,6 +25,7 @@ export declare type PopupBaseProps = {
 };
 export declare const defaultPopupBaseProps: {
     closeOnMaskClick: boolean;
+    closeIcon: React.JSX.Element;
     destroyOnClose: boolean;
     disableBodyScroll: boolean;
     forceRender: boolean;

package/2x/cjs/components/popup/popup-base-props.js

@@ -4,8 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultPopupBaseProps = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _antdMobileIcons = require("antd-mobile-icons");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const defaultPopupBaseProps = {
   closeOnMaskClick: false,
+  closeIcon: _react.default.createElement(_antdMobileIcons.CloseOutline, null),
   destroyOnClose: false,
   disableBodyScroll: true,
   forceRender: false,

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

@@ -15,7 +15,6 @@ var _renderToContainer = require("../../utils/render-to-container");
 var _web = require("@react-spring/web");
 var _withStopPropagation = require("../../utils/with-stop-propagation");
 var _shouldRender = require("../../utils/should-render");
-var _antdMobileIcons = require("antd-mobile-icons");
 var _popupBaseProps = require("./popup-base-props");
 var _useInnerVisible = require("../../utils/use-inner-visible");
 var _configProvider = require("../config-provider");
@@ -29,11 +28,12 @@ const defaultProps = Object.assign(Object.assign({}, _popupBaseProps.defaultPopu
   position: 'bottom'
 });
 const Popup = p => {
-  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  const bodyCls = (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName, `${classPrefix}-body-position-${props.position}`);
   const {
-    locale
+    locale,
+    popup: componentConfig = {}
   } = (0, _configProvider.useConfig)();
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, p);
+  const bodyCls = (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName, `${classPrefix}-body-position-${props.position}`);
   const [active, setActive] = (0, _react.useState)(props.visible);
   const ref = (0, _react.useRef)(null);
   (0, _useLockScroll.useLockScroll)(ref, props.disableBodyScroll && active ? 'strict' : false);
@@ -128,7 +128,7 @@ const Popup = p => {
     },
     role: 'button',
     "aria-label": locale.common.close
-  }, _react.default.createElement(_antdMobileIcons.CloseOutline, null)), props.children))));
+  }, props.closeIcon), props.children))));
   return _react.default.createElement(_shouldRender.ShouldRender, {
     active: active,
     forceRender: props.forceRender,

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

@@ -6,18 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.Result = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _antdMobileIcons = require("antd-mobile-icons");
 var _nativeProps = require("../../utils/native-props");
 var _withDefaultProps = require("../../utils/with-default-props");
+var _useResultIcon = require("./use-result-icon");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = `adm-result`;
-const iconRecord = {
-  success: _antdMobileIcons.CheckCircleFill,
-  error: _antdMobileIcons.CloseCircleFill,
-  info: _antdMobileIcons.InformationCircleFill,
-  waiting: _antdMobileIcons.ClockCircleFill,
-  warning: _antdMobileIcons.ExclamationCircleFill
-};
 const defaultProps = {
   status: 'info'
 };
@@ -29,13 +22,13 @@ const Result = p => {
     description,
     icon
   } = props;
+  const fallbackIcon = (0, _useResultIcon.useResultIcon)(status);
   if (!status) return null;
-  const resultIcon = icon || _react.default.createElement(iconRecord[status]);
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: (0, _classnames.default)(classPrefix, `${classPrefix}-${status}`)
   }, _react.default.createElement("div", {
     className: `${classPrefix}-icon`
-  }, resultIcon), _react.default.createElement("div", {
+  }, icon || fallbackIcon), _react.default.createElement("div", {
     className: `${classPrefix}-title`
   }, title), !!description && _react.default.createElement("div", {
     className: `${classPrefix}-description`

package/2x/cjs/components/result/use-result-icon.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare type ResultIconProps = {};
+export declare const useResultIcon: (status?: "error" | "waiting" | "success" | "warning" | "info" | undefined) => string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null;

package/2x/cjs/components/result/use-result-icon.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useResultIcon = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _antdMobileIcons = require("antd-mobile-icons");
+var _configProvider = require("../config-provider");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const useResultIcon = status => {
+  const {
+    result: componentConfig = {}
+  } = (0, _configProvider.useConfig)();
+  const {
+    successIcon = _react.default.createElement(_antdMobileIcons.CheckCircleFill, null),
+    errorIcon = _react.default.createElement(_antdMobileIcons.CloseCircleFill, null),
+    infoIcon = _react.default.createElement(_antdMobileIcons.InformationCircleFill, null),
+    waitingIcon = _react.default.createElement(_antdMobileIcons.ClockCircleFill, null),
+    warningIcon = _react.default.createElement(_antdMobileIcons.ExclamationCircleFill, null)
+  } = componentConfig || {};
+  switch (status) {
+    case 'success':
+      return successIcon;
+    case 'error':
+      return errorIcon;
+    case 'info':
+      return infoIcon;
+    case 'waiting':
+      return waitingIcon;
+    case 'warning':
+      return warningIcon;
+    default:
+      return null;
+  }
+};
+exports.useResultIcon = useResultIcon;

package/2x/cjs/components/result-page/result-page.js

@@ -5,23 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ResultPage = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _antdMobileIcons = require("antd-mobile-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _nativeProps = require("../../utils/native-props");
 var _withDefaultProps = require("../../utils/with-default-props");
 var _isNodeWithContent = require("../../utils/is-node-with-content");
 var _button = _interopRequireDefault(require("../button"));
+var _useResultIcon = require("../result/use-result-icon");
 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; }
 const classPrefix = `adm-result-page`;
-const iconRecord = {
-  success: _antdMobileIcons.CheckCircleFill,
-  error: _antdMobileIcons.CloseCircleFill,
-  info: _antdMobileIcons.InformationCircleFill,
-  waiting: _antdMobileIcons.ClockCircleFill,
-  warning: _antdMobileIcons.ExclamationCircleFill
-};
 const defaultProps = {
   status: 'info',
   details: []
@@ -39,7 +32,7 @@ const ResultPage = p => {
     onPrimaryButtonClick,
     onSecondaryButtonClick
   } = props;
-  const resultIcon = icon || _react.default.createElement(iconRecord[status]);
+  const fallbackIcon = (0, _useResultIcon.useResultIcon)(status);
   const [collapse, setCollapse] = (0, _react.useState)(true);
   const showSecondaryButton = (0, _isNodeWithContent.isNodeWithContent)(secondaryButtonText);
   const showPrimaryButton = (0, _isNodeWithContent.isNodeWithContent)(primaryButtonText);
@@ -49,7 +42,7 @@ const ResultPage = p => {
     className: `${classPrefix}-header`
   }, _react.default.createElement("div", {
     className: `${classPrefix}-icon`
-  }, resultIcon), _react.default.createElement("div", {
+  }, icon || fallbackIcon), _react.default.createElement("div", {
     className: `${classPrefix}-title`
   }, title), (0, _isNodeWithContent.isNodeWithContent)(description) ? _react.default.createElement("div", {
     className: `${classPrefix}-description`

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

@@ -1,7 +1,7 @@
-import React from 'react';
 import type { ReactNode } from 'react';
-import { InputRef, InputProps } from '../input';
+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'> & {
     value?: string;
@@ -12,6 +12,10 @@ export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'on
     onlyShowClearWhenFocus?: boolean;
     showCancelButton?: boolean | ((focus: boolean, value: string) => boolean);
     cancelText?: string;
+    searchIcon?: ReactNode;
+    /**
+     * @deprecated use `searchIcon` instead
+     */
     icon?: ReactNode;
     clearOnCancel?: boolean;
     onSearch?: (val: string) => void;
@@ -27,6 +31,10 @@ export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps,
     onlyShowClearWhenFocus?: boolean | undefined;
     showCancelButton?: boolean | ((focus: boolean, value: string) => boolean) | undefined;
     cancelText?: string | undefined;
+    searchIcon?: ReactNode;
+    /**
+     * @deprecated use `searchIcon` instead
+     */
     icon?: ReactNode;
     clearOnCancel?: boolean | undefined;
     onSearch?: ((val: string) => void) | undefined;