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.

Sign up for GitHub

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

Jump to bottom

getHTML() should include outer tag when range is entire line #3850

Merged
merged 1 commit into from
Aug 8, 2023
Merged

getHTML() should include outer tag when range is entire line #3850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 20 additions & 10 deletions core/editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import cloneDeep from 'lodash.clonedeep';
import isEqual from 'lodash.isequal';
import merge from 'lodash.merge';
import { LeafBlot, EmbedBlot, Scope } from 'parchment';
import { LeafBlot, EmbedBlot, Scope, Blot, ParentBlot } from 'parchment';
import Delta, { AttributeMap, Op } from 'quill-delta';
import Block, { BlockEmbed, bubbleFormats } from '../blots/block';
import Break from '../blots/break';
Expand Down Expand Up @@ -194,8 +194,10 @@ class Editor {
getHTML(index: number, length: number): string {
const [line, lineOffset] = this.scroll.line(index);
if (line) {
const lineLength = line.length();
if (line.length() >= lineOffset + length) {
return convertHTML(line, lineOffset, length, true);
const excludeOuterTag = !(lineOffset === 0 && length === lineLength);
return convertHTML(line, lineOffset, length, excludeOuterTag);
}
return convertHTML(this.scroll, index, length, true);
}
Expand Down Expand Up @@ -311,7 +313,7 @@ class Editor {
}
}

function convertListHTML(items, lastIndent, types) {
function convertListHTML(items, lastIndent: number, types: string[]) {
if (items.length === 0) {
const [endTag] = getListType(types.pop());
if (lastIndent <= 0) {
Expand Down Expand Up @@ -344,19 +346,27 @@ function convertListHTML(items, lastIndent, types) {
return `</li></${endTag}>${convertListHTML(items, lastIndent - 1, types)}`;
}

function convertHTML(blot, index, length, isRoot = false) {
if (typeof blot.html === 'function') {
function convertHTML(
blot: Blot,
index: number,
length: number,
excludeOuterTag = false,
) {
if ('html' in blot && typeof blot.html === 'function') {
return blot.html(index, length);
}
if (blot instanceof TextBlot) {
return escapeText(blot.value().slice(index, index + length));
}
if (blot.children) {
if (blot instanceof ParentBlot) {
// TODO fix API
if (blot.statics.blotName === 'list-container') {
const items: any[] = [];
blot.children.forEachAt(index, length, (child, offset, childLength) => {
const formats = child.formats();
const formats =
'formats' in child && typeof child.formats === 'function'
? child.formats()
: {};
items.push({
child,
offset,
Expand All @@ -371,18 +381,18 @@ function convertHTML(blot, index, length, isRoot = false) {
blot.children.forEachAt(index, length, (child, offset, childLength) => {
parts.push(convertHTML(child, offset, childLength));
});
if (isRoot || blot.statics.blotName === 'list') {
if (excludeOuterTag || blot.statics.blotName === 'list') {
return parts.join('');
}
const { outerHTML, innerHTML } = blot.domNode;
const { outerHTML, innerHTML } = blot.domNode as Element;
const [start, end] = outerHTML.split(`>${innerHTML}<`);
// TODO cleanup
if (start === '<table') {
return `<table style="border: 1px solid #000;">${parts.join('')}<${end}`;
}
return `${start}>${parts.join('')}<${end}`;
}
return blot.domNode.outerHTML;
return blot.domNode instanceof Element ? blot.domNode.outerHTML : '';
}

function combineFormats(formats, combined) {
Expand Down
12 changes: 11 additions & 1 deletion test/unit/core/editor.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,8 +1214,18 @@ describe('Editor', () => {

describe('getHTML', () => {
test('inline', () => {
expect(
createEditor('<blockquote>Test</blockquote>').getHTML(1, 2),
).toEqual('es');

expect(
createEditor('<blockquote>Test</blockquote>').getHTML(0, 4),
).toEqual('Test');
});

test('entire line', () => {
const editor = createEditor('<blockquote>Test</blockquote>');
expect(editor.getHTML(1, 2)).toEqual('es');
expect(editor.getHTML(0, 5)).toEqual('<blockquote>Test</blockquote>');
});

test('across lines', () => {
Expand Down