@douyinfe/semi-ui 2.31.0-beta.0 → 2.31.1

package/lib/es/select/index.js

@@ -35,7 +35,6 @@ import Spin from '../spin';
 import Trigger from '../trigger';
 import { IconChevronDown, IconClear } from '@douyinfe/semi-icons';
 import { isSemiIcon, getFocusableElements, getActiveElement } from '../_utils';
-import warning from '@douyinfe/semi-foundation/lib/es/utils/warning';
 import { getUuidShort } from '@douyinfe/semi-foundation/lib/es/utils/uuid';
 import '@douyinfe/semi-foundation/lib/es/select/select.css';
 const prefixcls = cssClasses.PREFIX;
@@ -49,7 +48,7 @@ class Select extends BaseComponent {
       current: node
     };
 
-    this.handleInputChange = value => this.foundation.handleInputChange(value);
+    this.handleInputChange = (value, event) => this.foundation.handleInputChange(value, event);
 
     this.getTagItem = (item, i, renderSelectedItem) => {
       const {
@@ -136,8 +135,6 @@ class Select extends BaseComponent {
     this.onKeyPress = this.onKeyPress.bind(this);
     this.eventManager = new Event();
     this.foundation = new SelectFoundation(this.adapter);
-    warning('optionLabelProp' in this.props, '[Semi Select] \'optionLabelProp\' has already been deprecated, please use \'renderSelectedItem\' instead.');
-    warning('labelInValue' in this.props, '[Semi Select] \'labelInValue\' has already been deprecated, please use \'onChangeWithObject\' instead.');
   }
 
   get adapter() {
@@ -306,8 +303,8 @@ class Select extends BaseComponent {
       notifyDropdownVisibleChange: visible => {
         this.props.onDropdownVisibleChange(visible);
       },
-      notifySearch: input => {
-        this.props.onSearch(input);
+      notifySearch: (input, event) => {
+        this.props.onSearch(input, event);
       },
       notifyCreate: input => {
         this.props.onCreate(input);

package/lib/es/select/virtualRow.js

@@ -5,10 +5,11 @@ const VirtualRow = _ref => {
     style
   } = _ref;
   const {
-    visibleOptions
+    visibleOptions,
+    renderOption
   } = data;
   const option = visibleOptions[index];
-  return data.renderOption(option, index, style);
+  return renderOption(option, index, style);
 };
 
 export default VirtualRow;

package/lib/es/table/ColumnSelection.d.ts

@@ -1,13 +1,13 @@
 import React from 'react';
 import BaseComponent from '../_base/baseComponent';
 import PropTypes from 'prop-types';
-import { TableSelectionCellAdapter, TableSelectionCellEvent } from '@douyinfe/semi-foundation/lib/es/table/tableSelectionCellFoundation';
+import TableSelectionCellFoundation, { TableSelectionCellAdapter, TableSelectionCellEvent } from '@douyinfe/semi-foundation/lib/es/table/tableSelectionCellFoundation';
 import { CheckboxEvent, CheckboxProps } from '../checkbox';
 export interface TableSelectionCellProps {
     columnTitle?: string;
     getCheckboxProps?: () => CheckboxProps;
     type?: string;
-    onChange?: (value: any, e: TableSelectionCellEvent) => void;
+    onChange?: (checked: boolean, e: TableSelectionCellEvent) => void;
     selected?: boolean;
     disabled?: boolean;
     indeterminate?: boolean;
@@ -37,7 +37,8 @@ export default class TableSelectionCell extends BaseComponent<TableSelectionCell
         prefixCls: "semi-table";
     };
     get adapter(): TableSelectionCellAdapter;
+    foundation: TableSelectionCellFoundation;
     constructor(props: TableSelectionCellProps);
-    handleChange: (e: CheckboxEvent) => any;
+    handleChange: (e: CheckboxEvent) => void;
     render(): JSX.Element;
 }

package/lib/es/table/Table.d.ts

@@ -32,6 +32,14 @@ export interface NormalTableState<RecordType extends Record<string, any> = Data>
     prePropRowSelection?: TableStateRowSelection<RecordType>;
     tableWidth?: number;
     prePagination?: Pagination;
+    /**
+    * Disabled row keys in sorted and filtered data
+    */
+    allDisabledRowKeys?: BaseRowKeyType[];
+    /**
+     * Disabled row keys set in sorted and filtered data
+     */
+    allDisabledRowKeysSet?: Set<BaseRowKeyType>;
 }
 export declare type TableStateRowSelection<RecordType extends Record<string, any> = Data> = (RowSelectionProps<RecordType> & {
     selectedRowKeysSet?: Set<(string | number)>;
@@ -227,7 +235,7 @@ declare class Table<RecordType extends Record<string, any>> extends BaseComponen
       */
     addFnsInColumn: (column?: ColumnProps) => ColumnProps<any>;
     toggleSelectRow: (selected: boolean, realKey: string | number, e: TableSelectionCellEvent) => void;
-    toggleSelectAllRow: (status: boolean, e: TableSelectionCellEvent) => void;
+    toggleSelectAllRow: (selected: boolean, e: TableSelectionCellEvent) => void;
     /**
      * render pagination
      * @param {object} pagination

package/lib/es/table/Table.js

@@ -298,7 +298,7 @@ class Table extends BaseComponent {
       let inHeader = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       const {
         rowSelection,
-        disabledRowKeysSet
+        allDisabledRowKeysSet
       } = _this.state;
 
       if (rowSelection && typeof rowSelection === 'object') {
@@ -315,7 +315,7 @@ class Table extends BaseComponent {
           const allRowKeys = _this.cachedFilteredSortedRowKeys;
           const allRowKeysSet = _this.cachedFilteredSortedRowKeysSet;
 
-          const allIsSelected = _this.foundation.allIsSelected(selectedRowKeysSet, disabledRowKeysSet, allRowKeys);
+          const allIsSelected = _this.foundation.allIsSelected(selectedRowKeysSet, allDisabledRowKeysSet, allRowKeys);
 
           const hasRowSelected = _this.foundation.hasRowSelected(selectedRowKeys, allRowKeysSet);
 
@@ -325,8 +325,8 @@ class Table extends BaseComponent {
             key: columnKey,
             selected: allIsSelected,
             indeterminate: hasRowSelected && !allIsSelected,
-            onChange: (status, e) => {
-              _this.toggleSelectAllRow(status, e);
+            onChange: (selected, e) => {
+              _this.toggleSelectAllRow(selected, e);
             }
           });
         } else {
@@ -529,8 +529,8 @@ class Table extends BaseComponent {
       this.foundation.handleSelectRow(realKey, selected, e);
     };
 
-    this.toggleSelectAllRow = (status, e) => {
-      this.foundation.handleSelectAllRow(status, e);
+    this.toggleSelectAllRow = (selected, e) => {
+      this.foundation.handleSelectAllRow(selected, e);
     };
     /**
      * render pagination
@@ -848,6 +848,8 @@ class Table extends BaseComponent {
       allRowKeys: [],
       disabledRowKeys: [],
       disabledRowKeysSet: new Set(),
+      allDisabledRowKeys: [],
+      allDisabledRowKeysSet: new Set(),
       headWidths: [],
       bodyHasScrollBar: false,
       prePropRowSelection: undefined,
@@ -952,11 +954,20 @@ class Table extends BaseComponent {
         this.cachedFilteredSortedRowKeys = filteredSortedRowKeys;
         this.cachedFilteredSortedRowKeysSet = new Set(filteredSortedRowKeys);
       },
+      setAllDisabledRowKeys: allDisabledRowKeys => {
+        const allDisabledRowKeysSet = new Set(allDisabledRowKeys);
+        this.setState({
+          allDisabledRowKeys,
+          allDisabledRowKeysSet
+        });
+      },
       getCurrentPage: () => _get(this.state, 'pagination.currentPage', 1),
       getCurrentPageSize: () => _get(this.state, 'pagination.pageSize', numbers.DEFAULT_PAGE_SIZE),
       getCachedFilteredSortedDataSource: () => this.cachedFilteredSortedDataSource,
       getCachedFilteredSortedRowKeys: () => this.cachedFilteredSortedRowKeys,
       getCachedFilteredSortedRowKeysSet: () => this.cachedFilteredSortedRowKeysSet,
+      getAllDisabledRowKeys: () => this.state.allDisabledRowKeys,
+      getAllDisabledRowKeysSet: () => this.state.allDisabledRowKeysSet,
       notifyFilterDropdownVisibleChange: (visible, dataIndex) => this._invokeColumnFn(dataIndex, 'onFilterDropdownVisibleChange', visible),
       notifyChange: function () {
         return _this2.props.onChange(...arguments);
@@ -1160,8 +1171,11 @@ class Table extends BaseComponent {
           childrenRecordName,
           rowKey
         });
+        const disabledRowKeysSet = new Set(disabledRowKeys);
         willUpdateStates.disabledRowKeys = disabledRowKeys;
-        willUpdateStates.disabledRowKeysSet = new Set(disabledRowKeys);
+        willUpdateStates.disabledRowKeysSet = disabledRowKeysSet;
+        willUpdateStates.allDisabledRowKeys = disabledRowKeys;
+        willUpdateStates.allDisabledRowKeysSet = disabledRowKeysSet;
       }
 
       willUpdateStates.rowSelection = newSelectionStates;
@@ -1265,7 +1279,9 @@ class Table extends BaseComponent {
       // Temporarily use _dataSource=[...dataSource] for processing
       const _dataSource = [...dataSource];
       const filteredSortedDataSource = this.foundation.getFilteredSortedDataSource(_dataSource, stateQueries);
+      const allDataDisabledRowKeys = this.foundation.getAllDisabledRowKeys(filteredSortedDataSource);
       this.foundation.setCachedFilteredSortedDataSource(filteredSortedDataSource);
+      this.foundation.setAllDisabledRowKeys(allDataDisabledRowKeys);
       states.dataSource = filteredSortedDataSource;
 
       if (this.props.groupBy) {

package/lib/es/treeSelect/index.d.ts

@@ -245,7 +245,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
     getTreeNodeKey: (treeNode: TreeNodeData) => string;
     handlePopoverClose: (isVisible: any) => void;
     renderTreeNode: (treeNode: FlattenNode, ind: number, style: React.CSSProperties) => JSX.Element;
-    itemKey: (index: number, data: TreeNodeData) => any;
+    itemKey: (index: number, data: Record<string, any>) => any;
     renderNodeList: () => JSX.Element;
     renderTree: () => JSX.Element;
     render(): JSX.Element;

package/lib/es/treeSelect/index.js

@@ -34,6 +34,7 @@ import { isSemiIcon } from '../_utils';
 import { IconChevronDown, IconClear, IconSearch } from '@douyinfe/semi-icons';
 import CheckboxGroup from '../checkbox/checkboxGroup';
 import Popover from '../popover/index';
+import VirtualRow from '../select/virtualRow';
 const prefixcls = cssClasses.PREFIX;
 const prefixTree = cssClasses.PREFIX_TREE;
 const key = 0;
@@ -766,8 +767,11 @@ class TreeSelect extends BaseComponent {
     };
 
     this.itemKey = (index, data) => {
-      // Find the item at the specified index.
-      const item = data[index]; // Return a value that uniquely identifies this item.
+      const {
+        visibleOptions
+      } = data; // Find the item at the specified index.
+
+      const item = visibleOptions[index]; // Return a value that uniquely identifies this item.
 
       return item.key;
     };
@@ -801,23 +805,18 @@ class TreeSelect extends BaseComponent {
         });
       }
 
-      const option = _ref => {
-        let {
-          index,
-          style,
-          data
-        } = _ref;
-        return this.renderTreeNode(data[index], index, style);
+      const data = {
+        visibleOptions: flattenNodes,
+        renderOption: this.renderTreeNode
       };
-
       return /*#__PURE__*/React.createElement(AutoSizer, {
         defaultHeight: virtualize.height,
         defaultWidth: virtualize.width
-      }, _ref2 => {
+      }, _ref => {
         let {
           height,
           width
-        } = _ref2;
+        } = _ref;
         return /*#__PURE__*/React.createElement(VirtualList, {
           itemCount: flattenNodes.length,
           itemSize: virtualize.itemSize,
@@ -825,12 +824,12 @@ class TreeSelect extends BaseComponent {
           width: width,
           // @ts-ignore avoid strict check of itemKey
           itemKey: this.itemKey,
-          itemData: flattenNodes,
+          itemData: data,
           className: `${prefixTree}-virtual-list`,
           style: {
             direction
           }
-        }, option);
+        }, VirtualRow);
       });
     };
 
@@ -1140,11 +1139,11 @@ class TreeSelect extends BaseComponent {
     };
     return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, super.adapter), filterAdapter), treeSelectAdapter), treeAdapter), {
       updateLoadKeys: (data, resolve) => {
-        this.setState(_ref3 => {
+        this.setState(_ref2 => {
           let {
             loadedKeys,
             loadingKeys
-          } = _ref3;
+          } = _ref2;
           return this.foundation.handleNodeLoad(loadedKeys, loadingKeys, data, resolve);
         });
       },
@@ -1181,11 +1180,11 @@ class TreeSelect extends BaseComponent {
       notifyChangeWithObject: (node, e) => {
         this.props.onChange && this.props.onChange(node, e);
       },
-      notifyExpand: (expandedKeys, _ref4) => {
+      notifyExpand: (expandedKeys, _ref3) => {
         let {
           expanded: bool,
           node
-        } = _ref4;
+        } = _ref3;
         this.props.onExpand && this.props.onExpand([...expandedKeys], {
           expanded: bool,
           node

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.31.0-beta.0",
+    "version": "2.31.1",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -17,12 +17,12 @@
         "lib/*"
     ],
     "dependencies": {
-        "@douyinfe/semi-animation": "2.31.0-beta.0",
-        "@douyinfe/semi-animation-react": "2.31.0-beta.0",
-        "@douyinfe/semi-foundation": "2.31.0-beta.0",
-        "@douyinfe/semi-icons": "2.31.0-beta.0",
-        "@douyinfe/semi-illustrations": "2.31.0-beta.0",
-        "@douyinfe/semi-theme-default": "2.31.0-beta.0",
+        "@douyinfe/semi-animation": "2.31.1",
+        "@douyinfe/semi-animation-react": "2.31.1",
+        "@douyinfe/semi-foundation": "2.31.1",
+        "@douyinfe/semi-icons": "2.31.1",
+        "@douyinfe/semi-illustrations": "2.31.1",
+        "@douyinfe/semi-theme-default": "2.31.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -69,7 +69,7 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "8b378259f169ca3bfb9af17118e962d717efa685",
+    "gitHead": "00ded133e899ea816cbefe20eebcdb60fd983ecc",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",