@jant/core 0.6.14 → 0.6.15

package/src/types/views.ts

@@ -92,7 +92,7 @@ export interface PostView {
   // Media -- URLs pre-computed
   media: MediaView[];
 
-  // Collections this post belongs to
+  // Thread-level Collections projected onto this post
   collections: CollectionTagView[];
 
   // Thread context
@@ -157,6 +157,7 @@ export interface NavItemView {
   type: NavItemType;
   systemKey?: SystemNavKey;
   collectionId?: string;
+  postId?: string;
   label: string;
   url: string;
   /** "header" = visible in nav bar, "more" = under More dropdown */
@@ -173,7 +174,7 @@ export interface NavItemView {
 
 export type SuggestedNavLinkTargetType = "page" | "collection" | "archive";
 
-export type SuggestedNavLinkNavItemType = "link" | "collection";
+export type SuggestedNavLinkNavItemType = "link" | "collection" | "page";
 
 export interface SuggestedNavLink {
   key: string;
@@ -182,6 +183,15 @@ export interface SuggestedNavLink {
   targetType: SuggestedNavLinkTargetType;
   navItemType: SuggestedNavLinkNavItemType;
   collectionId?: string;
+  postId?: string;
+}
+
+/** A published titled note eligible to be added to site navigation. */
+export interface NavigationPageCandidate {
+  id: string;
+  title: string;
+  slug: string;
+  updatedAt: number;
 }
 
 /**
@@ -215,13 +225,15 @@ export interface SearchResultView {
 export interface TimelineItemView {
   post: PostView;
   threadPreview?: {
-    secondReply?: PostView;
-    penultimateReply?: PostView;
+    leadingReplies: PostView[];
+    trailingReplies: PostView[];
     latestReply: PostView;
     totalReplyCount: number;
   };
   curatedThread?: {
     rootPost: PostView;
+    /** Show ratings on non-highlighted context posts (complete Collection Threads). */
+    showContextRatings: boolean;
     segments: {
       post: PostView;
       hiddenBeforeCount: number;

package/src/ui/__tests__/font-themes.test.ts

@@ -1,9 +1,11 @@
 import { describe, it, expect } from "vitest";
 import {
   BUILTIN_FONT_THEMES,
+  DEFAULT_FONT_CJK_SANS_FALLBACK,
   DEFAULT_FONT_CJK_SERIF_FALLBACK,
-  getCjkSerifCssVariables,
+  getCjkFontCssVariables,
   getFontThemeCssVariables,
+  resolveCjkFontProfile,
 } from "../font-themes.js";
 
 describe("BUILTIN_FONT_THEMES", () => {
@@ -90,52 +92,62 @@ describe("BUILTIN_FONT_THEMES", () => {
     expect(variables["--type-label-weight"]).toBe("var(--fw-semibold)");
   });
 
-  it("routes zh-Hans to the simplified CJK serif fallback first", () => {
-    const variables = getCjkSerifCssVariables("zh-Hans");
-    const stack = variables["--font-cjk-serif-fallback"];
+  it("routes zh-Hans content to simplified serif and sans fallbacks", () => {
+    const variables = getCjkFontCssVariables("zh-Hans", "off");
+    const serif = variables["--font-cjk-serif-fallback"];
+    const sans = variables["--font-cjk-sans-fallback"];
 
-    expect(stack).toContain('"Songti SC"');
-    expect(stack).toContain('"Noto Serif SC"');
-    expect(stack.indexOf('"Songti SC"')).toBeLessThan(
-      stack.indexOf('"Noto Serif SC"'),
+    expect(serif).toContain('"Songti SC"');
+    expect(serif).toContain('"Noto Serif SC"');
+    expect(sans.indexOf('"PingFang SC"')).toBeLessThan(
+      sans.indexOf('"PingFang TC"'),
     );
   });
 
-  it("routes zh-Hant to the traditional CJK serif fallback first", () => {
-    const variables = getCjkSerifCssVariables("zh-Hant");
-    const stack = variables["--font-cjk-serif-fallback"];
+  it("routes zh-Hant content to traditional serif and sans fallbacks", () => {
+    const variables = getCjkFontCssVariables("zh-Hant", "off");
+    const serif = variables["--font-cjk-serif-fallback"];
+    const sans = variables["--font-cjk-sans-fallback"];
 
-    expect(stack).toContain('"Songti TC"');
-    expect(stack).toContain('"Noto Serif TC"');
-    expect(stack.indexOf('"Songti TC"')).toBeLessThan(
-      stack.indexOf('"Noto Serif TC"'),
+    expect(serif).toContain('"Songti TC"');
+    expect(serif).toContain('"Noto Serif TC"');
+    expect(sans.indexOf('"PingFang TC"')).toBeLessThan(
+      sans.indexOf('"PingFang SC"'),
     );
   });
 
-  it("routes ja to the Japanese CJK serif fallback", () => {
-    const variables = getCjkSerifCssVariables("ja");
-    const stack = variables["--font-cjk-serif-fallback"];
+  it("routes Japanese content to the Japanese font profile", () => {
+    const variables = getCjkFontCssVariables("ja", "off");
 
-    expect(stack).toContain('"Noto Serif JP"');
+    expect(variables["--font-cjk-serif-fallback"]).toContain('"Noto Serif JP"');
+    expect(variables["--font-cjk-sans-fallback"]).toContain('"Noto Sans JP"');
   });
 
-  it("routes ko to the Korean CJK serif fallback", () => {
-    const variables = getCjkSerifCssVariables("ko");
-    const stack = variables["--font-cjk-serif-fallback"];
+  it("routes Korean content to the Korean font profile", () => {
+    const variables = getCjkFontCssVariables("ko", "off");
 
-    expect(stack).toContain('"Noto Serif KR"');
+    expect(variables["--font-cjk-serif-fallback"]).toContain('"Noto Serif KR"');
+    expect(variables["--font-cjk-sans-fallback"]).toContain('"Noto Sans KR"');
   });
 
-  it("does not inject a runtime override when CJK is off", () => {
-    expect(getCjkSerifCssVariables("off")).toEqual({});
+  it("uses the explicit CJK fallback for an unadapted content language", () => {
+    expect(resolveCjkFontProfile("en", "zh-Hans")).toBe("zh-Hans");
   });
 
-  it("does not inject a runtime override for unrecognized values", () => {
-    expect(getCjkSerifCssVariables("en")).toEqual({});
+  it("lets an adapted content language override the manual fallback", () => {
+    expect(resolveCjkFontProfile("zh-Hant", "zh-Hans")).toBe("zh-Hant");
   });
 
-  it("keeps a default CJK serif fallback for the base tokens", () => {
-    expect(DEFAULT_FONT_CJK_SERIF_FALLBACK).toContain('"Songti SC"');
-    expect(DEFAULT_FONT_CJK_SERIF_FALLBACK).toContain('"Noto Serif SC"');
+  it("keeps the default profile neutral", () => {
+    expect(getCjkFontCssVariables("en", "off")).toEqual({});
+    expect(DEFAULT_FONT_CJK_SERIF_FALLBACK).toBe('"Jant Language Fallback"');
+    expect(DEFAULT_FONT_CJK_SANS_FALLBACK).toBe('"Jant Language Fallback"');
+  });
+
+  it("puts language slots into every serif and sans theme stack", () => {
+    for (const theme of BUILTIN_FONT_THEMES) {
+      const combined = `${theme.headingFontFamily} ${theme.bodyFontFamily}`;
+      expect(combined).toMatch(/var\(--font-cjk-(?:serif|sans)-fallback\)/);
+    }
   });
 });

package/src/ui/compose/ComposeDialog.tsx

@@ -13,6 +13,7 @@ import type { FC } from "hono/jsx";
 import { MAX_THREAD_POSTS, type Collection } from "../../types.js";
 import { useLingui } from "../../i18n/context.js";
 import { getCollectionFormLabels } from "../shared/collection-management-labels.js";
+import type { ComposeLabels } from "../../client/components/compose-types.js";
 
 export interface ComposeDialogProps {
   collections?: Collection[];
@@ -36,7 +37,7 @@ export const ComposeForm: FC<ComposeFormProps> = ({
 }) => {
   const { i18n } = useLingui();
 
-  const labels = JSON.stringify({
+  const labelsObject = {
     cancel: i18n._(
       msg({
         message: "Cancel",
@@ -476,6 +477,19 @@ export const ComposeForm: FC<ComposeFormProps> = ({
         comment: "@context: Drafts panel empty state",
       }),
     ),
+    previewDraft: i18n._(
+      msg({
+        message: "Preview",
+        comment: "@context: Draft item action that opens its rendered preview",
+      }),
+    ),
+    draftActions: i18n._(
+      msg({
+        message: "Draft actions",
+        comment:
+          "@context: Accessible label for a draft item's more-actions button",
+      }),
+    ),
     deleteDraft: i18n._(
       msg({
         message: "Delete Draft",
@@ -807,8 +821,84 @@ export const ComposeForm: FC<ComposeFormProps> = ({
           "@context: First-use hint shown over the compose editor to surface the slash command menu",
       }),
     ),
+    tableControls: {
+      toolbarLabel: i18n._(
+        msg({
+          message: "Table controls",
+          comment: "@context: Accessible label for the compose table toolbar",
+        }),
+      ),
+      addRowAbove: i18n._(
+        msg({
+          message: "Add row above",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      addRowBelow: i18n._(
+        msg({
+          message: "Add row below",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      addColumnBefore: i18n._(
+        msg({
+          message: "Add column before",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      addColumnAfter: i18n._(
+        msg({
+          message: "Add column after",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      options: i18n._(
+        msg({
+          message: "Table options",
+          comment: "@context: Compose table menu button label",
+        }),
+      ),
+      deleteRow: i18n._(
+        msg({
+          message: "Delete row",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      deleteColumn: i18n._(
+        msg({
+          message: "Delete column",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      toggleHeaderRow: i18n._(
+        msg({
+          message: "Toggle header row",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      deleteTable: i18n._(
+        msg({
+          message: "Delete table",
+          comment: "@context: Destructive compose table action",
+        }),
+      ),
+      sizePickerLabel: i18n._(
+        msg({
+          message: "Choose table size",
+          comment: "@context: Accessible title for the table dimension picker",
+        }),
+      ),
+      insertTableSize: i18n._(
+        msg({
+          message: "Insert %rows% by %cols% table",
+          comment:
+            "@context: Accessible label for a table size option. %rows% and %cols% are replaced with dimensions",
+        }),
+      ),
+    },
     collectionFormLabels: getCollectionFormLabels(i18n),
-  }).replace(/</g, "\\u003c");
+  } satisfies ComposeLabels;
+  const labels = JSON.stringify(labelsObject).replace(/</g, "\\u003c");
 
   const collectionsJson = JSON.stringify(
     (collections ?? []).map((c) => ({

package/src/ui/dash/appearance/NavigationContent.tsx

@@ -17,7 +17,9 @@ import type {
   NavManagerSuggestedLink,
   SystemNavConfig,
 } from "../../../client/components/nav-manager-types.js";
+import type { CollectionFormLabels } from "../../../client/components/collection-types.js";
 import { toPublicHref, toPublicPath } from "../../../lib/url.js";
+import { getCollectionFormLabels } from "../../shared/collection-management-labels.js";
 import {
   getNavItemDisplayLabel,
   getSystemNavDescription,
@@ -34,6 +36,7 @@ export function NavigationContent({
   directoryData,
   suggestedLinks,
   mainRssFeed,
+  rssFeedsEnabled,
   siteName,
   sitePathPrefix = "",
 }: {
@@ -41,6 +44,7 @@ export function NavigationContent({
   directoryData: CollectionsDirectoryData;
   suggestedLinks: SuggestedNavLink[];
   mainRssFeed: string;
+  rssFeedsEnabled: boolean;
   siteName: string;
   sitePathPrefix?: string;
 }) {
@@ -64,6 +68,90 @@ export function NavigationContent({
     }),
   );
   const moreLabel = i18n._(NAV_MORE_LABEL);
+  const createCollectionLabel = i18n._(
+    msg({
+      message: "Create Collection",
+      comment:
+        "@context: Button and dialog title for quick collection creation in Navigation settings",
+    }),
+  );
+  const collectionFormLabels: CollectionFormLabels = {
+    ...getCollectionFormLabels(i18n),
+    titleLabel: i18n._(
+      msg({
+        message: "Title",
+        comment: "@context: Collection title field in Navigation settings",
+      }),
+    ),
+    titlePlaceholder: i18n._(
+      msg({
+        message: "My Collection",
+        comment:
+          "@context: Collection title placeholder in Navigation settings",
+      }),
+    ),
+    slugLabel: i18n._(
+      msg({
+        message: "Collection link",
+        comment: "@context: Collection slug field in Navigation settings",
+      }),
+    ),
+    slugHelp: i18n._(
+      msg({
+        message: "This is the last part of the collection link.",
+        comment: "@context: Collection slug help text in Navigation settings",
+      }),
+    ),
+    slugInvalidHelp: i18n._(
+      msg({
+        message: "Use lowercase letters, numbers, and hyphens only.",
+        comment:
+          "@context: Collection slug validation error in Navigation settings",
+      }),
+    ),
+    slugReservedHelp: i18n._(
+      msg({
+        message: "This link is reserved. Choose something else.",
+        comment:
+          "@context: Reserved collection slug error in Navigation settings",
+      }),
+    ),
+    slugTooLongHelp: i18n._(
+      msg({
+        message: "Keep this link under 200 characters.",
+        comment: "@context: Long collection slug error in Navigation settings",
+      }),
+    ),
+    editSlugLabel: i18n._(
+      msg({
+        message: "Edit link",
+        comment:
+          "@context: Button to edit the generated collection slug in Navigation settings",
+      }),
+    ),
+    resetSlugLabel: i18n._(
+      msg({
+        message: "Reset link",
+        comment:
+          "@context: Button to reset the collection slug in Navigation settings",
+      }),
+    ),
+    quickHint: i18n._(
+      msg({
+        message: "More options are available after you create it.",
+        comment:
+          "@context: Helper text in quick collection creation in Navigation settings",
+      }),
+    ),
+    quickSubmitLabel: createCollectionLabel,
+    createdLabel: i18n._(
+      msg({
+        message: "Collection created.",
+        comment:
+          "@context: Heading after quick collection creation in Navigation settings",
+      }),
+    ),
+  };
 
   const suggestedTargetLabels = {
     page: i18n._(
@@ -98,6 +186,7 @@ export function NavigationContent({
       type: item.type,
       systemKey: item.systemKey,
       collectionId: item.collectionId,
+      postId: item.postId,
       label: item.label,
       displayLabel: getNavItemDisplayLabel(item, i18n, sitePathPrefix),
       url,
@@ -185,6 +274,12 @@ export function NavigationContent({
         comment: "@context: Nav item type badge",
       }),
     ),
+    page: i18n._(
+      msg({
+        message: "page",
+        comment: "@context: Nav item type badge for page items",
+      }),
+    ),
     system: i18n._(
       msg({
         message: "system",
@@ -235,6 +330,13 @@ export function NavigationContent({
           "@context: Confirm dialog for deleting a custom navigation link",
       }),
     ),
+    confirmDeletePage: i18n._(
+      msg({
+        message:
+          "Remove this page from navigation? The page itself won't be deleted.",
+        comment: "@context: Confirm dialog for removing a page from navigation",
+      }),
+    ),
     orderSaved: i18n._(
       msg({
         message: "Navigation order updated.",
@@ -353,6 +455,182 @@ export function NavigationContent({
         comment: "@context: Toast after adding a suggested nav link",
       }),
     ),
+    addPageToNavigation: i18n._(
+      msg({
+        message: "Add page to navigation",
+        comment: "@context: Section heading for adding a page to navigation",
+      }),
+    ),
+    addPageDescription: i18n._(
+      msg({
+        message:
+          "Choose a titled note that isn't already in navigation, or create a new page.",
+        comment: "@context: Description for adding a page to navigation",
+      }),
+    ),
+    addPage: i18n._(
+      msg({
+        message: "Add Page",
+        comment: "@context: Button that opens the navigation page picker",
+      }),
+    ),
+    searchPages: i18n._(
+      msg({
+        message: "Search pages",
+        comment: "@context: Placeholder for the navigation page search",
+      }),
+    ),
+    recentPages: i18n._(
+      msg({
+        message: "Recently updated",
+        comment: "@context: Heading above recent pages in the page picker",
+      }),
+    ),
+    searchingPages: i18n._(
+      msg({
+        message: "Searching pages…",
+        comment: "@context: Loading state in the navigation page picker",
+      }),
+    ),
+    noMatchingPages: i18n._(
+      msg({
+        message:
+          "No matching pages available to add. Try another title or create a new page.",
+        comment: "@context: Empty search results in the page picker",
+      }),
+    ),
+    noPages: i18n._(
+      msg({
+        message: "No pages available. Create one to add it to navigation.",
+        comment: "@context: Empty state in the navigation page picker",
+      }),
+    ),
+    pageSearchFailed: i18n._(
+      msg({
+        message: "Couldn't load pages. Try again in a moment.",
+        comment: "@context: Error shown when navigation page search fails",
+      }),
+    ),
+    createNewPage: i18n._(
+      msg({
+        message: "Create new page",
+        comment: "@context: Action at the bottom of the navigation page picker",
+      }),
+    ),
+    createPage: i18n._(
+      msg({
+        message: "Create Page",
+        comment: "@context: Button and dialog title for quick page creation",
+      }),
+    ),
+    createPageDescription: i18n._(
+      msg({
+        message: "Create a public page that won't appear in Latest.",
+        comment: "@context: Description in the quick-create page dialog",
+      }),
+    ),
+    pageTitle: i18n._(
+      msg({
+        message: "Title",
+        comment: "@context: Title field label in quick page creation",
+      }),
+    ),
+    pageAddress: i18n._(
+      msg({
+        message: "Page address",
+        comment: "@context: Slug field label in quick page creation",
+      }),
+    ),
+    pageVisibilityHint: i18n._(
+      msg({
+        message: "The page is public but stays out of Latest.",
+        comment: "@context: Visibility note in quick page creation",
+      }),
+    ),
+    titleRequired: i18n._(
+      msg({
+        message: "Enter a page title.",
+        comment: "@context: Validation error for an empty quick page title",
+      }),
+    ),
+    slugInvalid: i18n._(
+      msg({
+        message: "Use lowercase letters, numbers, and hyphens.",
+        comment: "@context: Validation error for an invalid page slug",
+      }),
+    ),
+    slugReserved: i18n._(
+      msg({
+        message: "That address is reserved. Choose another one.",
+        comment: "@context: Validation error for a reserved page slug",
+      }),
+    ),
+    slugTooLong: i18n._(
+      msg({
+        message: "Keep the page address under 200 characters.",
+        comment: "@context: Validation error for a long page slug",
+      }),
+    ),
+    slugUnavailable: i18n._(
+      msg({
+        message: "That address is already in use. Choose another one.",
+        comment: "@context: Validation error for an unavailable page slug",
+      }),
+    ),
+    checkingAddress: i18n._(
+      msg({
+        message: "Checking address…",
+        comment: "@context: Loading text while checking page slug availability",
+      }),
+    ),
+    creatingPage: i18n._(
+      msg({
+        message: "Creating page…",
+        comment: "@context: Loading label while creating a page",
+      }),
+    ),
+    createPageFailed: i18n._(
+      msg({
+        message: "Couldn't create the page. Check the details and try again.",
+        comment: "@context: Error when quick page creation fails",
+      }),
+    ),
+    pageCreated: i18n._(
+      msg({
+        message: "Page created.",
+        comment: "@context: Heading after quick page creation",
+      }),
+    ),
+    pageCreatedDescription: i18n._(
+      msg({
+        message: "Add it to navigation now or open the editor to add content.",
+        comment: "@context: Description after quick page creation",
+      }),
+    ),
+    addToNavigation: i18n._(
+      msg({
+        message: "Add to Navigation",
+        comment: "@context: Button that adds a created page to navigation",
+      }),
+    ),
+    editPage: i18n._(
+      msg({
+        message: "Edit Page",
+        comment: "@context: Button that opens a page for editing",
+      }),
+    ),
+    pageAdded: i18n._(
+      msg({
+        message: "Page added to navigation.",
+        comment: "@context: Confirmation after adding a page to navigation",
+      }),
+    ),
+    back: i18n._(
+      msg({
+        message: "Back",
+        comment: "@context: Button returning from page creation to page search",
+      }),
+    ),
     collection: i18n._(
       msg({
         message: "collection",
@@ -387,12 +665,56 @@ export function NavigationContent({
     ),
     noCollections: i18n._(
       msg({
-        message:
-          "No collections yet. Create one first, then add it to your navigation.",
+        message: "No collections yet. Create one here to add it to navigation.",
         comment:
           "@context: Empty state when no collections exist for nav picker",
       }),
     ),
+    createNewCollection: i18n._(
+      msg({
+        message: "Create new collection",
+        comment:
+          "@context: Action at the bottom of the Navigation collection picker",
+      }),
+    ),
+    createCollection: createCollectionLabel,
+    creatingCollection: i18n._(
+      msg({
+        message: "Creating collection…",
+        comment:
+          "@context: Loading label while creating a collection in Navigation settings",
+      }),
+    ),
+    createCollectionFailed: i18n._(
+      msg({
+        message:
+          "Couldn't create the collection. Check the details and try again.",
+        comment:
+          "@context: Error when quick collection creation fails in Navigation settings",
+      }),
+    ),
+    collectionCreatedDescription: i18n._(
+      msg({
+        message: "Add it to navigation now or open the editor to add details.",
+        comment:
+          "@context: Description after quick collection creation in Navigation settings",
+      }),
+    ),
+    editCollection: i18n._(
+      msg({
+        message: "Edit Collection",
+        comment:
+          "@context: Button that opens a newly created collection for editing",
+      }),
+    ),
+    collectionAdded: i18n._(
+      msg({
+        message: "Collection added to navigation.",
+        comment:
+          "@context: Confirmation after adding a collection to navigation",
+      }),
+    ),
+    collectionFormLabels,
     confirmDeleteCollection: i18n._(
       msg({
         message:
@@ -414,13 +736,19 @@ export function NavigationContent({
         collections={escapeJson(collectionsData)}
         suggested-links={escapeJson(suggestedLinksData)}
         site-name={siteName}
+        rss-feeds-enabled={rssFeedsEnabled || undefined}
       >
         {/* SSR fallback: static preview until JS hydrates */}
         {(() => {
-          const headerNavItems = navItems.filter(
+          const previewItems = rssFeedsEnabled
+            ? navItems
+            : navItems.filter(
+                (item) => item.type !== "system" || item.systemKey !== "rss",
+              );
+          const headerNavItems = previewItems.filter(
             (item) => item.placement !== "more",
           );
-          const moreNavItems = navItems.filter(
+          const moreNavItems = previewItems.filter(
             (item) => item.placement === "more",
           );
           return (