mirror of
https://github.com/ankitects/anki.git
synced 2025-09-19 14:32:22 -04:00
Implement moveNodesInsertedBeforeEndToAfterEnd
This will prevent the user typing into the decorated elements by accident because they place cursor behind it
This commit is contained in:
parent
d7e0f77439
commit
9fb0ce973b
2 changed files with 62 additions and 10 deletions
|
@ -50,9 +50,12 @@ export class Editable extends HTMLElement {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return containsInlineContent(clone) && this.innerHTML.endsWith("<br>")
|
const result =
|
||||||
|
containsInlineContent(clone) && clone.innerHTML.endsWith("<br>")
|
||||||
? clone.innerHTML.slice(0, -4) // trim trailing <br>
|
? clone.innerHTML.slice(0, -4) // trim trailing <br>
|
||||||
: clone.innerHTML;
|
: clone.innerHTML;
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
connectedCallback(): void {
|
connectedCallback(): void {
|
||||||
|
|
|
@ -1,9 +1,49 @@
|
||||||
import "mathjax/es5/tex-svg-full";
|
import "mathjax/es5/tex-svg-full";
|
||||||
|
import { nodeIsElement } from "lib/dom";
|
||||||
|
|
||||||
import Mathjax_svelte from "./Mathjax.svelte";
|
import Mathjax_svelte from "./Mathjax.svelte";
|
||||||
|
|
||||||
|
function moveNodesInsertedBeforeEndToAfterEnd(element: Element): () => void {
|
||||||
|
const allowedChildNodes = element.childNodes.length;
|
||||||
|
|
||||||
|
const observer = new MutationObserver(() => {
|
||||||
|
for (const node of [...element.childNodes].slice(allowedChildNodes)) {
|
||||||
|
element.removeChild(node);
|
||||||
|
|
||||||
|
let referenceNode: Node;
|
||||||
|
|
||||||
|
if (nodeIsElement(node)) {
|
||||||
|
referenceNode = element.insertAdjacentElement("afterend", node)!;
|
||||||
|
} else {
|
||||||
|
element.insertAdjacentText("afterend", (node as Text).wholeText);
|
||||||
|
referenceNode = element.nextSibling!;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!referenceNode) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const range = document.createRange();
|
||||||
|
range.setStartAfter(referenceNode);
|
||||||
|
range.collapse(false);
|
||||||
|
|
||||||
|
const selection = document.getSelection()!;
|
||||||
|
selection.removeAllRanges();
|
||||||
|
selection.addRange(range);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
observer.observe(element, { characterData: true, subtree: true });
|
||||||
|
return () => observer.disconnect();
|
||||||
|
}
|
||||||
|
|
||||||
class Mathjax extends HTMLElement {
|
class Mathjax extends HTMLElement {
|
||||||
block: boolean = false;
|
block: boolean = false;
|
||||||
|
disconnect: () => void = () => {};
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
static get observedAttributes(): string[] {
|
static get observedAttributes(): string[] {
|
||||||
return ["block"];
|
return ["block"];
|
||||||
|
@ -11,6 +51,11 @@ class Mathjax extends HTMLElement {
|
||||||
|
|
||||||
connectedCallback(): void {
|
connectedCallback(): void {
|
||||||
this.decorate();
|
this.decorate();
|
||||||
|
this.disconnect = moveNodesInsertedBeforeEndToAfterEnd(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
disconnectedCallback(): void {
|
||||||
|
this.disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
attributeChangedCallback(_name: string, _old: string, newValue: string): void {
|
attributeChangedCallback(_name: string, _old: string, newValue: string): void {
|
||||||
|
@ -41,17 +86,18 @@ class Mathjax extends HTMLElement {
|
||||||
|
|
||||||
customElements.define("anki-mathjax", Mathjax);
|
customElements.define("anki-mathjax", Mathjax);
|
||||||
|
|
||||||
// TODO mathjax regex will prob. fail at double quotes
|
|
||||||
const mathjaxTagPattern =
|
const mathjaxTagPattern =
|
||||||
/<anki-mathjax(?:[^>]*?block="(.*?)")?[^>]*?>(.*?)<\/anki-mathjax>/gsu;
|
/<anki-mathjax(?:[^>]*?block="(.*?)")?[^>]*?>(.*?)<\/anki-mathjax>/gsu;
|
||||||
|
|
||||||
export function toMathjaxDelimiters(html: string): string {
|
export function toMathjaxDelimiters(html: string): string {
|
||||||
return html.replace(
|
return html.replace(
|
||||||
mathjaxTagPattern,
|
mathjaxTagPattern,
|
||||||
(_match: string, block: string | undefined, text: string) =>
|
(_match: string, block: string | undefined, text: string) => {
|
||||||
typeof block === "string" && block !== "false"
|
console.log("delim", _match, block, "text", text);
|
||||||
|
return typeof block === "string" && block !== "false"
|
||||||
? `\\[${text}\\]`
|
? `\\[${text}\\]`
|
||||||
: `\\(${text}\\)`
|
: `\\(${text}\\)`;
|
||||||
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,11 +108,14 @@ export function toMathjaxTags(html: string): string {
|
||||||
return html
|
return html
|
||||||
.replace(
|
.replace(
|
||||||
mathjaxBlockDelimiterPattern,
|
mathjaxBlockDelimiterPattern,
|
||||||
(_match: string, text: string) =>
|
(_match: string, text: string) => (
|
||||||
`<anki-mathjax block="true">${text}</anki-mathjax>`
|
console.log(text), `<anki-mathjax block="true">${text}</anki-mathjax>`
|
||||||
|
)
|
||||||
)
|
)
|
||||||
.replace(
|
.replace(
|
||||||
mathjaxInlineDelimiterPattern,
|
mathjaxInlineDelimiterPattern,
|
||||||
(_match: string, text: string) => `<anki-mathjax>${text}</anki-mathjax>`
|
(_match: string, text: string) => (
|
||||||
|
console.log(text), `<anki-mathjax>${text}</anki-mathjax>`
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue