Selaa lähdekoodia

remove object.fromEntries (#933)

David Luzar 5 vuotta sitten
vanhempi
commit
450a024f5c
3 muutettua tiedostoa jossa 15 lisäystä ja 10 poistoa
  1. 4 3
      src/actions/actionSelectAll.ts
  2. 8 6
      src/components/App.tsx
  3. 3 1
      src/element/newElement.ts

+ 4 - 3
src/actions/actionSelectAll.ts

@@ -7,9 +7,10 @@ export const actionSelectAll = register({
     return {
       appState: {
         ...appState,
-        selectedElementIds: Object.fromEntries(
-          elements.map(element => [element.id, true]),
-        ),
+        selectedElementIds: elements.reduce((map, element) => {
+          map[element.id] = true;
+          return map;
+        }, {} as any),
       },
     };
   },

+ 8 - 6
src/components/App.tsx

@@ -1872,9 +1872,10 @@ export class App extends React.Component<any, AppState> {
         this.setState(prevState => ({
           selectedElementIds: {
             ...prevState.selectedElementIds,
-            ...Object.fromEntries(
-              elementsWithinSelection.map(element => [element.id, true]),
-            ),
+            ...elementsWithinSelection.reduce((map, element) => {
+              map[element.id] = true;
+              return map;
+            }, {} as any),
           },
         }));
       }
@@ -2088,9 +2089,10 @@ export class App extends React.Component<any, AppState> {
     elements = [...elements, ...newElements];
     history.resumeRecording();
     this.setState({
-      selectedElementIds: Object.fromEntries(
-        newElements.map(element => [element.id, true]),
-      ),
+      selectedElementIds: newElements.reduce((map, element) => {
+        map[element.id] = true;
+        return map;
+      }, {} as any),
     });
   };
 

+ 3 - 1
src/element/newElement.ts

@@ -98,7 +98,9 @@ function _duplicateElement(val: any, depth: number = 0) {
   return val;
 }
 
-export function duplicateElement(element: ReturnType<typeof newElement>) {
+export function duplicateElement(
+  element: ReturnType<typeof newElement>,
+): ReturnType<typeof newElement> {
   const copy = _duplicateElement(element);
   copy.id = nanoid();
   copy.seed = randomSeed();