From 450a024f5c1c3a6d12713c1e31310ce6e187ce5c Mon Sep 17 00:00:00 2001 From: David Luzar Date: Fri, 13 Mar 2020 15:10:24 +0100 Subject: [PATCH] remove object.fromEntries (#933) --- src/actions/actionSelectAll.ts | 7 ++++--- src/components/App.tsx | 14 ++++++++------ src/element/newElement.ts | 4 +++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/actions/actionSelectAll.ts b/src/actions/actionSelectAll.ts index 16f9921cb6..b2f0e7cafe 100644 --- a/src/actions/actionSelectAll.ts +++ b/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), }, }; }, diff --git a/src/components/App.tsx b/src/components/App.tsx index b27c2e29f6..913fd3bb6a 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -1872,9 +1872,10 @@ export class App extends React.Component { 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 { 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), }); }; diff --git a/src/element/newElement.ts b/src/element/newElement.ts index bddd68162a..2e981eec85 100644 --- a/src/element/newElement.ts +++ b/src/element/newElement.ts @@ -98,7 +98,9 @@ function _duplicateElement(val: any, depth: number = 0) { return val; } -export function duplicateElement(element: ReturnType) { +export function duplicateElement( + element: ReturnType, +): ReturnType { const copy = _duplicateElement(element); copy.id = nanoid(); copy.seed = randomSeed();