antd-mobile 5.0.0-beta.9 → 5.0.0-rc.3

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

@@ -0,0 +1,31 @@
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+import React from 'react';
+import PickerView from '../picker-view';
+import { useCascadePickerOptions } from '../cascade-picker/use-cascade-picker-options';
+import { generateCascadePickerColumns } from '../cascade-picker/cascade-picker-utils';
+export var CascadePickerView = function CascadePickerView(props) {
+  var options = props.options,
+      pickerProps = __rest(props, ["options"]);
+
+  var _useCascadePickerOpti = useCascadePickerOptions(options),
+      depth = _useCascadePickerOpti.depth,
+      subOptionsRecord = _useCascadePickerOpti.subOptionsRecord;
+
+  return /*#__PURE__*/React.createElement(PickerView, Object.assign({}, pickerProps, {
+    columns: function columns(selected) {
+      return generateCascadePickerColumns(selected, options, depth, subOptionsRecord);
+    }
+  }));
+};

package/2x/es/components/cascade-picker-view/index.d.ts

@@ -0,0 +1,3 @@
+import { CascadePickerView } from './cascade-picker-view';
+export type { CascadePickerViewProps } from './cascade-picker-view';
+export default CascadePickerView;

package/2x/es/components/cascade-picker-view/index.js

@@ -0,0 +1,2 @@
+import { CascadePickerView } from './cascade-picker-view';
+export default CascadePickerView;

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

