@douyinfe/semi-foundation 2.51.3 → 2.51.4

package/cascader/foundation.ts

@@ -15,7 +15,8 @@ import {
     normalizedArr,
     isValid,
     calcMergeType,
-    getKeysByValuePath
+    getKeysByValuePath,
+    getKeyByPos
 } from './util';
 import { strings } from './constants';
 import isEnterPress from '../utils/isEnterPress';
@@ -56,6 +57,8 @@ export interface BasicEntity {
     parentKey?: string;
     /* key path */
     path: Array<string>;
+    /* pos in treeData */
+    pos: string;
     /* value path */
     valuePath: Array<string>
 }
@@ -1026,17 +1029,20 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
         this._adapter.notifyListScroll(e, { panelIndex: ind, activeNode: data });
     }
 
-    handleTagRemove(e: any, tagValuePath: string[]) {
+    handleTagRemoveByKey = (key: string) => {
         const { keyEntities } = this.getStates();
         const { disabled } = this.getProps();
         if (disabled) {
             /* istanbul ignore next */
             return;
         }
-        const removedItem = (Object.values(keyEntities) as BasicEntity[])
-            .filter(item => isEqual(item.valuePath, tagValuePath))[0];
-        !isEmpty(removedItem) &&
-        !removedItem.data.disabled &&
-        this._handleMultipleSelect(removedItem);
+        const removedItem = keyEntities[key] ?? {};
+        !removedItem?.data?.disable && this._handleMultipleSelect(removedItem);
+    }
+
+    handleTagRemoveInTrigger = (pos: string) => {
+        const { treeData } = this.getStates();
+        const key = getKeyByPos(pos, treeData);
+        this.handleTagRemoveByKey(key);
     }
 }

package/cascader/util.ts

@@ -31,10 +31,12 @@ function traverseDataNodes(treeNodes: any, callback: any) {
         // Process node if is not root
         if (node) {
             const key = parent ? `${parent.key}${VALUE_SPLIT}${node.value}` : node.value;
+            const pos = parent ? getPosition(parent.pos, ind) : `${ind}`;
             item = {
                 data: { ...node },
                 ind,
                 key,
+                pos,
                 level: parent ? parent.level + 1 : 0,
                 parentKey: parent ? parent.key : null,
                 path: parent ? [...parent.path, key] : [key],
@@ -74,6 +76,17 @@ export function getValuePathByKey(key: string) {
     return key.split(VALUE_SPLIT);
 }
 
+export function getKeyByPos(pos: string, treeData: any) {
+    const posArr = pos.split('-').map(item => Number(item));
+    let resultData = treeData;
+    let valuePath = [];
+    posArr.forEach((item, index) => {
+        resultData = index === 0 ? resultData[item] : resultData?.children?.[item];
+        valuePath.push(resultData?.value);
+    });
+    return getKeyByValuePath(valuePath);
+}
+
 export function convertDataToEntities(dataNodes: any) {
     const keyEntities: any = {};
 

package/datePicker/foundation.ts

@@ -18,6 +18,7 @@ import type { Type, DateInputFoundationProps, InsetInputValue } from './inputFou
 import type { MonthsGridFoundationProps } from './monthsGridFoundation';
 import type { WeekStartNumber } from './_utils/getMonthTable';
 import isValidTimeZone from './_utils/isValidTimeZone';
+import warning from '../utils/warning';
 
 export type ValidateStatus = ArrayElement<typeof strings.STATUS>;
 export type InputSize = ArrayElement<typeof strings.SIZE_SET>;
@@ -291,6 +292,8 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
                         parsedV = zonedTimeToUtc(parsedV, prevTimeZone);
                     }
                     result.push(isValidTimeZone(timeZone) ? utcToZonedTime(parsedV, timeZone) : parsedV);
+                } else {
+                    warning(true, `[Semi DatePicker] value cannot be parsed, value: ${String(v)}`);
                 }
             }
         }

