@douyinfe/semi-ui 2.31.1 → 2.31.2

package/lib/cjs/_utils/index.d.ts

@@ -7,11 +7,9 @@ import React from 'react';
  */
 export declare function stopPropagation(e: React.MouseEvent, noImmediate?: boolean): void;
 /**
- *
- * @param {any} value
- * @param {Function} customizer
- * @returns {any}
  * use in Table, Form, Navigation
+ *
+ * skip clone function and react element
  */
 export declare function cloneDeep(value: any, customizer?: (value: any) => void): any;
 /**

package/lib/cjs/_utils/index.js

@@ -47,11 +47,9 @@ function stopPropagation(e, noImmediate) {
   }
 }
 /**
- *
- * @param {any} value
- * @param {Function} customizer
- * @returns {any}
  * use in Table, Form, Navigation
+ *
+ * skip clone function and react element
  */
 
 
@@ -67,7 +65,9 @@ function cloneDeep(value, customizer) {
 
     if (Object.prototype.toString.call(v) === '[object Error]') {
       return v;
-    }
+    } // it is tricky
+    // when array length beyond max length, array.length will be 0
+
 
     if (Array.isArray(v) && v.length === 0) {
       const keys = Object.keys(v);

package/lib/cjs/navigation/Item.js

@@ -53,12 +53,14 @@ class NavItem extends _baseComponent.default {
         tooltipHideDelay,
         tooltipShowDelay
       } = this.props;
+      const hideDelay = tooltipHideDelay !== null && tooltipHideDelay !== void 0 ? tooltipHideDelay : this.context.tooltipHideDelay;
+      const showDelay = tooltipShowDelay !== null && tooltipShowDelay !== void 0 ? tooltipShowDelay : this.context.tooltipShowDelay;
       return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
         content: text,
         position: "right",
         trigger: 'hover',
-        mouseEnterDelay: tooltipShowDelay,
-        mouseLeaveDelay: tooltipHideDelay
+        mouseEnterDelay: showDelay,
+        mouseLeaveDelay: hideDelay
       }, node);
     };
 

package/lib/cjs/navigation/nav-context.d.ts

@@ -21,6 +21,8 @@ export interface NavContextType {
     canUpdateOpenKeys?: boolean;
     renderWrapper?: NavProps['renderWrapper'];
     getPopupContainer?: DropdownProps['getPopupContainer'];
+    tooltipShowDelay?: number;
+    tooltipHideDelay?: number;
 }
 declare const NavContext: React.Context<NavContextType>;
 export default NavContext;

package/lib/cjs/table/ResizableTable.js

