Merge branch 'main' into matcher-types

CHANGELOG.md

@@ -1,5 +1,8 @@
 # [Unreleased]
 
+- **Clipboard** Add support for Quill v1 list attributes
+- Fix overload declarations for `quill.formatText()` and other methods
+
 # 2.0.0-rc.4
 
 - Include source maps for Parchment

README.md

@@ -43,7 +43,7 @@ Instantiate a new Quill object with a css selector for the div that should becom
 ```html
 <!-- Include Quill stylesheet -->
 <link
-  href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/quill.snow.css"
+  href="https://cdn.jsdelivr.net/npm/[email protected].4/dist/quill.snow.css"
   rel="stylesheet"
 />
 
@@ -61,7 +61,7 @@ Instantiate a new Quill object with a css selector for the div that should becom
 </div>
 
 <!-- Include the Quill library -->
-<script src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/quill.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected].4/dist/quill.js"></script>
 
 <!-- Initialize Quill editor -->
 <script>
@@ -83,24 +83,24 @@ npm install quill@rc
 
 ```html
 <!-- Main Quill library -->
-<script src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/quill.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected].4/dist/quill.js"></script>
 
 <!-- Theme included stylesheets -->
 <link
-  href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/quill.snow.css"
+  href="https://cdn.jsdelivr.net/npm/[email protected].4/dist/quill.snow.css"
   rel="stylesheet"
 />
 <link
-  href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/quill.bubble.css"
+  href="https://cdn.jsdelivr.net/npm/[email protected].4/dist/quill.bubble.css"
   rel="stylesheet"
 />
 
 <!-- Core build with no theme, formatting, non-essential modules -->
 <link
-  href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/quill.core.css"
+  href="https://cdn.jsdelivr.net/npm/[email protected].4/dist/quill.core.css"
   rel="stylesheet"
 />
