Virtual whiteboard for sketching hand-drawn like diagrams
fix text constructor groupIds & improve type safety (#1715)
David Luzard1be2a5481e4
diff --git a/src/element/newElement.ts b/src/element/newElement.tsindex b8ab67427f..77f282a5d0 100644--- a/src/element/newElement.ts+++ b/src/element/newElement.ts@@ -14,20 +14,16 @@ import { newElementWith } from "./mutateElement";import { getNewGroupIdsForDuplication } from "../groups";import { AppState } from "../types";-type ElementConstructorOpts = {- x: ExcalidrawGenericElement["x"];- y: ExcalidrawGenericElement["y"];- strokeColor: ExcalidrawGenericElement["strokeColor"];- backgroundColor: ExcalidrawGenericElement["backgroundColor"];- fillStyle: ExcalidrawGenericElement["fillStyle"];- strokeWidth: ExcalidrawGenericElement["strokeWidth"];- strokeStyle: ExcalidrawGenericElement["strokeStyle"];- roughness: ExcalidrawGenericElement["roughness"];- opacity: ExcalidrawGenericElement["opacity"];- width?: ExcalidrawGenericElement["width"];- height?: ExcalidrawGenericElement["height"];- angle?: ExcalidrawGenericElement["angle"];-};+type ElementConstructorOpts = MarkOptional<+ Omit<ExcalidrawGenericElement, "id" | "type" | "isDeleted">,+ | "width"+ | "height"+ | "angle"+ | "groupIds"+ | "seed"+ | "version"+ | "versionNonce"+>;const _newElementBase = <T extends ExcalidrawElement>(type: T["type"],@@ -44,6 +40,7 @@ const _newElementBase = <T extends ExcalidrawElement>(width = 0,height = 0,angle = 0,+ groupIds = [],...rest}: ElementConstructorOpts & Omit<Partial<ExcalidrawGenericElement>, "type">,) => ({@@ -61,11 +58,11 @@ const _newElementBase = <T extends ExcalidrawElement>(strokeStyle,roughness,opacity,+ groupIds,seed: rest.seed ?? randomInteger(),version: rest.version || 1,versionNonce: rest.versionNonce ?? 0,isDeleted: false as false,- groupIds: [],});export const newElement = (diff --git a/src/global.d.ts b/src/global.d.tsindex 59672b7402..7046dae35f 100644--- a/src/global.d.ts+++ b/src/global.d.ts@@ -25,3 +25,6 @@ type ResolutionType<T extends (...args: any) => any> = T extends () => Promise<infer R>? R: any;++// https://github.com/krzkaczor/ts-essentials+type MarkOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;