Skip to content

Commit

Permalink
feat(Utils): rename function from getDeepest to getDeepElement
Browse files Browse the repository at this point in the history
  • Loading branch information
luolonghao committed Jul 9, 2024
1 parent 2d8d83b commit 87379c9
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/operations/add-mark.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parseStyle, query, getBox, getDeepest, removeBreak } from '../utils';
import { parseStyle, query, getBox, getDeepElement, removeBreak } from '../utils';
import { Nodes } from '../models/nodes';
import { Range } from '../models/range';
import { insertBookmark } from './insert-bookmark';
Expand Down Expand Up @@ -91,7 +91,7 @@ export function addMark(range: Range, value: string | Nodes): void {
newMark.css(cssProperties);
valueNode = newMark;
} else {
const deepestMark = getDeepest(newMark);
const deepestMark = getDeepElement(newMark);
deepestMark.append(zeroWidthSpace);
valueNode.append(newMark);
}
Expand Down
4 changes: 2 additions & 2 deletions src/operations/remove-mark.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getDeepest, query, removeZWS } from '../utils';
import { getDeepElement, query, removeZWS } from '../utils';
import { Nodes } from '../models/nodes';
import { Range } from '../models/range';
import { insertBookmark } from './insert-bookmark';
Expand Down Expand Up @@ -82,7 +82,7 @@ export function removeMark(range: Range, value?: string): void {
range.collapseToStart();
return;
}
const deepestMark = getDeepest(newMark);
const deepestMark = getDeepElement(newMark);
deepestMark.append(zeroWidthSpace);
parts.start.after(newMark);
removeEmptyMarks(parts.start);
Expand Down
4 changes: 2 additions & 2 deletions src/operations/set-blocks.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { KeyValue } from '../types/object';
import { query, getDeepest, wrapNodeList, appendBreak } from '../utils';
import { query, getDeepElement, wrapNodeList, appendBreak } from '../utils';
import { Nodes } from '../models/nodes';
import { Range } from '../models/range';
import { insertBookmark } from './insert-bookmark';
Expand Down Expand Up @@ -69,7 +69,7 @@ export function setBlocks(range: Range, value: string | KeyValue): void {
if (block.isList && node.isList && node.attr('indent') !== '') {
block.attr('indent', node.attr('indent'));
}
const deepestBlock = getDeepest(block);
const deepestBlock = getDeepElement(block);
let child = node.first();
while(child.length > 0) {
const nextNode = child.next();
Expand Down
2 changes: 1 addition & 1 deletion src/utils/get-deepest.ts → src/utils/get-deep-element.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Nodes } from '../models/nodes';

// Returns the deepest element of the specified element.
export function getDeepest(element: Nodes): Nodes {
export function getDeepElement(element: Nodes): Nodes {
let child = element;
while (child.length > 0) {
let firstChild = child.first();
Expand Down
2 changes: 1 addition & 1 deletion src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export * from './query';
export * from './split-nodes';
export * from './merge-nodes';
export * from './wrap-node-list';
export * from './get-deepest';
export * from './get-deep-element';
export * from './remove-zws';
export * from './change-tag-name';
export * from './fix-numbered-list';
Expand Down
4 changes: 2 additions & 2 deletions src/utils/wrap-node-list.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Nodes } from '../models/nodes';
import { getDeepest } from './get-deepest';
import { getDeepElement } from './get-deep-element';
import { query } from './query';

export function wrapNodeList(nodeList: Nodes[], wrapper?: Nodes): Nodes {
Expand All @@ -8,7 +8,7 @@ export function wrapNodeList(nodeList: Nodes[], wrapper?: Nodes): Nodes {
return wrapper;
}
wrapper = wrapper.clone(true);
const deepestElement = getDeepest(wrapper);
const deepestElement = getDeepElement(wrapper);
nodeList[0].before(wrapper);
for (const node of nodeList) {
deepestElement.append(node);
Expand Down
2 changes: 1 addition & 1 deletion tests/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import './utils/query.test';
import './utils/split-nodes.test';
import './utils/merge-nodes.test';
import './utils/wrap-node-list.test';
import './utils/get-deepest.test';
import './utils/get-deep-element.test';
import './utils/remove-zws.test';
import './utils/change-tag-name.test';
import './utils/fix-numbered-list.test';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import { getDeepest, query } from '../../src/utils';
import { getDeepElement, query } from '../../src/utils';

describe('utils / get-deepest', () => {
describe('utils / get-deep-element', () => {

it('should return strong', () => {
const element = query('<div><p><strong></strong></p></div>');
expect(getDeepest(element).name).to.equal('strong');
expect(getDeepElement(element).name).to.equal('strong');
});

it('should not return element', () => {
const element = query('<div><p>foo</p></div>');
expect(getDeepest(element).name).to.equal('');
expect(getDeepElement(element).name).to.equal('');
});

it('should not return element when the deepest node is void', () => {
const element = query('<div><p><br></p></div>');
expect(getDeepest(element).name).to.equal('');
expect(getDeepElement(element).name).to.equal('');
});

it('should return element when the deepest node is an empty text', () => {
const element = query('<div><p><strong>\u200B</strong></p></div>');
expect(getDeepest(element).name).to.equal('strong');
expect(getDeepElement(element).name).to.equal('strong');
});

});

0 comments on commit 87379c9

Please sign in to comment.