Skip to content

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

:art: Align automation collection chip spacing https://github.com/siyuan-note/siyuan/issues/20641

Daniel7c9e1c9dcdaf
diff --git a/app/src/protyle/render/av/collectionConditions.ts b/app/src/protyle/render/av/collectionConditions.ts
index 2bd93852a3..6da3d1f497 100644
--- a/app/src/protyle/render/av/collectionConditions.ts
+++ b/app/src/protyle/render/av/collectionConditions.ts
@@ -37,9 +37,9 @@ export const mountCollectionConditions = (host: HTMLElement, source: AVAutomatio
const addButton = (action: string, label: string) => `<button type="button" class="b3-button b3-button--cancel b3-button--wrap av__automation-source-action" ${action}><svg><use xlink:href="#iconAdd"></use></svg><span>${escapeHtml(label)}</span></button>`;
const chip = (kind: string, index: number, label: string, editable = false) => `<div class="b3-chip b3-chip--middle"><span class="fn__ellipsis${editable ? " b3-chip--pointer" : ""} ariaLabel" ${editable ? `data-edit-attribute="${index}" role="button" tabindex="0"` : ""} aria-label="${escapeAttr(label)}">${escapeHtml(label)}</span><svg class="b3-chip__close" data-remove-filter="${kind}" data-index="${index}" role="button" tabindex="0" aria-label="${escapeAttr(lang.delete)}"><use xlink:href="#iconClose"></use></svg></div>`;
host.className = "av__automation-control";
- host.innerHTML = `<div class="av__automation-control"><span class="av__automation-control-label">${lang.automationCollectionTypes}</span><div class="b3-chips b3-chips__doctag av__automation-chips" data-type-chips></div>${addButton("data-types", `${lang.addAttr} - ${lang.automationCollectionTypes}`)}</div>
-<div class="av__automation-control"><div class="av__automation-row"><span class="av__automation-control-label fn__flex-1">${lang.tag}</span>${modeButton("tagMatch", lang.tag)}</div><div data-tags></div><div class="av__automation-row"><span class="av__automation-control-label fn__flex-1">${lang.automationCollectionTarget}</span><button type="button" class="b3-button b3-button--cancel b3-button--wrap av__automation-source-action" data-tag-target aria-label="${escapeAttr(lang.automationCollectionTarget)}"><span>${tagTargets[source.tagTarget || ""]}</span><svg><use xlink:href="#iconDown"></use></svg></button></div><div class="ft__on-surface ft__smaller av__automation-tip" data-tag-target-tip>${tagTargetTips[source.tagTarget || ""]}</div><div class="ft__on-surface ft__smaller av__automation-tip fn__none" data-tag-target-change-tip>${lang.automationCollectionTargetChangeTip}</div></div>
-<div class="av__automation-control"><div class="av__automation-row"><span class="av__automation-control-label fn__flex-1">${lang.attr}</span>${modeButton("attributeMatch", lang.attr)}</div><div class="b3-chips b3-chips__doctag av__automation-chips" data-attribute-chips></div>${addButton("data-add-attribute", `${lang.addAttr} - ${lang.attr}`)}<div data-attribute-editor></div></div>`;
+ host.innerHTML = `<div class="av__automation-control"><span class="av__automation-control-label">${lang.automationCollectionTypes}</span><div class="fn__flex-column"><div class="b3-chips b3-chips__doctag av__automation-chips" data-type-chips></div>${addButton("data-types", `${lang.addAttr} - ${lang.automationCollectionTypes}`)}</div></div>
+<div class="av__automation-control"><div class="av__automation-row"><span class="av__automation-control-label fn__flex-1">${lang.tag}</span>${modeButton("tagMatch", lang.tag)}</div><div class="fn__flex-column" data-tags></div><div class="av__automation-row"><span class="av__automation-control-label fn__flex-1">${lang.automationCollectionTarget}</span><button type="button" class="b3-button b3-button--cancel b3-button--wrap av__automation-source-action" data-tag-target aria-label="${escapeAttr(lang.automationCollectionTarget)}"><span>${tagTargets[source.tagTarget || ""]}</span><svg><use xlink:href="#iconDown"></use></svg></button></div><div class="ft__on-surface ft__smaller av__automation-tip" data-tag-target-tip>${tagTargetTips[source.tagTarget || ""]}</div><div class="ft__on-surface ft__smaller av__automation-tip fn__none" data-tag-target-change-tip>${lang.automationCollectionTargetChangeTip}</div></div>
+<div class="av__automation-control"><div class="av__automation-row"><span class="av__automation-control-label fn__flex-1">${lang.attr}</span>${modeButton("attributeMatch", lang.attr)}</div><div class="fn__flex-column"><div class="b3-chips b3-chips__doctag av__automation-chips" data-attribute-chips></div>${addButton("data-add-attribute", `${lang.addAttr} - ${lang.attr}`)}</div><div data-attribute-editor></div></div>`;
const typeChips = host.querySelector<HTMLElement>("[data-type-chips]");
const attributes = host.querySelector<HTMLElement>("[data-attribute-chips]");
const editor = host.querySelector<HTMLElement>("[data-attribute-editor]");
@@ -88,6 +88,7 @@ export const mountCollectionConditions = (host: HTMLElement, source: AVAutomatio
return true;
},
});
+ host.querySelector("[data-tags] button").classList.add("b3-button--wrap", "av__automation-source-action");
const openTypes = (target: HTMLElement) => {
let menu: Menu;
toggleMenu({target, build: () => {
diff --git a/app/tests/automationPanel.test.js b/app/tests/automationPanel.test.js
index b5a7aff7f9..50ab39c964 100644
--- a/app/tests/automationPanel.test.js
+++ b/app/tests/automationPanel.test.js
@@ -109,6 +109,15 @@ const runCases = async (sources, css, mobile) => {
};
const click = async selector => {get(selector).dispatchEvent(new MouseEvent("click", {bubbles: true})); await tick();};
const latest = () => transactions.at(-1).perform[0].data.rules[0];
+ const assertChipActionSpacing = (listSelector, buttonSelector) => {
+ const chips = Array.from(get(listSelector).querySelectorAll(".b3-chip"));
+ assert.ok(chips.length > 0, "spacing checks require visible chips");
+ const bottom = Math.max(...chips.map(chip => chip.getBoundingClientRect().bottom));
+ const gap = get(buttonSelector).getBoundingClientRect().top - bottom;
+ const expected = mobile ? 22 : 8;
+ assert.ok(Math.abs(gap - expected) <= 1,
+ `${listSelector} keeps the platform's chip spacing before its add button: ${gap}, expected ${expected}`);
+ };
const sections = menu.querySelectorAll("section");
assert.equal(sections.length, 3);
assert.ok(sections[0].contains(get("[data-trigger]")));
@@ -480,6 +489,7 @@ const runCases = async (sources, css, mobile) => {
const typePopup = fieldMenu.element;
typePopup.querySelector('[data-collection-type="l"]').click();
assert.deepEqual(latest().blockSource.types, ["l"]);
+ assertChipActionSpacing("[data-type-chips]", "[data-types]");
typePopup.querySelector('[data-collection-type="l:o"]').click();
assert.deepEqual(latest().blockSource.types, ["l:o"]);
assert.equal(transactions.at(-1).perform[0].data.spec, 3);
@@ -501,6 +511,7 @@ const runCases = async (sources, css, mobile) => {
assert.ok(latest().blockSource.types.length > 10);
assert.ok(get("[data-types]").scrollWidth <= get("[data-types]").clientWidth + 1, "many selected block types wrap");
assert.equal(menu.querySelectorAll("[data-type-chips] .b3-chip").length, latest().blockSource.types.length);
+ assertChipActionSpacing("[data-type-chips]", "[data-types]");
const draftWrites = transactions.length;
await click("[data-add-attribute] svg");
assert.equal(transactions.length, draftWrites, "adding an attribute starts an unsaved draft");
@@ -511,6 +522,7 @@ const runCases = async (sources, css, mobile) => {
assert.equal(transactions.length, draftWrites, "editing a draft does not save it");
await click("[data-confirm-attribute]");
assert.deepEqual(latest().blockSource.attributes, [{name: "custom-status", operator: "equals", value: "ready"}]);
+ assertChipActionSpacing("[data-attribute-chips]", "[data-add-attribute]");
await click("[data-edit-attribute]");
await change("[data-attr-value]", "cancelled");
get("[data-attr-value]").dispatchEvent(new KeyboardEvent("keydown", {key: "Escape", bubbles: true}));
@@ -550,6 +562,7 @@ const runCases = async (sources, css, mobile) => {
await tick();
assert.deepEqual(latest().blockSource.tags, ["todo"]);
assert.equal(get("[data-tags] .b3-chip span").textContent, "todo");
+ assertChipActionSpacing("[data-tags] .b3-chips", "[data-tags] button");
await click("[data-tags] button");
get("[data-tags] input").value = "todo";
get("[data-tags] input").dispatchEvent(new KeyboardEvent("keydown", {key: "Enter", bubbles: true}));