@jant/core 0.6.14 → 0.6.16

package/src/client/components/__tests__/jant-post-menu.test.ts

@@ -327,7 +327,7 @@ describe("JantPostMenu", () => {
         }
 
         if (
-          url === "/api/collections/collection-1/posts/post-1" &&
+          url === "/api/collections/collection-1/threads/post-1" &&
           method === "DELETE"
         ) {
           selectedIds.splice(0, 1);
@@ -397,7 +397,7 @@ describe("JantPostMenu", () => {
     keydown(requireElement(options[0] ?? null, "expected first option"), " ");
     await Promise.resolve();
     await menu.updateComplete;
-    expect(menu._postCollectionIds).toEqual([]);
+    expect(menu._threadCollectionIds).toEqual([]);
 
     options = Array.from(
       menu.querySelectorAll<HTMLButtonElement>(".post-menu-picker-option"),
@@ -412,6 +412,48 @@ describe("JantPostMenu", () => {
     expect(document.activeElement).toBe(searchInput);
   });
 
+  it("derives Child action scope from Thread identity", async () => {
+    const { menu, trigger } = await createMenu();
+    const article = requireElement(
+      trigger.closest<HTMLElement>("article[data-post]"),
+      "expected post article",
+    );
+    article.dataset.postId = "reply-1";
+    article.dataset.threadRootId = "post-1";
+    document.body.insertAdjacentHTML(
+      "afterbegin",
+      '<div data-collection-id="collection-1"></div>',
+    );
+
+    click(trigger);
+    await menu.updateComplete;
+
+    expect(menu.textContent).toContain("Edit");
+    expect(menu.textContent).toContain("Add to Featured");
+    expect(menu.textContent).toContain("Delete");
+    expect(menu.querySelector("[data-post-menu-open-collections]")).toBeNull();
+    expect(menu.querySelector("[data-post-menu-open-visibility]")).toBeNull();
+    expect(menu.textContent).not.toContain("Pin this post");
+    expect(menu.textContent).not.toContain("Pin in collection");
+  });
+
+  it("blocks the collection shortcut for a Child without a reply marker", async () => {
+    const fetchMock = vi.mocked(globalThis.fetch);
+    const { menu, trigger } = await createMenu();
+    const article = requireElement(
+      trigger.closest<HTMLElement>("article[data-post]"),
+      "expected post article",
+    );
+    article.dataset.postId = "reply-1";
+    article.dataset.threadRootId = "post-1";
+
+    menu.openCollectionsForPost(article);
+    await menu.updateComplete;
+
+    expect(menu.textContent?.trim()).toBe("");
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+
   it("closes the collection picker with Enter without toggling the focused option", async () => {
     const selectedIds = ["collection-1"];
     const fetchMock = vi.fn(
@@ -466,7 +508,7 @@ describe("JantPostMenu", () => {
     keydown(firstOption, "Enter");
     await menu.updateComplete;
 
-    expect(menu._postCollectionIds).toEqual(["collection-1"]);
+    expect(menu._threadCollectionIds).toEqual(["collection-1"]);
     expect(menu.textContent?.trim()).toBe("");
     expect(trigger.getAttribute("aria-expanded")).toBe("false");
   });
@@ -564,7 +606,7 @@ describe("JantPostMenu", () => {
         }
 
         if (
-          url === "/api/collections/collection-3/posts" &&
+          url === "/api/collections/collection-3/threads" &&
           method === "POST"
         ) {
           selectedIds.push("collection-3");
@@ -572,7 +614,7 @@ describe("JantPostMenu", () => {
         }
 
         if (
-          url === "/api/collections/collection-2/posts/post-1" &&
+          url === "/api/collections/collection-2/threads/post-1" &&
           method === "DELETE"
         ) {
           const index = selectedIds.indexOf("collection-2");

package/src/client/components/__tests__/jant-settings-avatar.test.ts

@@ -51,9 +51,9 @@ const labels: SettingsLabels = {
   contentLanguagePreview: "Readers and search engines see",
   dashboardLanguage: "Dashboard language",
   dashboardLanguageHelp: "The language this admin dashboard shows in.",
-  cjkFont: "CJK Font",
+  cjkFont: "CJK fallback",
   cjkFontHelp:
-    "Load a serif font optimized for Chinese, Japanese, or Korean content.",
+    "Used when the content language has no built-in font profile. Your font theme still controls serif and sans styling.",
   timeZone: "Time Zone",
   feeds: "Feeds",
   mainRssFeed: "Main RSS feed",

package/src/client/components/__tests__/jant-settings-general.test.ts

@@ -96,9 +96,9 @@ const labels: SettingsLabels = {
   contentLanguagePreview: "Readers and search engines see",
   dashboardLanguage: "Dashboard language",
   dashboardLanguageHelp: "The language this admin dashboard shows in.",
-  cjkFont: "CJK Font",
+  cjkFont: "CJK fallback",
   cjkFontHelp:
-    "Load a serif font optimized for Chinese, Japanese, or Korean content.",
+    "Used when the content language has no built-in font profile. Your font theme still controls serif and sans styling.",
   timeZone: "Time Zone",
   feeds: "Feeds",
   mainRssFeed: "Main RSS feed",
@@ -137,7 +137,7 @@ const timezones: SettingsTimezone[] = [
 ];
 
 const cjkFonts: SettingsCjkFont[] = [
-  { value: "off", label: "None" },
+  { value: "off", label: "Follow content language" },
   { value: "zh-Hans", label: "简体中文 (Simplified Chinese)" },
 ];
 

package/src/client/components/collection-manager-types.ts

@@ -17,6 +17,12 @@ export interface CollectionManagerLabels {
   dividerLabelPlaceholder: string;
   newCollection: string;
   edit: string;
+  addToNavigation: string;
+  addingToNavigation: string;
+  addedToNavigation: string;
+  editNavigation: string;
+  addToNavigationFailed: string;
+  notNow: string;
   label: string;
   url: string;
   linkLabelPlaceholder: string;
@@ -31,8 +37,8 @@ export interface CollectionManagerLabels {
   deleteLink: string;
   confirmDeleteLink: string;
   cancel: string;
-  entrySingular: string;
-  entryPlural: string;
+  threadSingular: string;
+  threadPlural: string;
   emptyState: string;
   orderSaved: string;
   saved: string;
@@ -50,7 +56,7 @@ export interface ManagedCollection {
   title: string;
   description: string | null;
   sortOrder: string;
-  postCount: number;
+  threadCount: number;
   recentActivityAt: number;
 }
 

package/src/client/components/compose-format-convert.ts

@@ -249,7 +249,11 @@ export function convertComposeFormat(
   if (prepend.length) content.unshift(...prepend);
 
   out.bodyJson = content.length ? { type: "doc", content } : null;
-  out.showTitle = to === "note" && out.title.trim().length > 0;
+  // A title carried in from another format has nowhere to show unless the note's
+  // title field is open, so opening it is the only way not to drop it. The
+  // toggle is otherwise left alone, so note → link → note keeps the user's
+  // choice instead of resetting it.
+  if (to === "note" && out.title.trim().length > 0) out.showTitle = true;
 
   return out;
 }

package/src/client/components/compose-types.ts

@@ -7,9 +7,22 @@
 
 import type { JSONContent } from "@tiptap/core";
 import type { CollectionFormLabels } from "./collection-types.js";
+import type { TableControlLabels } from "../tiptap/table-control-labels.js";
 
 export type ComposeFormat = "note" | "link" | "quote";
 
+/**
+ * What one composer row says about itself. An editor owns its fields, so it
+ * owns these two answers too — the dialog reduces them over the rows it has
+ * instead of reading editors back out of the DOM while it renders.
+ */
+export interface ComposeRowStatus {
+  /** Anything worth keeping: the check behind "discard this?" and autosave. */
+  hasContent: boolean;
+  /** Enough to publish this row: its format's requirements met, fields valid. */
+  publishable: boolean;
+}
+
 export interface ComposeAttachment {
   clientId: string;
   file: File;
@@ -24,6 +37,12 @@ export interface ComposeAttachment {
   status: "pending" | "processing" | "uploading" | "done" | "error";
   progress: number | null;
   mediaId: string | null;
+  /**
+   * Server URL of the uploaded file, set when the upload completes. Unlike
+   * `previewUrl` (a blob URL revoked on editor reset) it stays valid, so
+   * draft restore can rehydrate the attachment after the dialog closed.
+   */
+  remoteUrl: string | null;
   alt: string;
   error: string | null;
   /** Text content preview for text files (first ~100 chars) */
@@ -46,6 +65,7 @@ export interface AttachedTextItem {
 
 export interface DraftItem {
   id: string;
+  slug: string;
   format: ComposeFormat;
   title: string | null;
   bodyText: string | null;
@@ -62,6 +82,23 @@ export interface DraftItem {
   }[];
 }
 
+/**
+ * Snapshot of a media attachment whose upload completed. Stored in the local
+ * draft (and passed by the bridge on failure restore) so uploaded images
+ * survive a failed publish or a page reload — the bytes are already on the
+ * server, only the reference needs restoring.
+ */
+export interface LocalDraftMedia {
+  clientId: string;
+  mediaId: string;
+  url: string;
+  mimeType: string;
+  name?: string;
+  alt?: string;
+  summary?: string | null;
+  chars?: number | null;
+}
+
 export interface LocalDraft {
   format: ComposeFormat;
   title: string;
@@ -85,9 +122,15 @@ export interface LocalDraft {
     summary: string;
   }>;
   attachmentOrder?: string[];
+  mediaAttachments?: LocalDraftMedia[];
   /** Present when the draft is a multi-post thread */
   threadItems?: Array<{
     format: ComposeFormat;
+    /** Per-post publish date; empty means "follows the thread". */
+    publishedAtInput?: string;
+    publishedAtTimeMinutes?: number | null;
+    /** Per-post permalink; empty means the server assigns a random id. */
+    slug?: string;
     title: string;
     bodyJson: JSONContent | null;
     url: string;
@@ -100,6 +143,7 @@ export interface LocalDraft {
       summary: string;
     }>;
     attachmentOrder?: string[];
+    mediaAttachments?: LocalDraftMedia[];
   }>;
   savedAt: number;
 }
@@ -180,6 +224,8 @@ export interface ComposeLabels {
   discardChangesConfirm: string;
   drafts: string;
   draftsEmpty: string;
+  previewDraft: string;
+  draftActions: string;
   deleteDraft: string;
   draftDeleted: string;
   publishFailedDraft: string;
@@ -225,10 +271,11 @@ export interface ComposeLabels {
   threadLimitReached: string;
   showMore: string;
   showLess: string;
-  newThread: string;
-  replyTitle: string;
-  editTitle: string;
+  closeCompose: string;
+  editing: string;
+  composeDialogLabel: string;
   slashHint: string;
+  tableControls: TableControlLabels;
   collectionFormLabels: CollectionFormLabels;
 }
 
@@ -250,6 +297,7 @@ export interface ComposeFullscreenOpenDetail {
   selection?: ComposeEditorSelection | null;
   labels?: ComposeLabels;
   replyContext?: ComposeFullscreenReplyContext | null;
+  editorIndex?: number;
 }
 
 export interface ComposeFullscreenCloseDetail {
@@ -258,6 +306,8 @@ export interface ComposeFullscreenCloseDetail {
   showTitle: boolean;
   selection?: ComposeEditorSelection | null;
   replyExpanded: boolean;
+  intent?: "publish";
+  editorIndex?: number;
 }
 
 export type ComposeVisibility = "public" | "latest_hidden" | "private";
@@ -293,6 +343,8 @@ export interface ComposeSubmitDetail {
   collectionIds: string[];
   attachments: ComposeSubmitAttachment[];
   editPostId?: string;
+  /** Identifies an existing server draft loaded through the drafts workflow. */
+  draftSourceId?: string;
   replyToId?: string;
   quietReply?: boolean;
   replyThreadRootId?: string;

package/src/client/components/jant-collection-directory.ts

@@ -27,13 +27,16 @@ import {
 } from "../sortable-list.js";
 import { showConfirmDialog } from "../confirm.js";
 import { publicPath } from "../runtime-paths.js";
-import { showToast } from "../toast.js";
+import { showToast, showToastWithAction } from "../toast.js";
+import { addCollectionToNavigation } from "../collection-navigation.js";
+import { consumeCollectionCreatedNotice } from "../collection-created-notice.js";
 import { getDividerCollectionGroup } from "../../lib/collection-groups.js";
 import {
   getCollectionEditPath,
   getCollectionSelectionPath,
   getCollectionsDirectoryPath,
 } from "../../lib/collection-paths.js";
+import { NAVIGATION_SETTINGS_PATH } from "../../lib/settings-paths.js";
 import { render as renderMarkdown } from "../../lib/markdown.js";
 import { formatRelativeAge, toISOString } from "../../lib/time.js";
 import {
@@ -53,7 +56,7 @@ interface CollectionsResponse {
     title: string;
     description: string | null;
     sortOrder: string;
-    postCount: number;
+    threadCount: number;
     recentActivityAt: number;
   }>;
   directoryItems?: Array<{
@@ -77,6 +80,10 @@ export class JantCollectionsManager extends LitElement {
   static properties = {
     items: { type: Array },
     labels: { type: Object },
+    navigationCollectionIds: {
+      type: Array,
+      attribute: "navigation-collection-ids",
+    },
 
     _items: { state: true },
     _reorderMode: { state: true },
@@ -91,12 +98,14 @@ export class JantCollectionsManager extends LitElement {
     _newLinkUrl: { state: true },
     _newLinkDescription: { state: true },
     _addingLink: { state: true },
-    _hoveringId: { state: true },
     _showItemMenuId: { state: true },
+    _addingToNavigationId: { state: true },
+    _createdCollectionId: { state: true },
   };
 
   declare items: CollectionManagerItem[];
   declare labels: CollectionManagerLabels;
+  declare navigationCollectionIds: string[];
 
   declare _items: CollectionManagerItem[];
   declare _reorderMode: boolean;
@@ -111,8 +120,9 @@ export class JantCollectionsManager extends LitElement {
   declare _newLinkUrl: string;
   declare _newLinkDescription: string;
   declare _addingLink: boolean;
-  declare _hoveringId: string | null;
   declare _showItemMenuId: string | null;
+  declare _addingToNavigationId: string | null;
+  declare _createdCollectionId: string | null;
 
   #sortable: { destroy(): void } | null = null;
   #initialized = false;
@@ -189,12 +199,17 @@ export class JantCollectionsManager extends LitElement {
   connectedCallback() {
     super.connectedCallback();
     this.#bindManagerRoot();
+    const createdCollectionId = consumeCollectionCreatedNotice();
+    if (createdCollectionId) {
+      this._createdCollectionId = createdCollectionId;
+    }
   }
 
   constructor() {
     super();
     this.items = [];
     this.labels = {} as CollectionManagerLabels;
+    this.navigationCollectionIds = [];
 
     this._items = [];
     this._reorderMode = false;
@@ -209,8 +224,9 @@ export class JantCollectionsManager extends LitElement {
     this._newLinkUrl = "";
     this._newLinkDescription = "";
     this._addingLink = false;
-    this._hoveringId = null;
     this._showItemMenuId = null;
+    this._addingToNavigationId = null;
+    this._createdCollectionId = null;
   }
 
   protected update(
@@ -247,7 +263,7 @@ export class JantCollectionsManager extends LitElement {
 
   #countLabel(count: number) {
     return `${count} ${
-      count === 1 ? this.labels.entrySingular : this.labels.entryPlural
+      count === 1 ? this.labels.threadSingular : this.labels.threadPlural
     }`;
   }
 
@@ -323,7 +339,7 @@ export class JantCollectionsManager extends LitElement {
         title: collection.title,
         description: collection.description,
         sortOrder: collection.sortOrder,
-        postCount: collection.postCount ?? 0,
+        threadCount: collection.threadCount ?? 0,
         recentActivityAt: collection.recentActivityAt,
       });
     }
@@ -666,6 +682,32 @@ export class JantCollectionsManager extends LitElement {
     }
   }
 
+  async #addCollectionToNavigation(collectionId: string) {
+    if (!collectionId || this._addingToNavigationId) return;
+
+    const usesInlineNotice = this._createdCollectionId === collectionId;
+    this._showItemMenuId = null;
+    this._addingToNavigationId = collectionId;
+    document.removeEventListener("click", this.#closeItemMenu);
+
+    try {
+      await addCollectionToNavigation(collectionId);
+      this.navigationCollectionIds = [
+        ...new Set([...this.navigationCollectionIds, collectionId]),
+      ];
+      if (!usesInlineNotice) {
+        showToastWithAction(this.labels.addedToNavigation, {
+          label: this.labels.editNavigation,
+          href: publicPath(NAVIGATION_SETTINGS_PATH),
+        });
+      }
+    } catch {
+      showToast(this.labels.addToNavigationFailed, "error");
+    } finally {
+      this._addingToNavigationId = null;
+    }
+  }
+
   #toggleLinkEdit(item: CollectionManagerItem) {
     if (item.type !== "link") return;
 
@@ -839,13 +881,17 @@ export class JantCollectionsManager extends LitElement {
         ${collection.description
           ? html`
               <div class="collection-directory-description prose">
-                ${unsafeHTML(renderMarkdown(collection.description))}
+                ${unsafeHTML(
+                  renderMarkdown(collection.description, {
+                    namespace: collection.id,
+                  }),
+                )}
               </div>
             `
           : nothing}
         <p class="collection-directory-summary">
           <span class="collection-directory-meta"
-            >${this.#countLabel(collection.postCount)}</span
+            >${this.#countLabel(collection.threadCount)}</span
           >
           <span class="collection-directory-meta-separator" aria-hidden="true"
             >/</span
@@ -895,24 +941,17 @@ export class JantCollectionsManager extends LitElement {
       <div
         class=${classMap({
           "group relative": true,
+          "collection-directory-managed-row": true,
           "z-50":
             this._showItemMenuId === item.id || this._editingLinkId === item.id,
         })}
-        @mouseenter=${() => {
-          this._hoveringId = item.id;
-        }}
-        @mouseleave=${() => {
-          if (this._hoveringId === item.id) this._hoveringId = null;
-        }}
       >
         <div
           class="collection-directory-item collection-directory-item-manageable"
         >
           ${body}
         </div>
-        ${this._hoveringId === item.id || this._showItemMenuId === item.id
-          ? this.#renderItemMenu(item)
-          : nothing}
+        ${this.#renderItemMenu(item)}
       </div>
     `;
   }
@@ -1036,7 +1075,9 @@ export class JantCollectionsManager extends LitElement {
         ${item.description
           ? html`
               <div class="collection-directory-description prose">
-                ${unsafeHTML(renderMarkdown(item.description))}
+                ${unsafeHTML(
+                  renderMarkdown(item.description, { namespace: item.id }),
+                )}
               </div>
             `
           : html`
@@ -1084,25 +1125,17 @@ export class JantCollectionsManager extends LitElement {
       <div
         class=${classMap({
           "group relative": true,
+          "collection-directory-managed-row": true,
           "z-50":
             this._showItemMenuId === item.id || this._editingLinkId === item.id,
         })}
-        @mouseenter=${() => {
-          this._hoveringId = item.id;
-        }}
-        @mouseleave=${() => {
-          if (this._hoveringId === item.id) this._hoveringId = null;
-        }}
       >
         <div
           class="collection-directory-item collection-directory-item-link collection-directory-item-manageable"
         >
           ${body}
         </div>
-        ${this._hoveringId === item.id || this._showItemMenuId === item.id
-          ? this.#renderItemMenu(item)
-          : nothing}
-        ${this.#renderLinkEditPanel(item)}
+        ${this.#renderItemMenu(item)} ${this.#renderLinkEditPanel(item)}
       </div>
     `;
   }
@@ -1166,6 +1199,31 @@ export class JantCollectionsManager extends LitElement {
                       >
                         ${this.labels.edit}
                       </a>
+                      ${this.navigationCollectionIds.includes(collection.id)
+                        ? html`
+                            <a
+                              href=${publicPath(NAVIGATION_SETTINGS_PATH)}
+                              class="collections-page-menu-item"
+                            >
+                              ${this.labels.editNavigation}
+                            </a>
+                          `
+                        : html`
+                            <button
+                              type="button"
+                              class="collections-page-menu-item"
+                              ?disabled=${this._addingToNavigationId ===
+                              collection.id}
+                              @click=${() =>
+                                void this.#addCollectionToNavigation(
+                                  collection.id,
+                                )}
+                            >
+                              ${this._addingToNavigationId === collection.id
+                                ? this.labels.addingToNavigation
+                                : this.labels.addToNavigation}
+                            </button>
+                          `}
                       <button
                         type="button"
                         class="collections-page-menu-item collections-page-menu-item-danger"
@@ -1398,9 +1456,86 @@ export class JantCollectionsManager extends LitElement {
     `;
   }
 
+  #renderCreatedCollectionNotice() {
+    if (!this._createdCollectionId) return nothing;
+
+    const collection = this._items.find(
+      (item) => item.collection?.id === this._createdCollectionId,
+    )?.collection;
+    if (!collection) return nothing;
+
+    const isInNavigation = this.navigationCollectionIds.includes(collection.id);
+
+    return html`
+      <section
+        class="collection-created-notice"
+        role="status"
+        aria-labelledby="collection-created-notice-title"
+      >
+        <p
+          id="collection-created-notice-title"
+          class="collection-created-notice-message"
+        >
+          ${isInNavigation
+            ? this.labels.addedToNavigation
+            : this.labels.formLabels.createdLabel}
+        </p>
+        <div class="collection-created-notice-actions">
+          ${isInNavigation
+            ? html`
+                <a
+                  href=${publicPath(NAVIGATION_SETTINGS_PATH)}
+                  class="collection-created-notice-action collection-created-notice-action-primary"
+                >
+                  ${this.labels.editNavigation}
+                </a>
+              `
+            : html`
+                <button
+                  type="button"
+                  class="collection-created-notice-action collection-created-notice-action-primary"
+                  ?disabled=${this._addingToNavigationId === collection.id}
+                  @click=${() =>
+                    void this.#addCollectionToNavigation(collection.id)}
+                >
+                  ${this._addingToNavigationId === collection.id
+                    ? this.labels.addingToNavigation
+                    : this.labels.addToNavigation}
+                </button>
+              `}
+          <button
+            type="button"
+            class="collection-created-notice-dismiss"
+            aria-label=${this.labels.notNow}
+            title=${this.labels.notNow}
+            @click=${() => {
+              this._createdCollectionId = null;
+            }}
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="14"
+              height="14"
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              aria-hidden="true"
+            >
+              <path d="M18 6 6 18" />
+              <path d="m6 6 12 12" />
+            </svg>
+          </button>
+        </div>
+      </section>
+    `;
+  }
+
   render() {
     return html`
-      ${this.#renderCreateLinkForm()}
+      ${this.#renderCreatedCollectionNotice()} ${this.#renderCreateLinkForm()}
       ${this.#hasDirectoryContent()
         ? html`
             <div id="collections-manager-list" class="collection-directory">