Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch up to upstream #60

Merged
merged 6 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow ref for insertBefore to be null
  • Loading branch information
luin committed Apr 4, 2024
commit 20f02f55e30ca87c0c539632b36c6c52ca4670eb
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- Fix overload declarations for `quill.formatText()` and other methods
- Expose Bounds type for getBounds()
- Expose Range type
- Allow ref for insertBefore to be null

# 2.0.0-rc.4

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/quill/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"eventemitter3": "^5.0.1",
"lodash-es": "^4.17.21",
"parchment": "3.0.0-rc.0",
"parchment": "3.0.0-rc.1",
"quill-delta": "^5.1.0"
},
"devDependencies": {
Expand Down
4 changes: 0 additions & 4 deletions packages/quill/src/blots/block.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ class Block extends BlockBlot {
}

moveChildren(target: Parent, ref?: Blot | null) {
// @ts-expect-error Parchment types are wrong
super.moveChildren(target, ref);
this.cache = {};
}
Expand All @@ -116,7 +115,6 @@ class Block extends BlockBlot {
this.parent.insertBefore(clone, this);
return this;
}
// @ts-expect-error Fix me later
this.parent.insertBefore(clone, this.next);
return clone;
}
Expand Down Expand Up @@ -172,11 +170,9 @@ class BlockEmbed extends EmbedBlot {
});
const ref = this.split(index);
blocks.forEach((block) => {
// @ts-expect-error Fix me later
this.parent.insertBefore(block, ref);
});
if (text) {
// @ts-expect-error Fix me later
this.parent.insertBefore(this.scroll.create('text', text), ref);
}
}
Expand Down
1 change: 0 additions & 1 deletion packages/quill/src/blots/embed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ class Embed extends EmbedBlot {
};
} else {
textNode = document.createTextNode(text);
// @ts-expect-error Fix me later
this.parent.insertBefore(this.scroll.create(textNode), this.next);
range = {
startNode: textNode,
Expand Down
2 changes: 1 addition & 1 deletion packages/quill/src/blots/scroll.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class Scroll extends ScrollBlot {
this.optimize();
}

insertBefore(blot: Blot, ref?: Blot) {
insertBefore(blot: Blot, ref?: Blot | null) {
if (blot.statics.scope === Scope.INLINE_BLOT) {
const wrapper = this.scroll.create(
this.statics.defaultChild.blotName,
Expand Down
1 change: 0 additions & 1 deletion packages/quill/src/core/selection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ class Selection {
// TODO Give blot ability to not split
if (blot instanceof LeafBlot) {
const after = blot.split(nativeRange.start.offset);
// @ts-expect-error Fix me later
blot.parent.insertBefore(this.cursor, after);
} else {
// @ts-expect-error TODO: nativeRange.start.node doesn't seem to match function signature
Expand Down