@ant-design/pro-components 3.0.2-0 → 3.1.1-0

package/lib/skeleton/index.js

@@ -1,78 +1,82 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 Object.defineProperty(exports, "DescriptionsSkeleton", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _Descriptions.DescriptionsSkeleton;
   }
 });
 Object.defineProperty(exports, "ListPageSkeleton", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _List.default;
   }
 });
 Object.defineProperty(exports, "ListSkeleton", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _List.ListSkeleton;
   }
 });
 Object.defineProperty(exports, "ListSkeletonItem", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _List.ListSkeletonItem;
   }
 });
 Object.defineProperty(exports, "ListToolbarSkeleton", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _List.ListToolbarSkeleton;
   }
 });
 Object.defineProperty(exports, "PageHeaderSkeleton", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _List.PageHeaderSkeleton;
   }
 });
 exports.ProSkeleton = void 0;
 Object.defineProperty(exports, "TableItemSkeleton", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _Descriptions.TableItemSkeleton;
   }
 });
 Object.defineProperty(exports, "TableSkeleton", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _Descriptions.TableSkeleton;
   }
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _Descriptions = _interopRequireWildcard(require("./components/Descriptions"));
 var _List = _interopRequireWildcard(require("./components/List"));
 var _Result = _interopRequireDefault(require("./components/Result"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["type"];
-var ProSkeleton = exports.ProSkeleton = function ProSkeleton(_ref) {
-  var _ref$type = _ref.type,
-    type = _ref$type === void 0 ? 'list' : _ref$type,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+const ProSkeleton = ({
+  type = 'list',
+  ...rest
+}) => {
   if (type === 'result') {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Result.default, (0, _objectSpread2.default)({}, rest));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Result.default, {
+      ...rest
+    });
   }
   if (type === 'descriptions') {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Descriptions.default, (0, _objectSpread2.default)({}, rest));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Descriptions.default, {
+      ...rest
+    });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_List.default, (0, _objectSpread2.default)({}, rest));
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_List.default, {
+    ...rest
+  });
 };
+exports.ProSkeleton = ProSkeleton;
 var _default = exports.default = ProSkeleton;

package/lib/table/Store/Provide.d.ts

