@douyinfe/semi-foundation 2.1.0-beta.2 → 2.1.0-next.2

package/lib/es/table/utils.js

@@ -1,3 +1,16 @@
+import _isFunction from "lodash/isFunction";
+import _toString from "lodash/toString";
+import _includes from "lodash/includes";
+import _some from "lodash/some";
+import _findIndex from "lodash/findIndex";
+import _each from "lodash/each";
+import _clone from "lodash/clone";
+import _map from "lodash/map";
+import _find from "lodash/find";
+import _filter from "lodash/filter";
+import _get from "lodash/get";
+import _isEqualWith from "lodash/isEqualWith";
+import _cloneDeepWith from "lodash/cloneDeepWith";
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import _everyInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/every";
@@ -7,18 +20,11 @@ import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/inst
 import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
 import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
-
-/* eslint-disable max-len */
-
-/* eslint-disable no-param-reassign */
-
-/* eslint-disable eqeqeq */
-import { cloneDeepWith, isEqualWith, get, filter, find, map, clone as lodashClone, each, findIndex, some, includes, toString, isFunction } from 'lodash-es';
 import { strings, numbers } from './constants';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
 import Logger from '../utils/Logger';
 export function cloneDeep(value, customizer) {
-  return cloneDeepWith(value, v => {
+  return _cloneDeepWith(value, v => {
     if (typeof v === 'function') {
       return v;
     } else if (typeof customizer === 'function') {
@@ -29,9 +35,9 @@ export function cloneDeep(value, customizer) {
   });
 }
 export function equalWith(value, other, customizer) {
-  return isEqualWith(value, other, function (objVal, othVal) {
+  return _isEqualWith(value, other, function (objVal, othVal) {
     if (typeof objVal === 'function' && typeof othVal === 'function') {
-      return toString(objVal) === toString(othVal);
+      return _toString(objVal) === _toString(othVal);
     }
 
     if (typeof customizer === 'function') {
@@ -49,8 +55,9 @@ export function equalWith(value, other, customizer) {
 export function getColumnKey(column, keyPropNames) {
   keyPropNames = _Array$isArray(keyPropNames) ? keyPropNames : ['key', 'dataIndex'];
   let key = null;
-  each(keyPropNames, propName => {
-    key = get(column, propName);
+
+  _each(keyPropNames, propName => {
+    key = _get(column, propName);
 
     if (key != null) {
       return false;
@@ -58,6 +65,7 @@ export function getColumnKey(column, keyPropNames) {
 
     return undefined;
   });
+
   return key;
 }
 export function mergeColumns() {
@@ -66,11 +74,13 @@ export function mergeColumns() {
   let keyPropNames = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   let deep = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   const finalColumns = [];
-  const clone = deep ? cloneDeep : lodashClone;
-  map(newColumns, newColumn => {
+  const clone = deep ? cloneDeep : _clone;
+
+  _map(newColumns, newColumn => {
     newColumn = _Object$assign({}, newColumn);
     const key = getColumnKey(newColumn, keyPropNames);
-    const oldColumn = key != null && find(oldColumns, item => getColumnKey(item, keyPropNames) === key);
+
+    const oldColumn = key != null && _find(oldColumns, item => getColumnKey(item, keyPropNames) === key);
 
     if (oldColumn) {
       finalColumns.push(clone(_Object$assign(_Object$assign({}, oldColumn), newColumn)));
@@ -78,6 +88,7 @@ export function mergeColumns() {
       finalColumns.push(clone(newColumn));
     }
   });
+
   return finalColumns;
 }
 /**
@@ -95,23 +106,31 @@ export function arrayAdd() {
   beginIndex = beginIndex < 0 || typeof beginIndex !== 'number' ? 0 : beginIndex;
   endIndex = endIndex > arr.length || typeof endIndex !== 'number' ? arr.length : endIndex;
   let result = 0;
-  each(arr, (value, index) => {
+
+  _each(arr, (value, index) => {
     if (index >= beginIndex && index < endIndex) {
       result += typeof value === 'number' && !isNaN(value) ? value : 0;
     }
   });
+
   return result;
 }
 export function isLastLeftFixed(columns, column) {
   let checkKeys = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ['key'];
-  const leftFixedColumns = filter(columns, col => col.fixed === true || col.fixed === 'left');
-  const index = findIndex(leftFixedColumns, col => _everyInstanceProperty(checkKeys).call(checkKeys, key => col[key] != null && col[key] === column[key]));
+
+  const leftFixedColumns = _filter(columns, col => col.fixed === true || col.fixed === 'left');
+
+  const index = _findIndex(leftFixedColumns, col => _everyInstanceProperty(checkKeys).call(checkKeys, key => col[key] != null && col[key] === column[key]));
+
   return leftFixedColumns.length > 0 && index === leftFixedColumns.length - 1;
 }
 export function isFirstFixedRight(columns, column) {
   let checkKeys = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ['key'];
-  const rightFixedColumns = filter(columns, col => col.fixed === 'right');
-  const index = findIndex(rightFixedColumns, col => _everyInstanceProperty(checkKeys).call(checkKeys, key => col[key] != null && col[key] === column[key]));
+
+  const rightFixedColumns = _filter(columns, col => col.fixed === 'right');
+
+  const index = _findIndex(rightFixedColumns, col => _everyInstanceProperty(checkKeys).call(checkKeys, key => col[key] != null && col[key] === column[key]));
+
   return rightFixedColumns.length > 0 && index === 0;
 }
 export function isAnyFixed(columns) {
@@ -121,20 +140,20 @@ export function isAnyFixed(columns) {
     fixedSet = [fixedSet];
   }
 
-  return fixedSet.length > 0 && some(columns, col => _includesInstanceProperty(fixedSet).call(fixedSet, col.fixed));
+  return fixedSet.length > 0 && _some(columns, col => _includesInstanceProperty(fixedSet).call(fixedSet, col.fixed));
 }
 export function isAnyFixedRight(columns) {
-  return some(columns, col => col.fixed === 'right');
+  return _some(columns, col => col.fixed === 'right');
 }
 export function isFixedLeft(column) {
   var _context;
 
-  return _includesInstanceProperty(_context = ['left', true]).call(_context, get(column, 'fixed'));
+  return _includesInstanceProperty(_context = ['left', true]).call(_context, _get(column, 'fixed'));
 }
 export function isFixedRight(column) {
   var _context2;
 
-  return _includesInstanceProperty(_context2 = ['right']).call(_context2, get(column, 'fixed'));
+  return _includesInstanceProperty(_context2 = ['right']).call(_context2, _get(column, 'fixed'));
 }
 export function isFixed(column) {
   return isFixedLeft(column) || isFixedRight(column);
@@ -145,17 +164,17 @@ export function isInnerColumnKey(key) {
   return _includesInstanceProperty(_context3 = [strings.DEFAULT_KEY_COLUMN_EXPAND, strings.DEFAULT_KEY_COLUMN_SCROLLBAR, strings.DEFAULT_KEY_COLUMN_SELECTION]).call(_context3, key);
 }
 export function isExpandedColumn(column) {
-  return get(column, 'key') === strings.DEFAULT_KEY_COLUMN_EXPAND;
+  return _get(column, 'key') === strings.DEFAULT_KEY_COLUMN_EXPAND;
 }
 export function isScrollbarColumn(column) {
-  return get(column, 'key') === strings.DEFAULT_KEY_COLUMN_SCROLLBAR;
+  return _get(column, 'key') === strings.DEFAULT_KEY_COLUMN_SCROLLBAR;
 }
 export function isSelectionColumn(column) {
-  return get(column, 'key') === strings.DEFAULT_KEY_COLUMN_SELECTION;
+  return _get(column, 'key') === strings.DEFAULT_KEY_COLUMN_SELECTION;
 }
 export function filterColumns(columns) {
   let ignoreKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [strings.DEFAULT_KEY_COLUMN_SCROLLBAR];
-  return filter(columns, col => !_includesInstanceProperty(ignoreKeys).call(ignoreKeys, col.key));
+  return _filter(columns, col => !_includesInstanceProperty(ignoreKeys).call(ignoreKeys, col.key));
 }
 /**
  * get width of scroll bar
@@ -170,8 +189,8 @@ export function getScrollbarColumnWidth() {
   if (len) {
     const lastColumn = columns[len - 1];
 
-    if (get(lastColumn, 'key') === strings.DEFAULT_KEY_COLUMN_SCROLLBAR) {
-      return get(lastColumn, 'width', 0);
+    if (_get(lastColumn, 'key') === strings.DEFAULT_KEY_COLUMN_SCROLLBAR) {
+      return _get(lastColumn, 'width', 0);
     }
   }
 }
@@ -180,7 +199,7 @@ export function getRecordKey(record, rowKey) {
     rowKey = 'key';
   }
 
-  return typeof rowKey === 'function' ? rowKey(record) : get(record, rowKey);
+  return typeof rowKey === 'function' ? rowKey(record) : _get(record, rowKey);
 }
 /**
  * Determine whether the expandedRowKeys includes a key (rowKey will be added to expandedRowKeys when the expand button is clicked)
@@ -189,7 +208,7 @@ export function getRecordKey(record, rowKey) {
  */
 
 export function isExpanded(expandedRowKeys, key) {
-  return key != null && includes(expandedRowKeys, key);
+  return key != null && _includes(expandedRowKeys, key);
 }
 /**
  * Determine whether the selectedKeysSet includes the key
@@ -214,14 +233,14 @@ export function getRecord(data, recordKey, rowKey) {
     rowKey = 'key';
   }
 
-  return find(data, record => recordKey != null && recordKey !== '' && getRecordKey(record, rowKey) === recordKey);
+  return _find(data, record => recordKey != null && recordKey !== '' && getRecordKey(record, rowKey) === recordKey);
 }
 export function getRecordChildren(record, childrenRecordName) {
   if (childrenRecordName === undefined) {
     childrenRecordName = 'children';
   }
 
-  return get(record, childrenRecordName);
+  return _get(record, childrenRecordName);
 }
 export function genExpandedRowKey() {
   let recordKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
@@ -272,7 +291,8 @@ export function assignColumnKeys(columns) {
   let childrenColumnName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'children';
   let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   const sameLevelCols = [];
-  each(columns, (column, index) => {
+
+  _each(columns, (column, index) => {
     if (column.key == null) {
       var _context4;
 
@@ -360,7 +380,8 @@ export function getColumnByLevelIndex(columns, index) {
 export function findColumn(columns, column) {
   let childrenColumnName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
   let found;
-  each(columns, item => {
+
+  _each(columns, item => {
     if (item && item.key != null && !found) {
       if (item.key === column.key) {
         found = item;
@@ -377,6 +398,7 @@ export function findColumn(columns, column) {
 
     return undefined;
   });
+
   return found;
 }
 export function expandBtnShouldInRow(props) {
@@ -389,7 +411,7 @@ export function expandBtnShouldInRow(props) {
   } = props;
   const hasExpandedRowRender = typeof expandedRowRender === 'function';
   return hideExpandedColumn && hasExpandedRowRender || !hasExpandedRowRender && _someInstanceProperty(dataSource).call(dataSource, record => {
-    const children = get(record, childrenRecordName);
+    const children = _get(record, childrenRecordName);
 
     if (_Array$isArray(children) && children.length || rowExpandable(record)) {
       return true;
@@ -438,10 +460,11 @@ export function withResizeWidth(columns, newColumns) {
   for (const column of columns) {
     if (!isNullOrUndefined(column.width)) {
       const currentColumn = column.key;
-      const columnIndex = findIndex(_newColumns, item => item.key === currentColumn);
+
+      const columnIndex = _findIndex(_newColumns, item => item.key === currentColumn);
 
       if (columnIndex !== -1) {
-        _newColumns[columnIndex].width = get(column, 'width');
+        _newColumns[columnIndex].width = _get(column, 'width');
       }
     }
   }
@@ -465,13 +488,13 @@ export function getAllDisabledRowKeys(_ref) {
   if (_Array$isArray(dataSource) && dataSource.length && typeof getCheckboxProps === 'function') {
     for (const record of dataSource) {
       const props = getCheckboxProps(record);
-      const recordKey = typeof rowKey === 'function' ? rowKey(record) : get(record, rowKey);
+      const recordKey = typeof rowKey === 'function' ? rowKey(record) : _get(record, rowKey);
 
       if (props && props.disabled) {
         disabledRowKeys.push(recordKey);
       }
 
-      const children = get(record, childrenRecordName);
+      const children = _get(record, childrenRecordName);
 
       if (_Array$isArray(children) && children.length) {
         const keys = getAllDisabledRowKeys({
@@ -494,7 +517,7 @@ export function warnIfNoDataIndex(column) {
     } = column;
     const logger = new Logger('[@douyinfe/semi-ui Table]');
 
-    if ((_Array$isArray(filters) || isFunction(sorter)) && isNullOrUndefined(dataIndex)) {
+    if ((_Array$isArray(filters) || _isFunction(sorter)) && isNullOrUndefined(dataIndex)) {
       logger.warn("The column with sorter or filter must pass the 'dataIndex' prop");
     }
   }

package/lib/es/tabs/foundation.d.ts

@@ -1,10 +1,12 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 export interface TabsAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
     collectPane: () => void;
+    collectActiveKey: () => void;
     notifyTabClick: (activeKey: string, event: any) => void;
     notifyChange: (activeKey: string) => void;
     setNewActiveKey: (activeKey: string) => void;
     getDefaultActiveKeyFromChildren: () => string;
+    notifyTabDelete: (tabKey: string) => void;
 }
 declare class TabsFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<TabsAdapter<P, S>, P, S> {
     constructor(adapter: TabsAdapter<P, S>);
@@ -16,5 +18,6 @@ declare class TabsFoundation<P = Record<string, any>, S = Record<string, any>> e
     getDefaultActiveKey(): string;
     handleTabListChange(): void;
     handleTabPanesChange(): void;
+    handleTabDelete(tabKey: string): void;
 }
 export default TabsFoundation;

package/lib/es/tabs/foundation.js

@@ -1,11 +1,11 @@
+import _noop from "lodash/noop";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import BaseFoundation from '../base/foundation';
-import { noop } from 'lodash-es';
 
 class TabsFoundation extends BaseFoundation {
   constructor(adapter) {
     super(_Object$assign({}, adapter));
-    this.destroy = noop;
+    this.destroy = _noop;
   }
 
   init() {
@@ -68,15 +68,11 @@ class TabsFoundation extends BaseFoundation {
   handleTabPanesChange() {
     this._adapter.collectPane();
 
-    let activeKey = this.getState('activeKey');
-
-    if (typeof activeKey === 'undefined') {
-      activeKey = this._adapter.getDefaultActiveKeyFromChildren();
-    }
+    this._adapter.collectActiveKey();
+  }
 
-    if (typeof activeKey !== 'undefined') {
-      this.handleNewActiveKey(activeKey);
-    }
+  handleTabDelete(tabKey) {
+    this._adapter.notifyTabDelete(tabKey);
   }
 
 }

package/lib/es/tabs/tabs.css

@@ -40,6 +40,13 @@
   top: 3px;
   color: var(--semi-color-text-2);
 }
+.semi-tabs-bar .semi-tabs-tab .semi-icon-close {
+  margin-right: 0;
+  font-size: 14px;
+  color: var(--semi-color-text-2);
+  margin-left: 10px;
+  cursor: pointer;
+}
 .semi-tabs-bar .semi-tabs-tab:hover {
   color: var(--semi-color-text-0);
 }
@@ -53,7 +60,6 @@
   color: var(--semi-color-text-0);
 }
 .semi-tabs-bar .semi-tabs-tab-active, .semi-tabs-bar .semi-tabs-tab-active:hover {
-  color: var(--semi-color-text-0);
   cursor: default;
   font-weight: 600;
   color: var(--semi-color-text-0);
@@ -61,6 +67,12 @@
 .semi-tabs-bar .semi-tabs-tab-active .semi-icon, .semi-tabs-bar .semi-tabs-tab-active:hover .semi-icon {
   color: var(--semi-color-primary);
 }
+.semi-tabs-bar .semi-tabs-tab-active .semi-icon-close, .semi-tabs-bar .semi-tabs-tab-active:hover .semi-icon-close {
+  color: var(--semi-color-text-2);
+}
+.semi-tabs-bar .semi-tabs-tab-active .semi-icon-close:hover {
+  color: var(--semi-color-text-1);
+}
 .semi-tabs-bar .semi-tabs-tab-disabled {
   cursor: not-allowed;
   color: var(--semi-color-disabled-text);