-<script src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/quill.core.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected].4/dist/quill.core.js"></script>
 ```
 
 ## Community

packages/quill/src/core.ts

@@ -1,6 +1,7 @@
-import Quill from './core/quill.js';
+import Quill, { Parchment, Range } from './core/quill.js';
 import type {
   DebugLevel,
+  EmitterSource,
   ExpandedQuillOptions,
   QuillOptions,
 } from './core/quill.js';
@@ -22,8 +23,8 @@ import Delta, { Op, OpIterator, AttributeMap } from 'quill-delta';
 import Input from './modules/input.js';
 import UINode from './modules/uiNode.js';
 
-export { Delta, Op, OpIterator, AttributeMap };
-export type { DebugLevel, ExpandedQuillOptions, QuillOptions };
+export { Delta, Op, OpIterator, AttributeMap, Parchment, Range };
+export type { DebugLevel, EmitterSource, ExpandedQuillOptions, QuillOptions };
 
 Quill.register({
   'blots/block': Block,

packages/quill/src/core/quill.ts

@@ -412,7 +412,13 @@ class Quill {
     length: number,
     name: string,
     value: unknown,
-    source: EmitterSource,
+    source?: EmitterSource,
+  ): Delta;
+  formatText(
+    index: number,
+    length: number,
+    formats: Record<string, unknown>,
+    source?: EmitterSource,
   ): Delta;
   formatText(
     index: number | { index: number; length: number },
@@ -568,24 +574,24 @@ class Quill {
     );
   }
 
-  insertText(index: number, text: string, source: EmitterSource): Delta;
+  insertText(index: number, text: string, source?: EmitterSource): Delta;
   insertText(
     index: number,
     text: string,
     formats: Record<string, unknown>,
-    source: EmitterSource,
+    source?: EmitterSource,
   ): Delta;
   insertText(
     index: number,
     text: string,
     name: string,
     value: unknown,
-    source: EmitterSource,
+    source?: EmitterSource,
   ): Delta;
   insertText(
     index: number,
     text: string,
-    name: string | Record<string, unknown> | EmitterSource,
+    name?: string | Record<string, unknown> | EmitterSource,
     value?: unknown,
     source?: EmitterSource,
   ): Delta {
@@ -647,8 +653,8 @@ class Quill {
     return this.emitter.once(...args);
   }
 
-  removeFormat(...args: Parameters<typeof overload>) {
-    const [index, length, , source] = overload(...args);
+  removeFormat(index: number, length: number, source?: EmitterSource) {
+    [index, length, , source] = overload(index, length, source);
     return modify.call(
       this,
       () => {
@@ -1027,6 +1033,7 @@ function shiftRange(
   return new Range(start, end - start);
 }
 
-export type { DebugLevel };
+export type { DebugLevel, EmitterSource };
+export { Parchment, Range };
 
 export { globalRegistry, expandConfig, overload, Quill as default };

packages/quill/src/modules/clipboard.ts

@@ -564,7 +564,13 @@ function matchIndent(node: Node, delta: Delta, scroll: ScrollBlot) {
 }
 
 function matchList(node: Element, delta: Delta, scroll: ScrollBlot) {
-  const list = node.tagName === 'OL' ? 'ordered' : 'bullet';
+  let list = node.tagName === 'OL' ? 'ordered' : 'bullet';
+
+  const checkedAttr = node.getAttribute('data-checked');
+  if (checkedAttr) {
+    list = checkedAttr === 'true' ? 'checked' : 'unchecked';
+  }
+
   return applyFormat(delta, 'list', list, scroll);
 }
 

packages/quill/src/quill.ts

@@ -1,5 +1,10 @@
-import Quill from './core.js';
-import type { DebugLevel, ExpandedQuillOptions, QuillOptions } from './core.js';
+import Quill, { Parchment, Range } from './core.js';
+import type {
+  DebugLevel,
+  EmitterSource,
+  ExpandedQuillOptions,
+  QuillOptions,
+} from './core.js';
 
 import { AlignClass, AlignStyle } from './formats/align.js';
 import {
@@ -109,6 +114,7 @@ Quill.register(
   true,
 );
 
-export type { DebugLevel, ExpandedQuillOptions, QuillOptions };
+export type { DebugLevel, EmitterSource, ExpandedQuillOptions, QuillOptions };
+export { Parchment, Range };
 
 export default Quill;

packages/quill/test/types/quill.test-d.ts

@@ -0,0 +1,211 @@
+import { assertType, expectTypeOf } from 'vitest';
+import Quill from '../../src/quill.js';
+import type { EmitterSource, Parchment, Range } from '../../src/quill.js';
+import Delta from 'quill-delta';
+import type { default as Block, BlockEmbed } from '../../src/blots/block.js';
+
+const quill = new Quill('#editor');
+
+{
+  quill.deleteText(0, 1);
+  quill.deleteText(0, 1, 'api');
+  quill.deleteText({ index: 0, length: 1 });
+  quill.deleteText({ index: 0, length: 1 }, 'api');
+}
+
+{
+  assertType<Delta>(quill.getContents());
+  assertType<Delta>(quill.getContents(1));
+  assertType<Delta>(quill.getContents(1, 2));
+}
+
+{
+  assertType<number>(quill.getLength());
+}
+
+{
+  assertType<string>(quill.getSemanticHTML());
+  assertType<string>(quill.getSemanticHTML(1));
+  assertType<string>(quill.getSemanticHTML(1, 2));
+}
+
+{
+  quill.insertEmbed(10, 'image', 'https://example.com/logo.png');
+  quill.insertEmbed(10, 'image', 'https://example.com/logo.png', 'api');
+}
+
+{
+  quill.insertText(0, 'Hello');
+  quill.insertText(0, 'Hello', 'api');
+  quill.insertText(0, 'Hello', 'bold', true);
+  quill.insertText(0, 'Hello', 'bold', true, 'api');
+  quill.insertText(5, 'Quill', {
+    color: '#ffff00',
+    italic: true,
+  });
+  quill.insertText(
+    5,
+    'Quill',
+    {
+      color: '#ffff00',
+      italic: true,
+    },
+    'api',
+  );
+}
+
+{
+  quill.enable();
+  quill.enable(true);
+}
+
+{
+  quill.disable();
+}
+
+{
+  assertType<boolean>(quill.editReadOnly(() => true));
+  assertType<string>(quill.editReadOnly(() => 'success'));
+}
+
+{
+  quill.setText('Hello World!');
+  quill.setText('Hello World!', 'api');
+}
+
+{
+  quill.updateContents([{ insert: 'Hello World!' }]);
+  quill.updateContents([{ insert: 'Hello World!' }], 'api');
+  quill.updateContents(new Delta().insert('Hello World!'));
+  quill.updateContents(new Delta().insert('Hello World!'), 'api');
+}
+
+{
+  quill.setContents([{ insert: 'Hello World!\n' }]);
+  quill.setContents([{ insert: 'Hello World!\n' }], 'api');
+  quill.setContents(new Delta().insert('Hello World!\n'));
+  quill.setContents(new Delta().insert('Hello World!\n'), 'api');
+}
+
+{
+  quill.format('bold', true);
+  quill.format('bold', true, 'api');
+}
+
+{
+  quill.formatText(0, 1, 'bold', true);
+  quill.formatText(0, 1, 'bold', true, 'api');
+  quill.formatText(0, 5, {
+    bold: false,
+    color: 'rgb(0, 0, 255)',
+  });
+  quill.formatText(
+    0,
+    5,
+    {
+      bold: false,
+      color: 'rgb(0, 0, 255)',
+    },
+    'api',
+  );
+}
+
+{
+  quill.formatLine(0, 1, 'bold', true);
+  quill.formatLine(0, 1, 'bold', true, 'api');
+  quill.formatLine(0, 5, {
+    bold: false,
+    color: 'rgb(0, 0, 255)',
+  });
+  quill.formatLine(
+    0,
+    5,
+    {
+      bold: false,
+      color: 'rgb(0, 0, 255)',
+    },
+    'api',
+  );
+}
+
+{
+  quill.getFormat();
+  quill.getFormat(1);
+  quill.getFormat(1, 10);
+  quill.getFormat({ index: 1, length: 1 });
+}
+
+{
+  quill.removeFormat(3, 2);
+  quill.removeFormat(3, 2, 'user');
+}
+
+{
+  quill.getBounds(3, 2);
+}
+
+{
+  quill.getSelection();
+  quill.getSelection(true);
+}
+
+{
+  quill.setSelection(1, 2);
+  quill.setSelection(1, 2, 'api');
+  quill.setSelection({ index: 1, length: 2 });
+  quill.setSelection({ index: 1, length: 2 }, 'api');
+}
+
+{
+  quill.scrollSelectionIntoView();
+}
+
+{
+  quill.blur();
+}
+
+{
+  quill.focus();
+}
+
+{
+  assertType<boolean>(quill.hasFocus());
+}
+
+{
+  quill.update();
+  quill.update('user');
+}
+
+{
+  quill.scrollRectIntoView({ left: 0, right: 0, top: 0, bottom: 0 });
+}
+
+{
+  quill.on('text-change', (delta, oldDelta, source) => {
+    expectTypeOf<Delta>(delta);
+    expectTypeOf<Delta>(oldDelta);
+    expectTypeOf<EmitterSource>(source);
+  });
+}
+
+{
+  quill.on('selection-change', (range, oldRange, source) => {
+    expectTypeOf<Range>(range);
+    expectTypeOf<Range>(oldRange);
+    expectTypeOf<EmitterSource>(source);
+  });
+}
+
+{
+  assertType<[Parchment.LeafBlot | null, number]>(quill.getLeaf(0));
+}
+
+{
+  assertType<[BlockEmbed | Block | null, number]>(quill.getLine(0));
+}
+
+{
+  assertType<(BlockEmbed | Block)[]>(quill.getLines(0));
+  assertType<(BlockEmbed | Block)[]>(quill.getLines(0, 10));
+}