package/lib/cjs/cascader/foundation.d.ts

@@ -24,6 +24,7 @@ export interface BasicEntity {
     parent?: BasicEntity;
     parentKey?: string;
     path: Array<string>;
+    pos: string;
     valuePath: Array<string>;
 }
 export interface BasicCascaderData {
@@ -239,16 +240,7 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
      * @param {boolean} curCheckedStatus checked status of node
      */
     calcCheckedKeys(key: string, curCheckedStatus: boolean): {
-        checkedKeys: Set<string>; /**
-         * If selectedKeys does not meet the update conditions,
-         * and state.selectedKeys is the same as selectedKeys
-         * at this time, state.selectedKeys should be cleared.
-         * A typical scenario is:
-         * The originally selected node is the leaf node, but
-         * after props.treeData is dynamically updated, the node
-         * is a non-leaf node. At this point, selectedKeys should
-         * be cleared.
-         */
+        checkedKeys: Set<string>;
         halfCheckedKeys: Set<string>;
     };
     handleInputChange(sugInput: string): void;
@@ -260,5 +252,6 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
     getRenderData(): BasicEntity[] | BasicData[];
     getFilteredData(): BasicData[];
     handleListScroll(e: any, ind: number): void;
-    handleTagRemove(e: any, tagValuePath: string[]): void;
+    handleTagRemoveByKey: (key: string) => void;
+    handleTagRemoveInTrigger: (pos: string) => void;
 }

package/lib/cjs/cascader/foundation.js

@@ -29,6 +29,28 @@ class CascaderFoundation extends _foundation.default {
         isSearching: false
       });
     };
+    this.handleTagRemoveByKey = key => {
+      var _a, _b;
+      const {
+        keyEntities
+      } = this.getStates();
+      const {
+        disabled
+      } = this.getProps();
+      if (disabled) {
+        /* istanbul ignore next */
+        return;
+      }
+      const removedItem = (_a = keyEntities[key]) !== null && _a !== void 0 ? _a : {};
+      !((_b = removedItem === null || removedItem === void 0 ? void 0 : removedItem.data) === null || _b === void 0 ? void 0 : _b.disable) && this._handleMultipleSelect(removedItem);
+    };
+    this.handleTagRemoveInTrigger = pos => {
+      const {
+        treeData
+      } = this.getStates();
+      const key = (0, _util.getKeyByPos)(pos, treeData);
+      this.handleTagRemoveByKey(key);
+    };
   }
   init() {
     const isOpen = this.getProp('open') || this.getProp('defaultOpen');
@@ -862,19 +884,5 @@ class CascaderFoundation extends _foundation.default {
       activeNode: data
     });
   }
-  handleTagRemove(e, tagValuePath) {
-    const {
-      keyEntities
-    } = this.getStates();
-    const {
-      disabled
-    } = this.getProps();
-    if (disabled) {
-      /* istanbul ignore next */
-      return;
-    }
-    const removedItem = Object.values(keyEntities).filter(item => (0, _isEqual2.default)(item.valuePath, tagValuePath))[0];
-    !(0, _isEmpty2.default)(removedItem) && !removedItem.data.disabled && this._handleMultipleSelect(removedItem);
-  }
 }
 exports.default = CascaderFoundation;

package/lib/cjs/cascader/util.d.ts

@@ -3,5 +3,6 @@ export declare function normalizedArr(val: any): any[];
 export declare function getKeysByValuePath(valuePath: (string | number)[][] | (string | number)[]): string[];
 export declare function getKeyByValuePath(valuePath: (string | number)[]): string;
 export declare function getValuePathByKey(key: string): string[];
+export declare function getKeyByPos(pos: string, treeData: any): string;
 export declare function convertDataToEntities(dataNodes: any): any;
 export declare function calcMergeType(autoMergeValue: boolean, leafOnly: boolean): string;

