Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Keep container gutters consistent when hovering list markers https://github.com/siyuan-note/siyuan/issues/20404

Danielb08d679d1de8
diff --git a/app/src/protyle/gutter/container.ts b/app/src/protyle/gutter/container.ts
index 906cd7f9cb..d3ff01740c 100644
--- a/app/src/protyle/gutter/container.ts
+++ b/app/src/protyle/gutter/container.ts
@@ -3,7 +3,8 @@ export const getListItemGutterContainer = (element: Element) => {
const item = element.closest('[data-type="NodeListItem"]');
const first = item?.querySelector(":scope > [data-node-id]");
if (first && ["NodeTable", "NodeBlockquote", "NodeCallout", "NodeSuperBlock", "NodeTabs"]
- .includes(first.getAttribute("data-type")) && (element === item || first.contains(element))) {
+ .includes(first.getAttribute("data-type")) && (element === item || first.contains(element) ||
+ element.parentElement === item && element.classList.contains("protyle-action"))) {
return first;
}
};
diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index 44bd140cb2..0b4d1e3812 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -3717,7 +3717,8 @@ export class Gutter {
let html = "";
let nodeElement = selectedElement || element;
const listItemContainer = isMultiSelect ? undefined : getListItemGutterContainer(nodeElement);
- if (listItemContainer && nodeElement === listItemContainer.parentElement) {
+ if (listItemContainer && (nodeElement === listItemContainer.parentElement ||
+ nodeElement.classList.contains("protyle-action"))) {
nodeElement = listItemContainer;
}
const mindmapElement = (nodeElement.getAttribute("data-type") === "NodeMindmap" ||
diff --git a/app/tests/listContainerGutter.test.js b/app/tests/listContainerGutter.test.js
index 149558f683..5ccd54098a 100644
--- a/app/tests/listContainerGutter.test.js
+++ b/app/tests/listContainerGutter.test.js
@@ -35,7 +35,7 @@ const cases = source => {
hasClosestByClassName: (element, name) => element?.closest("." + name),
hasTopClosestByClassName: (element, name) => element?.closest("." + name),
getBlockTypeName: type => type, getIconByType: () => "iconTest",
- genGutterBlockButtonHTML: data => `<button data-type="${data.type}"></button>`,
+ genGutterBlockButtonHTML: data => `<button data-type="${data.type}" data-node-id="${data.nodeID}"></button>`,
};
const render = new Function(...Object.keys(dependencies), source + "\nreturn render;")(...Object.values(dependencies));
window.siyuan = {languages: {fold: "Fold"}};
@@ -59,10 +59,20 @@ const cases = source => {
check.ok(html?.includes(`data-type="${type}"`), `${type}/${id}/${!!extra}: ${html}`);
check.ok(html?.includes('data-type="NodeListItem"'), `${type}/${id}/${!!extra}: ${html}`);
}
+ for (const subtype of ["u", "o", "t"]) {
+ root.querySelector('[data-node-id="list"]').setAttribute("data-subtype", subtype);
+ root.querySelector('[data-node-id="item"]').setAttribute("data-subtype", subtype);
+ const container = root.querySelector('[data-node-id="container"]');
+ const marker = root.querySelector(".protyle-action");
+ check.equal(render.call(gutter, protyle, marker, marker),
+ render.call(gutter, protyle, container, container), `${type}/${subtype}/${!!extra}: marker gutters`);
+ }
}
}
root.innerHTML = `<div data-node-id="list" data-type="NodeList" class="list"><div data-node-id="item" data-type="NodeListItem" class="li"><div class="protyle-action"></div><div data-node-id="p" data-type="NodeParagraph">Text</div>${attr}</div>${attr}</div>`;
check.ok(!render.call(gutter, protyle, root.querySelector('[data-node-id="p"]')).includes('data-type="NodeParagraph"'));
+ check.equal(render.call(gutter, protyle, root.querySelector(".protyle-action")),
+ render.call(gutter, protyle, root.querySelector('[data-node-id="p"]')));
return "List container gutters passed";
};
@@ -73,7 +83,12 @@ if (process.versions.electron && process.type === "browser") {
await app.whenReady();
const win = new BrowserWindow({show: false, webPreferences: {nodeIntegration: true, contextIsolation: false}});
await win.loadURL("data:text/html,<html><body></body></html>");
- console.log(await win.webContents.executeJavaScript(`(${cases.toString()})(${JSON.stringify(sources())})`));
+ const result = await win.webContents.executeJavaScript(`(() => {
+ try { return {message: (${cases.toString()})(${JSON.stringify(sources())})}; }
+ catch (error) { return {error: error.stack}; }
+ })()`);
+ assert.ok(!result.error, result.error);
+ console.log(result.message);
win.destroy();
app.exit(0);
})().catch(error => { console.error(error); require("electron").app.exit(1); });