@@ -112,7 +112,7 @@ const ResizableTable = function () {
     // If there is a resize value, the width does not use the default value fix#1072
     const _newColumns = (0, _utils.withResizeWidth)(columns, newColumns);
 
-    setColumns((0, _utils.mergeColumns)(columns, _newColumns));
+    setColumns((0, _utils2.mergeColumns)(columns, _newColumns));
   }, [propColumns, props.expandedRowRender, props.hideExpandedColumn, props.rowSelection]);
   const components = (0, _react.useMemo)(() => (0, _merge2.default)({
     header: {

package/lib/cjs/table/utils.d.ts

@@ -39,4 +39,5 @@ export declare function mergeComponents(components: TableComponents, virtualized
     };
 } & TableComponents;
 export declare const logger: Logger;
+export declare function mergeColumns(oldColumns?: any[], newColumns?: any[], keyPropNames?: any[], deep?: boolean): any[];
 export { cloneDeep };

package/lib/cjs/table/utils.js

@@ -12,8 +12,15 @@ Object.defineProperty(exports, "cloneDeep", {
 });
 exports.logger = void 0;
 exports.measureScrollbar = measureScrollbar;
+exports.mergeColumns = mergeColumns;
 exports.mergeComponents = mergeComponents;
 
+var _map2 = _interopRequireDefault(require("lodash/map"));
+
+var _find2 = _interopRequireDefault(require("lodash/find"));
+
+var _clone2 = _interopRequireDefault(require("lodash/clone"));
+
 var _merge2 = _interopRequireDefault(require("lodash/merge"));
 
 var _Logger = _interopRequireDefault(require("@douyinfe/semi-foundation/lib/cjs/utils/Logger"));
@@ -22,6 +29,8 @@ var _constants = require("@douyinfe/semi-foundation/lib/cjs/table/constants");
 
 var _utils = require("../_utils");
 
+var _utils2 = require("@douyinfe/semi-foundation/lib/cjs/table/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 let scrollbarVerticalSize, scrollbarHorizontalSize; // Measure scrollbar width for padding body during modal show/hide
@@ -130,4 +139,25 @@ function mergeComponents(components, virtualized) {
 }
 
 const logger = new _Logger.default('[@douyinfe/semi-ui Table]');
-exports.logger = logger;
+exports.logger = logger;
+
+function mergeColumns() {
+  let oldColumns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  let newColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  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 ? _utils.cloneDeep : _clone2.default;
+  (0, _map2.default)(newColumns, newColumn => {
+    newColumn = Object.assign({}, newColumn);
+    const key = (0, _utils2.getColumnKey)(newColumn, keyPropNames);
+    const oldColumn = key != null && (0, _find2.default)(oldColumns, item => (0, _utils2.getColumnKey)(item, keyPropNames) === key);
+
+    if (oldColumn) {
+      finalColumns.push(clone(Object.assign(Object.assign({}, oldColumn), newColumn)));
+    } else {
+      finalColumns.push(clone(newColumn));
+    }
+  });
+  return finalColumns;
+}

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

@@ -7,11 +7,9 @@ import React from 'react';
  */
 export declare function stopPropagation(e: React.MouseEvent, noImmediate?: boolean): void;
 /**
- *
- * @param {any} value
- * @param {Function} customizer
- * @returns {any}
  * use in Table, Form, Navigation
+ *
+ * skip clone function and react element
  */
 export declare function cloneDeep(value: any, customizer?: (value: any) => void): any;
 /**

package/lib/es/_utils/index.js

@@ -26,11 +26,9 @@ export function stopPropagation(e, noImmediate) {
   }
 }
 /**
- *
- * @param {any} value
- * @param {Function} customizer
- * @returns {any}
  * use in Table, Form, Navigation
+ *
+ * skip clone function and react element
  */
 
 export function cloneDeep(value, customizer) {
@@ -45,7 +43,9 @@ export function cloneDeep(value, customizer) {
 
     if (Object.prototype.toString.call(v) === '[object Error]') {
       return v;
-    }
+    } // it is tricky
+    // when array length beyond max length, array.length will be 0
+
 
     if (Array.isArray(v) && v.length === 0) {
       const keys = Object.keys(v);

package/lib/es/navigation/Item.js

@@ -31,12 +31,14 @@ export default class NavItem extends BaseComponent {
         tooltipHideDelay,
         tooltipShowDelay
       } = this.props;
+      const hideDelay = tooltipHideDelay !== null && tooltipHideDelay !== void 0 ? tooltipHideDelay : this.context.tooltipHideDelay;
+      const showDelay = tooltipShowDelay !== null && tooltipShowDelay !== void 0 ? tooltipShowDelay : this.context.tooltipShowDelay;
       return /*#__PURE__*/React.createElement(Tooltip, {
         content: text,
         position: "right",
         trigger: 'hover',
-        mouseEnterDelay: tooltipShowDelay,
-        mouseLeaveDelay: tooltipHideDelay
+        mouseEnterDelay: showDelay,
+        mouseLeaveDelay: hideDelay
       }, node);
     };
 

package/lib/es/navigation/nav-context.d.ts

@@ -21,6 +21,8 @@ export interface NavContextType {
     canUpdateOpenKeys?: boolean;
     renderWrapper?: NavProps['renderWrapper'];
     getPopupContainer?: DropdownProps['getPopupContainer'];
+    tooltipShowDelay?: number;
+    tooltipHideDelay?: number;
 }
 declare const NavContext: React.Context<NavContextType>;
 export default NavContext;

package/lib/es/table/ResizableTable.js

@@ -27,9 +27,9 @@ var __rest = this && this.__rest || function (s, e) {
 import React, { useState, useEffect, useMemo } from 'react';
 import { addClass, removeClass } from '@douyinfe/semi-foundation/lib/es/utils/classnames';
 import { strings, numbers } from '@douyinfe/semi-foundation/lib/es/table/constants';
-import { mergeColumns, assignColumnKeys, findColumn, withResizeWidth } from '@douyinfe/semi-foundation/lib/es/table/utils';
+import { assignColumnKeys, findColumn, withResizeWidth } from '@douyinfe/semi-foundation/lib/es/table/utils';
 import Table from './Table';
-import { cloneDeep } from './utils';
+import { cloneDeep, mergeColumns } from './utils';
 import getColumns from './getColumns';
 import ResizableHeaderCell from './ResizableHeaderCell';
 

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

@@ -39,4 +39,5 @@ export declare function mergeComponents(components: TableComponents, virtualized
     };
 } & TableComponents;
 export declare const logger: Logger;
+export declare function mergeColumns(oldColumns?: any[], newColumns?: any[], keyPropNames?: any[], deep?: boolean): any[];
 export { cloneDeep };

package/lib/es/table/utils.js

@@ -1,7 +1,11 @@
+import _map from "lodash/map";
+import _find from "lodash/find";
+import _clone from "lodash/clone";
 import _merge from "lodash/merge";
 import Logger from '@douyinfe/semi-foundation/lib/es/utils/Logger';
 import { numbers } from '@douyinfe/semi-foundation/lib/es/table/constants';
 import { cloneDeep } from '../_utils';
+import { getColumnKey } from '@douyinfe/semi-foundation/lib/es/table/utils';
 let scrollbarVerticalSize, scrollbarHorizontalSize; // Measure scrollbar width for padding body during modal show/hide
 
 const scrollbarMeasure = {
@@ -105,4 +109,27 @@ export function mergeComponents(components, virtualized) {
   }, components);
 }
 export const logger = new Logger('[@douyinfe/semi-ui Table]');
+export function mergeColumns() {
+  let oldColumns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  let newColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  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 : _clone;
+
+  _map(newColumns, newColumn => {
+    newColumn = Object.assign({}, newColumn);
+    const key = getColumnKey(newColumn, keyPropNames);
+
+    const oldColumn = key != null && _find(oldColumns, item => getColumnKey(item, keyPropNames) === key);
+
+    if (oldColumn) {
+      finalColumns.push(clone(Object.assign(Object.assign({}, oldColumn), newColumn)));
+    } else {
+      finalColumns.push(clone(newColumn));
+    }
+  });
+
+  return finalColumns;
+}
 export { cloneDeep };

package/package.json

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