@@ -1,60 +1,40 @@
-.adm-cascader,
-.adm-cascader-multiple {
+.adm-cascader {
+  width: 100%;
+  height: 800px;
+  overflow: hidden;
+  position: relative;
   display: flex;
-  height: 100%;
-  font-size: var(--adm-font-size-main);
-  background-color: var(--adm-color-white);
-}
-
-.adm-cascader-column,
-.adm-cascader-multiple-column {
-  overflow-y: auto;
-  transform: translateZ(0);
-  -webkit-transform: translateZ(0);
-}
-
-.adm-cascader-column:first-child,
-.adm-cascader-multiple-column:first-child {
-  background-color: #f5f5f5;
-}
-
-.adm-cascader-column:nth-child(2),
-.adm-cascader-multiple-column:nth-child(2) {
-  background-color: #fafafa;
+  flex-direction: column;
 }
 
-.adm-cascader-item,
-.adm-cascader-multiple-item {
+.adm-cascader-header {
+  flex: none;
   display: flex;
+  justify-content: space-between;
   align-items: center;
-  min-height: 100px;
-  padding: 12px 24px;
-  position: relative;
+  padding: 12px 16px;
 }
 
-.adm-cascader-item-active {
-  color: var(--adm-color-primary);
-  font-weight: bold;
-  background-color: white;
+.adm-cascader-header-button {
+  font-size: 30px;
+  display: inline-block;
+  padding: 8px 8px;
 }
 
-.adm-cascader-multiple-item-expand {
-  color: var(--adm-color-primary);
-  font-weight: bold;
-  background-color: white;
+.adm-cascader-header-title {
+  padding: 8px 8px;
+  font-size: 30px;
+  color: var(--adm-color-text);
+  text-align: center;
+  flex: 1;
 }
 
-.adm-cascader-multiple-item-checkbox {
-  margin-right: 16px;
+.adm-cascader-body {
+  flex: auto;
+  height: 100%;
+  width: 100%;
 }
 
-.adm-cascader-multiple-dot {
-  position: absolute;
-  top: 50%;
-  margin-top: -6px;
-  right: 16px;
-  width: 12px;
-  height: 12px;
-  background: var(--adm-color-primary);
-  border-radius: 6px;
+.adm-cascader-body > .adm-cascader-view {
+  --height: 620px;
 }

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

@@ -1,17 +1,20 @@
-import React from 'react';
+import { ReactNode, FC } from 'react';
+import { PopupProps } from '../popup';
+import { CascaderValue, CascaderValueExtend, CascaderOption } from '../cascader-view';
 import { NativeProps } from '../../utils/native-props';
-export interface CascaderOption {
-    [key: string]: any;
-}
 export declare type CascaderProps = {
     options: CascaderOption[];
-    defaultValue?: string[];
-    value?: string[];
-    onChange?: (value: string[], nodes: CascaderOption[]) => void;
-    fieldNames?: {
-        label: string;
-        value: string;
-        children: string;
-    };
-} & NativeProps;
-export declare const Cascader: React.FC<CascaderProps>;
+    value?: CascaderValue[];
+    defaultValue?: CascaderValue[];
+    placeholder?: string;
+    onSelect?: (value: CascaderValue[], extend: CascaderValueExtend) => void;
+    onConfirm?: (value: CascaderValue[], extend: CascaderValueExtend) => void;
+    onCancel?: () => void;
+    onClose?: () => void;
+    visible?: boolean;
+    title?: ReactNode;
+    confirmText?: string;
+    cancelText?: string;
+    children?: (items: (CascaderOption | null)[]) => ReactNode;
+} & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
+export declare const Cascader: FC<CascaderProps>;

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

@@ -1,120 +1,104 @@
-import classNames from 'classnames';
-import React, { useMemo } from 'react';
+import React, { useState, useEffect } from 'react';
+import Popup from '../popup';
+import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
-import { getTreeDeep } from '../../utils/tree';
-import { withDefaultProps } from '../../utils/with-default-props';
-import { useNewControllableValue } from '../../utils/use-controllable-value';
+import { usePropsValue } from '../../utils/use-props-value';
+import CascaderView from '../cascader-view';
+import { useConfig } from '../config-provider';
+import { useCascaderValueExtend } from '../cascader-view/use-cascader-value-extend';
 var classPrefix = "adm-cascader";
-export var Cascader = withDefaultProps({
-  options: [],
-  fieldNames: {},
+var defaultProps = {
   defaultValue: []
-})(function (props) {
-  var labelName = props.fieldNames.label || 'label';
-  var valueName = props.fieldNames.value || 'value';
-  var childrenName = props.fieldNames.children || 'children';
+};
+export var Cascader = function Cascader(p) {
+  var _a;
 
-  var _useNewControllableVa = useNewControllableValue({
-    value: props.value,
-    defaultValue: props.defaultValue
-  }),
-      value = _useNewControllableVa[0],
-      setValue = _useNewControllableVa[1];
+  var _useConfig = useConfig(),
+      locale = _useConfig.locale;
 
-  var _useMemo = useMemo(function () {
-    var deep = getTreeDeep(props.options, childrenName);
-    var optionsMap = new Map();
-    var optionsParentMap = new Map();
+  var props = mergeProps(defaultProps, {
+    confirmText: locale.common.confirm,
+    cancelText: locale.common.cancel,
+    placeholder: locale.Cascader.placeholder
+  }, p);
 
-    function traverse(current, children) {
-      children.forEach(function (item) {
-        optionsParentMap.set(item[valueName], current);
-        optionsMap.set(item[valueName], item);
+  var _usePropsValue = usePropsValue(Object.assign(Object.assign({}, props), {
+    onChange: function onChange(val) {
+      var _a;
 
-        if (item[childrenName]) {
-          traverse(item, item[childrenName]);
-        }
-      });
+      (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, val, generateValueExtend(val));
     }
+  })),
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1];
 
-    traverse(undefined, props.options);
-    return [deep, optionsMap, optionsParentMap];
-  }, [props.options]),
-      deep = _useMemo[0],
-      optionsMap = _useMemo[1],
-      optionsParentMap = _useMemo[2];
+  var generateValueExtend = useCascaderValueExtend(props.options);
 
-  var onItemSelect = function onItemSelect(node) {
-    var _a; // 找到父级节点
+  var _useState = useState(value),
+      innerValue = _useState[0],
+      setInnerValue = _useState[1];
 
-
-    var parentNodes = [];
-    var current = node;
-
-    while (current) {
-      parentNodes.unshift(current);
-      var next = optionsParentMap.get(current[valueName]);
-      current = next;
+  useEffect(function () {
+    if (!props.visible) {
+      setInnerValue(value);
     }
-
-    var values = parentNodes.map(function (i) {
-      return i[valueName];
-    });
-    setValue(values);
-    (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, values, parentNodes);
-  };
-
-  var renderItems = function renderItems(columnOptions, index) {
-    if (columnOptions === void 0) {
-      columnOptions = [];
+  }, [props.visible]);
+  useEffect(function () {
+    if (!props.visible) {
+      setInnerValue(value);
     }
+  }, [value]);
+  var cascaderElement = withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-header"
+  }, /*#__PURE__*/React.createElement("a", {
+    className: classPrefix + "-header-button",
+    onClick: function onClick() {
+      var _a, _b;
+
+      (_a = props.onCancel) === null || _a === void 0 ? void 0 : _a.call(props);
+      (_b = props.onClose) === null || _b === void 0 ? void 0 : _b.call(props);
+    }
+  }, props.cancelText), /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-header-title"
+  }, props.title), /*#__PURE__*/React.createElement("a", {
+    className: classPrefix + "-header-button",
+    onClick: function onClick() {
+      var _a;
+
+      setValue(innerValue);
+      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+    }
+  }, props.confirmText)), /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-body"
+  }, /*#__PURE__*/React.createElement(CascaderView, Object.assign({}, props, {
+    value: innerValue,
+    onChange: function onChange(val, ext) {
+      var _a;
 
-    return columnOptions.map(function (item) {
-      var _classNames;
-
-      var isActive = item[valueName] === value[index];
-      return /*#__PURE__*/React.createElement("div", {
-        key: item[valueName],
-        className: classNames(classPrefix + "-item", (_classNames = {}, _classNames[classPrefix + "-item-active"] = isActive, _classNames)),
-        onClick: function onClick() {
-          if (!isActive) {
-            onItemSelect(item);
-          }
-        }
-      }, item[labelName]);
-    });
-  };
-
-  var renderColumns = function renderColumns() {
-    var _a;
-
-    var columns = [];
-
-    for (var i = 0; i < deep; i++) {
-      var width = 100 / deep + "%"; // 两列的第一列宽度为 33.33，两列的第二列为 66.67%
-
-      if (deep === 2 && i === 0) {
-        width = "33.33%";
-      }
+      setInnerValue(val);
 
-      if (deep === 2 && i === 1) {
-        width = "66.67%";
+      if (props.visible) {
+        (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, val, ext);
       }
-
-      var column = /*#__PURE__*/React.createElement("div", {
-        key: i,
-        className: classNames(classPrefix + "-column"),
-        style: {
-          width: width
-        }
-      }, renderItems(i === 0 ? props.options : (_a = optionsMap.get(value[i - 1])) === null || _a === void 0 ? void 0 : _a[childrenName], i));
-      columns.push(column);
     }
-
-    return columns;
-  };
-
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
-  }, renderColumns()));
-});
+  })))));
+  var popupElement = /*#__PURE__*/React.createElement(Popup, {
+    visible: props.visible,
+    position: 'bottom',
+    onMaskClick: function onMaskClick() {
+      var _a, _b;
+
+      (_a = props.onCancel) === null || _a === void 0 ? void 0 : _a.call(props);
+      (_b = props.onClose) === null || _b === void 0 ? void 0 : _b.call(props);
+    },
+    getContainer: props.getContainer,
+    destroyOnClose: true,
+    afterShow: props.afterShow,
+    afterClose: props.afterClose,
+    onClick: props.onClick,
+    stopPropagation: props.stopPropagation
+  }, cascaderElement);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, generateValueExtend(value).items));
+};

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

