blue
/
zotero-better-notes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: #82 multi-level list jump bug

This commit is contained in:
xiangyu 2022-07-07 11:43:00 +08:00
parent 5bf65abd9f
commit ae5da2a39c
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/events.ts
View File

@ -989,6 +989,7 @@ class AddonEvents extends AddonBase {
return e.tagName === "UL" || e.tagName === "OL";
}
);
console.log(currentLineIndex, tableElements);
for (const tableElement of tableElements) {
currentLineIndex += tableElement.childElementCount - 1;
@ -997,12 +998,18 @@ class AddonEvents extends AddonBase {
const tagName = focusNode.tagName;
if (tagName === "UL" || tagName === "OL") {
let liElement = selection.focusNode as XUL.Element;
while (liElement.tagName !== "LI") {
while (
liElement.tagName !== "LI" ||
!liElement.parentElement.parentElement.className.includes(
"primary-editor"
)
) {
liElement = liElement.parentElement;
}
currentLineIndex += getChildIndex(liElement);
}
Zotero.debug(`Knowledge4Zotero: line ${currentLineIndex} selected.`);
console.log(currentLineIndex);
this._Addon.knowledge.currentLine = currentLineIndex;
}
} else if (message.type === "addHeading") {

29
src/views.ts
View File

@ -258,41 +258,40 @@ class AddonViews extends AddonBase {
async scrollToLine(instance: EditorInstance, lineIndex: number) {
await instance._initPromise;
let editor = this.getEditor(instance._iframeWindow.document);
const indexMap = [];
const eleList = [];
const diveTagNames = ["OL", "UL", "LI"];
function dive(e: Element, targetIndex: string) {
if (diveTagNames.indexOf(e.tagName) !== -1) {
if (e.tagName === "LI") {
indexMap.push(targetIndex);
if (
e.tagName === "LI" &&
e.parentElement.parentElement.className.includes("primary-editor")
) {
eleList.push(e);
}
for (let i in e.children) {
dive(e.children[i], targetIndex);
}
}
}
for (let i in editor.children) {
const ele = editor.children[i];
const nodes = Array.from(editor.children);
for (let i in nodes) {
const ele = nodes[i];
if (diveTagNames.indexOf(ele.tagName) !== -1) {
dive(ele, i);
} else {
indexMap.push(i);
eleList.push(ele);
}
}
if (lineIndex >= indexMap.length) {
lineIndex = indexMap.length - 1;
} else if (lineIndex < 0) {
lineIndex = 0;
}
lineIndex = indexMap[lineIndex];
if (lineIndex >= editor.children.length) {
lineIndex = editor.children.length - 1;
console.log(eleList, lineIndex);
if (lineIndex >= eleList.length) {
lineIndex = eleList.length - 1;
} else if (lineIndex < 0) {
lineIndex = 0;
}
// @ts-ignore
const scrollNum = editor.children[lineIndex].offsetTop;
const scrollNum = eleList[lineIndex].offsetTop;
(editor.parentNode as HTMLElement).scrollTo(0, scrollNum);
const texView = instance._iframeWindow.document.getElementById("texView");