gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 23:29:02 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

feat(import/markdown): preserve fractional widths

Browse Source
This commit is contained in:
Elian Doran 2025-04-05 20:36:20 +03:00
parent 8977926c00
commit 447439efd6
No known key found for this signature in database
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/export/markdown.spec.ts
View File

@ -267,12 +267,12 @@ describe("Markdown export", () => {
it("preserves figures", () => { it("preserves figures", () => {
const html = /*html*/trimIndentation`\ const html = /*html*/trimIndentation`\
<figure class="image"> <figure class="image" style="width:53.44%;">
<img style="aspect-ratio:991/403;" src="Jump to Note_image.png" width="991" <img style="aspect-ratio:991/403;" src="Jump to Note_image.png" width="991"
height="403"> height="403">
</figure> </figure>
`; `;
const expected = `<figure class="image"><img style="aspect-ratio:991/403;" src="Jump to Note_image.png" width="991" height="403"></figure>`; const expected = `<figure class="image" style="width:53.44%;"><img style="aspect-ratio:991/403;" src="Jump to Note_image.png" width="991" height="403"></figure>`;
expect(markdownExportService.toMarkdown(html)).toBe(expected); expect(markdownExportService.toMarkdown(html)).toBe(expected);
}); });

1
src/services/export/markdown.ts
View File

@ -2,7 +2,6 @@
import TurndownService, { type Rule } from "turndown"; import TurndownService, { type Rule } from "turndown";
import { gfm } from "../../../packages/turndown-plugin-gfm/src/gfm.js"; import { gfm } from "../../../packages/turndown-plugin-gfm/src/gfm.js";
import type { DOMElement } from "react";
let instance: TurndownService | null = null; let instance: TurndownService | null = null;

2
src/services/html_sanitizer.ts
View File

@ -142,7 +142,7 @@ function sanitize(dirtyHtml: string) {
} }
const colorRegex = [/^#(0x)?[0-9a-f]+$/i, /^rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$/, /^hsl\(\s*(\d{1,3})\s*,\s*(\d{1,3})%\s*,\s*(\d{1,3})%\s*\)$/]; const colorRegex = [/^#(0x)?[0-9a-f]+$/i, /^rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$/, /^hsl\(\s*(\d{1,3})\s*,\s*(\d{1,3})%\s*,\s*(\d{1,3})%\s*\)$/];
const sizeRegex = [/^\d+(?:px|em|%)$/]; const sizeRegex = [/^\d+\.?\d*(?:px|em|%)$/];
// to minimize document changes, compress H // to minimize document changes, compress H
return sanitizeHtml(dirtyHtml, { return sanitizeHtml(dirtyHtml, {

11
src/services/import/markdown.spec.ts
View File

@ -164,9 +164,14 @@ second line 2</code></pre><ul><li>Hello</li><li>world</li></ul><ol><li>Hello</li
}); });
it("preserves figures", () => { it("preserves figures", () => {
const input = `<figure class="image image-style-align-center image_resized" style="width:50%;"><img style="aspect-ratio:991/403;" src="Jump to Note_image.png" width="991" height="403"></figure>`; const scenarios = [
const expected = /*html*/`<figure class="image image-style-align-center image_resized" style="width:50%;"><img style="aspect-ratio:991/403;" src="Jump to Note_image.png" width="991" height="403"></figure>`; /*html*/`<figure class="image image-style-align-center image_resized" style="width:53.44%;"><img style="aspect-ratio:991/403;" src="Jump to Note_image.png" width="991" height="403"></figure>`,
expect(markdownService.renderToHtml(input, "Title")).toStrictEqual(expected); /*html*/`<figure class="image image-style-align-center image_resized" style="width:53.44%;"><img style="aspect-ratio:991/403;" src="Jump to Note_image.png" width="991" height="403"></figure>`
];
for (const scenario of scenarios) {
expect(markdownService.renderToHtml(scenario, "Title")).toStrictEqual(scenario);
}
}); });
it("converts inline math expressions into Mathtex format", () => { it("converts inline math expressions into Mathtex format", () => {