@jant/core 0.6.14 → 0.6.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/commands/import-site.js +81 -13
- package/bin/commands/migrate.js +55 -0
- package/bin/commands/posts/rebuild-html.js +184 -0
- package/bin/commands/site/snapshot/import.js +14 -10
- package/bin/lib/d1-query.js +23 -5
- package/bin/lib/migration-runner.js +29 -7
- package/bin/lib/node-database.js +32 -0
- package/bin/lib/site-snapshot.js +347 -46
- package/bin/lib/sql-export.js +1 -1
- package/bin/lib/thread-collection-migration.js +326 -0
- package/dist/app-BxCOR3Uc.js +6 -0
- package/dist/{app-2i7-WQHg.js → app-C-oi_t8W.js} +7408 -6343
- package/dist/client/.vite/manifest.json +3 -3
- package/dist/client/_assets/client-B_eGKN5p.css +2 -0
- package/dist/client/_assets/{client-BvID5ucz.js → client-DxY5BFe8.js} +58 -37
- package/dist/client/_assets/client-auth-CakPESv9.js +5533 -0
- package/dist/{export-DWn149b7.js → export-CsFx6F_M.js} +1259 -125
- package/dist/{github-sync-Ckk0sJxK.js → github-sync-Cq1pzzOI.js} +1 -1
- package/dist/{github-sync-C0zyF6XS.js → github-sync-ppWXN3jb.js} +2 -2
- package/dist/index.js +3 -3
- package/dist/node.js +5 -5
- package/package.json +11 -10
- package/src/__tests__/bin/posts-rebuild-html.test.ts +137 -0
- package/src/__tests__/dev-navigation-defaults.test.ts +22 -0
- package/src/__tests__/export-hugo-build.test.ts +63 -4
- package/src/__tests__/export-import-roundtrip.test.ts +6 -4
- package/src/__tests__/export-service.test.ts +142 -9
- package/src/__tests__/helpers/app.ts +3 -0
- package/src/__tests__/helpers/export-fixtures.ts +2 -0
- package/src/__tests__/import-site-command.test.ts +65 -0
- package/src/__tests__/vite-config.test.ts +45 -0
- package/src/app.tsx +16 -3
- package/src/client/__tests__/collection-created-notice.test.ts +36 -0
- package/src/client/__tests__/collection-form-bridge.test.ts +10 -1
- package/src/client/__tests__/collection-page-actions.test.ts +71 -2
- package/src/client/__tests__/compose-bridge.test.ts +64 -0
- package/src/client/__tests__/feed-video-player.test.ts +16 -1
- package/src/client/__tests__/footnote-rail.test.ts +472 -0
- package/src/client/__tests__/hydrate-partial.test.ts +3 -0
- package/src/client/__tests__/toast.test.ts +18 -1
- package/src/client/collection-created-notice.ts +66 -0
- package/src/client/collection-form-bridge.ts +17 -0
- package/src/client/collection-navigation.ts +44 -0
- package/src/client/collection-page-actions.ts +57 -1
- package/src/client/components/__tests__/jant-collection-directory.test.ts +155 -6
- package/src/client/components/__tests__/jant-compose-dialog.test.ts +370 -5
- package/src/client/components/__tests__/jant-compose-editor.test.ts +97 -0
- package/src/client/components/__tests__/jant-compose-fullscreen.test.ts +104 -0
- package/src/client/components/__tests__/jant-config-editor.test.ts +405 -0
- package/src/client/components/__tests__/jant-media-lightbox.test.ts +121 -0
- package/src/client/components/__tests__/jant-nav-manager.test.ts +538 -2
- package/src/client/components/__tests__/jant-post-form.test.ts +2 -2
- package/src/client/components/__tests__/jant-post-menu.test.ts +47 -5
- package/src/client/components/__tests__/jant-settings-avatar.test.ts +2 -2
- package/src/client/components/__tests__/jant-settings-general.test.ts +3 -3
- package/src/client/components/collection-manager-types.ts +9 -3
- package/src/client/components/compose-types.ts +8 -0
- package/src/client/components/jant-collection-directory.ts +165 -30
- package/src/client/components/jant-command-palette.ts +2 -1
- package/src/client/components/jant-compose-dialog.ts +85 -21
- package/src/client/components/jant-compose-editor.ts +13 -7
- package/src/client/components/jant-compose-fullscreen.ts +24 -4
- package/src/client/components/jant-config-editor.ts +722 -0
- package/src/client/components/jant-media-lightbox.ts +100 -18
- package/src/client/components/jant-nav-manager.ts +1283 -54
- package/src/client/components/jant-post-form.ts +3 -3
- package/src/client/components/jant-post-menu.ts +86 -74
- package/src/client/components/nav-manager-types.ts +51 -2
- package/src/client/components/post-form-types.ts +1 -1
- package/src/client/compose-bridge.ts +4 -1
- package/src/client/feed-video-player.ts +62 -2
- package/src/client/footnote-rail.ts +478 -0
- package/src/client/hydrate-partial.ts +2 -0
- package/src/client/media-lightbox-events.ts +63 -0
- package/src/client/site-header-fragment.ts +38 -0
- package/src/client/tiptap/__tests__/blockquote-editing.test.ts +201 -0
- package/src/client/tiptap/__tests__/clear-formatting.test.ts +168 -0
- package/src/client/tiptap/__tests__/list-editing.test.ts +447 -0
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +727 -4
- package/src/client/tiptap/__tests__/table-controls.test.ts +263 -0
- package/src/client/tiptap/__tests__/table-size-picker.test.ts +179 -0
- package/src/client/tiptap/bubble-menu.ts +88 -10
- package/src/client/tiptap/continuous-lists.ts +102 -0
- package/src/client/tiptap/create-editor.ts +3 -0
- package/src/client/tiptap/extensions.ts +14 -5
- package/src/client/tiptap/markdown-clipboard.ts +608 -11
- package/src/client/tiptap/slash-commands.ts +8 -1
- package/src/client/tiptap/structural-keymap.ts +211 -0
- package/src/client/tiptap/tab-indent.ts +8 -22
- package/src/client/tiptap/table-control-labels.ts +30 -0
- package/src/client/tiptap/table-controls.ts +537 -0
- package/src/client/tiptap/table-size-picker.ts +254 -0
- package/src/client/toast.ts +8 -6
- package/src/client-auth.ts +1 -0
- package/src/client.ts +1 -0
- package/src/db/__tests__/d1-query.test.ts +43 -1
- package/src/db/__tests__/migration-runner.test.ts +63 -0
- package/src/db/__tests__/migrations.test.ts +469 -0
- package/src/db/__tests__/thread-collection-migration.test.ts +364 -0
- package/src/db/migrations/0027_old_blue_blade.sql +39 -0
- package/src/db/migrations/0028_superb_post.sql +2 -0
- package/src/db/migrations/0029_boring_magma.sql +1 -0
- package/src/db/migrations/0030_typical_vivisector.sql +50 -0
- package/src/db/migrations/meta/0027_snapshot.json +2511 -0
- package/src/db/migrations/meta/0028_snapshot.json +2511 -0
- package/src/db/migrations/meta/0029_snapshot.json +2519 -0
- package/src/db/migrations/meta/0030_snapshot.json +2541 -0
- package/src/db/migrations/meta/_journal.json +28 -0
- package/src/db/migrations/pg/0025_moaning_epoch.sql +39 -0
- package/src/db/migrations/pg/0026_talented_killer_shrike.sql +2 -0
- package/src/db/migrations/pg/0027_short_cannonball.sql +1 -0
- package/src/db/migrations/pg/0028_perfect_sharon_carter.sql +27 -0
- package/src/db/migrations/pg/meta/0025_snapshot.json +3204 -0
- package/src/db/migrations/pg/meta/0026_snapshot.json +3204 -0
- package/src/db/migrations/pg/meta/0027_snapshot.json +3211 -0
- package/src/db/migrations/pg/meta/0028_snapshot.json +3248 -0
- package/src/db/migrations/pg/meta/_journal.json +28 -0
- package/src/db/pg/schema.ts +28 -20
- package/src/db/rehearsal-fixtures/demo-current.json +39 -4
- package/src/db/rehearsal-fixtures/demo-current.sql +121 -6
- package/src/db/schema.ts +28 -20
- package/src/i18n/__tests__/detect.test.ts +8 -2
- package/src/i18n/detect.ts +14 -5
- package/src/i18n/locales/public/en.po +133 -30
- package/src/i18n/locales/public/en.ts +1 -1
- package/src/i18n/locales/public/zh-Hans.po +128 -25
- package/src/i18n/locales/public/zh-Hans.ts +1 -1
- package/src/i18n/locales/public/zh-Hant.po +128 -25
- package/src/i18n/locales/public/zh-Hant.ts +1 -1
- package/src/i18n/locales/settings/en.po +513 -10
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +515 -12
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +515 -12
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/lib/__tests__/api-settings.test.ts +299 -0
- package/src/lib/__tests__/constants.test.ts +5 -0
- package/src/lib/__tests__/feed-policy.test.ts +25 -0
- package/src/lib/__tests__/footnotes-upgrade.test.ts +181 -0
- package/src/lib/__tests__/markdown-roundtrip-embed.test.ts +61 -0
- package/src/lib/__tests__/markdown-to-tiptap.test.ts +32 -4
- package/src/lib/__tests__/markdown.test.ts +8 -6
- package/src/lib/__tests__/navigation.test.ts +59 -2
- package/src/lib/__tests__/post-body-html.test.ts +176 -0
- package/src/lib/__tests__/post-display.test.ts +64 -0
- package/src/lib/__tests__/resolve-config.test.ts +113 -1
- package/src/lib/__tests__/summary.test.ts +82 -0
- package/src/lib/__tests__/timeline.test.ts +109 -70
- package/src/lib/__tests__/timezones.test.ts +31 -3
- package/src/lib/__tests__/tiptap-render.test.ts +268 -9
- package/src/lib/__tests__/tiptap-to-markdown.test.ts +6 -0
- package/src/lib/__tests__/view.test.ts +53 -0
- package/src/lib/__tests__/worker-response-cache.test.ts +18 -1
- package/src/lib/api-settings.ts +239 -12
- package/src/lib/collection-sort.ts +7 -5
- package/src/lib/constants.ts +2 -0
- package/src/lib/feed-path.ts +25 -0
- package/src/lib/feed-policy.ts +64 -0
- package/src/lib/footnotes.ts +264 -0
- package/src/lib/github-sync-site-config.ts +2 -0
- package/src/lib/hugo-markdown.ts +10 -3
- package/src/lib/jant-branding.ts +1 -0
- package/src/lib/markdown-manager.ts +188 -5
- package/src/lib/markdown.ts +10 -3
- package/src/lib/navigation.ts +16 -3
- package/src/lib/post-body-html.ts +131 -0
- package/src/lib/post-display.ts +7 -1
- package/src/lib/render.tsx +9 -2
- package/src/lib/resolve-config.ts +100 -16
- package/src/lib/schemas.ts +133 -1
- package/src/lib/settings-paths.ts +5 -0
- package/src/lib/site-skill.ts +78 -0
- package/src/lib/summary.ts +16 -5
- package/src/lib/timeline.ts +98 -122
- package/src/lib/timezones.ts +54 -14
- package/src/lib/tiptap-render.ts +355 -81
- package/src/lib/view.ts +30 -20
- package/src/lib/worker-response-cache.ts +11 -18
- package/src/middleware/__tests__/public-content-access.test.ts +91 -0
- package/src/middleware/config.ts +2 -2
- package/src/middleware/public-content-access.ts +87 -0
- package/src/node/__tests__/cli-export.test.ts +14 -0
- package/src/node/__tests__/cli-migrate.test.ts +6 -0
- package/src/node/__tests__/cli-site-snapshot.test.ts +205 -2
- package/src/node/__tests__/cli-snapshot-meta.test.ts +100 -0
- package/src/node/index.ts +2 -1
- package/src/preset.css +16 -2
- package/src/routes/__tests__/compose.test.ts +51 -0
- package/src/routes/__tests__/site-skill.test.ts +112 -0
- package/src/routes/api/__tests__/collections.test.ts +91 -19
- package/src/routes/api/__tests__/mcp.test.ts +65 -1
- package/src/routes/api/__tests__/nav-items.test.ts +91 -0
- package/src/routes/api/__tests__/public-access.test.ts +81 -0
- package/src/routes/api/__tests__/settings.test.ts +217 -0
- package/src/routes/api/collections.ts +22 -26
- package/src/routes/api/export.ts +2 -0
- package/src/routes/api/internal/__tests__/post-body-html.test.ts +163 -0
- package/src/routes/api/internal/__tests__/sites.test.ts +35 -2
- package/src/routes/api/internal/post-body-html.ts +43 -0
- package/src/routes/api/internal/sites.ts +24 -0
- package/src/routes/api/nav-items.ts +24 -1
- package/src/routes/api/posts.ts +2 -2
- package/src/routes/api/public/__tests__/archive.test.ts +35 -0
- package/src/routes/api/public/__tests__/posts.test.ts +208 -0
- package/src/routes/api/public/archive.ts +4 -0
- package/src/routes/api/public/posts.ts +41 -24
- package/src/routes/api/search.ts +3 -0
- package/src/routes/api/settings.ts +33 -0
- package/src/routes/auth/__tests__/setup.test.ts +7 -4
- package/src/routes/compose.tsx +2 -1
- package/src/routes/dash/settings.tsx +45 -2
- package/src/routes/feed/__tests__/feed.test.ts +210 -6
- package/src/routes/feed/feed.ts +23 -14
- package/src/routes/pages/__tests__/archive-params.test.ts +92 -3
- package/src/routes/pages/__tests__/collection-routing.test.ts +63 -5
- package/src/routes/pages/__tests__/collections.test.ts +9 -9
- package/src/routes/pages/__tests__/preview.test.ts +174 -0
- package/src/routes/pages/__tests__/search.test.ts +69 -0
- package/src/routes/pages/archive.tsx +27 -7
- package/src/routes/pages/collection.tsx +32 -19
- package/src/routes/pages/collections.tsx +6 -1
- package/src/routes/pages/page.tsx +83 -11
- package/src/routes/site-skill.ts +18 -0
- package/src/services/__tests__/auth.test.ts +7 -5
- package/src/services/__tests__/collection.test.ts +159 -44
- package/src/services/__tests__/navigation.test.ts +229 -21
- package/src/services/__tests__/post-timeline.test.ts +109 -30
- package/src/services/__tests__/post.test.ts +567 -5
- package/src/services/__tests__/search.test.ts +48 -1
- package/src/services/__tests__/settings.test.ts +8 -0
- package/src/services/__tests__/site-admin.test.ts +121 -1
- package/src/services/auth.ts +2 -2
- package/src/services/bootstrap.ts +3 -2
- package/src/services/collection.ts +226 -167
- package/src/services/export-theme/assets/client-site.css +1 -1
- package/src/services/export-theme/assets/client-site.js +46 -25
- package/src/services/export-theme/layouts/_default/list.html +18 -4
- package/src/services/export-theme/layouts/_default/rss.xml +8 -12
- package/src/services/export-theme/layouts/featured/list.html +5 -4
- package/src/services/export-theme/layouts/partials/featured-thread.html +56 -0
- package/src/services/export-theme/layouts/partials/footer.html +1 -1
- package/src/services/export-theme/layouts/partials/media-gallery.html +1 -0
- package/src/services/export-theme/styles/main.css +30 -2
- package/src/services/export.ts +91 -80
- package/src/services/mcp.ts +37 -27
- package/src/services/media.ts +1 -1
- package/src/services/navigation.ts +185 -46
- package/src/services/post.ts +874 -271
- package/src/services/search.ts +8 -2
- package/src/services/settings.ts +2 -10
- package/src/services/site-admin.ts +63 -43
- package/src/style-cjk-jp.css +1 -1
- package/src/style-cjk-kr.css +1 -1
- package/src/style-cjk-tc.css +1 -1
- package/src/style-cjk.css +1 -1
- package/src/styles/components.css +540 -0
- package/src/styles/site-media.css +111 -19
- package/src/styles/tokens.css +14 -9
- package/src/styles/ui.css +829 -29
- package/src/types/bindings.ts +3 -0
- package/src/types/config.ts +243 -12
- package/src/types/constants.ts +22 -1
- package/src/types/entities.ts +9 -8
- package/src/types/operations.ts +18 -10
- package/src/types/props.ts +8 -2
- package/src/types/raw-assets.d.ts +5 -0
- package/src/types/views.ts +16 -4
- package/src/ui/__tests__/font-themes.test.ts +42 -30
- package/src/ui/compose/ComposeDialog.tsx +92 -2
- package/src/ui/dash/appearance/NavigationContent.tsx +332 -4
- package/src/ui/dash/appearance/__tests__/NavigationContent.test.tsx +23 -0
- package/src/ui/dash/settings/ConfigEditorContent.tsx +578 -0
- package/src/ui/dash/settings/GeneralContent.tsx +15 -5
- package/src/ui/dash/settings/SettingsRootContent.tsx +21 -1
- package/src/ui/dash/settings/__tests__/ConfigEditorContent.test.tsx +98 -0
- package/src/ui/dash/settings/__tests__/SettingsRootContent.test.tsx +15 -0
- package/src/ui/feed/CuratedThreadPreview.tsx +16 -4
- package/src/ui/feed/LinkCard.tsx +2 -12
- package/src/ui/feed/NoteCard.tsx +10 -20
- package/src/ui/feed/QuoteCard.tsx +2 -12
- package/src/ui/feed/ThreadPreview.tsx +26 -34
- package/src/ui/feed/TimelineFeed.tsx +2 -2
- package/src/ui/feed/__tests__/thread-preview.test.ts +197 -56
- package/src/ui/feed/__tests__/timeline-cards.test.ts +178 -3
- package/src/ui/feed/thread-preview-state.ts +5 -7
- package/src/ui/font-themes.ts +74 -26
- package/src/ui/layouts/BaseLayout.tsx +22 -8
- package/src/ui/layouts/__tests__/BaseLayout.test.tsx +64 -1
- package/src/ui/pages/CollectionPage.tsx +101 -22
- package/src/ui/pages/CollectionsPage.tsx +3 -1
- package/src/ui/pages/PostPage.tsx +39 -12
- package/src/ui/pages/SearchPage.tsx +6 -14
- package/src/ui/pages/__tests__/ArchivePage.test.tsx +7 -0
- package/src/ui/pages/__tests__/PostPage.test.tsx +88 -0
- package/src/ui/shared/CollectionDirectory.tsx +13 -9
- package/src/ui/shared/CollectionsManager.tsx +17 -7
- package/src/ui/shared/DraftPreviewBar.tsx +33 -0
- package/src/ui/shared/HomePageBranding.tsx +2 -2
- package/src/ui/shared/MediaGallery.tsx +1 -0
- package/src/ui/shared/PostFooter.tsx +3 -1
- package/src/ui/shared/__tests__/home-page-branding.test.tsx +1 -1
- package/src/ui/shared/__tests__/media-gallery.test.ts +1 -0
- package/src/ui/shared/__tests__/navigation-labels.test.ts +2 -2
- package/src/ui/shared/__tests__/post-footer.test.ts +15 -0
- package/src/ui/shared/collection-management-labels.ts +33 -2
- package/src/ui/shared/navigation-labels.ts +2 -4
- package/src/ui/shared/post-article-attributes.ts +46 -0
- package/dist/app-DZDlmh7C.js +0 -6
- package/dist/client/_assets/client-Cevfpm8H.css +0 -2
- package/dist/client/_assets/client-auth-v3yvhbgZ.js +0 -4736
- package/src/client/tiptap/wrapping-input-rules.ts +0 -102
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
// @vitest-environment happy-dom
|
|
2
|
+
|
|
3
|
+
import { Editor } from "@tiptap/core";
|
|
4
|
+
import { TextSelection } from "@tiptap/pm/state";
|
|
5
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
6
|
+
import { createMarkdownContentExtensions } from "../../../lib/markdown-manager.js";
|
|
7
|
+
import { StructuralKeymap } from "../structural-keymap.js";
|
|
8
|
+
|
|
9
|
+
const editors: Editor[] = [];
|
|
10
|
+
|
|
11
|
+
function createEditor(content: string): Editor {
|
|
12
|
+
const element = document.createElement("div");
|
|
13
|
+
document.body.appendChild(element);
|
|
14
|
+
|
|
15
|
+
const editor = new Editor({
|
|
16
|
+
element,
|
|
17
|
+
extensions: [...createMarkdownContentExtensions(), StructuralKeymap],
|
|
18
|
+
content,
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
editor.view.dispatch(editor.state.tr);
|
|
22
|
+
editors.push(editor);
|
|
23
|
+
return editor;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function paragraphPosition(
|
|
27
|
+
editor: Editor,
|
|
28
|
+
text: string,
|
|
29
|
+
edge: "start" | "end",
|
|
30
|
+
): number {
|
|
31
|
+
let position: number | null = null;
|
|
32
|
+
|
|
33
|
+
editor.state.doc.descendants((node, pos) => {
|
|
34
|
+
if (node.type.name !== "paragraph" || node.textContent !== text) return;
|
|
35
|
+
|
|
36
|
+
position = pos + 1 + (edge === "end" ? node.content.size : 0);
|
|
37
|
+
return false;
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
if (position === null) throw new Error(`Paragraph not found: ${text}`);
|
|
41
|
+
return position;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function setCursor(editor: Editor, pos: number): void {
|
|
45
|
+
editor.view.dispatch(
|
|
46
|
+
editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos)),
|
|
47
|
+
);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
function pressKey(
|
|
51
|
+
editor: Editor,
|
|
52
|
+
key: string,
|
|
53
|
+
options: globalThis.KeyboardEventInit = {},
|
|
54
|
+
): boolean {
|
|
55
|
+
return Boolean(
|
|
56
|
+
editor.view.someProp("handleKeyDown", (handler) =>
|
|
57
|
+
handler(
|
|
58
|
+
editor.view,
|
|
59
|
+
new KeyboardEvent("keydown", { key, code: key, ...options }),
|
|
60
|
+
),
|
|
61
|
+
),
|
|
62
|
+
);
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
function typeText(editor: Editor, text: string): void {
|
|
66
|
+
for (const character of text) {
|
|
67
|
+
const { from, to } = editor.state.selection;
|
|
68
|
+
const handled = editor.view.someProp("handleTextInput", (handler) =>
|
|
69
|
+
handler(editor.view, from, to, character, () =>
|
|
70
|
+
editor.state.tr.insertText(character, from, to),
|
|
71
|
+
),
|
|
72
|
+
);
|
|
73
|
+
|
|
74
|
+
if (!handled) {
|
|
75
|
+
editor.view.dispatch(editor.state.tr.insertText(character, from, to));
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
function meaningfulTopLevelNodes(editor: Editor) {
|
|
81
|
+
return editor.state.doc.content.content.filter(
|
|
82
|
+
(node) => node.type.name !== "paragraph" || node.content.size > 0,
|
|
83
|
+
);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
afterEach(() => {
|
|
87
|
+
while (editors.length > 0) editors.pop()?.destroy();
|
|
88
|
+
document.body.innerHTML = "";
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
describe("blockquote boundary editing", () => {
|
|
92
|
+
it.each([
|
|
93
|
+
{
|
|
94
|
+
name: "paragraphs in one quote",
|
|
95
|
+
html: "<blockquote><p>A</p><p>B</p></blockquote>",
|
|
96
|
+
expectedType: "blockquote",
|
|
97
|
+
},
|
|
98
|
+
{
|
|
99
|
+
name: "quote followed by paragraph",
|
|
100
|
+
html: "<blockquote><p>A</p></blockquote><p>B</p>",
|
|
101
|
+
expectedType: "blockquote",
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
name: "paragraph followed by quote",
|
|
105
|
+
html: "<p>A</p><blockquote><p>B</p></blockquote>",
|
|
106
|
+
expectedType: "paragraph",
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
name: "adjacent quotes",
|
|
110
|
+
html: "<blockquote><p>A</p></blockquote><blockquote><p>B</p></blockquote>",
|
|
111
|
+
expectedType: "blockquote",
|
|
112
|
+
},
|
|
113
|
+
])(
|
|
114
|
+
"merges $name symmetrically with Backspace and Delete",
|
|
115
|
+
({ html, expectedType }) => {
|
|
116
|
+
const backwardEditor = createEditor(html);
|
|
117
|
+
const forwardEditor = createEditor(html);
|
|
118
|
+
setCursor(
|
|
119
|
+
backwardEditor,
|
|
120
|
+
paragraphPosition(backwardEditor, "B", "start"),
|
|
121
|
+
);
|
|
122
|
+
setCursor(forwardEditor, paragraphPosition(forwardEditor, "A", "end"));
|
|
123
|
+
|
|
124
|
+
expect(pressKey(backwardEditor, "Backspace")).toBe(true);
|
|
125
|
+
expect(pressKey(forwardEditor, "Delete")).toBe(true);
|
|
126
|
+
|
|
127
|
+
const backwardNodes = meaningfulTopLevelNodes(backwardEditor);
|
|
128
|
+
const forwardNodes = meaningfulTopLevelNodes(forwardEditor);
|
|
129
|
+
expect(backwardNodes.map((node) => node.toJSON())).toEqual(
|
|
130
|
+
forwardNodes.map((node) => node.toJSON()),
|
|
131
|
+
);
|
|
132
|
+
expect(backwardNodes).toHaveLength(1);
|
|
133
|
+
expect(backwardNodes[0]?.type.name).toBe(expectedType);
|
|
134
|
+
expect(backwardNodes[0]?.textContent).toBe("AB");
|
|
135
|
+
if (expectedType === "blockquote") {
|
|
136
|
+
expect(backwardNodes[0]?.childCount).toBe(1);
|
|
137
|
+
}
|
|
138
|
+
expect(backwardEditor.state.selection.$from.parentOffset).toBe(1);
|
|
139
|
+
},
|
|
140
|
+
);
|
|
141
|
+
|
|
142
|
+
it.each([
|
|
143
|
+
["Backspace", {}],
|
|
144
|
+
["Shift-Backspace", { shiftKey: true }],
|
|
145
|
+
["Mod-Backspace", { ctrlKey: true }],
|
|
146
|
+
])("uses the same quote merge for %s", (_name, eventOptions) => {
|
|
147
|
+
const editor = createEditor("<blockquote><p>A</p><p>B</p></blockquote>");
|
|
148
|
+
setCursor(editor, paragraphPosition(editor, "B", "start"));
|
|
149
|
+
|
|
150
|
+
expect(pressKey(editor, "Backspace", eventOptions)).toBe(true);
|
|
151
|
+
expect(meaningfulTopLevelNodes(editor)[0]?.toJSON()).toMatchObject({
|
|
152
|
+
type: "blockquote",
|
|
153
|
+
content: [
|
|
154
|
+
{
|
|
155
|
+
type: "paragraph",
|
|
156
|
+
content: [{ type: "text", text: "AB" }],
|
|
157
|
+
},
|
|
158
|
+
],
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
it("restores the original quote structure with undo", () => {
|
|
163
|
+
const editor = createEditor("<blockquote><p>A</p></blockquote><p>B</p>");
|
|
164
|
+
setCursor(editor, paragraphPosition(editor, "B", "start"));
|
|
165
|
+
const before = editor.getJSON();
|
|
166
|
+
|
|
167
|
+
expect(pressKey(editor, "Backspace")).toBe(true);
|
|
168
|
+
expect(editor.commands.undo()).toBe(true);
|
|
169
|
+
expect(editor.getJSON()).toEqual(before);
|
|
170
|
+
});
|
|
171
|
+
|
|
172
|
+
it("removes an empty trailing quote paragraph in one Backspace", () => {
|
|
173
|
+
const editor = createEditor("<blockquote><p>A</p><p></p></blockquote>");
|
|
174
|
+
const quote = editor.state.doc.firstChild!;
|
|
175
|
+
const emptyParagraphPosition = 1 + quote.child(0).nodeSize + 1;
|
|
176
|
+
setCursor(editor, emptyParagraphPosition);
|
|
177
|
+
|
|
178
|
+
expect(pressKey(editor, "Backspace")).toBe(true);
|
|
179
|
+
expect(editor.state.doc.firstChild?.toJSON()).toEqual({
|
|
180
|
+
type: "blockquote",
|
|
181
|
+
content: [
|
|
182
|
+
{
|
|
183
|
+
type: "paragraph",
|
|
184
|
+
content: [{ type: "text", text: "A" }],
|
|
185
|
+
},
|
|
186
|
+
],
|
|
187
|
+
});
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
it("keeps the official input rule that joins a new adjacent quote", () => {
|
|
191
|
+
const editor = createEditor("<blockquote><p>A</p></blockquote><p></p>");
|
|
192
|
+
setCursor(editor, editor.state.doc.content.size - 1);
|
|
193
|
+
|
|
194
|
+
typeText(editor, "> ");
|
|
195
|
+
|
|
196
|
+
const quote = editor.state.doc.firstChild;
|
|
197
|
+
expect(quote?.type.name).toBe("blockquote");
|
|
198
|
+
expect(quote?.childCount).toBe(2);
|
|
199
|
+
expect(editor.state.doc.child(1).type.name).toBe("paragraph");
|
|
200
|
+
});
|
|
201
|
+
});
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
// @vitest-environment happy-dom
|
|
2
|
+
|
|
3
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
4
|
+
import { Editor } from "@tiptap/core";
|
|
5
|
+
import { TextSelection } from "@tiptap/pm/state";
|
|
6
|
+
import { createMarkdownContentExtensions } from "../../../lib/markdown-manager.js";
|
|
7
|
+
import { clearFormatting } from "../bubble-menu.js";
|
|
8
|
+
|
|
9
|
+
const editors: Editor[] = [];
|
|
10
|
+
|
|
11
|
+
function createEditor(content: string): Editor {
|
|
12
|
+
const element = document.createElement("div");
|
|
13
|
+
document.body.appendChild(element);
|
|
14
|
+
|
|
15
|
+
const editor = new Editor({
|
|
16
|
+
element,
|
|
17
|
+
extensions: createMarkdownContentExtensions(),
|
|
18
|
+
content,
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
editor.view.dispatch(editor.state.tr);
|
|
22
|
+
editors.push(editor);
|
|
23
|
+
return editor;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function selectText(editor: Editor, fromText: string, toText = fromText): void {
|
|
27
|
+
let from: number | null = null;
|
|
28
|
+
let to: number | null = null;
|
|
29
|
+
|
|
30
|
+
editor.state.doc.descendants((node, pos) => {
|
|
31
|
+
if (!node.isText) return;
|
|
32
|
+
if (from === null && node.text?.includes(fromText)) {
|
|
33
|
+
from = pos;
|
|
34
|
+
}
|
|
35
|
+
if (node.text?.includes(toText)) {
|
|
36
|
+
to = pos + node.nodeSize;
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
if (from === null || to === null) {
|
|
41
|
+
throw new Error(`Text selection not found: ${fromText} → ${toText}`);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
editor.view.dispatch(
|
|
45
|
+
editor.state.tr.setSelection(
|
|
46
|
+
TextSelection.create(editor.state.doc, from, to),
|
|
47
|
+
),
|
|
48
|
+
);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
function getMarkNames(editor: Editor): string[] {
|
|
52
|
+
const markNames: string[] = [];
|
|
53
|
+
editor.state.doc.descendants((node) => {
|
|
54
|
+
if (node.isText) {
|
|
55
|
+
markNames.push(...node.marks.map((mark) => mark.type.name));
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
return markNames;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
afterEach(() => {
|
|
62
|
+
while (editors.length > 0) editors.pop()?.destroy();
|
|
63
|
+
document.body.innerHTML = "";
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
describe("clear formatting", () => {
|
|
67
|
+
it("converts selected headings to paragraphs and preserves semantic links", () => {
|
|
68
|
+
const editor = createEditor(
|
|
69
|
+
'<h2><a href="https://example.com"><strong>Heading</strong></a></h2>',
|
|
70
|
+
);
|
|
71
|
+
selectText(editor, "Heading");
|
|
72
|
+
|
|
73
|
+
clearFormatting(editor);
|
|
74
|
+
|
|
75
|
+
const paragraph = editor.state.doc.firstChild;
|
|
76
|
+
const linkedText = paragraph?.firstChild;
|
|
77
|
+
expect(paragraph?.type.name).toBe("paragraph");
|
|
78
|
+
expect(linkedText?.marks.map((mark) => mark.type.name)).toEqual(["link"]);
|
|
79
|
+
expect(linkedText?.marks[0]?.attrs.href).toBe("https://example.com");
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
it("unwraps a blockquote without flattening its nested ordered list", () => {
|
|
83
|
+
const editor = createEditor(
|
|
84
|
+
'<blockquote><ol start="5"><li><p><a href="https://example.com"><strong>Five</strong></a></p><ol><li><p>Nested</p></li></ol></li><li><p><em>Six</em></p></li></ol></blockquote>',
|
|
85
|
+
);
|
|
86
|
+
selectText(editor, "Five", "Six");
|
|
87
|
+
|
|
88
|
+
clearFormatting(editor);
|
|
89
|
+
|
|
90
|
+
const outerList = editor.state.doc.firstChild;
|
|
91
|
+
expect(outerList?.type.name).toBe("orderedList");
|
|
92
|
+
expect(outerList?.attrs.start).toBe(5);
|
|
93
|
+
expect(outerList?.childCount).toBe(2);
|
|
94
|
+
expect(outerList?.child(0).lastChild?.type.name).toBe("orderedList");
|
|
95
|
+
expect(outerList?.child(0).lastChild?.firstChild?.textContent).toBe(
|
|
96
|
+
"Nested",
|
|
97
|
+
);
|
|
98
|
+
const linkedText = outerList?.child(0).firstChild?.firstChild;
|
|
99
|
+
expect(linkedText?.marks.map((mark) => mark.type.name)).toEqual(["link"]);
|
|
100
|
+
expect(linkedText?.marks[0]?.attrs.href).toBe("https://example.com");
|
|
101
|
+
expect(editor.isActive("bold")).toBe(false);
|
|
102
|
+
expect(editor.isActive("italic")).toBe(false);
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
it("clears headings and blockquotes across a mixed block selection", () => {
|
|
106
|
+
const editor = createEditor(
|
|
107
|
+
"<h2><strong>Heading</strong></h2><blockquote><p><em>Quote</em></p></blockquote><p><strong>Body</strong></p>",
|
|
108
|
+
);
|
|
109
|
+
selectText(editor, "Heading", "Body");
|
|
110
|
+
|
|
111
|
+
clearFormatting(editor);
|
|
112
|
+
|
|
113
|
+
expect(
|
|
114
|
+
editor.state.doc.content.content.map((node) => node.type.name),
|
|
115
|
+
).toEqual(["paragraph", "paragraph", "paragraph"]);
|
|
116
|
+
expect(getMarkNames(editor)).toEqual([]);
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
it("only unwraps the selected part of a multi-paragraph blockquote", () => {
|
|
120
|
+
const editor = createEditor(
|
|
121
|
+
"<blockquote><p>First</p><p><strong>Second</strong></p><p>Third</p></blockquote>",
|
|
122
|
+
);
|
|
123
|
+
selectText(editor, "Second");
|
|
124
|
+
|
|
125
|
+
clearFormatting(editor);
|
|
126
|
+
|
|
127
|
+
expect(editor.getJSON().content).toEqual([
|
|
128
|
+
{
|
|
129
|
+
type: "blockquote",
|
|
130
|
+
content: [
|
|
131
|
+
{
|
|
132
|
+
type: "paragraph",
|
|
133
|
+
content: [{ type: "text", text: "First" }],
|
|
134
|
+
},
|
|
135
|
+
],
|
|
136
|
+
},
|
|
137
|
+
{ type: "paragraph", content: [{ type: "text", text: "Second" }] },
|
|
138
|
+
{
|
|
139
|
+
type: "blockquote",
|
|
140
|
+
content: [
|
|
141
|
+
{
|
|
142
|
+
type: "paragraph",
|
|
143
|
+
content: [{ type: "text", text: "Third" }],
|
|
144
|
+
},
|
|
145
|
+
],
|
|
146
|
+
},
|
|
147
|
+
{ type: "paragraph" },
|
|
148
|
+
]);
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
it("preserves code blocks and restores the whole clear with one undo", () => {
|
|
152
|
+
const editor = createEditor(
|
|
153
|
+
"<h3><strong>Heading</strong></h3><blockquote><p><em>Quote</em></p></blockquote><pre><code>const x = 1;\nnext();</code></pre>",
|
|
154
|
+
);
|
|
155
|
+
selectText(editor, "Heading", "next();");
|
|
156
|
+
const before = editor.getJSON();
|
|
157
|
+
|
|
158
|
+
clearFormatting(editor);
|
|
159
|
+
|
|
160
|
+
expect(editor.state.doc.child(0).type.name).toBe("paragraph");
|
|
161
|
+
expect(editor.state.doc.child(1).type.name).toBe("paragraph");
|
|
162
|
+
expect(editor.state.doc.child(2).type.name).toBe("codeBlock");
|
|
163
|
+
expect(editor.state.doc.child(2).textContent).toBe("const x = 1;\nnext();");
|
|
164
|
+
|
|
165
|
+
expect(editor.commands.undo()).toBe(true);
|
|
166
|
+
expect(editor.getJSON()).toEqual(before);
|
|
167
|
+
});
|
|
168
|
+
});
|