@@ -1,8 +1,9 @@
 /// <reference types="react" />
+import { prompt } from './prompt';
 import './cascader.less';
-export type { CascaderProps, CascaderOption } from './cascader';
-export type { MultipleProps } from './multiple';
+export type { CascaderProps } from './cascader';
+export type { CascaderValue, CascaderValueExtend, CascaderOption, } from '../cascader-view';
 declare const _default: import("react").FC<import("./cascader").CascaderProps> & {
-    Multiple: import("react").FC<import("./multiple").MultipleProps>;
+    prompt: typeof prompt;
 };
 export default _default;

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

@@ -1,7 +1,7 @@
-import "./cascader.css";
 import { Cascader } from './cascader';
+import { prompt } from './prompt';
 import { attachPropertiesToComponent } from '../../utils/attach-properties-to-component';
-import { Multiple } from './multiple';
+import "./cascader.css";
 export default attachPropertiesToComponent(Cascader, {
-  Multiple: Multiple
+  prompt: prompt
 });

package/2x/es/components/cascader/prompt.d.ts

@@ -0,0 +1,2 @@
+import type { CascaderProps } from './index';
+export declare function prompt(props: Omit<CascaderProps, 'value' | 'visible' | 'children'>): Promise<string[] | null>;

package/{es/components/picker/prompt-cascader.js → 2x/es/components/cascader/prompt.js}

