Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

refactor: improve typing & check (#5415)

David Luzar792f238d162b
diff --git a/src/actions/actionDuplicateSelection.tsx b/src/actions/actionDuplicateSelection.tsx
index 2ef0d25ca7..d8702a76da 100644
--- a/src/actions/actionDuplicateSelection.tsx
+++ b/src/actions/actionDuplicateSelection.tsx
@@ -128,12 +128,15 @@ const duplicateElements = (
{
...appState,
selectedGroupIds: {},
- selectedElementIds: newElements.reduce((acc, element) => {
- if (!isBoundToContainer(element)) {
- acc[element.id] = true;
- }
- return acc;
- }, {} as any),
+ selectedElementIds: newElements.reduce(
+ (acc: Record<ExcalidrawElement["id"], true>, element) => {
+ if (!isBoundToContainer(element)) {
+ acc[element.id] = true;
+ }
+ return acc;
+ },
+ {},
+ ),
},
getNonDeletedElements(finalElements),
),
diff --git a/src/actions/actionSelectAll.ts b/src/actions/actionSelectAll.ts
index 09c08d72b9..8a6763a663 100644
--- a/src/actions/actionSelectAll.ts
+++ b/src/actions/actionSelectAll.ts
@@ -2,6 +2,7 @@ import { KEYS } from "../keys";
import { register } from "./register";
import { selectGroupsForSelectedElements } from "../groups";
import { getNonDeletedElements, isTextElement } from "../element";
+import { ExcalidrawElement } from "../element/types";
export const actionSelectAll = register({
name: "selectAll",
@@ -15,16 +16,19 @@ export const actionSelectAll = register({
{
...appState,
editingGroupId: null,
- selectedElementIds: elements.reduce((map, element) => {
- if (
- !element.isDeleted &&
- !(isTextElement(element) && element.containerId) &&
- element.locked === false
- ) {
- map[element.id] = true;
- }
- return map;
- }, {} as any),
+ selectedElementIds: elements.reduce(
+ (map: Record<ExcalidrawElement["id"], true>, element) => {
+ if (
+ !element.isDeleted &&
+ !(isTextElement(element) && element.containerId) &&
+ !element.locked
+ ) {
+ map[element.id] = true;
+ }
+ return map;
+ },
+ {},
+ ),
},
getNonDeletedElements(elements),
),
diff --git a/src/components/App.tsx b/src/components/App.tsx
index 271f1ac4df..7a9240e931 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1540,12 +1540,15 @@ class App extends React.Component<AppProps, AppState> {
this.state.isLibraryOpen && this.device.canDeviceFitSidebar
? this.state.isLibraryMenuDocked
: false,
- selectedElementIds: newElements.reduce((map, element) => {
- if (!isBoundToContainer(element)) {
- map[element.id] = true;
- }
- return map;
- }, {} as any),
+ selectedElementIds: newElements.reduce(
+ (acc: Record<ExcalidrawElement["id"], true>, element) => {
+ if (!isBoundToContainer(element)) {
+ acc[element.id] = true;
+ }
+ return acc;
+ },
+ {},
+ ),
selectedGroupIds: {},
},
this.scene.getNonDeletedElements(),
@@ -4307,10 +4310,13 @@ class App extends React.Component<AppProps, AppState> {
...prevState,
selectedElementIds: {
...prevState.selectedElementIds,
- ...elementsWithinSelection.reduce((map, element) => {
- map[element.id] = true;
- return map;
- }, {} as any),
+ ...elementsWithinSelection.reduce(
+ (acc: Record<ExcalidrawElement["id"], true>, element) => {
+ acc[element.id] = true;
+ return acc;
+ },
+ {},
+ ),
...(pointerDownState.hit.element
? {
// if using ctrl/cmd, select the hitElement only if we