imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable @typescript-eslint/explicit-function-return-type in /src (#9788)

Browse source 
* Enable `@typescript-eslint/explicit-member-accessibility` on /src

* Prettier

* Enable `@typescript-eslint/explicit-function-return-type` in /src

* Fix types

* tsc strict fixes

* Delint

* Fix test

* Fix bad merge
This commit is contained in:
Michael Telatynski 2023-01-12 13:25:14 +00:00 • committed by GitHub
parent 7a36ba0fde
commit 030b7e90bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
683 changed files with 3459 additions and 3013 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/utils/MessageDiffUtils.tsx
View file

@ -74,9 +74,16 @@ function wrapDeletion(child: Node): HTMLElement {
return wrapper;
}
function findRefNodes(root: Node, route: number[], isAddition = false) {
function findRefNodes(
root: Node,
route: number[],
isAddition = false,
): {
refNode: Node;
refParentNode?: Node;
} {
let refNode = root;
let refParentNode;
let refParentNode: Node | undefined;
const end = isAddition ? route.length - 1 : route.length;
for (let i = 0; i < end; ++i) {
refParentNode = refNode;
@ -85,8 +92,12 @@ function findRefNodes(root: Node, route: number[], isAddition = false) {
return { refNode, refParentNode };
}
function diffTreeToDOM(desc) {
if (desc.nodeName === "#text") {
function isTextNode(node: Text | HTMLElement): node is Text {
return node.nodeName === "#text";
}
function diffTreeToDOM(desc): Node {
if (isTextNode(desc)) {
return stringAsTextNode(desc.data);
} else {
const node = document.createElement(desc.nodeName);
@ -97,7 +108,7 @@ function diffTreeToDOM(desc) {
}
if (desc.childNodes) {
for (const childDesc of desc.childNodes) {
node.appendChild(diffTreeToDOM(childDesc));
node.appendChild(diffTreeToDOM(childDesc as Text | HTMLElement));
}
}
return node;
@ -152,25 +163,25 @@ function renderDifferenceInDOM(originalRootNode: Node, diff: IDiff, diffMathPatc
switch (diff.action) {
case "replaceElement": {
const container = document.createElement("span");
const delNode = wrapDeletion(diffTreeToDOM(diff.oldValue));
const insNode = wrapInsertion(diffTreeToDOM(diff.newValue));
const delNode = wrapDeletion(diffTreeToDOM(diff.oldValue as HTMLElement));
const insNode = wrapInsertion(diffTreeToDOM(diff.newValue as HTMLElement));
container.appendChild(delNode);
container.appendChild(insNode);
refNode.parentNode.replaceChild(container, refNode);
break;
}
case "removeTextElement": {
const delNode = wrapDeletion(stringAsTextNode(diff.value));
const delNode = wrapDeletion(stringAsTextNode(diff.value as string));
refNode.parentNode.replaceChild(delNode, refNode);
break;
}
case "removeElement": {
const delNode = wrapDeletion(diffTreeToDOM(diff.element));
const delNode = wrapDeletion(diffTreeToDOM(diff.element as HTMLElement));
refNode.parentNode.replaceChild(delNode, refNode);
break;
}
case "modifyTextElement": {
const textDiffs = diffMathPatch.diff_main(diff.oldValue, diff.newValue);
const textDiffs = diffMathPatch.diff_main(diff.oldValue as string, diff.newValue as string);
diffMathPatch.diff_cleanupSemantic(textDiffs);
const container = document.createElement("span");
for (const [modifier, text] of textDiffs) {
@ -186,7 +197,7 @@ function renderDifferenceInDOM(originalRootNode: Node, diff: IDiff, diffMathPatc
break;
}
case "addElement": {
const insNode = wrapInsertion(diffTreeToDOM(diff.element));
const insNode = wrapInsertion(diffTreeToDOM(diff.element as HTMLElement));
insertBefore(refParentNode, refNode, insNode);
break;
}
@ -194,7 +205,7 @@ function renderDifferenceInDOM(originalRootNode: Node, diff: IDiff, diffMathPatc
// XXX: sometimes diffDOM says insert a newline when there shouldn't be one
// but we must insert the node anyway so that we don't break the route child IDs.
// See https://github.com/fiduswriter/diffDOM/issues/100
const insNode = wrapInsertion(stringAsTextNode(diff.value !== "\n" ? diff.value : ""));
const insNode = wrapInsertion(stringAsTextNode(diff.value !== "\n" ? (diff.value as string) : ""));
insertBefore(refParentNode, refNode, insNode);
break;
}
@ -206,7 +217,7 @@ function renderDifferenceInDOM(originalRootNode: Node, diff: IDiff, diffMathPatc
const delNode = wrapDeletion(refNode.cloneNode(true));
const updatedNode = refNode.cloneNode(true) as HTMLElement;
if (diff.action === "addAttribute" || diff.action === "modifyAttribute") {
updatedNode.setAttribute(diff.name, diff.newValue);
updatedNode.setAttribute(diff.name, diff.newValue as string);
} else {
updatedNode.removeAttribute(diff.name);
}