@@ -1,7 +1,7 @@
-import { Cascader } from './cascader';
 import React, { useEffect, useState } from 'react';
 import { renderToBody } from '../../utils/render-to-body';
-export function promptCascader(props) {
+import { Cascader } from './cascader';
+export function prompt(props) {
   return new Promise(function (resolve) {
     var Wrapper = function Wrapper() {
       var _useState = useState(false),

package/2x/es/components/cascader-view/cascader-view.css

@@ -0,0 +1,40 @@
+.adm-cascader-view {
+  --height: fit-content;
+}
+
+.adm-cascader-view-tabs.adm-tabs {
+  --title-font-size: 28px;
+  --content-padding: none;
+}
+
+.adm-cascader-view-header-title {
+  max-width: 168px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.adm-cascader-view-content {
+  height: var(--height);
+  overflow-y: auto;
+  padding-top: 8px;
+  box-sizing: border-box;
+}
+
+.adm-cascader-view-content.adm-list {
+  --border-inner: none;
+  --border-bottom: none;
+  --border-top: none;
+}
+
+.adm-cascader-view-item {
+  font-size: 28px;
+}
+
+.adm-cascader-view-item-active {
+  color: var(--adm-color-primary);
+}
+
+.adm-cascader-view .adm-list-inner {
+  margin-bottom: 0;
+}

package/2x/es/components/cascader-view/cascader-view.d.ts

@@ -0,0 +1,20 @@
+import { FC } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare type CascaderValue = string;
+export declare type CascaderOption = {
+    label: string;
+    value: string;
+    disabled?: boolean;
+    children?: CascaderOption[];
+};
+export declare type CascaderValueExtend = {
+    items: (CascaderOption | null)[];
+};
+export declare type CascaderViewProps = {
+    options: CascaderOption[];
+    value?: CascaderValue[];
+    defaultValue?: CascaderValue[];
+    onChange?: (value: CascaderValue[], extend: CascaderValueExtend) => void;
+    placeholder?: string;
+} & NativeProps<'--height'>;
+export declare const CascaderView: FC<CascaderViewProps>;

package/2x/es/components/cascader-view/cascader-view.js

@@ -0,0 +1,130 @@
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+import React, { useState, useEffect, useMemo } from 'react';
+import classNames from 'classnames';
+import Tabs from '../tabs';
+import CheckList from '../check-list';
+import { withNativeProps } from '../../utils/native-props';
+import { mergeProps } from '../../utils/with-default-props';
+import { usePropsValue } from '../../utils/use-props-value';
+import { useCascaderValueExtend } from './use-cascader-value-extend';
+import { useConfig } from '../config-provider';
+var classPrefix = "adm-cascader-view";
+var defaultProps = {
+  defaultValue: []
+};
+export var CascaderView = function CascaderView(p) {
+  var _useConfig = useConfig(),
+      locale = _useConfig.locale;
+
+  var props = mergeProps(defaultProps, {
+    placeholder: locale.Cascader.placeholder
+  }, p);
+
+  var _usePropsValue = usePropsValue(Object.assign(Object.assign({}, props), {
+    onChange: function onChange(val) {
+      var _a;
+
+      (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, val, generateValueExtend(val));
+    }
+  })),
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1];
+
+  var _useState = useState(0),
+      tabActiveKey = _useState[0],
+      setTabActiveKey = _useState[1];
+
+  var generateValueExtend = useCascaderValueExtend(props.options);
+  var levels = useMemo(function () {
+    var ret = [];
+    var currentOptions = props.options;
+    var reachedEnd = false;
+
+    var _loop = function _loop() {
+      var v = _step.value;
+      var target = currentOptions.find(function (option) {
+        return option.value === v;
+      });
+      ret.push({
+        selected: target,
+        options: currentOptions
+      });
+
+      if (!target || !target.children || target.children.length === 0) {
+        reachedEnd = true;
+        return "break";
+      }
+
+      currentOptions = target.children;
+    };
+
+    for (var _iterator = _createForOfIteratorHelperLoose(value), _step; !(_step = _iterator()).done;) {
+      var _ret = _loop();
+
+      if (_ret === "break") break;
+    }
+
+    if (!reachedEnd) {
+      ret.push({
+        selected: undefined,
+        options: currentOptions
+      });
+    }
+
+    return ret;
+  }, [value, props.options]);
+  useEffect(function () {
+    setTabActiveKey(levels.length - 1);
+  }, [value]);
+
+  var onItemSelect = function onItemSelect(selectValue, depth) {
+    var next = value.slice(0, depth);
+
+    if (selectValue !== undefined) {
+      next[depth] = selectValue;
+    }
+
+    setValue(next);
+  };
+
+  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
+  }, /*#__PURE__*/React.createElement(Tabs, {
+    activeKey: tabActiveKey.toString(),
+    onChange: function onChange(key) {
+      return setTabActiveKey(parseInt(key));
+    },
+    stretch: false,
+    className: classPrefix + "-tabs"
+  }, levels.map(function (level, index) {
+    var selected = level.selected;
+    return /*#__PURE__*/React.createElement(Tabs.Tab, {
+      key: index,
+      title: /*#__PURE__*/React.createElement("div", {
+        className: classPrefix + "-header-title"
+      }, selected ? selected.label : props.placeholder),
+      forceRender: true
+    }, /*#__PURE__*/React.createElement(CheckList, {
+      value: [value[index]],
+      onChange: function onChange(selectValue) {
+        return onItemSelect(selectValue[0], index);
+      },
+      className: classPrefix + "-content"
+    }, level.options.map(function (option) {
+      var _classNames;
+
+      var active = value[index] === option.value;
+      return /*#__PURE__*/React.createElement(CheckList.Item, {
+        value: option.value,
+        key: option.value,
+        disabled: option.disabled,
+        className: classNames(classPrefix + "-item", (_classNames = {}, _classNames[classPrefix + "-item-active"] = active, _classNames))
+      }, option.label);
+    })));
+  }))));
+};

package/2x/es/components/cascader-view/index.d.ts

@@ -0,0 +1,4 @@
+import './cascader-view.less';
+import { CascaderView } from './cascader-view';
+export type { CascaderViewProps, CascaderValue, CascaderValueExtend, CascaderOption, } from './cascader-view';
+export default CascaderView;

package/2x/es/components/cascader-view/index.js

@@ -0,0 +1,3 @@
+import "./cascader-view.css";
+import { CascaderView } from './cascader-view';
+export default CascaderView;

package/2x/es/components/cascader-view/use-cascader-value-extend.d.ts

@@ -0,0 +1,2 @@
+import { CascaderValue, CascaderValueExtend, CascaderOption } from './cascader-view';
+export declare function useCascaderValueExtend(options: CascaderOption[]): (val: CascaderValue[]) => CascaderValueExtend;