antd-mobile 5.0.0-rc.2 → 5.0.0-rc.23

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Switch = void 0;
 
+var _tslib = require("tslib");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -13,139 +15,72 @@ var _spin = _interopRequireDefault(require("../../assets/spin.svg"));
 
 var _nativeProps = require("../../utils/native-props");
 
-var _usePropsValue2 = require("../../utils/use-props-value");
+var _usePropsValue = require("../../utils/use-props-value");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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 }; }
+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); }
 
-var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
+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; }
 
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var classPrefix = "adm-switch";
-var defaultProps = {
+const classPrefix = `adm-switch`;
+const defaultProps = {
   defaultChecked: false
 };
 
-var Switch = function Switch(p) {
-  var _classNames;
-
-  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  var disabled = props.disabled || props.loading || false;
-
-  var _useState = (0, _react.useState)(false),
-      changing = _useState[0],
-      setChanging = _useState[1];
-
-  var _usePropsValue = (0, _usePropsValue2.usePropsValue)({
+const Switch = p => {
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const disabled = props.disabled || props.loading || false;
+  const [changing, setChanging] = (0, _react.useState)(false);
+  const [checked, setChecked] = (0, _usePropsValue.usePropsValue)({
     value: props.checked,
     defaultValue: props.defaultChecked,
     onChange: props.onChange
-  }),
-      checked = _usePropsValue[0],
-      setChecked = _usePropsValue[1];
+  });
 
   function onClick() {
-    return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var nextChecked;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(disabled || props.loading || changing)) {
-                _context.next = 2;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 2:
-              nextChecked = !checked;
-
-              if (!props.beforeChange) {
-                _context.next = 18;
-                break;
-              }
-
-              setChanging(true);
-              _context.prev = 5;
-              _context.next = 8;
-              return props.beforeChange(nextChecked);
-
-            case 8:
-              setChecked(nextChecked);
-              setChanging(false);
-              _context.next = 16;
-              break;
-
-            case 12:
-              _context.prev = 12;
-              _context.t0 = _context["catch"](5);
-              setChanging(false);
-              throw _context.t0;
-
-            case 16:
-              _context.next = 19;
-              break;
-
-            case 18:
-              setChecked(nextChecked);
-
-            case 19:
-            case "end":
-              return _context.stop();
-          }
+    return (0, _tslib.__awaiter)(this, void 0, void 0, function* () {
+      if (disabled || props.loading || changing) {
+        return;
+      }
+
+      const nextChecked = !checked;
+
+      if (props.beforeChange) {
+        setChanging(true);
+
+        try {
+          yield props.beforeChange(nextChecked);
+          setChecked(nextChecked);
+          setChanging(false);
+        } catch (e) {
+          setChanging(false);
+          throw e;
         }
-      }, _callee, null, [[5, 12]]);
-    }));
+      } else {
+        setChecked(nextChecked);
+      }
+    });
   }
 
-  return (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
+  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     onClick: onClick,
-    className: (0, _classnames["default"])(classPrefix, (_classNames = {}, _classNames[classPrefix + "-checked"] = checked, _classNames[classPrefix + "-disabled"] = disabled || changing, _classNames))
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-checkbox"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-handle"
-  }, (props.loading || changing) && /*#__PURE__*/_react["default"].createElement("img", {
-    src: _spin["default"],
-    className: classPrefix + "-icon",
+    className: (0, _classnames.default)(classPrefix, {
+      [`${classPrefix}-checked`]: checked,
+      [`${classPrefix}-disabled`]: disabled || changing
+    })
+  }, _react.default.createElement("div", {
+    className: `${classPrefix}-checkbox`
+  }, _react.default.createElement("div", {
+    className: `${classPrefix}-handle`
+  }, (props.loading || changing) && _react.default.createElement("img", {
+    src: _spin.default,
+    className: `${classPrefix}-icon`,
     alt: 'switch-handle'
-  })), /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-inner"
+  })), _react.default.createElement("div", {
+    className: `${classPrefix}-inner`
   }, checked ? props.checkedText : props.uncheckedText))));
 };
 

package/2x/cjs/components/tab-bar/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 require("./tab-bar.css");
 
@@ -15,4 +15,4 @@ var _default = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_ta
   Item: _tabBar2.TabBarItem
 });
 
-exports["default"] = _default;
+exports.default = _default;

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

