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

package/lib/es/utils/log.js

@@ -1,5 +1,7 @@
+import _get from "lodash/get";
+
 const log = function (text) {
-  if (process.env.NODE_ENV === 'development') {
+  if (_get(process, 'env.NODE_ENV') === 'development') {
     for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       rest[_key - 1] = arguments[_key];
     }

package/lib/es/utils/object.js

@@ -1,3 +1,11 @@
+import _isObject from "lodash/isObject";
+import _isNumber from "lodash/isNumber";
+import _values from "lodash/values";
+import _unset from "lodash/unset";
+import _toPath from "lodash/toPath";
+import _has from "lodash/has";
+import _set from "lodash/set";
+import _get from "lodash/get";
 import _Number$isInteger from "@babel/runtime-corejs3/core-js-stable/number/is-integer";
 import _everyInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/every";
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
@@ -5,15 +13,11 @@ import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instan
 import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
 import _Object$entries from "@babel/runtime-corejs3/core-js-stable/object/entries";
 
-/* eslint-disable max-len */
-
-/* argus-disable unPkgSensitiveInfo */
-import { get as lodashGet, set as lodashSet, has as lodashHas, toPath as lodashToPath, unset as lodashUnset, values as lodashValues, isNumber, isObject, values } from 'lodash-es';
-
 const pathToArrayElem = path => {
-  const pathArray = lodashToPath(path); // internal-issues:673
+  const pathArray = _toPath(path); // internal-issues:673
+
 
-  const justNumber = isNumber(path) && pathArray.length === 1;
+  const justNumber = _isNumber(path) && pathArray.length === 1;
   return justNumber ? false : _Number$isInteger(+pathArray[pathArray.length - 1]);
 };
 
@@ -30,12 +34,13 @@ function isEmptyObject(target) {
    *  But we cannot use JSON.stringify() directly, because if the input parameter of JSON.stringify includes fiberNode, it will cause an TypeError: 'Convering circular structure to JSON'
    *  So we have to mock it's behavihor, also, the form value cannot have Symbol or function type, it can be ignored
    */
-  if (!isObject(target)) {
+  if (!_isObject(target)) {
     return false;
   } else {
-    const valuesOfTarget = values(target); // values(a)  ->   []
+    const valuesOfTarget = _values(target); // values(a)  ->   []
     // values(b)  ->   [undefined]
 
+
     if (!valuesOfTarget.length) {
       return true; // like target: {}
     } else {
@@ -51,7 +56,7 @@ function cleanup(obj, path) {
     return;
   }
 
-  const target = lodashGet(obj, path); // remove undefined from array
+  const target = _get(obj, path); // remove undefined from array
   // if (Array.isArray(target) && pull) {
   //     // only remove undefined form array from right to left
   //     // Remove undefined from right to left
@@ -61,10 +66,11 @@ function cleanup(obj, path) {
   // Delete object if its empty
   // eslint-disable-next-line
 
+
   if (_Array$isArray(target) && _everyInstanceProperty(target).call(target, e => e == null)) {
-    lodashUnset(obj, path);
+    _unset(obj, path);
   } else if (isEmptyObject(target)) {
-    lodashUnset(obj, path);
+    _unset(obj, path);
   } // Recur
 
 
@@ -72,32 +78,36 @@ function cleanup(obj, path) {
 }
 
 export function empty(object) {
-  return lodashValues(object).length === 0;
+  return _values(object).length === 0;
 }
 export function get(object, path) {
-  return lodashGet(object, path);
+  return _get(object, path);
 }
 export function remove(object, path) {
-  lodashUnset(object, path); // a.b => [a, b]
+  _unset(object, path); // a.b => [a, b]
   // arr[11].a => [arr, 11, a]
 
-  let pathArray = lodashToPath(path);
+
+  let pathArray = _toPath(path);
+
   pathArray = _sliceInstanceProperty(pathArray).call(pathArray, 0, pathArray.length - 1);
   cleanup(object, pathArray, false);
 }
 export function set(object, path, value, allowEmpty) {
   if (allowEmpty) {
-    return lodashSet(object, path, value);
+    return _set(object, path, value);
   }
 
   if (value !== undefined) {
-    return lodashSet(object, path, value);
+    return _set(object, path, value);
   } else {
     // If the path is to an array leaf then we want to set to undefined
     // 将数组的叶子节点置为undefined时，例如 a.b[0]  a.b[1]  a.b[99]
     if (pathToArrayElem(path) && get(object, path) !== undefined) {
-      lodashSet(object, path, undefined);
-      let pathArray = lodashToPath(path);
+      _set(object, path, undefined);
+
+      let pathArray = _toPath(path);
+
       pathArray = _sliceInstanceProperty(pathArray).call(pathArray, 0, pathArray.length - 1);
       cleanup(object, pathArray, false);
     } else if (!pathToArrayElem(path) && get(object, path) !== undefined) {
@@ -113,7 +123,7 @@ export function set(object, path, value, allowEmpty) {
   }
 }
 export function has(object, path) {
-  return lodashHas(object, path);
+  return _has(object, path);
 }
 /**
  * set static properties from `srcObj` to `obj`

package/lib/es/utils/set.js

@@ -1,5 +1,5 @@
+import _isSet from "lodash/isSet";
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
-import { isSet } from 'lodash-es';
 export function copySet(setA) {
   return new _Set(setA);
 }
@@ -14,7 +14,7 @@ export function pullAll(setA, setB) {
     setB = copySet(setB);
   }
 
-  if (isSet(setA) && setA.size && isSet(setB) && setB.size) {
+  if (_isSet(setA) && setA.size && _isSet(setB) && setB.size) {
     for (const item of setB) {
       if (setA.has(item)) {
         setA.delete(item);

package/navigation/foundation.ts

@@ -4,7 +4,7 @@ import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import NavItem from './NavItem';
 import { ItemProps } from './itemFoundation';
 import { strings } from './constants';
-import { get } from 'lodash-es';
+import { get } from 'lodash';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
 
 export interface ItemKey2ParentKeysMap {

package/notification/notificationFoundation.ts

@@ -1,5 +1,5 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
-import { isNumber } from 'lodash-es';
+import { isNumber } from 'lodash';
 import { strings } from '../notification/constants';
 import { Motion } from '../utils/type';
 

package/overflowList/foundation.ts

@@ -1,6 +1,6 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import { strings } from './constants';
-import { noop, get, cloneDeep } from 'lodash-es';
+import { noop, get, cloneDeep } from 'lodash';
 const Boundary = strings.BOUNDARY_MAP;
 const OverflowDirection = strings.OVERFLOW_DIR;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.1.0-beta.2",
+    "version": "2.1.0-next.2",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -8,12 +8,12 @@
     },
     "dependencies": {
         "@babel/runtime-corejs3": "^7.15.4",
-        "@douyinfe/semi-animation": "2.1.0-beta.2",
+        "@douyinfe/semi-animation": "2.1.0-next.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.9.0",
         "date-fns-tz": "^1.0.10",
-        "lodash-es": "^4.17.15",
+        "lodash": "^4.17.21",
         "memoize-one": "^5.2.1",
         "scroll-into-view-if-needed": "^2.2.24"
     },
@@ -24,11 +24,13 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "513b92cb3746033d0b7326485e85c73d80340a0d",
+    "gitHead": "512cc7428375c2e219875b94bade171f87a24d67",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",
+        "@types/lodash": "^4.14.176",
+        "babel-plugin-lodash": "^3.3.4",
         "del": "^6.0.0",
         "gulp": "^4.0.2",
         "gulp-babel": "^8.0.0",

package/pagination/foundation.ts

@@ -12,9 +12,9 @@ export interface PaginationAdapter<P = Record<string, any>, S = Record<string, a
     setCurrentPage: (pageIndex: number) => void;
     registerKeyDownHandler: (handler: KeyDownHandler) => void;
     unregisterKeyDownHandler: (handler: KeyDownHandler) => void;
-    notifyPageChange: (pageIndex: number | string) => void;
+    notifyPageChange: (pageIndex: number) => void;
     notifyPageSizeChange: (pageSize: number) => void;
-    notifyChange: (pageIndex: number | string, pageSize: number) => void;
+    notifyChange: (pageIndex: number, pageSize: number) => void;
 }
 
 export type PageRenderText = number | '...';

package/popconfirm/popconfirmFoundation.ts

@@ -7,6 +7,7 @@ export interface PopconfirmAdapter<P = Record<string, any>, S = Record<string, a
     notifyConfirm: (e: any) => void;
     notifyCancel: (e: any) => void;
     notifyVisibleChange: (visible: boolean) => void;
+    notifyClickOutSide: (e: any) => void;
 }
 
 export default class PopConfirmFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<PopconfirmAdapter<P, S>, P, S> {
@@ -25,6 +26,10 @@ export default class PopConfirmFoundation<P = Record<string, any>, S = Record<st
         this.handleVisibleChange(false);
     }
 
+    handleClickOutSide(e: any): void {
+        this._adapter.notifyClickOutSide(e);
+    }
+
     handleVisibleChange(visible: boolean): void {
         if (!this._isControlledComponent('visible')) {
             this._adapter.setVisible(visible);

package/scrollList/itemFoundation.ts

@@ -1,6 +1,6 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import isElement from '../utils/isElement';
-import { slice, find, findIndex } from 'lodash-es';
+import { slice, find, findIndex } from 'lodash';
 import { append, prepend } from '../utils/dom';
 
 export interface Item {
@@ -11,16 +11,16 @@ export interface Item {
     disabled?: boolean;
 }
 
-export interface ScrollItemAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
+export interface ScrollItemAdapter<P = Record<string, any>, S = Record<string, any>, I = Item> extends DefaultAdapter<P, S> {
     setPrependCount: (prependCount: number) => void;
     setAppendCount: (appendCount: number) => void;
     setSelectedNode: (el: HTMLElement) => void;
     isDisabledIndex: (i: number) => boolean;
-    notifySelectItem: (data: Item) => void;
+    notifySelectItem: (data: I) => void;
     scrollToCenter: (selectedNode: Element, scrollWrapper?: Element, duration?: number) => void;
 }
 
-export default class ItemFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<ScrollItemAdapter<P, S>, P, S> {
+export default class ItemFoundation<P = Record<string, any>, S = Record<string, any>, I = Item> extends BaseFoundation<ScrollItemAdapter<P, S, I>, P, S> {
     _cachedSelectedNode: HTMLElement = null;
 
     selectIndex(index: number, listWrapper: HTMLElement) {

package/select/foundation.ts

@@ -2,7 +2,7 @@
 /* eslint-disable max-len */
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import KeyCode from '../utils/keyCode';
-import { isNumber, isString, isEqual } from 'lodash-es';
+import { isNumber, isString, isEqual, omit } from 'lodash';
 import warning from '../utils/warning';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
 import { BasicOptionProps } from './optionFoundation';
@@ -45,8 +45,9 @@ export interface SelectAdapter<P = Record<string, any>, S = Record<string, any>>
     updateHovering(isHover: boolean): void;
     updateScrollTop(): void;
 }
-type PropValue = string | number | Record<string, any>;
 
+type LabelValue = string | number;
+type PropValue = LabelValue | Record<string, any>;
 export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
 
     constructor(adapter: SelectAdapter) {
@@ -230,9 +231,9 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
             selections.set(optionExist.label, optionExist);
         } else if (noMatchOptionInList) {
             // If the current value does not have a corresponding item in the optionList, construct an option and update it to the selection. However, it does not need to be inserted into the list
-            let optionNotExist = { value: propValue, label: propValue, _notExist: true };
+            let optionNotExist = { value: propValue, label: propValue, _notExist: true, _scrollIndex: -1 } as BasicOptionProps;
             if (onChangeWithObject) {
-                optionNotExist = { ...propValue as BasicOptionProps, _notExist: true } as any;
+                optionNotExist = { ...propValue as BasicOptionProps, _notExist: true, _scrollIndex: -1 };
             }
             selections.set(optionNotExist.label, optionNotExist);
         }
@@ -258,11 +259,11 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
 
         // When onChangeWithObject is true
         if (onChangeWithObject && propValueIsArray) {
-            selectedValues = propValue.map((item: BasicOptionProps) => item.value) as any;
+            selectedValues = (propValue as BasicOptionProps[]).map(item => item.value);
         }
 
         if (propValueIsArray && selectedValues.length) {
-            selectedValues.forEach((selectedValue: string, i: number) => {
+            (selectedValues as LabelValue[]).forEach((selectedValue, i: number) => {
                 // The current value exists in the current optionList
                 const index = originalOptions.findIndex(option => option.value === selectedValue);
                 if (index !== -1) {
@@ -277,7 +278,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
                         // The current value does not exist in the current optionList or the list before the change. Construct an option and update it to the selection
                         let optionNotExist = { value: selectedValue, label: selectedValue, _notExist: true };
                         onChangeWithObject ? (optionNotExist = { ...propValue[i] as any, _notExist: true }) : null;
-                        selections.set(optionNotExist.label, optionNotExist);
+                        selections.set(optionNotExist.label, { ...optionNotExist, _scrollIndex: -1 });
                     }
                 }
             });
@@ -409,7 +410,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
             this._notifyDeselect(value, { value, label, ...rest });
             selections.delete(label);
         } else if (maxLimit && selections.size === maxLimit) {
-            this._adapter.notifyMaxLimit({ value, label, ...rest });
+            this._adapter.notifyMaxLimit({ value, label, ...omit(rest, '_scrollIndex') });
             return;
         } else {
             this._notifySelect(value, { value, label, ...rest });
@@ -787,6 +788,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
         delete option._parentGroup;
         delete option._show;
         delete option._selected;
+        delete option._scrollIndex;
         if ('_keyInOptionList' in option) {
             option.key = option._keyInOptionList;
             delete option._keyInOptionList;

package/sideSheet/sideSheetFoundation.ts

@@ -1,5 +1,5 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
-import { get, noop } from 'lodash-es';
+import { get, noop } from 'lodash';
 import KeyCode from '../utils/keyCode';
 import { Motion } from '../utils/type';
 

package/table/bodyFoundation.ts

@@ -1,5 +1,5 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
-import { get, includes, isMap, findLastIndex, isObject } from 'lodash-es';
+import { get, includes, isMap, findLastIndex, isObject } from 'lodash';
 import { strings } from './constants';
 import { getRecordKey, genExpandedRowKey, getRecordChildren, expandBtnShouldInRow } from './utils';
 

package/table/foundation.ts

@@ -18,7 +18,7 @@ import {
     isMap,
     slice,
     isEqual
-} from 'lodash-es';
+} from 'lodash';
 import memoizeOne from 'memoize-one';
 
 import { ArrayElement } from '../utils/type';

package/table/utils.ts

@@ -15,7 +15,7 @@ import {
     includes,
     toString,
     isFunction
-} from 'lodash-es';
+} from 'lodash';
 import { strings, numbers } from './constants';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
 import Logger from '../utils/Logger';
@@ -166,7 +166,7 @@ export function isSelectionColumn(column: Record<string, any>) {
     return get(column, 'key') === strings.DEFAULT_KEY_COLUMN_SELECTION;
 }
 
-export function filterColumns(columns: Record<string, any>[], ignoreKeys = [strings.DEFAULT_KEY_COLUMN_SCROLLBAR]) {
+export function filterColumns(columns: Record<string, any>[], ignoreKeys = [strings.DEFAULT_KEY_COLUMN_SCROLLBAR as string]) {
     return filter(columns, col => !ignoreKeys.includes(col.key));
 }
 

package/tabs/foundation.ts

@@ -1,12 +1,14 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
-import { noop } from 'lodash-es';
+import { noop } from 'lodash';
 
 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;
 }
 
 class TabsFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<TabsAdapter<P, S>, P, S> {
@@ -64,15 +66,12 @@ class TabsFoundation<P = Record<string, any>, S = Record<string, any>> extends B
 
     handleTabPanesChange(): void {
         this._adapter.collectPane();
+        this._adapter.collectActiveKey();
+    }
 
-        let activeKey = this.getState('activeKey');
-        if (typeof activeKey === 'undefined') {
-            activeKey = this._adapter.getDefaultActiveKeyFromChildren();
-        }
-        if (typeof activeKey !== 'undefined') {
-            this.handleNewActiveKey(activeKey);
-        }
+    handleTabDelete(tabKey: string): void {
+        this._adapter.notifyTabDelete(tabKey);
     }
 }
 
-export default TabsFoundation;
+export default TabsFoundation;