Skip to content

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

:bug: Restore legacy WebView PDF and interface compatibility https://github.com/siyuan-note/siyuan/issues/20976

Daniel822ef7bc9dae
diff --git a/app/src/asset/anno.ts b/app/src/asset/anno.ts
index bd4384fd60..66b55a8be0 100644
--- a/app/src/asset/anno.ts
+++ b/app/src/asset/anno.ts
@@ -163,7 +163,7 @@ export const initAnno = (element: HTMLElement, pdf: any) => {
newHeight = y - newTop;
}
rectResizeElement.setAttribute("style",
- `top:${newTop}px;height:${newHeight}px;left:${newLeft}px;width:${newWidth}px;background-color:${moveEvent.altKey ? "color-mix(in srgb, var(--b3-pdf-background1) 35%, transparent)" : ""}`);
+ `top:${newTop}px;height:${newHeight}px;left:${newLeft}px;width:${newWidth}px;opacity:${moveEvent.altKey && !CSS.supports("background-color", "color-mix(in srgb, red, transparent)") ? ".35" : "1"};background-color:${moveEvent.altKey ? "var(--b3-pdf-background1)" : ""};background-color:${moveEvent.altKey ? "color-mix(in srgb, var(--b3-pdf-background1) 35%, transparent)" : ""}`);
};
const stopRectCreation = () => {
setRectCreationMode(false);
diff --git a/app/src/asset/pdf/annotation_layer_builder.js b/app/src/asset/pdf/annotation_layer_builder.js
index cc0e205464..759164338b 100644
--- a/app/src/asset/pdf/annotation_layer_builder.js
+++ b/app/src/asset/pdf/annotation_layer_builder.js
@@ -308,7 +308,7 @@ class AnnotationLayerBuilder {
) {
continue;
}
- section.inert = disableFormElements;
+ section.toggleAttribute("inert", disableFormElements);
}
}
diff --git a/app/src/asset/pdf/app.js b/app/src/asset/pdf/app.js
index 5a8f332007..23e3d6ca9a 100644
--- a/app/src/asset/pdf/app.js
+++ b/app/src/asset/pdf/app.js
@@ -290,7 +290,7 @@ class PDFViewerApplication {
if (typeof PDFJSDev === "undefined") {
// NOTE
- globalThis.pdfjsWorker = await import(`${Constants.PROTYLE_CDN}/js/pdf/pdf.worker.compat.mjs?v=6.4.299-siyuan.1`);
+ globalThis.pdfjsWorker = await import(`${Constants.PROTYLE_CDN}/js/pdf/pdf.worker.compat.mjs?v=6.4.299-siyuan.2`);
} else {
await __non_webpack_import__(PDFWorker.workerSrc);
}
diff --git a/app/src/asset/pdf/caret_browsing.js b/app/src/asset/pdf/caret_browsing.js
index c5c9cc40e8..668b55306e 100644
--- a/app/src/asset/pdf/caret_browsing.js
+++ b/app/src/asset/pdf/caret_browsing.js
@@ -213,18 +213,31 @@ class CaretBrowsingMode {
);
return;
}
- this.#mainContainer.addEventListener(
- "scrollend",
- this.#setCaretPositionHelper.bind(
+ const positionCaret = this.#setCaretPositionHelper.bind(
this,
selection,
caretX,
select,
newLineElement,
null
- ),
- { once: true }
);
+ if ("onscrollend" in this.#mainContainer) {
+ this.#mainContainer.addEventListener("scrollend", positionCaret, { once: true });
+ } else {
+ // Older WebViews still finish smooth scrolling; update after it becomes idle.
+ let timer;
+ const finish = () => {
+ clearTimeout(timer);
+ this.#mainContainer.removeEventListener("scroll", onScroll);
+ positionCaret();
+ };
+ const onScroll = () => {
+ clearTimeout(timer);
+ timer = setTimeout(finish, 100);
+ };
+ this.#mainContainer.addEventListener("scroll", onScroll);
+ onScroll();
+ }
newLineElement.scrollIntoView();
}
diff --git a/app/src/asset/pdf/struct_tree_layer_builder.js b/app/src/asset/pdf/struct_tree_layer_builder.js
index 7c2e009eca..31073b8dce 100644
--- a/app/src/asset/pdf/struct_tree_layer_builder.js
+++ b/app/src/asset/pdf/struct_tree_layer_builder.js
@@ -341,7 +341,7 @@ class StructTreeLayerBuilder {
#getHeaderIds(headers) {
const result = [],
visited = new Set(),
- pending = headers.toReversed();
+ pending = headers.slice().reverse();
while (pending.length > 0) {
const structId = pending.pop();
diff --git a/app/src/asset/pdf/viewer.js b/app/src/asset/pdf/viewer.js
index 8a55cfb972..aa24a9a29d 100644
--- a/app/src/asset/pdf/viewer.js
+++ b/app/src/asset/pdf/viewer.js
@@ -242,7 +242,7 @@ function getViewerConfiguration(element) {
function webViewerLoad(file, element, pdfPage, annoId, previewOnly = false) {
// SiYuan 通过 AppOptions.set 显式配置 viewer,禁用从 localStorage 读取的 Preferences,
AppOptions.set("disablePreferences", true);
- AppOptions.set("workerSrc", `${Constants.PROTYLE_CDN}/js/pdf/pdf.worker.compat.mjs?v=6.4.299-siyuan.1`);
+ AppOptions.set("workerSrc", `${Constants.PROTYLE_CDN}/js/pdf/pdf.worker.compat.mjs?v=6.4.299-siyuan.2`);
AppOptions.set("defaultUrl", file);
AppOptions.set("cMapUrl", `${Constants.PROTYLE_CDN}/js/pdf/cmaps/`);
AppOptions.set("iccUrl", `${Constants.PROTYLE_CDN}/js/pdf/iccs/`);
diff --git a/app/src/asset/pdfViewer.ts b/app/src/asset/pdfViewer.ts
index ab0a0f8d17..96fe9bf3f3 100644
--- a/app/src/asset/pdfViewer.ts
+++ b/app/src/asset/pdfViewer.ts
@@ -1,16 +1,9 @@
import {Constants} from "../constants";
import {patchAppearancePreference} from "../config/tabs/appearancePreferences";
+import {ensureBrowserCompatibility} from "../protyle/util/browserCompat";
const PDF_JS_VERSION = "6.4.299-siyuan.1";
-interface IPromiseWithResolversConstructor {
- withResolvers?: <T>() => {
- promise: Promise<T>,
- resolve: (value: T | PromiseLike<T>) => void,
- reject: (reason?: unknown) => void,
- };
-}
-
interface IPdfViewerModule {
webViewerLoad: (file: string, element: HTMLElement, page?: number, annotationId?: string, previewOnly?: boolean) => any;
}
@@ -43,19 +36,7 @@ const loadPdfScript = () => new Promise<void>((resolve, reject) => {
export const loadPdfViewerModule = () => {
if (!pdfViewerModulePromise) {
- const promiseConstructor = Promise as unknown as IPromiseWithResolversConstructor;
- if (!promiseConstructor.withResolvers) {
- promiseConstructor.withResolvers = <T>() => {
- let resolve!: (value: T | PromiseLike<T>) => void;
- let reject!: (reason?: unknown) => void;
- const promise = new Promise<T>((promiseResolve, promiseReject) => {
- resolve = promiseResolve;
- reject = promiseReject;
- });
- return {promise, resolve, reject};
- };
- }
- pdfViewerModulePromise = loadPdfScript().then(async () => {
+ pdfViewerModulePromise = ensureBrowserCompatibility().then(loadPdfScript).then(async () => {
// @ts-ignore PDF.js viewer 由上游 JavaScript 源码构建,没有 TypeScript 声明
return import("./pdf/viewer") as Promise<IPdfViewerModule>;
}).catch((error) => {
diff --git a/app/src/assets/scss/business/_ai_agent.scss b/app/src/assets/scss/business/_ai_agent.scss
index eae32fe840..af1c78fd45 100644
--- a/app/src/assets/scss/business/_ai_agent.scss
+++ b/app/src/assets/scss/business/_ai_agent.scss
@@ -639,6 +639,7 @@
margin: 0;
padding: 8px 12px 8px 30px;
border-top: 1px solid var(--b3-border-color);
+ background: var(--b3-theme-surface);
background: color-mix(in srgb, var(--b3-card-warning-color) 10%, transparent);
color: var(--b3-theme-on-background);
font-size: 12px;
diff --git a/app/src/assets/scss/business/_av-calendar.scss b/app/src/assets/scss/business/_av-calendar.scss
index 3c1bb31ccd..6c6b7990e2 100644
--- a/app/src/assets/scss/business/_av-calendar.scss
+++ b/app/src/assets/scss/business/_av-calendar.scss
@@ -226,6 +226,7 @@
cursor: pointer;
font-size: 12px;
line-height: 20px;
+ background: var(--b3-av-calendar-background, var(--b3-theme-primary-lightest));
background: color-mix(in srgb, var(--b3-av-calendar-background, var(--b3-theme-primary-lightest)) 50%, var(--b3-theme-background));
color: var(--b3-theme-on-background);
border: 1px solid transparent;
@@ -414,6 +415,7 @@
position: absolute;
top: 0;
bottom: 0;
+ background: var(--b3-theme-primary-lightest);
background: color-mix(in srgb, var(--b3-theme-primary) 12%, transparent);
}
diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
index 8cdb62725c..2fcacf7cb6 100644
--- a/app/src/assets/scss/business/_av.scss
+++ b/app/src/assets/scss/business/_av.scss
@@ -697,11 +697,13 @@
&:hover,
&:focus {
+ background-color: var(--b3-theme-primary);
background-color: color-mix(in srgb, var(--b3-theme-primary) 88%, black);
box-shadow: none;
}
&:active {
+ background-color: var(--b3-theme-primary);
background-color: color-mix(in srgb, var(--b3-theme-primary) 80%, black);
box-shadow: none;
}
@@ -2212,14 +2214,17 @@
border: 1px solid var(--b3-theme-surface-lighter);
&--depth1 {
+ background-color: var(--b3-theme-surface);
background-color: color-mix(in srgb, var(--b3-theme-on-background) 1%, transparent);
}
&--depth2 {
+ background-color: var(--b3-theme-surface);
background-color: color-mix(in srgb, var(--b3-theme-on-background) 2%, transparent);
}
&--depth3 {
+ background-color: var(--b3-theme-surface);
background-color: color-mix(in srgb, var(--b3-theme-on-background) 3%, transparent);
}
}
diff --git a/app/src/assets/scss/business/_config.scss b/app/src/assets/scss/business/_config.scss
index e6b5ac6c0e..f63e01dceb 100644
--- a/app/src/assets/scss/business/_config.scss
+++ b/app/src/assets/scss/business/_config.scss
@@ -248,6 +248,7 @@
position: absolute;
inset: 0;
pointer-events: none;
+ background-color: var(--b3-theme-background);
background-color: color-mix(in srgb, var(--b3-theme-background) 80%, transparent);
backdrop-filter: blur(10px);
-webkit-backdrop-filter: blur(10px);
@@ -794,6 +795,7 @@
&__drop {
align-items: center;
backdrop-filter: blur(8px);
+ background-color: var(--b3-theme-background);
background-color: color-mix(in srgb, var(--b3-theme-background) 88%, transparent);
color: var(--b3-theme-primary);
display: flex;
diff --git a/app/src/assets/scss/business/_custom.scss b/app/src/assets/scss/business/_custom.scss
index fd88ba0047..c5ce72ad6b 100644
--- a/app/src/assets/scss/business/_custom.scss
+++ b/app/src/assets/scss/business/_custom.scss
@@ -243,6 +243,11 @@
textarea.b3-text-field--text {
field-sizing: content;
+
+ @supports not (field-sizing: content) {
+ min-height: 64px;
+ resize: vertical;
+ }
}
.b3-chip {
diff --git a/app/src/assets/scss/business/_history.scss b/app/src/assets/scss/business/_history.scss
index 7951796db6..388b6d4a07 100644
--- a/app/src/assets/scss/business/_history.scss
+++ b/app/src/assets/scss/business/_history.scss
@@ -596,6 +596,7 @@
&:first-child {
[data-history-diff~="only"],
[data-history-diff="inline"] {
+ background-color: var(--b3-card-error-background);
background-color: color-mix(in srgb, var(--b3-theme-error) 18%, transparent);
}
@@ -609,6 +610,7 @@
&:last-child {
[data-history-diff~="only"],
[data-history-diff="inline"] {
+ background-color: var(--b3-card-success-background);
background-color: color-mix(in srgb, var(--b3-theme-success) 18%, transparent);
}
diff --git a/app/src/assets/scss/component/_sync-checkout.scss b/app/src/assets/scss/component/_sync-checkout.scss
index 2a05fe5c1d..a63b48c363 100644
--- a/app/src/assets/scss/component/_sync-checkout.scss
+++ b/app/src/assets/scss/component/_sync-checkout.scss
@@ -7,6 +7,7 @@
top: 50%;
transform: translate(-50%, -50%);
max-width: min(680px, 92vw);
+ max-height: calc(100vh - 32px);
max-height: calc(100dvh - 32px);
overflow: auto;
box-sizing: border-box;
diff --git a/app/src/assets/scss/pdf/_pdf.scss b/app/src/assets/scss/pdf/_pdf.scss
index 69d65211da..44f085f2a1 100644
--- a/app/src/assets/scss/pdf/_pdf.scss
+++ b/app/src/assets/scss/pdf/_pdf.scss
@@ -192,7 +192,12 @@
}
&:not([data-type="border"]) > div {
+ background-color: var(--pdf-annotation-color);
background-color: color-mix(in srgb, var(--pdf-annotation-color) 35%, transparent);
+
+ @supports not (background-color: color-mix(in srgb, red, transparent)) {
+ opacity: .35;
+ }
}
}
diff --git a/app/src/assets/scss/protyle/_mindmap-view.scss b/app/src/assets/scss/protyle/_mindmap-view.scss
index d2a0d2706c..345c9daf0e 100644
--- a/app/src/assets/scss/protyle/_mindmap-view.scss
+++ b/app/src/assets/scss/protyle/_mindmap-view.scss
@@ -258,6 +258,7 @@
border: 1px solid currentColor;
border-radius: var(--b3-border-radius);
overflow: hidden;
+ background-image: radial-gradient(circle, currentColor 1px, transparent 1px);
background-image: radial-gradient(circle, color-mix(in srgb, currentColor 24%, transparent) 1px, transparent 1px);
background-size: 24px 24px;
background-position: center;
diff --git a/app/src/assets/scss/util/_reset.scss b/app/src/assets/scss/util/_reset.scss
index 79b3bd75f4..913959b198 100644
--- a/app/src/assets/scss/util/_reset.scss
+++ b/app/src/assets/scss/util/_reset.scss
@@ -10,12 +10,25 @@ html {
}
// 声明当前配色方案,用于修正 iOS 深色模式下输入法候选词高亮项背景丢失等问题 https://github.com/siyuan-note/siyuan/issues/17894
+:root {
+ --b3-legacy-light-color: initial;
+ --b3-legacy-dark-color: ;
+}
+
:root[data-theme-mode="dark"] {
color-scheme: dark;
+ --b3-legacy-light-color: ;
+ --b3-legacy-dark-color: initial;
}
:root[data-theme-mode="light"] {
color-scheme: light;
+ --b3-legacy-light-color: initial;
+ --b3-legacy-dark-color: ;
+}
+
+[inert] {
+ pointer-events: none;
}
// iOS 使用固定蓝色光标,改善系统与应用明暗模式不同组合下的输入法候选字对比度。
diff --git a/app/src/boot/inert.ts b/app/src/boot/inert.ts
new file mode 100644
index 0000000000..65787bf224
--- /dev/null
+++ b/app/src/boot/inert.ts
@@ -0,0 +1,50 @@
+// Keep hidden mobile controls out of focus navigation on WebView versions without inert.
+export const installInertFallback = (doc: Document) => {
+ const prototype = doc.defaultView.HTMLElement.prototype;
+ if ("inert" in prototype) return;
+ Object.defineProperty(prototype, "inert", {
+ configurable: true,
+ get() { return this.hasAttribute("inert"); },
+ set(value: boolean) { this.toggleAttribute("inert", Boolean(value)); },
+ });
+ let previous: HTMLElement;
+ const rejectFocus = () => {
+ const active = doc.activeElement as HTMLElement;
+ if (!active?.closest("[inert]")) return;
+ active.blur();
+ if (previous?.isConnected && !previous.closest("[inert]")) previous.focus({preventScroll: true});
+ };
+ doc.addEventListener("focusin", event => {
+ if ((event.target as HTMLElement).closest("[inert]")) {
+ event.stopImmediatePropagation();
+ rejectFocus();
+ } else {
+ previous = event.target as HTMLElement;
+ }
+ }, true);
+ doc.addEventListener("click", event => {
+ if ((event.target as Element).closest("[inert]")) {
+ event.preventDefault();
+ event.stopImmediatePropagation();
+ }
+ }, true);
+ doc.addEventListener("keydown", event => {
+ if (event.key !== "Tab" || event.defaultPrevented) return;
+ const candidates = Array.from(doc.querySelectorAll<HTMLElement>(
+ "a[href],button,input,select,textarea,[tabindex],[contenteditable]"
+ )).filter(element => (element.tabIndex >= 0 || (element.isContentEditable && !element.hasAttribute("tabindex"))) &&
+ !element.matches(":disabled") && element.getClientRects().length &&
+ getComputedStyle(element).visibility === "visible");
+ candidates.sort((a, b) => (a.tabIndex > 0 ? a.tabIndex : Infinity) - (b.tabIndex > 0 ? b.tabIndex : Infinity));
+ const step = event.shiftKey ? -1 : 1;
+ const index = candidates.indexOf(doc.activeElement as HTMLElement);
+ let next = index < 0 ? (event.shiftKey ? candidates.length - 1 : 0) : index + step;
+ if (!candidates[next]?.closest("[inert]")) return;
+ event.preventDefault();
+ while (candidates[next]?.closest("[inert]")) next += step;
+ const target = candidates[next] || (event.shiftKey ? candidates.slice().reverse() : candidates)
+ .find(element => !element.closest("[inert]"));
+ target?.focus();
+ });
+ new MutationObserver(rejectFocus).observe(doc.documentElement, {attributes: true, attributeFilter: ["inert"], subtree: true});
+};
diff --git a/app/src/dialog/index.ts b/app/src/dialog/index.ts
index 96b7155775..35c2aa4daa 100644
--- a/app/src/dialog/index.ts
+++ b/app/src/dialog/index.ts
@@ -106,7 +106,7 @@ export class Dialog {
}
this.element.innerHTML = `<div class="b3-dialog" style="z-index: ${++window.siyuan.zIndex};${typeof left === "string" ? "display:block" : ""}">
<div class="b3-dialog__scrim"${options.transparent ? ' style="background-color:transparent"' : ""}></div>
-<div role="dialog" aria-modal="true" ${options.title ? `aria-labelledby="dialog-title-${this.id}" ` : ""}tabindex="-1" class="b3-dialog__container ${options.containerClassName || ""}" style="width:${options.width || "auto"};height:${options.height || "auto"};
+<div role="dialog" aria-modal="true" ${options.title ? `aria-labelledby="dialog-title-${this.id}" ` : ""}tabindex="-1" class="b3-dialog__container ${options.containerClassName || ""}" style="width:${options.width || "auto"};height:${options.height?.replace(/dvh/g, "vh") || "auto"};height:${options.height || "auto"};
left:${left || "auto"};top:${top || "auto"}">
<svg class="b3-dialog__close${(!isMobile() || this.disableClose || options.hideCloseIcon) ? " fn__none" : ""}"><use xlink:href="#iconCloseRound"></use></svg>
<div id="dialog-title-${this.id}" class="resize__move b3-dialog__header${options.title ? "" : " fn__none"}" ${(isMobile() &&options.title) ? 'style="padding-right: 38px;"' : ""} onselectstart="return false;">${options.title || ""}</div>
diff --git a/app/src/mobile/startup.ts b/app/src/mobile/startup.ts
index 5a66045b35..13068efc70 100644
--- a/app/src/mobile/startup.ts
+++ b/app/src/mobile/startup.ts
@@ -1,6 +1,8 @@
import {installStartupError} from "../boot/startupError";
+import {installInertFallback} from "../boot/inert";
import "../assets/scss/startup.scss";
declare const SIYUAN_VERSION: string;
installStartupError(window, SIYUAN_VERSION);
+installInertFallback(document);
diff --git a/app/src/protyle/render/av/color.test.ts b/app/src/protyle/render/av/color.test.ts
index e5d2d97be5..4457c9bc28 100644
--- a/app/src/protyle/render/av/color.test.ts
+++ b/app/src/protyle/render/av/color.test.ts
@@ -64,6 +64,17 @@ describe("AV color indexes", () => {
});
describe("AV resolved colors", () => {
+ it("uses theme-controlled CSS variables when light-dark is unavailable", () => {
+ const previous = globalThis.CSS;
+ Object.defineProperty(globalThis, "CSS", {configurable: true, writable: true, value: {supports: () => false}});
+ try {
+ assert.equal(getAVBackgroundColor({color: "15", resolvedColor: customColor}),
+ "var(--b3-legacy-light-color, #ddeeff) var(--b3-legacy-dark-color, #223344)");
+ } finally {
+ if (previous === undefined) delete globalThis.CSS;
+ else globalThis.CSS = previous;
+ }
+ });
it("renders local light and dark chip colors", () => {
assert.equal(getAVColorStyle({color: "15", resolvedColor: customColor}),
"background-color:light-dark(#ddeeff, #223344);color:light-dark(#112233, #fefefe)");
diff --git a/app/src/protyle/render/av/color.ts b/app/src/protyle/render/av/color.ts
index 5a82e69991..7d0dbd9bec 100644
--- a/app/src/protyle/render/av/color.ts
+++ b/app/src/protyle/render/av/color.ts
@@ -43,7 +43,9 @@ const isResolvedColor = (color: IAVColor | undefined): color is IAVColor => !!co
COLOR_PATTERN.test(color.light?.color) && COLOR_PATTERN.test(color.light?.backgroundColor) &&
COLOR_PATTERN.test(color.dark?.color) && COLOR_PATTERN.test(color.dark?.backgroundColor);
-const getModeColor = (light: string, dark: string) => `light-dark(${light}, ${dark})`;
+const getModeColor = (light: string, dark: string) => typeof CSS !== "undefined" &&
+ !CSS.supports("color", "light-dark(white, black)") ?
+ `var(--b3-legacy-light-color, ${light}) var(--b3-legacy-dark-color, ${dark})` : `light-dark(${light}, ${dark})`;
const cssVarsForIndex = (index: number) =>
`background-color:var(--b3-font-background${index});color:var(--b3-font-color${index})`;
diff --git a/app/src/protyle/render/mermaidRender.test.ts b/app/src/protyle/render/mermaidRender.test.ts
index 189993d0e1..197e8f082c 100644
--- a/app/src/protyle/render/mermaidRender.test.ts
+++ b/app/src/protyle/render/mermaidRender.test.ts
@@ -54,6 +54,7 @@ test("Mermaid follows both theme directions and discards renders superseded by a
},
require: () => ({
Constants: {PROTYLE_CDN: "", ZWSP: ""}, addScript: async () => {},
+ ensureBrowserCompatibility: async () => {},
isFoldedRenderContent: () => false, isZenumlDiagram: () => false,
getMermaidLayout: () => "", applyMermaidLayout: (value: string) => value,
hasClosestByClassName: (): Element => null, getHostCapabilities: () => ({remoteKernel: false}),
diff --git a/app/src/protyle/render/mermaidRender.ts b/app/src/protyle/render/mermaidRender.ts
index 5dbaf9f8a6..7f72a7ec18 100644
--- a/app/src/protyle/render/mermaidRender.ts
+++ b/app/src/protyle/render/mermaidRender.ts
@@ -8,6 +8,7 @@ import {MERMAID_SANITIZE_OPTIONS} from "./mermaidSanitize";
import {isZenumlDiagram} from "./mermaidZenuml";
import {getHostCapabilities} from "../../util/hostCapabilities";
import {escapeHtml} from "../../util/escape";
+import {ensureBrowserCompatibility} from "../util/browserCompat";
let mermaidTidyTreePromise: Promise<void>;
let mermaidZenumlPromise: Promise<void>;
@@ -53,7 +54,8 @@ export const mermaidRender = (element: Element, cdn = Constants.PROTYLE_CDN) =>
if (mermaidElements.length === 0) {
return;
}
- addScript(`${cdn}/js/mermaid/mermaid.min.js?v=12.2.0`, "protyleMermaidScript").then(async () => {
+ ensureBrowserCompatibility(cdn).then(() =>
+ addScript(`${cdn}/js/mermaid/mermaid.min.js?v=12.2.0`, "protyleMermaidScript")).then(async () => {
await registerMermaidExternalDiagrams(mermaidElements, cdn);
await registerMermaidLayouts(mermaidElements, cdn);
window.mermaid.registerIconPacks([
diff --git a/app/src/protyle/render/mermaidResize.test.ts b/app/src/protyle/render/mermaidResize.test.ts
index e142a213f8..06f1c6aae7 100644
--- a/app/src/protyle/render/mermaidResize.test.ts
+++ b/app/src/protyle/render/mermaidResize.test.ts
@@ -32,6 +32,7 @@ const browserCases = async (sources: Record<string, string>, resizeSource: strin
Object.assign(window, {siyuan: {config: {appearance: {mode: 0}}}, DOMPurify: {sanitize: (value: string) => value}});
new Function("exports", "require", sources.renderer)(api, () => ({
Constants: {PROTYLE_CDN: "", ZWSP: "\u200b"}, addScript: async () => {},
+ ensureBrowserCompatibility: async () => {},
isFoldedRenderContent: () => false, isZenumlDiagram: () => false,
getMermaidLayout: (): undefined => undefined, applyMermaidLayout: (value: string) => value,
hasClosestByClassName: (element: Element, name: string) => element.closest("." + name),
diff --git a/app/src/protyle/util/browserCompat.test.ts b/app/src/protyle/util/browserCompat.test.ts
new file mode 100644
index 0000000000..4fdad7a2cf
--- /dev/null
+++ b/app/src/protyle/util/browserCompat.test.ts
@@ -0,0 +1,28 @@
+import * as assert from "node:assert/strict";
+import {readFileSync} from "node:fs";
+import {test} from "node:test";
+import {createContext, runInContext} from "node:vm";
+import {ModuleKind, transpileModule} from "typescript";
+
+test("compatibility loader skips native runtimes and retries failures before dependent scripts load", async () => {
+ const source = transpileModule(readFileSync("src/protyle/util/browserCompat.ts", "utf8"), {
+ compilerOptions: {module: ModuleKind.CommonJS},
+ }).outputText;
+ const exports = {} as typeof import("./browserCompat");
+ const requests: string[] = [];
+ let install = false;
+ const context = createContext({exports, window: {siyuan: {languages: {loadingError: "loading failed"}}},
+ URL: class {}, AbortSignal: class {},
+ require: (name: string) => name === "../../constants" ? {Constants: {PROTYLE_CDN: "/stage/protyle"}} : {
+ addScriptSync: async (url: string) => {
+ requests.push(url);
+ if (install) runInContext("structuredClone = () => {}; Object.groupBy = () => {}; URL.parse = () => {}; AbortSignal.any = () => {}; Promise.withResolvers = () => {};", context);
+ },
+ }});
+ runInContext(source, context);
+ await assert.rejects(exports.ensureBrowserCompatibility(), /loading failed/);
+ install = true;
+ await exports.ensureBrowserCompatibility();
+ await exports.ensureBrowserCompatibility();
+ assert.deepEqual(requests, ["/stage/protyle/js/webview-compat.js?v=1", "/stage/protyle/js/webview-compat.js?v=1"]);
+});
diff --git a/app/src/protyle/util/browserCompat.ts b/app/src/protyle/util/browserCompat.ts
new file mode 100644
index 0000000000..f25b89c45d
--- /dev/null
+++ b/app/src/protyle/util/browserCompat.ts
@@ -0,0 +1,16 @@
+import {Constants} from "../../constants";
+import {addScriptSync} from "./addScript";
+
+const needsCompatibility = () => typeof structuredClone !== "function" ||
+ typeof (Object as ObjectConstructor & {groupBy?: unknown}).groupBy !== "function" ||
+ typeof (URL as typeof URL & {parse?: unknown}).parse !== "function" ||
+ typeof AbortSignal.any !== "function" ||
+ typeof (Promise as PromiseConstructor & {withResolvers?: unknown}).withResolvers !== "function";
+
+export const ensureBrowserCompatibility = async (cdn = Constants.PROTYLE_CDN) => {
+ if (!needsCompatibility()) return;
+ await addScriptSync(`${cdn}/js/webview-compat.js?v=1`, "protyleBrowserCompatScript", {reloadOnFailure: false});
+ if (needsCompatibility()) {
+ throw new Error(window.siyuan.languages.loadingError);
+ }
+};
diff --git a/app/stage/protyle/js/pdf/pdf.worker.compat.mjs b/app/stage/protyle/js/pdf/pdf.worker.compat.mjs
index a0dd1c728c..c5177bd2c9 100644
--- a/app/stage/protyle/js/pdf/pdf.worker.compat.mjs
+++ b/app/stage/protyle/js/pdf/pdf.worker.compat.mjs
@@ -1,18 +1,4 @@
-if (typeof Promise.withResolvers !== "function") {
- Object.defineProperty(Promise, "withResolvers", {
- configurable: true,
- writable: true,
- value() {
- let resolve;
- let reject;
- const promise = new Promise((promiseResolve, promiseReject) => {
- resolve = promiseResolve;
- reject = promiseReject;
- });
- return {promise, resolve, reject};
- },
- });
-}
+import "../webview-compat.js?v=1";
const {WorkerMessageHandler} = await import("./pdf.worker.min.mjs?v=6.4.299-siyuan.1");
diff --git a/app/stage/protyle/js/webview-compat.js b/app/stage/protyle/js/webview-compat.js
new file mode 100644
index 0000000000..3c0c2d1cc6
--- /dev/null
+++ b/app/stage/protyle/js/webview-compat.js
@@ -0,0 +1,101 @@
+// Maintained compatibility entry for lazy-loaded PDF.js and Mermaid on WebView 95+.
+// Native implementations always take precedence. This file is shared with the PDF worker.
+(function () {
+ const define = (target, name, value) => Object.defineProperty(target, name, {
+ configurable: true, writable: true, value,
+ });
+ if (typeof URL.parse !== "function") {
+ define(URL, "parse", function (input, base) {
+ if (!arguments.length || typeof input === "symbol" || typeof base === "symbol") {
+ throw new TypeError("Invalid URL argument");
+ }
+ const value = String(input);
+ const baseValue = base === undefined ? undefined : String(base);
+ try {
+ return new URL(value, baseValue);
+ } catch {
+ return null;
+ }
+ });
+ }
+ if (typeof Promise.withResolvers !== "function") {
+ define(Promise, "withResolvers", function () {
+ let resolve;
+ let reject;
+ const promise = new this((onResolve, onReject) => { resolve = onResolve; reject = onReject; });
+ return {promise, resolve, reject};
+ });
+ }
+ if (typeof AbortSignal.any !== "function") {
+ define(AbortSignal, "any", function (signals) {
+ const inputs = Array.from(signals);
+ for (const signal of inputs) {
+ if (!(signal instanceof AbortSignal)) { throw new TypeError("Expected an AbortSignal"); }
+ }
+ const controller = new AbortController();
+ const listeners = new Map();
+ const abort = (signal) => {
+ const reason = signal.reason === undefined ? new DOMException("This operation was aborted", "AbortError") : signal.reason;
+ if (!("reason" in controller.signal)) {
+ Object.defineProperty(controller.signal, "reason", {value: reason});
+ }
+ controller.abort(reason);
+ for (const [input, listener] of listeners) { input.removeEventListener("abort", listener); }
+ listeners.clear();
+ };
+ const aborted = inputs.find(signal => signal.aborted);
+ if (aborted) { abort(aborted); return controller.signal; }
+ for (const signal of new Set(inputs)) {
+ const listener = () => abort(signal);
+ listeners.set(signal, listener);
+ signal.addEventListener("abort", listener, {once: true});
+ }
+ return controller.signal;
+ });
+ }
+ if (typeof Object.groupBy !== "function") {
+ define(Object, "groupBy", function (items, callback) {
+ if (typeof callback !== "function") { throw new TypeError("Expected a grouping callback"); }
+ const groups = Object.create(null);
+ let index = 0;
+ for (const item of items) {
+ const value = callback(item, index++);
+ const key = typeof value === "symbol" ? value : String(value);
+ if (Object.prototype.hasOwnProperty.call(groups, key)) { groups[key].push(item); }
+ else { groups[key] = [item]; }
+ }
+ return groups;
+ });
+ }
+ if (typeof globalThis.structuredClone !== "function") {
+ define(globalThis, "structuredClone", function (value, options) {
+ if (!arguments.length) { throw new TypeError("Expected a value to clone"); }
+ const transfer = options?.transfer === undefined ? [] : Array.from(options.transfer);
+ const seen = new Set();
+ for (const item of transfer) {
+ // PDF.js transfers ArrayBuffers and ImageBitmaps. Other transfer-only
+ // types cannot be synchronously cloned through PerformanceMark.
+ if (seen.has(item) || !(item instanceof ArrayBuffer ||
+ (typeof ImageBitmap !== "undefined" && item instanceof ImageBitmap))) {
+ throw new DOMException("Unsupported or duplicate transferable", "DataCloneError");
+ }
+ seen.add(item);
+ }
+ // User Timing uses the browser's structured serialization algorithm,
+ // retaining cycles, shared references, typed arrays and native objects.
+ // Constructing a mark does not add an entry to the performance timeline.
+ const clone = new PerformanceMark("siyuan-clone", {detail: value}).detail;
+ if (transfer.length) {
+ const channel = new MessageChannel();
+ try {
+ // Detach originals only after cloning succeeds, using native transfer.
+ channel.port1.postMessage(null, transfer);
+ } finally {
+ channel.port1.close();
+ channel.port2.close();
+ }
+ }
+ return clone;
+ });
+ }
+})();
diff --git a/app/tests/assetPreview.test.js b/app/tests/assetPreview.test.js
index 8e7d35021f..7360df590f 100644
--- a/app/tests/assetPreview.test.js
+++ b/app/tests/assetPreview.test.js
@@ -57,6 +57,7 @@ const runCases = async source => {
});
const pdfTheme = load(source.pdfTheme, {
"../constants": {Constants},
+ "../protyle/util/browserCompat": {ensureBrowserCompatibility: async () => {}},
"../config/tabs/appearancePreferences": {patchAppearancePreference: async (key, value) => {
themePatches.push([key, value]);
}},
diff --git a/app/tests/pdfAnnotationCompatibility.test.js b/app/tests/pdfAnnotationCompatibility.test.js
index c624c03bb2..02fbac292d 100644
--- a/app/tests/pdfAnnotationCompatibility.test.js
+++ b/app/tests/pdfAnnotationCompatibility.test.js
@@ -11,6 +11,14 @@ async function runElectron() {
let exitCode = 0;
try {
await win.loadURL("data:text/html,<html><body></body></html>");
+ if (process.argv[3] === "legacy") {
+ const compatibility = readFileSync(path.join(__dirname, "../stage/protyle/js/webview-compat.js"), "utf8");
+ await win.webContents.executeJavaScript(`
+ delete globalThis.structuredClone; delete URL.parse; delete AbortSignal.any;
+ delete Promise.withResolvers; delete Object.groupBy; delete Array.prototype.toReversed;
+ ${compatibility}
+ `);
+ }
const moduleUrl = source => "data:text/javascript;base64," + Buffer.from(source).toString("base64");
const treeUrl = moduleUrl(await require("./pdfViewerBundle.cjs")());
const runtimeUrl = moduleUrl(readFileSync(path.join(__dirname, "../stage/protyle/js/pdf/pdf.min.mjs"), "utf8"));
@@ -339,7 +347,7 @@ if (process.versions.electron && process.type === "browser") {
require("electron").app.exit(1);
});
} else {
- require("node:test").it("renders PDF annotation layers, highlights and rotated rectangle captures with the bundled runtime", {
+ for (const mode of ["native", "legacy"]) require("node:test").it(`renders PDF annotation layers, highlights and rotated rectangle captures (${mode} APIs)`, {
skip: process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,
timeout: 60000,
}, async () => {
@@ -348,7 +356,7 @@ if (process.versions.electron && process.type === "browser") {
const profile = mkdtempSync(path.join(os.tmpdir(), "siyuan-pdf-annotation-"));
try {
await require("node:util").promisify(require("node:child_process").execFile)(
- require("electron"), [__filename, profile], {env, windowsHide: true, timeout: 55000});
+ require("electron"), [__filename, profile, mode], {env, windowsHide: true, timeout: 55000});
} finally {
rmSync(profile, {recursive: true, force: true});
}
diff --git a/app/tests/webviewCompatibility.test.js b/app/tests/webviewCompatibility.test.js
new file mode 100644
index 0000000000..c8cf941a28
--- /dev/null
+++ b/app/tests/webviewCompatibility.test.js
@@ -0,0 +1,154 @@
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+
+async function runElectron() {
+ const {app, BrowserWindow} = require("electron");
+ app.setPath("userData", process.argv[2]);
+ await app.whenReady();
+ const win = new BrowserWindow({show: false});
+ const root = path.resolve(__dirname, "../stage/protyle");
+ const server = require("node:http").createServer((request, response) => {
+ const name = decodeURIComponent(new URL(request.url, "http://localhost").pathname);
+ if (name === "/") { response.end("<html><body></body></html>"); return; }
+ const file = path.resolve(root, "." + name);
+ if (!file.startsWith(root + path.sep) || !fs.existsSync(file)) { response.writeHead(404); response.end(); return; }
+ response.setHeader("Content-Type", "text/javascript");
+ response.end(fs.readFileSync(file));
+ });
+ await new Promise(resolve => server.listen(0, "127.0.0.1", resolve));
+ let code = 0;
+ try {
+ await win.loadURL("http://127.0.0.1:" + server.address().port + "/");
+ const compat = fs.readFileSync(path.join(__dirname, "../stage/protyle/js/webview-compat.js"), "utf8");
+ const ts = require("typescript");
+ const inert = ts.transpileModule(fs.readFileSync(path.join(__dirname, "../src/boot/inert.ts"), "utf8"), {
+ compilerOptions: {module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020},
+ }).outputText;
+ const reset = require("sass").compile(path.join(__dirname, "../src/assets/scss/util/_reset.scss")).css;
+ await win.webContents.insertCSS(reset);
+ const result = await win.webContents.executeJavaScript(`(async () => {
+ const check = (value, message) => { if (!value) throw new Error(message); };
+ const native = {clone: structuredClone, parse: URL.parse, any: AbortSignal.any, group: Object.groupBy};
+ ${compat}
+ check(native.clone === structuredClone && native.parse === URL.parse && native.any === AbortSignal.any && native.group === Object.groupBy,
+ "compatibility replaced native implementations");
+ delete globalThis.structuredClone; delete URL.parse; delete AbortSignal.any;
+ delete Promise.withResolvers; delete Object.groupBy;
+ ${compat}
+ check(URL.parse("/a", "https://example.com/").href === "https://example.com/a", "relative URL parsing failed");
+ check(URL.parse("https://[invalid") === null, "invalid URL did not return null");
+ let threw = false;
+ try { URL.parse({toString() { throw new Error("conversion"); }}); } catch { threw = true; }
+ check(threw, "URL conversion error was swallowed");
+ const {promise, resolve} = Promise.withResolvers(); resolve(42);
+ check(await promise === 42, "promise resolver failed");
+ const a = new AbortController(), b = new AbortController();
+ const reason = new Error("cancel");
+ const signal = AbortSignal.any([a.signal, b.signal]); b.abort(reason);
+ check(signal.aborted && signal.reason === reason, "abort reason was not preserved");
+ check(AbortSignal.any([b.signal]).reason === reason && !AbortSignal.any([]).aborted, "pre-aborted or empty signal list failed");
+ const groups = Object.groupBy([1, 2, 3], value => value % 2 ? "__proto__" : "even");
+ check(Object.getPrototypeOf(groups) === null && groups.__proto__.length === 2 && groups.even[0] === 2, "grouping keys were unsafe");
+ const buffer = new Uint8Array([1, 2, 3]).buffer;
+ const object = {buffer, view: new Uint8Array(buffer), map: new Map(), set: new Set([7]), date: new Date(123), big: 5n};
+ object.self = object; object.map.set(object, object.view);
+ const copy = structuredClone(object, {transfer: [buffer]});
+ check(buffer.byteLength === 0 && copy.buffer.byteLength === 3 && copy.view.buffer === copy.buffer &&
+ copy.self === copy && copy.map.get(copy) === copy.view && copy.set.has(7) && copy.date.getTime() === 123 && copy.big === 5n,
+ "structured clone lost transfer, type or graph identity");
+ const unchanged = new ArrayBuffer(4);
+ try { structuredClone({fn() {}}, {transfer: [unchanged]}); } catch (error) { check(error.name === "DataCloneError", "wrong clone error"); }
+ check(unchanged.byteLength === 4, "failed clone detached original data");
+ threw = false;
+ try { structuredClone(unchanged, {transfer: [unchanged, unchanged]}); } catch (error) { threw = error.name === "DataCloneError"; }
+ check(threw && unchanged.byteLength === 4, "duplicate transfers were accepted");
+ const canvas = new OffscreenCanvas(2, 2);
+ canvas.getContext("2d").fillRect(0, 0, 2, 2);
+ const bitmap = canvas.transferToImageBitmap();
+ const imageCopy = structuredClone({bitmap}, {transfer: [bitmap]});
+ check(bitmap.width === 0 && imageCopy.bitmap.width === 2, "image transfer was not preserved");
+ imageCopy.bitmap.close();
+ const compatUrl = location.origin + "/js/webview-compat.js";
+ const workerCode = 'delete URL.parse; delete Promise.withResolvers; delete globalThis.structuredClone; await import(' + JSON.stringify(compatUrl) + '); postMessage({url:URL.parse("/worker", "https://example.com").pathname, value:await Promise.withResolvers().promise.constructor.resolve(7)});';
+ const workerUrl = URL.createObjectURL(new Blob([workerCode], {type: "text/javascript"}));
+ const worker = new Worker(workerUrl, {type: "module"});
+ const workerResult = await new Promise((resolve, reject) => { worker.onmessage = event => resolve(event.data); worker.onerror = event => reject(new Error("compatibility worker: " + event.message)); });
+ worker.terminate(); URL.revokeObjectURL(workerUrl);
+ check(workerResult.url === "/worker" && workerResult.value === 7, "worker compatibility failed");
+ const pdfModule = await import(location.origin + "/js/pdf/pdf.min.mjs");
+ const pdfWorkerCode = 'delete URL.parse; delete Promise.withResolvers; await import(' + JSON.stringify(location.origin + "/js/pdf/pdf.worker.compat.mjs?v=6.4.299-siyuan.2") + ');';
+ const pdfWorkerUrl = URL.createObjectURL(new Blob([pdfWorkerCode], {type: "text/javascript"}));
+ const pdfWorker = new Worker(pdfWorkerUrl, {type: "module"});
+ const workerMessages = [];
+ await new Promise((resolve, reject) => {
+ const timeout = setTimeout(() => reject(new Error("PDF worker initialization timed out")), 8000);
+ pdfWorker.addEventListener("message", event => {
+ if (event.data.action === "ready") { clearTimeout(timeout); resolve(); }
+ });
+ pdfWorker.addEventListener("error", event => { clearTimeout(timeout); reject(new Error(event.message || "PDF worker initialization failed")); });
+ });
+ pdfWorker.addEventListener("message", event => workerMessages.push(event.data.action));
+ pdfWorker.addEventListener("error", event => workerMessages.push(event.message || "worker error"));
+ pdfModule.GlobalWorkerOptions.workerPort = pdfWorker;
+ let pdfSource = "%PDF-1.7\\n";
+ const objects = ["<< /Type /Catalog /Pages 2 0 R >>", "<< /Type /Pages /Kids [3 0 R] /Count 1 >>",
+ "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 100 100] /Resources << >> >>"];
+ const offsets = [0];
+ objects.forEach((object, index) => { offsets.push(pdfSource.length); pdfSource += (index + 1) + " 0 obj\\n" + object + "\\nendobj\\n"; });
+ const xref = pdfSource.length;
+ pdfSource += "xref\\n0 4\\n0000000000 65535 f \\n" + offsets.slice(1).map(offset => String(offset).padStart(10, "0") + " 00000 n \\n").join("");
+ pdfSource += "trailer\\n<< /Size 4 /Root 1 0 R >>\\nstartxref\\n" + xref + "\\n%%EOF";
+ const pdfTask = pdfModule.getDocument({data: new TextEncoder().encode(pdfSource)});
+ try {
+ const pdf = await Promise.race([pdfTask.promise, new Promise((_, reject) => setTimeout(() =>
+ reject(new Error("PDF compatibility worker timed out: " + JSON.stringify(workerMessages))), 8000))]);
+ const page = await pdf.getPage(1);
+ check(pdf.numPages === 1 && page.getViewport({scale: 1}).width === 100, "PDF did not open with its compatibility worker");
+ await pdfTask.destroy();
+ } finally { pdfWorker.terminate(); URL.revokeObjectURL(pdfWorkerUrl); }
+ delete HTMLElement.prototype.inert;
+ const exports = {}; ${inert}
+ exports.installInertFallback(document);
+ document.body.innerHTML = '<button id="first">First</button><div id="hidden"><button id="inside">Inside</button></div><button id="last">Last</button><div id="color"></div>';
+ const first = document.getElementById("first"), hidden = document.getElementById("hidden"), inside = document.getElementById("inside"), last = document.getElementById("last");
+ first.focus(); hidden.inert = true;
+ first.dispatchEvent(new KeyboardEvent("keydown", {key:"Tab", bubbles:true, cancelable:true}));
+ check(document.activeElement === last, "Tab entered inert controls");
+ last.dispatchEvent(new KeyboardEvent("keydown", {key:"Tab", shiftKey:true, bubbles:true, cancelable:true}));
+ check(document.activeElement === first, "reverse Tab entered inert controls");
+ inside.focus(); check(document.activeElement !== inside, "programmatic focus entered inert controls");
+ let clicked = false; inside.onclick = () => { clicked = true; }; inside.click();
+ check(!clicked, "inert controls received a click");
+ hidden.inert = false; inside.focus(); check(document.activeElement === inside, "removing inert did not restore focus");
+ hidden.setAttribute("inert", ""); await Promise.resolve();
+ check(document.activeElement !== inside, "new inert attribute retained focus");
+ const color = document.getElementById("color");
+ color.style.backgroundColor = "var(--b3-legacy-light-color, #ddeeff) var(--b3-legacy-dark-color, #223344)";
+ document.documentElement.dataset.themeMode = "light";
+ check(getComputedStyle(color).backgroundColor === "rgb(221, 238, 255)", "light color fallback failed");
+ document.documentElement.dataset.themeMode = "dark";
+ check(getComputedStyle(color).backgroundColor === "rgb(34, 51, 68)", "dark color fallback failed to switch");
+ return true;
+ })()`);
+ assert.equal(result, true);
+ } catch (error) { console.error(error); code = 1; }
+ finally { win.destroy(); server.close(); app.exit(code); }
+}
+
+if (process.versions.electron && process.type === "browser") {
+ runElectron().catch(error => { console.error(error); require("electron").app.exit(1); });
+} else {
+ require("node:test").test("legacy WebView fallbacks preserve cloning, workers, focus and theme switching", {
+ skip: process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,
+ timeout: 45000,
+ }, async () => {
+ const env = {...process.env}; delete env.ELECTRON_RUN_AS_NODE;
+ const profile = fs.mkdtempSync(path.join(os.tmpdir(), "siyuan-webview-compat-"));
+ try {
+ await require("node:util").promisify(require("node:child_process").execFile)(
+ require("electron"), [__filename, profile], {env, windowsHide: true, timeout: 40000});
+ } finally { fs.rmSync(profile, {recursive: true, force: true}); }
+ });
+}