fix(antd/transfer): transKeys Map Structure Adjustment

ant-design · Dec 23, 2022 · 4faf47a · 4faf47a
1 parent 10aebbc
commit 4faf47a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/components/_util/transKeys.ts b/components/_util/transKeys.ts
@@ -1,24 +1,15 @@
-export type mapItem = {
-  k: string;
-  i: number;
-};
-export type MapType = Record<string, mapItem>;
-
 export const groupKeysMap = (keys: string[]) => {
-  const map: MapType = {};
-  keys.forEach((k, i) => {
-    map[k] = { k, i };
+  const map = new Map<string, number>();
+  keys.forEach((key, index) => {
+    map.set(key, index);
   });
   return map;
 };
 export const groupDisabledKeysMap = <RecordType extends any[]>(dataSource: RecordType) => {
-  const map: MapType = {};
-  dataSource.forEach((d, i) => {
-    if (d.disabled) {
-      map[d.key] = {
-        k: d.key,
-        i,
-      };
+  const map = new Map<string, number>();
+  dataSource.forEach(({ disabled, key }, index) => {
+    if (disabled) {
+      map.set(key, index);
     }
   });
   return map;

diff --git a/components/transfer/index.tsx b/components/transfer/index.tsx
@@ -207,13 +207,13 @@ class Transfer<RecordType extends TransferItem = TransferItem> extends React.Com
     const dataSourceDisabledKeysMap = groupDisabledKeysMap(dataSource);
 
     // filter the disabled options
-    const newMoveKeys = moveKeys.filter((key) => !dataSourceDisabledKeysMap[key]);
+    const newMoveKeys = moveKeys.filter((key) => !dataSourceDisabledKeysMap.has(key));
     const newMoveKeysMap = groupKeysMap(newMoveKeys);
     // move items to target box
     const newTargetKeys =
       direction === 'right'
         ? newMoveKeys.concat(targetKeys)
-        : targetKeys.filter((targetKey) => !newMoveKeysMap[targetKey]);
+        : targetKeys.filter((targetKey) => !newMoveKeysMap.has(targetKey));
 
     // empty checked keys
     const oppositeDirection = direction === 'right' ? 'left' : 'right';
@@ -236,7 +236,7 @@ class Transfer<RecordType extends TransferItem = TransferItem> extends React.Com
       } else {
         const selectedKeysMap = groupKeysMap(selectedKeys);
         // Remove current keys from origin keys
-        mergedCheckedKeys = prevKeys.filter((key) => !selectedKeysMap[key]);
+        mergedCheckedKeys = prevKeys.filter((key) => !selectedKeysMap.has(key));
       }
 
       this.handleSelectChange(direction, mergedCheckedKeys);
@@ -354,8 +354,8 @@ class Transfer<RecordType extends TransferItem = TransferItem> extends React.Com
       }
       // rightDataSource should be ordered by targetKeys
       // leftDataSource should be ordered by dataSource
-      if (targetKeysMap[record.key]) {
-        rightDataSource[targetKeysMap[record.key].i] = record;
+      if (targetKeysMap.has(record.key)) {
+        rightDataSource[targetKeysMap.get(record.key)!] = record;
       } else {
         leftDataSource.push(record);
       }

diff --git a/components/transfer/list.tsx b/components/transfer/list.tsx
@@ -104,8 +104,8 @@ export default class TransferList<
     if (checkedKeys.length === 0) {
       return 'none';
     }
-    const keysMap = groupKeysMap(checkedKeys);
-    if (filteredItems.every((item) => keysMap[item.key] || !!item.disabled)) {
+    const checkedKeysMap = groupKeysMap(checkedKeys);
+    if (filteredItems.every((item) => checkedKeysMap.has(item.key) || !!item.disabled)) {
       return 'all';
     }
     return 'part';