@@ -29,11 +29,11 @@ declare function useContainer(props?: UseContainerProps): {
     columnsMap: Record<string, ColumnsState>;
     keyWords: string | undefined;
     setKeyWords: (k: string | undefined) => void;
-    setTableSize: (updater: DensitySize | ((origin: DensitySize) => DensitySize), ignoreDestroy?: boolean | undefined) => void;
+    setTableSize: (updater: DensitySize | ((prev: DensitySize) => DensitySize)) => void;
     tableSize: DensitySize;
     prefixName: any;
     setPrefixName: (name: any) => void;
-    setColumnsMap: (updater: Record<string, ColumnsState> | ((origin: Record<string, ColumnsState>) => Record<string, ColumnsState>), ignoreDestroy?: boolean | undefined) => void;
+    setColumnsMap: (updater: Record<string, ColumnsState> | ((prev: Record<string, ColumnsState>) => Record<string, ColumnsState>)) => void;
     columns: ProTableColumn<any>[] | ProColumns<any, any>[] | undefined;
     rootDomRef: import("react").RefObject<HTMLDivElement>;
     clearPersistenceStorage: () => void;
@@ -48,11 +48,11 @@ declare const TableContext: import("react").Context<{
     columnsMap: Record<string, ColumnsState>;
     keyWords: string | undefined;
     setKeyWords: (k: string | undefined) => void;
-    setTableSize: (updater: DensitySize | ((origin: DensitySize) => DensitySize), ignoreDestroy?: boolean | undefined) => void;
+    setTableSize: (updater: DensitySize | ((prev: DensitySize) => DensitySize)) => void;
     tableSize: DensitySize;
     prefixName: any;
     setPrefixName: (name: any) => void;
-    setColumnsMap: (updater: Record<string, ColumnsState> | ((origin: Record<string, ColumnsState>) => Record<string, ColumnsState>), ignoreDestroy?: boolean | undefined) => void;
+    setColumnsMap: (updater: Record<string, ColumnsState> | ((prev: Record<string, ColumnsState>) => Record<string, ColumnsState>)) => void;
     columns: ProTableColumn<any>[] | ProColumns<any, any>[] | undefined;
     rootDomRef: import("react").RefObject<HTMLDivElement>;
     clearPersistenceStorage: () => void;

package/lib/table/Store/Provide.js

@@ -5,108 +5,100 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TableContext = exports.Container = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _util = require("@rc-component/util");
 var _merge = _interopRequireDefault(require("lodash-es/merge"));
 var _react = require("react");
 var _utils = require("../utils");
 var _jsxRuntime = require("react/jsx-runtime");
-function useContainer() {
-  var _props$columnsState6, _props$columnsState7, _props$columnsState10, _props$columnsState11, _props$columnsState15, _props$columnsState16;
-  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var actionRef = (0, _react.useRef)();
-  var rootDomRef = (0, _react.useRef)(null);
+function useContainer(props = {}) {
+  const actionRef = (0, _react.useRef)();
+  const rootDomRef = (0, _react.useRef)(null);
   /** 父 form item 的 name */
-  var prefixNameRef = (0, _react.useRef)();
+  const prefixNameRef = (0, _react.useRef)();
 
   /** 自己 props 的引用 */
-  var propsRef = (0, _react.useRef)();
+  const propsRef = (0, _react.useRef)();
 
   // 共享状态比较难，就放到这里了
-  var _useState = (0, _react.useState)(''),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    keyWords = _useState2[0],
-    _setKeyWords = _useState2[1];
+  const [keyWords, setKeyWords] = (0, _react.useState)('');
   // 用于排序的数组
-  var sortKeyColumns = (0, _react.useRef)([]);
-  var _useMergedState = (0, _util.useMergedState)(function () {
-      return props.size || props.defaultSize || 'middle';
-    }, {
-      value: props.size,
-      onChange: props.onSizeChange
-    }),
-    _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
-    tableSize = _useMergedState2[0],
-    setTableSize = _useMergedState2[1];
+  const sortKeyColumns = (0, _react.useRef)([]);
+  const [tableSize, setTableSizeInner] = (0, _util.useControlledState)(() => props.size || props.defaultSize || 'middle', props.size);
+  const setTableSize = (0, _react.useCallback)(updater => {
+    setTableSizeInner(prev => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      props.onSizeChange?.(next);
+      return next;
+    });
+  }, [props.onSizeChange]);
 
   /** 默认全选中 */
-  var defaultColumnKeyMap = (0, _react.useMemo)(function () {
-    var _props$columnsState, _props$columns;
-    if (props !== null && props !== void 0 && (_props$columnsState = props.columnsState) !== null && _props$columnsState !== void 0 && _props$columnsState.defaultValue) return props.columnsState.defaultValue;
-    var columnKeyMap = {};
-    (_props$columns = props.columns) === null || _props$columns === void 0 || _props$columns.forEach(function (_ref, index) {
-      var key = _ref.key,
-        dataIndex = _ref.dataIndex,
-        fixed = _ref.fixed,
-        disable = _ref.disable;
-      var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+  const defaultColumnKeyMap = (0, _react.useMemo)(() => {
+    if (props?.columnsState?.defaultValue) return props.columnsState.defaultValue;
+    const columnKeyMap = {};
+    props.columns?.forEach(({
+      key,
+      dataIndex,
+      fixed,
+      disable
+    }, index) => {
+      const columnKey = (0, _utils.genColumnKey)(key ?? dataIndex, index);
       if (columnKey) {
         columnKeyMap[columnKey] = {
           show: true,
-          fixed: fixed,
-          disable: disable
+          fixed,
+          disable
         };
       }
     });
     return columnKeyMap;
   }, [props.columns]);
-  var _useMergedState3 = (0, _util.useMergedState)(function () {
-      var _props$columnsState4, _props$columnsState5;
-      var _ref2 = props.columnsState || {},
-        persistenceType = _ref2.persistenceType,
-        persistenceKey = _ref2.persistenceKey;
-      if (persistenceKey && persistenceType && typeof window !== 'undefined') {
-        /** 从持久化中读取数据 */
-        var storage = window[persistenceType];
-        try {
-          var storageValue = storage === null || storage === void 0 ? void 0 : storage.getItem(persistenceKey);
-          if (storageValue) {
-            var _props$columnsState2;
-            if (props !== null && props !== void 0 && (_props$columnsState2 = props.columnsState) !== null && _props$columnsState2 !== void 0 && _props$columnsState2.defaultValue) {
-              var _props$columnsState3;
-              // 实际生产中，defaultValue往往作为系统方默认配置，则优先级不应高于用户配置的storageValue
-              return (0, _merge.default)({}, props === null || props === void 0 || (_props$columnsState3 = props.columnsState) === null || _props$columnsState3 === void 0 ? void 0 : _props$columnsState3.defaultValue, JSON.parse(storageValue));
-            }
-            return JSON.parse(storageValue);
+  const [columnsMap, setColumnsMapInner] = (0, _util.useControlledState)(() => {
+    const {
+      persistenceType,
+      persistenceKey
+    } = props.columnsState || {};
+    if (persistenceKey && persistenceType && typeof window !== 'undefined') {
+      /** 从持久化中读取数据 */
+      const storage = window[persistenceType];
+      try {
+        const storageValue = storage?.getItem(persistenceKey);
+        if (storageValue) {
+          if (props?.columnsState?.defaultValue) {
+            // 实际生产中，defaultValue往往作为系统方默认配置，则优先级不应高于用户配置的storageValue
+            return (0, _merge.default)({}, props?.columnsState?.defaultValue, JSON.parse(storageValue));
           }
-        } catch (error) {
-          console.warn(error);
+          return JSON.parse(storageValue);
         }
+      } catch (error) {
+        console.warn(error);
       }
-      return ((_props$columnsState4 = props.columnsState) === null || _props$columnsState4 === void 0 ? void 0 : _props$columnsState4.value) || ((_props$columnsState5 = props.columnsState) === null || _props$columnsState5 === void 0 ? void 0 : _props$columnsState5.defaultValue) || defaultColumnKeyMap;
-    }, {
-      value: (_props$columnsState6 = props.columnsState) === null || _props$columnsState6 === void 0 ? void 0 : _props$columnsState6.value,
-      onChange: ((_props$columnsState7 = props.columnsState) === null || _props$columnsState7 === void 0 ? void 0 : _props$columnsState7.onChange) || props.onColumnsStateChange
-    }),
-    _useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
-    columnsMap = _useMergedState4[0],
-    setColumnsMap = _useMergedState4[1];
+    }
+    return props.columnsState?.value || props.columnsState?.defaultValue || defaultColumnKeyMap;
+  }, props.columnsState?.value);
+  const onColumnsMapChange = props.columnsState?.onChange || props.onColumnsStateChange;
+  const setColumnsMap = (0, _react.useCallback)(updater => {
+    setColumnsMapInner(prev => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      onColumnsMapChange?.(next);
+      return next;
+    });
+  }, [onColumnsMapChange]);
 
   /**  配置或列更改时对columnsMap重新赋值 */
-  (0, _react.useEffect)(function () {
-    var _ref3 = props.columnsState || {},
-      persistenceType = _ref3.persistenceType,
-      persistenceKey = _ref3.persistenceKey;
+  (0, _react.useEffect)(() => {
+    const {
+      persistenceType,
+      persistenceKey
+    } = props.columnsState || {};
     if (persistenceKey && persistenceType && typeof window !== 'undefined') {
       /** 从持久化中读取数据 */
-      var storage = window[persistenceType];
+      const storage = window[persistenceType];
       try {
-        var storageValue = storage === null || storage === void 0 ? void 0 : storage.getItem(persistenceKey);
+        const storageValue = storage?.getItem(persistenceKey);
         if (storageValue) {
-          var _props$columnsState8;
-          if (props !== null && props !== void 0 && (_props$columnsState8 = props.columnsState) !== null && _props$columnsState8 !== void 0 && _props$columnsState8.defaultValue) {
-            var _props$columnsState9;
-            setColumnsMap((0, _merge.default)({}, props === null || props === void 0 || (_props$columnsState9 = props.columnsState) === null || _props$columnsState9 === void 0 ? void 0 : _props$columnsState9.defaultValue, JSON.parse(storageValue)));
+          if (props?.columnsState?.defaultValue) {
+            setColumnsMap((0, _merge.default)({}, props?.columnsState?.defaultValue, JSON.parse(storageValue)));
           } else {
             setColumnsMap(JSON.parse(storageValue));
           }
@@ -118,91 +110,85 @@ function useContainer() {
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [(_props$columnsState10 = props.columnsState) === null || _props$columnsState10 === void 0 ? void 0 : _props$columnsState10.persistenceKey, (_props$columnsState11 = props.columnsState) === null || _props$columnsState11 === void 0 ? void 0 : _props$columnsState11.persistenceType, defaultColumnKeyMap]);
+  }, [props.columnsState?.persistenceKey, props.columnsState?.persistenceType, defaultColumnKeyMap]);
 
   /** 清空一下当前的 key */
-  var clearPersistenceStorage = (0, _react.useCallback)(function () {
-    var _ref4 = props.columnsState || {},
-      persistenceType = _ref4.persistenceType,
-      persistenceKey = _ref4.persistenceKey;
+  const clearPersistenceStorage = (0, _react.useCallback)(() => {
+    const {
+      persistenceType,
+      persistenceKey
+    } = props.columnsState || {};
     if (!persistenceKey || !persistenceType || typeof window === 'undefined') return;
 
     /** 给持久化中设置数据 */
-    var storage = window[persistenceType];
+    const storage = window[persistenceType];
     try {
-      storage === null || storage === void 0 || storage.removeItem(persistenceKey);
+      storage?.removeItem(persistenceKey);
     } catch (error) {
       console.warn(error);
     }
   }, [props.columnsState]);
-  (0, _react.useEffect)(function () {
-    var _props$columnsState12, _props$columnsState13;
-    if (!((_props$columnsState12 = props.columnsState) !== null && _props$columnsState12 !== void 0 && _props$columnsState12.persistenceKey) || !((_props$columnsState13 = props.columnsState) !== null && _props$columnsState13 !== void 0 && _props$columnsState13.persistenceType)) {
+  (0, _react.useEffect)(() => {
+    if (!props.columnsState?.persistenceKey || !props.columnsState?.persistenceType) {
       return;
     }
     if (typeof window === 'undefined') return;
     /** 给持久化中设置数据 */
-    var _props$columnsState14 = props.columnsState,
-      persistenceType = _props$columnsState14.persistenceType,
-      persistenceKey = _props$columnsState14.persistenceKey;
-    var storage = window[persistenceType];
+    const {
+      persistenceType,
+      persistenceKey
+    } = props.columnsState;
+    const storage = window[persistenceType];
     try {
-      storage === null || storage === void 0 || storage.setItem(persistenceKey, JSON.stringify(columnsMap));
+      storage?.setItem(persistenceKey, JSON.stringify(columnsMap));
     } catch (error) {
       console.warn(error);
       clearPersistenceStorage();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [(_props$columnsState15 = props.columnsState) === null || _props$columnsState15 === void 0 ? void 0 : _props$columnsState15.persistenceKey, columnsMap, (_props$columnsState16 = props.columnsState) === null || _props$columnsState16 === void 0 ? void 0 : _props$columnsState16.persistenceType]);
-  var renderValue = {
+  }, [props.columnsState?.persistenceKey, columnsMap, props.columnsState?.persistenceType]);
+  const renderValue = {
     action: actionRef.current,
-    setAction: function setAction(newAction) {
+    setAction: newAction => {
       actionRef.current = newAction;
     },
     sortKeyColumns: sortKeyColumns.current,
-    setSortKeyColumns: function setSortKeyColumns(keys) {
+    setSortKeyColumns: keys => {
       sortKeyColumns.current = keys;
     },
-    propsRef: propsRef,
-    columnsMap: columnsMap,
-    keyWords: keyWords,
-    setKeyWords: function setKeyWords(k) {
-      return _setKeyWords(k);
-    },
-    setTableSize: setTableSize,
-    tableSize: tableSize,
+    propsRef,
+    columnsMap,
+    keyWords,
+    setKeyWords: k => setKeyWords(k),
+    setTableSize,
+    tableSize,
     prefixName: prefixNameRef.current,
-    setPrefixName: function setPrefixName(name) {
+    setPrefixName: name => {
       prefixNameRef.current = name;
     },
-    setColumnsMap: setColumnsMap,
+    setColumnsMap,
     columns: props.columns,
-    rootDomRef: rootDomRef,
-    clearPersistenceStorage: clearPersistenceStorage,
-    defaultColumnKeyMap: defaultColumnKeyMap
+    rootDomRef,
+    clearPersistenceStorage,
+    defaultColumnKeyMap
   };
   Object.defineProperty(renderValue, 'prefixName', {
-    get: function get() {
-      return prefixNameRef.current;
-    }
+    get: () => prefixNameRef.current
   });
   Object.defineProperty(renderValue, 'sortKeyColumns', {
-    get: function get() {
-      return sortKeyColumns.current;
-    }
+    get: () => sortKeyColumns.current
   });
   Object.defineProperty(renderValue, 'action', {
-    get: function get() {
-      return actionRef.current;
-    }
+    get: () => actionRef.current
   });
   return renderValue;
 }
-var TableContext = exports.TableContext = /*#__PURE__*/(0, _react.createContext)({});
-var Container = exports.Container = function Container(props) {
-  var value = useContainer(props.initValue);
+const TableContext = exports.TableContext = /*#__PURE__*/(0, _react.createContext)({});
+const Container = props => {
+  const value = useContainer(props.initValue);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(TableContext.Provider, {
     value: value,
     children: props.children
   });
-};
+};
+exports.Container = Container;

package/lib/table/Table.d.ts

@@ -1,4 +1,4 @@
-import type Summary from 'rc-table/lib/Footer/Summary';
+import React from 'react';
 import type { ParamsType } from '../provider';
 import type { ProTableProps } from './typing';
 /**
@@ -8,6 +8,9 @@ import type { ProTableProps } from './typing';
  */
 declare const ProviderTableContainer: {
     <DataType extends Record<string, any>, Params extends ParamsType = ParamsType, ValueType = "text">(props: ProTableProps<DataType, Params, ValueType>): import("react/jsx-runtime").JSX.Element;
-    Summary: typeof Summary;
+    Summary: React.FC<React.PropsWithChildren<import("@rc-component/table/lib/Footer/Summary").SummaryProps>> & {
+        Row: React.FC<React.PropsWithChildren<import("@rc-component/table/lib/Footer/Row").FooterRowProps>>;
+        Cell: React.FC<React.PropsWithChildren<import("@rc-component/table/lib/Footer/Cell").SummaryCellProps>>;
+    };
 };
 export default ProviderTableContainer;