Remove unneeded ScrollConstructor

slab · Jan 16, 2024 · f42cceb · f42cceb
1 parent c765212
commit f42cceb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/quill/package.json b/packages/quill/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "eventemitter3": "^5.0.1",
     "lodash-es": "^4.17.21",
-    "parchment": "github:quilljs/parchment#c4cd8723382972dc3c5b5911b4dfabc0047bb26e",
+    "parchment": "github:quilljs/parchment#9d148df41cc3d62ab07c25ebcead46a3d513d2c6",
     "quill-delta": "^5.1.0"
   },
   "devDependencies": {

diff --git a/packages/quill/src/blots/scroll.ts b/packages/quill/src/blots/scroll.ts
@@ -440,12 +440,4 @@ function insertInlineContents(
   }, index);
 }
 
-export interface ScrollConstructor {
-  new (
-    registry: Registry,
-    domNode: HTMLDivElement,
-    options: { emitter: Emitter },
-  ): Scroll;
-}
-
 export default Scroll;
diff --git a/packages/quill/src/core/quill.ts b/packages/quill/src/core/quill.ts
@@ -5,7 +5,6 @@ import Delta from 'quill-delta';
 import type { BlockEmbed } from '../blots/block';
 import type Block from '../blots/block';
 import type Scroll from '../blots/scroll';
-import type { ScrollConstructor } from '../blots/scroll';
 import type Clipboard from '../modules/clipboard';
 import type History from '../modules/history';
 import type Keyboard from '../modules/keyboard';
@@ -169,13 +168,16 @@ class Quill {
     this.root = this.addContainer('ql-editor');
     this.root.classList.add('ql-blank');
     this.emitter = new Emitter();
-    // @ts-expect-error TODO: fix BlotConstructor
-    const ScrollBlot = this.options.registry.query(
-      Parchment.ScrollBlot.blotName,
-    ) as ScrollConstructor;
+    const scrollBlotName = Parchment.ScrollBlot.blotName;
+    const ScrollBlot = this.options.registry.query(scrollBlotName);
+    if (!ScrollBlot || !('blotName' in ScrollBlot)) {
+      throw new Error(
+        `Cannot initialize Quill without "${scrollBlotName}" blot`,
+      );
+    }
     this.scroll = new ScrollBlot(this.options.registry, this.root, {
       emitter: this.emitter,
-    });
+    }) as Scroll;
     this.editor = new Editor(this.scroll);
     this.selection = new Selection(this.scroll, this.emitter);
     this.composition = new Composition(this.scroll, this.emitter);

diff --git a/packages/quill/test/unit/__helpers__/factory.ts b/packages/quill/test/unit/__helpers__/factory.ts
@@ -1,4 +1,5 @@
 import { Registry } from 'parchment';
+import type { Attributor } from 'parchment';
 
 import Block from '../../../src/blots/block';
 import Break from '../../../src/blots/break';
@@ -14,7 +15,7 @@ export const createRegistry = (formats: unknown[] = []) => {
   const registry = new Registry();
 
   formats.forEach((format) => {
-    registry.register(format);
+    registry.register(format as Attributor);
   });
   registry.register(Block);
   registry.register(Break);