package/lib/cjs/cascader/util.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.calcMergeType = calcMergeType;
 exports.convertDataToEntities = convertDataToEntities;
+exports.getKeyByPos = getKeyByPos;
 exports.getKeyByValuePath = getKeyByValuePath;
 exports.getKeysByValuePath = getKeysByValuePath;
 exports.getValuePathByKey = getValuePathByKey;
@@ -37,10 +38,12 @@ function traverseDataNodes(treeNodes, callback) {
     // Process node if is not root
     if (node) {
       const key = parent ? `${parent.key}${_constants.VALUE_SPLIT}${node.value}` : node.value;
+      const pos = parent ? getPosition(parent.pos, ind) : `${ind}`;
       item = {
         data: Object.assign({}, node),
         ind,
         key,
+        pos,
         level: parent ? parent.level + 1 : 0,
         parentKey: parent ? parent.key : null,
         path: parent ? [...parent.path, key] : [key],
@@ -73,6 +76,17 @@ function getKeyByValuePath(valuePath) {
 function getValuePathByKey(key) {
   return key.split(_constants.VALUE_SPLIT);
 }
+function getKeyByPos(pos, treeData) {
+  const posArr = pos.split('-').map(item => Number(item));
+  let resultData = treeData;
+  let valuePath = [];
+  posArr.forEach((item, index) => {
+    var _a;
+    resultData = index === 0 ? resultData[item] : (_a = resultData === null || resultData === void 0 ? void 0 : resultData.children) === null || _a === void 0 ? void 0 : _a[item];
+    valuePath.push(resultData === null || resultData === void 0 ? void 0 : resultData.value);
+  });
+  return getKeyByValuePath(valuePath);
+}
 function convertDataToEntities(dataNodes) {
   const keyEntities = {};
   traverseDataNodes(dataNodes, data => {

package/lib/cjs/datePicker/foundation.js

@@ -21,6 +21,7 @@ var _constants2 = require("../input/constants");
 var _getInsetInputFormatToken = _interopRequireDefault(require("./_utils/getInsetInputFormatToken"));
 var _getInsetInputValueFromInsetInputStr = _interopRequireDefault(require("./_utils/getInsetInputValueFromInsetInputStr"));
 var _isValidTimeZone = _interopRequireDefault(require("./_utils/isValidTimeZone"));
+var _warning = _interopRequireDefault(require("../utils/warning"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * The datePicker foundation.js is responsible for maintaining the date value and the input box value, as well as the callback of both
@@ -125,6 +126,8 @@ class DatePickerFoundation extends _foundation.default {
             parsedV = (0, _dateFnsExtra.zonedTimeToUtc)(parsedV, prevTimeZone);
           }
           result.push((0, _isValidTimeZone.default)(timeZone) ? (0, _dateFnsExtra.utcToZonedTime)(parsedV, timeZone) : parsedV);
+        } else {
+          (0, _warning.default)(true, `[Semi DatePicker] value cannot be parsed, value: ${String(v)}`);
         }
       }
     }

package/lib/cjs/tooltip/foundation.js

@@ -427,6 +427,7 @@ class Tooltip extends _foundation.default {
     return null;
   }
   calcPosStyle(props) {
+    var _a;
     const {
       spacing,
       isOverFlow
@@ -477,6 +478,10 @@ class Tooltip extends _foundation.default {
     const isTriggerNearLeft = middleX - containerRect.left < containerRect.right - middleX;
     const isTriggerNearTop = middleY - containerRect.top < containerRect.bottom - middleY;
     const isWrapperWidthOverflow = wrapperRect.width > innerWidth;
+    const scaled = Math.abs((wrapperRect === null || wrapperRect === void 0 ? void 0 : wrapperRect.width) - ((_a = this._adapter.getContainer()) === null || _a === void 0 ? void 0 : _a.clientWidth)) > 1;
+    if (scaled) {
+      SPACING = SPACING * wrapperRect.width / this._adapter.getContainer().clientWidth;
+    }
     switch (position) {
       case 'top':
         // left = middleX;
@@ -593,6 +598,12 @@ class Tooltip extends _foundation.default {
     // Calculate container positioning relative to window
     left = left - containerRect.left;
     top = top - containerRect.top;
+    if (scaled) {
+      left /= wrapperRect.width / this._adapter.getContainer().clientWidth;
+    }
+    if (scaled) {
+      top /= wrapperRect.height / this._adapter.getContainer().clientHeight;
+    }
     /**
      * container为body时，如果position不为relative或absolute，这时trigger计算出的top/left会根据html定位（initial containing block）
      * 此时如果body有margin，则计算出的位置相对于body会有问题 fix issue #1368

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

@@ -24,6 +24,7 @@ export interface BasicEntity {
     parent?: BasicEntity;
     parentKey?: string;
     path: Array<string>;
+    pos: string;
     valuePath: Array<string>;
 }
 export interface BasicCascaderData {
@@ -239,16 +240,7 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
      * @param {boolean} curCheckedStatus checked status of node
      */
     calcCheckedKeys(key: string, curCheckedStatus: boolean): {
-        checkedKeys: Set<string>; /**
-         * If selectedKeys does not meet the update conditions,
-         * and state.selectedKeys is the same as selectedKeys
-         * at this time, state.selectedKeys should be cleared.
-         * A typical scenario is:
-         * The originally selected node is the leaf node, but
-         * after props.treeData is dynamically updated, the node
-         * is a non-leaf node. At this point, selectedKeys should
-         * be cleared.
-         */
+        checkedKeys: Set<string>;
         halfCheckedKeys: Set<string>;
     };
     handleInputChange(sugInput: string): void;
@@ -260,5 +252,6 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
     getRenderData(): BasicEntity[] | BasicData[];
     getFilteredData(): BasicData[];
     handleListScroll(e: any, ind: number): void;
-    handleTagRemove(e: any, tagValuePath: string[]): void;
+    handleTagRemoveByKey: (key: string) => void;
+    handleTagRemoveInTrigger: (pos: string) => void;
 }

package/lib/es/cascader/foundation.js

@@ -11,7 +11,7 @@ import _get from "lodash/get";
 import _isEqual from "lodash/isEqual";
 import BaseFoundation from '../base/foundation';
 import { filter, findAncestorKeys, calcCheckedKeysForUnchecked, calcCheckedKeysForChecked, calcCheckedKeys, findDescendantKeys, normalizeKeyList } from '../tree/treeUtil';
-import { convertDataToEntities, normalizedArr, isValid, calcMergeType, getKeysByValuePath } from './util';
+import { convertDataToEntities, normalizedArr, isValid, calcMergeType, getKeysByValuePath, getKeyByPos } from './util';
 import { strings } from './constants';
 import isEnterPress from '../utils/isEnterPress';
 export default class CascaderFoundation extends BaseFoundation {
@@ -22,6 +22,28 @@ export default class CascaderFoundation extends BaseFoundation {
         isSearching: false
       });
     };
+    this.handleTagRemoveByKey = key => {
+      var _a, _b;
+      const {
+        keyEntities
+      } = this.getStates();
+      const {
+        disabled
+      } = this.getProps();
+      if (disabled) {
+        /* istanbul ignore next */
+        return;
+      }
+      const removedItem = (_a = keyEntities[key]) !== null && _a !== void 0 ? _a : {};
+      !((_b = removedItem === null || removedItem === void 0 ? void 0 : removedItem.data) === null || _b === void 0 ? void 0 : _b.disable) && this._handleMultipleSelect(removedItem);
+    };
+    this.handleTagRemoveInTrigger = pos => {
+      const {
+        treeData
+      } = this.getStates();
+      const key = getKeyByPos(pos, treeData);
+      this.handleTagRemoveByKey(key);
+    };
   }
   init() {
     const isOpen = this.getProp('open') || this.getProp('defaultOpen');
@@ -855,18 +877,4 @@ export default class CascaderFoundation extends BaseFoundation {
       activeNode: data
     });
   }
-  handleTagRemove(e, tagValuePath) {
-    const {
-      keyEntities
-    } = this.getStates();
-    const {
-      disabled
-    } = this.getProps();
-    if (disabled) {
-      /* istanbul ignore next */
-      return;
-    }
-    const removedItem = Object.values(keyEntities).filter(item => _isEqual(item.valuePath, tagValuePath))[0];
-    !_isEmpty(removedItem) && !removedItem.data.disabled && this._handleMultipleSelect(removedItem);
-  }
 }

package/lib/es/cascader/util.d.ts

@@ -3,5 +3,6 @@ export declare function normalizedArr(val: any): any[];
 export declare function getKeysByValuePath(valuePath: (string | number)[][] | (string | number)[]): string[];
 export declare function getKeyByValuePath(valuePath: (string | number)[]): string;
 export declare function getValuePathByKey(key: string): string[];
+export declare function getKeyByPos(pos: string, treeData: any): string;
 export declare function convertDataToEntities(dataNodes: any): any;
 export declare function calcMergeType(autoMergeValue: boolean, leafOnly: boolean): string;

package/lib/es/cascader/util.js

@@ -24,10 +24,12 @@ function traverseDataNodes(treeNodes, callback) {
     // Process node if is not root
     if (node) {
       const key = parent ? `${parent.key}${VALUE_SPLIT}${node.value}` : node.value;
+      const pos = parent ? getPosition(parent.pos, ind) : `${ind}`;
       item = {
         data: Object.assign({}, node),
         ind,
         key,
+        pos,
         level: parent ? parent.level + 1 : 0,
         parentKey: parent ? parent.key : null,
         path: parent ? [...parent.path, key] : [key],
@@ -60,6 +62,17 @@ export function getKeyByValuePath(valuePath) {
 export function getValuePathByKey(key) {
   return key.split(VALUE_SPLIT);
 }
+export function getKeyByPos(pos, treeData) {
+  const posArr = pos.split('-').map(item => Number(item));
+  let resultData = treeData;
+  let valuePath = [];
+  posArr.forEach((item, index) => {
+    var _a;
+    resultData = index === 0 ? resultData[item] : (_a = resultData === null || resultData === void 0 ? void 0 : resultData.children) === null || _a === void 0 ? void 0 : _a[item];
+    valuePath.push(resultData === null || resultData === void 0 ? void 0 : resultData.value);
+  });
+  return getKeyByValuePath(valuePath);
+}
 export function convertDataToEntities(dataNodes) {
   const keyEntities = {};
   traverseDataNodes(dataNodes, data => {

package/lib/es/datePicker/foundation.js

@@ -15,6 +15,7 @@ import { strings as inputStrings } from '../input/constants';
 import getInsetInputFormatToken from './_utils/getInsetInputFormatToken';
 import getInsetInputValueFromInsetInputStr from './_utils/getInsetInputValueFromInsetInputStr';
 import isValidTimeZone from './_utils/isValidTimeZone';
+import warning from '../utils/warning';
 /**
  * The datePicker foundation.js is responsible for maintaining the date value and the input box value, as well as the callback of both
  *  task 1. Accept the selected date change, update the date value, and update the input box value according to the date = > Notify the change
@@ -118,6 +119,8 @@ export default class DatePickerFoundation extends BaseFoundation {
             parsedV = zonedTimeToUtc(parsedV, prevTimeZone);
           }
           result.push(isValidTimeZone(timeZone) ? utcToZonedTime(parsedV, timeZone) : parsedV);
+        } else {
+          warning(true, `[Semi DatePicker] value cannot be parsed, value: ${String(v)}`);
         }
       }
     }

package/lib/es/tooltip/foundation.js

@@ -420,6 +420,7 @@ export default class Tooltip extends BaseFoundation {
     return null;
   }
   calcPosStyle(props) {
+    var _a;
     const {
       spacing,
       isOverFlow
@@ -470,6 +471,10 @@ export default class Tooltip extends BaseFoundation {
     const isTriggerNearLeft = middleX - containerRect.left < containerRect.right - middleX;
     const isTriggerNearTop = middleY - containerRect.top < containerRect.bottom - middleY;
     const isWrapperWidthOverflow = wrapperRect.width > innerWidth;
+    const scaled = Math.abs((wrapperRect === null || wrapperRect === void 0 ? void 0 : wrapperRect.width) - ((_a = this._adapter.getContainer()) === null || _a === void 0 ? void 0 : _a.clientWidth)) > 1;
+    if (scaled) {
+      SPACING = SPACING * wrapperRect.width / this._adapter.getContainer().clientWidth;
+    }
     switch (position) {
       case 'top':
         // left = middleX;
@@ -586,6 +591,12 @@ export default class Tooltip extends BaseFoundation {
     // Calculate container positioning relative to window
     left = left - containerRect.left;
     top = top - containerRect.top;
+    if (scaled) {
+      left /= wrapperRect.width / this._adapter.getContainer().clientWidth;
+    }
+    if (scaled) {
+      top /= wrapperRect.height / this._adapter.getContainer().clientHeight;
+    }
     /**
      * container为body时，如果position不为relative或absolute，这时trigger计算出的top/left会根据html定位（initial containing block）
      * 此时如果body有margin，则计算出的位置相对于body会有问题 fix issue #1368

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.51.3",
+    "version": "2.51.4",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.51.3",
+        "@douyinfe/semi-animation": "2.51.4",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.29.3",
@@ -23,7 +23,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "d39b89cf05ae9bed8f2a18f6d73026b915db87a4",
+    "gitHead": "b8cad87796be9b6b10409a95d3a5b4cb8b9592e6",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

package/tooltip/foundation.ts

@@ -450,7 +450,10 @@ export default class Tooltip<P = Record<string, any>, S = Record<string, any>> e
         const isTriggerNearTop = middleY - containerRect.top < containerRect.bottom - middleY;
         
         const isWrapperWidthOverflow = wrapperRect.width > innerWidth;
-
+        const scaled = Math.abs(wrapperRect?.width - this._adapter.getContainer()?.clientWidth) > 1;
+        if (scaled) {
+            SPACING = SPACING * wrapperRect.width/this._adapter.getContainer().clientWidth;
+        }
         switch (position) {
             case 'top':
                 // left = middleX;
@@ -570,6 +573,14 @@ export default class Tooltip<P = Record<string, any>, S = Record<string, any>> e
         left = left - containerRect.left;
         top = top - containerRect.top;
 
+        if (scaled) {
+            left /= wrapperRect.width/this._adapter.getContainer().clientWidth;
+        }
+
+        if (scaled) {
+            top /= wrapperRect.height/this._adapter.getContainer().clientHeight;
+        }
+
         /**
          * container为body时，如果position不为relative或absolute，这时trigger计算出的top/left会根据html定位（initial containing block）
          * 此时如果body有margin，则计算出的位置相对于body会有问题 fix issue #1368
@@ -828,7 +839,6 @@ export default class Tooltip<P = Record<string, any>, S = Record<string, any>> e
 
             const halfHeight = triggerRect.height / 2;
             const halfWidth = triggerRect.width / 2;
-
             // 视口, 原空间与反向空间是否都不足判断
             // Viewport, whether the original space and the reverse space are insufficient to judge
             const isViewYOverFlow = this.isOverFlow(clientTop - marginTop, restClientBottom - marginBottom, wrapperRect.height + spacing);