diff --git a/src/element/types.ts b/src/element/types.ts index 168039fc0..1a6fcf482 100644 --- a/src/element/types.ts +++ b/src/element/types.ts @@ -1,4 +1,3 @@ -import { Subtype } from "../subtypes"; import { Point } from "../types"; import { FONT_FAMILY, @@ -66,7 +65,7 @@ type _ExcalidrawElementBase = Readonly<{ updated: number; link: string | null; locked: boolean; - subtype?: Subtype; + subtype?: string; customData?: Record; }>; diff --git a/src/subtypes.ts b/src/subtypes.ts index cf0c5baff..a2d6116bf 100644 --- a/src/subtypes.ts +++ b/src/subtypes.ts @@ -51,13 +51,13 @@ export type SubtypeRecord = Readonly<{ }>; // Subtype Names -export type Subtype = string; +export type Subtype = Required["subtype"]; export const getSubtypeNames = (): readonly Subtype[] => { return subtypeNames; }; export const isValidSubtype = (s: any, t: any): s is Subtype => parentTypeMap.find( - (val) => val.subtype === (s as string) && val.parentType === (t as string), + (val) => (val.subtype as any) === s && (val.parentType as any) === t, ) !== undefined; const isSubtypeName = (s: any): s is Subtype => subtypeNames.includes(s);