Skip to content

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

:sparkles: Improve database checkbox size and calendar interaction https://github.com/siyuan-note/siyuan/issues/19933

Danielae68e48c13a9
diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
index 4827e099e3..51444e6fb6 100644
--- a/app/src/assets/scss/business/_av.scss
+++ b/app/src/assets/scss/business/_av.scss
@@ -1914,9 +1914,9 @@
&__checkbox {
color: var(--b3-theme-on-surface);
height: 1.625em;
- width: calc(1.625em - 10px);
+ width: 1.25em;
box-sizing: border-box;
- padding: 5px 0;
+ padding: .1875em 0;
display: block;
&:hover {
diff --git a/app/src/protyle/render/av/calendar/render.test.ts b/app/src/protyle/render/av/calendar/render.test.ts
index 2a81f49eef..c6e9ea5a12 100644
--- a/app/src/protyle/render/av/calendar/render.test.ts
+++ b/app/src/protyle/render/av/calendar/render.test.ts
@@ -151,3 +151,82 @@ test("calendar refresh keeps selected event segments and blank clicks dismiss th
assert.equal(menuClosed, 1);
assert.equal(stopped, true);
});
+
+test("calendar checkbox clicks and keyboard activation update only the chosen field and honor readonly modes", async () => {
+ for (const mode of ["desktop", "mobile", "disabled", "publish", "history", "snapshot"]) {
+ const start = new Date(2026, 8, 1).getTime();
+ const range = {start, end: dates.addCalendarDays(start, 7), timeZone: "UTC"};
+ const values = [
+ {...createEmptyAVValue("date", "date"), date: {content: start, isNotEmpty: true, isNotTime: true}},
+ createEmptyAVValue("first", "checkbox"), createEmptyAVValue("second", "checkbox"),
+ ];
+ const cells = values.map(value => ({id: value.keyID, value}));
+ const handlers: Record<string, (event: unknown) => void> = {};
+ const updates: unknown[] = [];
+ let opens = 0;
+ let html = "";
+ const root = {
+ querySelectorAll: (): unknown[] => [],
+ querySelector: () => ({addEventListener() {}}),
+ addEventListener(type: string, listener: (event: unknown) => void, capture?: boolean) {
+ if (capture !== true) {
+ handlers[type] = listener;
+ }
+ },
+ };
+ const modules: Record<string, unknown> = {
+ "./date": dates,
+ "./state": {getCalendarState: () => ({anchor: start, mode: "week", rowLimit: 3}), getCalendarRequestRange: () => range},
+ "./settings": {isCalendarDateColumn: () => true, bindCalendarSettings() {}},
+ "./undated": {getCalendarUndatedHTML: () => "", bindCalendarUndated() {}},
+ "../render": {genTabHeaderHTML: () => ""},
+ "../cellValue": {cellValueIsEmpty},
+ "../conditionalColor": {getConditionalBackground},
+ "../cell": {renderCell: () => "<span></span>", updateCellsValue: (...args: unknown[]) => updates.push(args)},
+ "../openDatabaseRow": {openDatabaseRowByData: () => opens++},
+ "../../../../util/escape": {escapeAttr: String, escapeHtml: String},
+ "../../../../util/functions": {isMobile: () => mode === "mobile"},
+ "../../../../constants": {Constants: {ZWSP: ""}},
+ "../container": {replaceAVContainer: (_block: unknown, value: string) => { html = value; }},
+ "../virtualScroll": {getAVSelectedItemIDs: (): string[] => [], setAVData() {}},
+ "../search": {bindAvSearch() {}},
+ "../richText": {renderAVRichTextElements() {}},
+ "../locate": {finishAVLocate() {}},
+ };
+ const exports = {} as typeof import("./render");
+ runInNewContext(transpileModule(readFileSync(join(__dirname, "render.ts"), "utf8"), {
+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2020},
+ }).outputText, {
+ exports, require: (name: string) => modules[name] || {},
+ window: {siyuan: {isPublish: mode === "publish", config: {lang: "en"}, languages: {}, menus: {menu: {remove() {}}}}},
+ document: {activeElement: null},
+ });
+ const block = {dataset: {avId: "database", nodeId: "carrier"},
+ querySelector: (selector: string) => selector === ".av__calendar" ? root : null, removeAttribute() {}};
+ const protyle = {disabled: mode === "disabled", options: {history: {
+ created: mode === "history" ? "history" : "", snapshot: mode === "snapshot" ? "snapshot" : "",
+ }}} as IProtyle;
+ await exports.renderCalendar(block as unknown as HTMLElement, protyle, {viewID: "calendar", view: {
+ calendar: {dateKeyID: "date"}, calendarRange: range,
+ columns: values.map(value => ({id: value.keyID, type: value.type, name: value.keyID})),
+ rows: [{id: "row", cells}],
+ }} as unknown as IAV);
+ const editable = mode === "desktop" || mode === "mobile";
+ assert.match(html, new RegExp(`role="checkbox" tabindex="${editable ? "0" : "-1"}" aria-checked="false" aria-disabled="${!editable}"`));
+ const item = {dataset: {calendarItem: "row"}};
+ const field = {dataset: {colId: "second"}, closest: () => item};
+ const target = {closest: (selector: string) => selector.includes("checkbox") ? field : item};
+ handlers.click({target, stopPropagation() {}});
+ handlers.keydown({target, key: " ", preventDefault() {}, stopPropagation() {}});
+ handlers.pointerdown({target, button: 0, pointerType: "mouse", stopPropagation() {}});
+ handlers.touchstart({target, touches: [{}]});
+ assert.equal(opens, 0);
+ assert.equal(updates.length, editable ? 2 : 0);
+ for (const args of updates as Parameters<typeof import("../cell").updateCellsValue>[]) {
+ assert.deepEqual(JSON.parse(JSON.stringify(args[2])), {checked: true});
+ assert.equal(args[9][0].cell, cells[2]);
+ assert.equal(args[9][0].rowID, "row");
+ assert.equal(args[9][0].colID, "second");
+ }
+ }
+});
diff --git a/app/src/protyle/render/av/calendar/render.ts b/app/src/protyle/render/av/calendar/render.ts
index 273e57f18f..6d705ee015 100644
--- a/app/src/protyle/render/av/calendar/render.ts
+++ b/app/src/protyle/render/av/calendar/render.ts
@@ -4,7 +4,7 @@ import * as dayjs from "dayjs";
import {escapeAttr, escapeHtml} from "../../../../util/escape";
import {isMobile} from "../../../../util/functions";
import {transaction} from "../../../wysiwyg/transaction";
-import {renderCell} from "../cell";
+import {renderCell, updateCellsValue} from "../cell";
import {cellValueIsEmpty} from "../cellValue";
import {getAVBackgroundColor} from "../color";
import {getConditionalBackground} from "../conditionalColor";
@@ -86,7 +86,9 @@ const getEventHTML = (segment: ICalendarSegment, view: IAVTable, editable: boole
return "";
}
const checkClass = field.type === "checkbox" ? (cell.value?.checkbox?.checked ? " av__cell-check" : " av__cell-uncheck") : "";
- return `<div class="av__calendar-field${checkClass}" data-field-id="${field.id}" data-col-id="${field.id}" data-dtype="${field.type}" data-align="${field.align || ""}" data-wrap="${field.wrap}"${field.renderTemplate?.trim() ? ' data-render-template="true"' : ""} title="${escapeAttr(field.name)}">${renderCell(cell.value, event.rowIndex || 0, view.showIcon, "calendar", field.options, field.dateFormat, field.renderTemplate, false)}</div>`;
+ const checkbox = field.type === "checkbox" && !field.renderTemplate?.trim() ?
+ ` role="checkbox" tabindex="${editable ? "0" : "-1"}" aria-checked="${!!cell.value.checkbox?.checked}" aria-disabled="${!editable}" aria-label="${escapeAttr(field.name)}"` : "";
+ return `<div class="av__calendar-field${checkClass}"${checkbox} data-field-id="${field.id}" data-col-id="${field.id}" data-dtype="${field.type}" data-align="${field.align || ""}" data-wrap="${field.wrap}"${field.renderTemplate?.trim() ? ' data-render-template="true"' : ""} title="${escapeAttr(field.name)}">${renderCell(cell.value, event.rowIndex || 0, view.showIcon, "calendar", field.options, field.dateFormat, field.renderTemplate, false)}</div>`;
}).join("");
return `<div class="av__calendar-item${starts ? " av__calendar-item--start" : ""}${ends ? " av__calendar-item--end" : ""}" role="button" tabindex="0" data-calendar-item="${event.row.id}" data-id="${event.row.id}" title="${escapeAttr(title)}" style="grid-column:${segment.column + 1}/span ${segment.span};grid-row:${segment.lane + 1};${background ? `--b3-av-calendar-background:${background}` : ""}">
${drag && starts ? `<span class="av__calendar-resize av__calendar-resize--start" data-calendar-resize="start" title="${window.siyuan.languages.calendarResizeStart}"></span>` : ""}
@@ -214,7 +216,7 @@ const bindCalendarDrag = (root: HTMLElement, protyle: IProtyle, blockElement: HT
const item = target.closest<HTMLElement>("[data-calendar-item]");
const entry = item && events.get(item.dataset.calendarItem);
const endpoint = target.closest<HTMLElement>("[data-calendar-resize]")?.dataset.calendarResize as "start" | "end" | undefined;
- if (event.button !== 0 || !entry || entry.invalid || entry.date.value.type !== "date" || !canEditCalendar(protyle) ||
+ if (target.closest('[role="checkbox"]') || event.button !== 0 || !entry || entry.invalid || entry.date.value.type !== "date" || !canEditCalendar(protyle) ||
event.pointerType === "touch" && !endpoint && !target.closest("[data-calendar-move]")) {
return;
}
@@ -265,7 +267,7 @@ const bindCalendarDrag = (root: HTMLElement, protyle: IProtyle, blockElement: HT
return;
}
const target = event.target as HTMLElement;
- if (target.closest("[data-calendar-resize]")) {
+ if (target.closest('[data-calendar-resize], [role="checkbox"]')) {
return;
}
const item = target.closest<HTMLElement>("[data-calendar-item]");
@@ -461,10 +463,31 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
{row, date: cell},
{content: day, isNotEmpty: true, isNotTime: true, hasEndDate: false, isNotEmpty2: false}, onUpdated)});
}
+ const toggleCheckbox = (target: HTMLElement) => {
+ const field = target.closest<HTMLElement>('.av__calendar-field[role="checkbox"]');
+ if (!field) {
+ return false;
+ }
+ const item = field.closest<HTMLElement>("[data-calendar-item]");
+ const entry = item && eventsByID.get(item.dataset.calendarItem);
+ const colIndex = view.columns.findIndex(column => column.id === field.dataset.colId);
+ const cell = entry?.row.cells[colIndex];
+ if (canEditCalendar(protyle) && cell?.value?.type === "checkbox") {
+ void updateCellsValue(protyle, blockElement, {checked: !cell.value.checkbox?.checked},
+ undefined, undefined, undefined, false, false, false, [{
+ groupID: "", rowID: entry.row.id, colID: field.dataset.colId,
+ rowIndex: entry.rowIndex || 0, colIndex, cell, column: view.columns[colIndex],
+ }]);
+ }
+ return true;
+ };
root.addEventListener("click", event => {
event.stopPropagation();
window.siyuan.menus.menu.remove();
const target = event.target as HTMLElement;
+ if (toggleCheckbox(target)) {
+ return;
+ }
const item = target.closest<HTMLElement>("[data-calendar-item]");
if (item) {
void openCalendarItem(protyle, blockElement, eventsByID.get(item.dataset.calendarItem).row);
@@ -514,7 +537,9 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
const item = (event.target as HTMLElement).closest<HTMLElement>("[data-calendar-item]");
if (item && (event.key === "Enter" || event.key === " ")) {
event.preventDefault();
- void openCalendarItem(protyle, blockElement, eventsByID.get(item.dataset.calendarItem).row);
+ if (!toggleCheckbox(event.target as HTMLElement)) {
+ void openCalendarItem(protyle, blockElement, eventsByID.get(item.dataset.calendarItem).row);
+ }
}
});
root.addEventListener("contextmenu", event => {
diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts
index c6efd8528f..f426308b24 100644
--- a/app/src/protyle/render/av/cell.ts
+++ b/app/src/protyle/render/av/cell.ts
@@ -1223,6 +1223,9 @@ export const updateAttrViewCellInOtherElements = (protyle: IProtyle, avID: strin
export const renderCellAttr = (cellElement: Element, value: IAVCellValue) => {
if (value.type === "checkbox") {
+ if (cellElement.getAttribute("role") === "checkbox") {
+ cellElement.setAttribute("aria-checked", String(!!value.checkbox?.checked));
+ }
if (value.checkbox.checked) {
cellElement.classList.add("av__cell-check");
cellElement.classList.remove("av__cell-uncheck");