@@ -1,4 +1,4 @@
-.adm-tab-bar {
+.adm-tab-bar-wrap {
   display: flex;
   flex-wrap: nowrap;
   justify-content: flex-start;

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

@@ -11,5 +11,6 @@ export declare type TabBarProps = {
     activeKey?: string | null;
     defaultActiveKey?: string | null;
     onChange?: (key: string) => void;
+    safeArea?: boolean;
 } & NativeProps;
 export declare const TabBar: FC<TabBarProps>;

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

@@ -11,27 +11,36 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _nativeProps = require("../../utils/native-props");
 
+var _withDefaultProps = require("../../utils/with-default-props");
+
 var _badge = _interopRequireDefault(require("../badge"));
 
-var _usePropsValue2 = require("../../utils/use-props-value");
+var _safeArea = _interopRequireDefault(require("../safe-area"));
+
+var _usePropsValue = require("../../utils/use-props-value");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var TabBarItem = function TabBarItem() {
+const TabBarItem = () => {
   return null;
 };
 
 exports.TabBarItem = TabBarItem;
+const classPrefix = `adm-tab-bar`;
+const defaultProps = {
+  safeArea: false
+};
 
-var TabBar = function TabBar(props) {
+const TabBar = p => {
   var _a;
 
-  var firstActiveKey = null;
-  var items = [];
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  let firstActiveKey = null;
+  const items = [];
 
-  _react["default"].Children.forEach(props.children, function (child, index) {
-    if (! /*#__PURE__*/_react["default"].isValidElement(child)) return;
-    var key = child.key;
+  _react.default.Children.forEach(props.children, (child, index) => {
+    if (!_react.default.isValidElement(child)) return;
+    const key = child.key;
     if (typeof key !== 'string') return;
 
     if (index === 0) {
@@ -41,54 +50,62 @@ var TabBar = function TabBar(props) {
     items.push(child);
   });
 
-  var _usePropsValue = (0, _usePropsValue2.usePropsValue)({
+  const [activeKey, setActiveKey] = (0, _usePropsValue.usePropsValue)({
     value: props.activeKey,
     defaultValue: (_a = props.defaultActiveKey) !== null && _a !== void 0 ? _a : firstActiveKey,
-    onChange: props.onChange
-  }),
-      activeKey = _usePropsValue[0],
-      setActiveKey = _usePropsValue[1];
+    onChange: v => {
+      var _a;
 
-  return (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
-    className: 'adm-tab-bar'
-  }, items.map(function (item) {
-    var active = item.key === activeKey;
+      if (v === null) return;
+      (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, v);
+    }
+  });
+  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+    className: classPrefix
+  }, _react.default.createElement("div", {
+    className: `${classPrefix}-wrap`
+  }, items.map(item => {
+    const active = item.key === activeKey;
 
     function renderContent() {
-      var iconElement = item.props.icon && /*#__PURE__*/_react["default"].createElement("div", {
-        className: 'adm-tab-bar-item-icon'
+      const iconElement = item.props.icon && _react.default.createElement("div", {
+        className: `${classPrefix}-item-icon`
       }, typeof item.props.icon === 'function' ? item.props.icon(active) : item.props.icon);
 
-      var titleElement = item.props.title && /*#__PURE__*/_react["default"].createElement("div", {
-        className: 'adm-tab-bar-item-title'
+      const titleElement = item.props.title && _react.default.createElement("div", {
+        className: `${classPrefix}-item-title`
       }, item.props.title);
 
       if (iconElement) {
-        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_badge["default"], {
+        return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement(_badge.default, {
           content: item.props.badge,
-          className: 'adm-tab-bar-icon-badge'
+          className: `${classPrefix}-icon-badge`
         }, iconElement), titleElement);
       } else if (titleElement) {
-        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_badge["default"], {
+        return _react.default.createElement(_badge.default, {
           content: item.props.badge,
-          className: 'adm-tab-bar-title-badge'
-        }, titleElement));
+          className: `${classPrefix}-title-badge`
+        }, titleElement);
       }
 
       return null;
     }
 
-    return (0, _nativeProps.withNativeProps)(item.props, /*#__PURE__*/_react["default"].createElement("div", {
+    return (0, _nativeProps.withNativeProps)(item.props, _react.default.createElement("div", {
       key: item.key,
-      onClick: function onClick() {
-        var key = item.key;
+      onClick: () => {
+        const {
+          key
+        } = item;
         if (key === undefined || key === null) return;
         setActiveKey(key.toString());
       },
-      className: (0, _classnames["default"])('adm-tab-bar-item', {
-        'adm-tab-bar-item-active': active
+      className: (0, _classnames.default)(`${classPrefix}-item`, {
+        [`${classPrefix}-item-active`]: active
       })
     }, renderContent()));
+  })), props.safeArea && _react.default.createElement(_safeArea.default, {
+    position: 'bottom'
   })));
 };
 

package/2x/cjs/components/tabs/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 require("./tabs.css");
 
@@ -15,4 +15,4 @@ var _default = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_ta
   Tab: _tabs2.Tab
 });
 
-exports["default"] = _default;
+exports.default = _default;

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

@@ -1,6 +1,8 @@
 .adm-tabs {
   --title-font-size: 34px;
   --content-padding: 24px;
+  --active-line-height: 4px;
+  --active-line-border-radius: var(--active-line-height);
   position: relative;
 }
 
@@ -53,9 +55,10 @@
 .adm-tabs-tab-line {
   position: absolute;
   bottom: 0;
-  height: 4px;
+  height: var(--active-line-height);
   color: var(--adm-color-primary);
   background: var(--adm-color-primary);
+  border-radius: var(--active-line-border-radius);
 }
 
 .adm-tabs-content {

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

@@ -12,5 +12,5 @@ export declare type TabsProps = {
     activeLineMode?: 'auto' | 'full' | 'fixed';
     stretch?: boolean;
     onChange?: (key: string) => void;
-} & NativeProps<'--fixed-active-line-width' | '--title-font-size' | '--content-padding'>;
+} & NativeProps<'--fixed-active-line-width' | '--active-line-height' | '--active-line-border-radius' | '--title-font-size' | '--content-padding'>;
 export declare const Tabs: FC<TabsProps>;