@rigel-cms/rigel 1.4.0-rc.2 → 1.4.0-rc.3

package/src/editor/App.svelte

@@ -471,7 +471,9 @@
 
   const sortedPosts = $derived.by(() => {
     if (!coll) return [];
-    const posts = [...coll.posts];
+    const query = (Object.hasOwn(collectionQueries, coll.name) ? collectionQueries[coll.name] : "").trim().toLocaleLowerCase();
+    const fields = coll.fields.filter(field => (field.key === "description" && (field.type === "string" || field.type === "text")) || (field.key === "tags" && field.type === "tags"));
+    const posts = coll.posts.filter(post => !query || [post.frontmatter.title, effectiveSlug(post.frontmatter, post.slug), ...fields.flatMap(field => post.frontmatter[field.key] ?? [])].some(value => typeof value === "string" && value.toLocaleLowerCase().includes(query)));
     if (!sortBy) return posts;
     return posts.sort((a, b) => {
       const va = cellValue(a, sortBy);
@@ -483,6 +485,13 @@
   const sidebar = $derived(buildSidebar(visibleContent, $t));
   let pagesFilter = $state<string | null>(null);
   let pagesQuery = $state("");
+  let collectionQueries = $state<Record<string, string>>({});
+  const tableQuery = $derived(sel?.kind === "collection" ? Object.hasOwn(collectionQueries, sel.name) ? collectionQueries[sel.name] : "" : pagesQuery);
+  const searchLabel = $derived(sel?.kind === "collection" && coll ? $t("shell.searchNamedEntries", { name: coll.label }) : $t("shell.searchPages"));
+  function setTableQuery(value: string) {
+    if (sel?.kind === "collection") collectionQueries[sel.name] = value;
+    else pagesQuery = value;
+  }
   let pagesSearch: HTMLInputElement;
   let entryList = $state<Sel | null>(null);
   const categories = $derived(pageCategories(visibleContent));
@@ -643,10 +652,19 @@
     action?.();
   }
 
-  function select(next: Sel | null) {
+  function select(next: Sel | null, fromSidebar = false) {
     if (manifest.contentLocales && !selectionInContent(visibleContent, next)) return;
-    if (sel && next && sameSel(sel, next)) return;
-    requestNavigation(() => openSelection(next));
+    const resetPages = fromSidebar && next?.kind === "pages";
+    const resetCollection = fromSidebar && next?.kind === "collection";
+    if (sel && next && sameSel(sel, next) && !resetPages && !resetCollection) return;
+    requestNavigation(() => {
+      if (resetPages) {
+        pagesFilter = next.category ?? null;
+        pagesQuery = "";
+      }
+      if (resetCollection) collectionQueries[next.name] = "";
+      openSelection(next);
+    });
   }
 
   function openSelection(next: Sel | null) {
@@ -915,7 +933,7 @@
             data-tooltip={node.label}
             class:active={navActive(node.target)}
             aria-current={navActive(node.target) ? "page" : undefined}
-            onclick={() => select(node.target)}
+            onclick={() => select(node.target, true)}
           >
             <SidebarIcon name={node.icon ?? ({ pages: "files", page: "file-text", collection: "newspaper", documents: "squares-four", document: "file-text", menus: "list", media: "images" }[node.target.kind])} /><span class="sidebar-label">{node.label}</span>
           </button>
@@ -1009,22 +1027,24 @@
           {#if templates.length}
             <button class="primary" onclick={() => newPage(pageDocType, true)}>{$t("shell.addNew")}</button>
           {/if}
+        {/if}
+        {#if (sel?.kind === "collection" && coll) || (sel?.kind === "documents" && activeDocType && activeDocType.creatable !== false && !activeDocType.singleton)}
+          <button class="primary" onclick={() => (sel?.kind === "collection" ? newPost(coll!) : newPage(activeDocType))}>{$t("shell.addNew")}</button>
+        {/if}
+        {#if sel.kind === "pages" || (sel.kind === "collection" && coll)}
           <div class="pages-controls">
-          {#if categories.length}
+          {#if sel.kind === "pages" && categories.length}
             <Select ariaLabel={$t("shell.category")} value={JSON.stringify(pageCategory)} options={[{ value: "null", label: $t("shell.allPages") }, { value: JSON.stringify(""), label: $t("shell.coreCategory") }, ...categories.map(category => ({ value: JSON.stringify(category), label: category }))]} onchange={(value) => { if (typeof value === "string") { pagesFilter = JSON.parse(value); select({ kind: "pages" }); } }} />
           {/if}
             <div class="pages-search">
               <Icon name="magnifier" size={18} />
-              <input type="search" aria-label={$t("shell.searchPages")} placeholder={$t("shell.searchPages")} bind:value={pagesQuery} bind:this={pagesSearch} />
-              {#if pagesQuery}
-                <button type="button" class="icon-btn" aria-label={$t("fields.clear")} onclick={() => { pagesQuery = ""; pagesSearch.focus(); }}><Icon name="x" size={16} /></button>
+              <input type="search" aria-label={searchLabel} placeholder={searchLabel} value={tableQuery} oninput={(event) => setTableQuery(event.currentTarget.value)} bind:this={pagesSearch} />
+              {#if tableQuery}
+                <button type="button" class="icon-btn" aria-label={$t("fields.clear")} onclick={() => { setTableQuery(""); pagesSearch.focus(); }}><Icon name="x" size={16} /></button>
               {/if}
             </div>
           </div>
         {/if}
-        {#if (sel?.kind === "collection" && coll) || (sel?.kind === "documents" && activeDocType && activeDocType.creatable !== false && !activeDocType.singleton)}
-          <button class="primary" onclick={() => (sel?.kind === "collection" ? newPost(coll!) : newPage(sel?.kind === "documents" ? activeDocType : pageDocType, sel?.kind === "pages"))}>{$t("shell.addNew")}</button>
-        {/if}
         {#if sel?.kind === "post" && post}
           <button class="icon-btn" aria-label={$t("shell.deletePost")} data-tooltip={$t("shell.deletePost")} disabled={saveState === "saving"} onclick={deletePost}>
             <Icon name="trash" size={15} />
@@ -1086,7 +1106,7 @@
                   {/each}
                 </tr>
               {:else}
-                <tr><td colspan={columns.length}>{$t(sel?.kind === "pages" && pagesQuery.trim() ? "shell.noResults" : "shell.noEntries")}</td></tr>
+                <tr><td colspan={columns.length}>{$t((sel?.kind === "pages" || sel?.kind === "collection") && tableQuery.trim() ? "shell.noResults" : "shell.noEntries")}</td></tr>
               {/each}
             </tbody>
           </table>
@@ -1106,6 +1126,7 @@
           documents={draftDocuments}
           previewPath={documentPreview("draft")}
           websitePath={documentPreview("website")}
+          bodyInline={settings.userPref.editorExperience === "inline"}
           creating={newDocument?.id === sel.id}
           devMode={settings.devMode}
           reloadToken={documentReload}
@@ -1161,8 +1182,8 @@
             devMode={settings.devMode}
             onchange={(next) => { draft = next; touch(); }}
           >
-            {#snippet properties(selected, focusToken, bodyInline, oneditbody, bodyLoading)}
-              <CollectionPanel fields={coll.fields} values={draft} storageSlug={post.slug} documents={manifest.documents ?? []} body={bodyDraft as ArticleBody} {bodyInline} {bodyLoading} {oneditbody} {selected} {focusToken} devMode={settings.devMode} onchange={(key, value) => { draft[key] = value; touch(); }} onbody={(value) => { bodyDraft = value; touch(); }} />
+            {#snippet properties(selected, focusToken, bodyInline, oneditbody, bodyLoading, inlineFields, oneditfield)}
+              <CollectionPanel fields={coll.fields} values={draft} storageSlug={post.slug} documents={manifest.documents ?? []} body={bodyDraft as ArticleBody} {bodyInline} {bodyLoading} {inlineFields} {oneditbody} {oneditfield} {selected} {focusToken} devMode={settings.devMode} onchange={(key, value) => { draft[key] = value; touch(); }} onbody={(value) => { bodyDraft = value; touch(); }} />
             {/snippet}
           </VisualEditor>
         {/key}

package/src/editor/i18n/de/fields.json

@@ -50,6 +50,8 @@
   "fields.editArticleBody": "Artikeltext in der Vorschau bearbeiten",
   "fields.loadingPreview": "Vorschau wird geladen…",
   "fields.editArticleBodyHint": "Klicken Sie zum Bearbeiten auf den Artikeltext in der Vorschau. Änderungen an den Inhalten müssen gespeichert werden.",
+  "fields.editRichText": "In der Vorschau bearbeiten",
+  "fields.editRichTextHint": "Klicke in der Vorschau auf diesen Text, um ihn zu bearbeiten. Änderungen müssen gespeichert werden.",
   "fields.seoNotSet": "Nicht festgelegt",
   "fields.seoTooShort": "Zu kurz",
   "fields.seoTooLong": "Zu lang",

package/src/editor/i18n/de/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "Aktuelle Inhaltssprache",
   "shell.coreCategory": "Standard",
   "shell.searchPages": "Seiten suchen",
+  "shell.searchNamedEntries": "In {name} suchen",
   "shell.template": "Vorlage",
   "shell.chooseTemplate": "Vorlage auswählen",
   "shell.search": "Suchen",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "Artikeltext bearbeiten",
   "shell.sidebar": "Seitenleiste",
   "shell.inlinePreview": "Inline-Vorschau",
-  "shell.editorExperienceHint": "Mit der Inline-Vorschau kannst du auf einen Artikeltext klicken und direkt auf der Seite schreiben. Andere Felder bleiben in der Seitenleiste. Diese Einstellung wird in diesem Browser gespeichert; Inhalte müssen weiterhin mit Speichern gesichert werden.",
+  "shell.editorExperienceHint": "Mit der Inline-Vorschau kannst du auf Rich-Text-Bereiche klicken und direkt auf der Seite schreiben. Felder ohne Vorschau-Bindung bleiben in der Seitenleiste. Diese Einstellung wird in diesem Browser gespeichert; Inhalte müssen weiterhin mit Speichern gesichert werden.",
   "shell.githubAccount": "GitHub-Konto",
   "shell.noGithubAccount": "Kein GitHub-Konto verbunden.",
   "shell.repository": "Repository",

package/src/editor/i18n/en/fields.json

@@ -50,6 +50,8 @@
   "fields.editArticleBody": "Edit article body in preview",
   "fields.loadingPreview": "Loading preview…",
   "fields.editArticleBodyHint": "Click the article body in the preview to edit. Content changes require Save.",
+  "fields.editRichText": "Edit in preview",
+  "fields.editRichTextHint": "Click this text in the preview to edit. Content changes require Save.",
   "fields.seoNotSet": "Not set",
   "fields.seoTooShort": "Too short",
   "fields.seoTooLong": "Too long",

package/src/editor/i18n/en/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "Current content language",
   "shell.coreCategory": "Core",
   "shell.searchPages": "Search pages",
+  "shell.searchNamedEntries": "Search {name}",
   "shell.template": "Template",
   "shell.chooseTemplate": "Choose a template",
   "shell.search": "Search",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "Article body editing",
   "shell.sidebar": "Sidebar",
   "shell.inlinePreview": "Inline preview",
-  "shell.editorExperienceHint": "Inline preview lets you click an article body and write directly on the page. Other fields stay in the sidebar. This preference saves in this browser; content still requires Save.",
+  "shell.editorExperienceHint": "Inline preview lets you click bound rich text and write directly on the page. Fields without a preview binding stay in the sidebar. This preference saves in this browser; content still requires Save.",
   "shell.githubAccount": "GitHub account",
   "shell.noGithubAccount": "No GitHub account connected.",
   "shell.repository": "Repository",

package/src/editor/i18n/es/fields.json

@@ -50,6 +50,8 @@
   "fields.editArticleBody": "Editar el cuerpo del artículo en la vista previa",
   "fields.loadingPreview": "Cargando vista previa…",
   "fields.editArticleBodyHint": "Haz clic en el cuerpo del artículo en la vista previa para editarlo. Los cambios en el contenido requieren pulsar Guardar.",
+  "fields.editRichText": "Editar en la vista previa",
+  "fields.editRichTextHint": "Haz clic en este texto de la vista previa para editarlo. Los cambios requieren pulsar Guardar.",
   "fields.seoNotSet": "Sin definir",
   "fields.seoTooShort": "Demasiado corto",
   "fields.seoTooLong": "Demasiado largo",

package/src/editor/i18n/es/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "Idioma actual del contenido",
   "shell.coreCategory": "Principales",
   "shell.searchPages": "Buscar páginas",
+  "shell.searchNamedEntries": "Buscar en {name}",
   "shell.template": "Plantilla",
   "shell.chooseTemplate": "Elige una plantilla",
   "shell.search": "Buscar",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "Edición del cuerpo del artículo",
   "shell.sidebar": "Barra lateral",
   "shell.inlinePreview": "Vista previa en línea",
-  "shell.editorExperienceHint": "La vista previa en línea permite hacer clic en el cuerpo de un artículo y escribir directamente en la página. Los demás campos permanecen en la barra lateral. Esta preferencia se guarda en este navegador; para guardar el contenido sigue siendo necesario pulsar Guardar.",
+  "shell.editorExperienceHint": "La vista previa en línea permite hacer clic en los textos enriquecidos vinculados y escribir directamente en la página. Los campos sin vínculo de vista previa permanecen en la barra lateral. Esta preferencia se guarda en este navegador; para guardar el contenido sigue siendo necesario pulsar Guardar.",
   "shell.githubAccount": "Cuenta de GitHub",
   "shell.noGithubAccount": "No hay ninguna cuenta de GitHub conectada.",
   "shell.repository": "Repositorio",

package/src/editor/i18n/fr/fields.json

@@ -50,6 +50,8 @@
   "fields.editArticleBody": "Modifier le corps de l’article dans l’aperçu",
   "fields.loadingPreview": "Chargement de l’aperçu…",
   "fields.editArticleBodyHint": "Cliquez sur le corps de l’article dans l’aperçu pour le modifier. Enregistrez pour conserver les modifications du contenu.",
+  "fields.editRichText": "Modifier dans l’aperçu",
+  "fields.editRichTextHint": "Cliquez sur ce texte dans l’aperçu pour le modifier. Enregistrez pour conserver les modifications du contenu.",
   "fields.seoNotSet": "Non défini",
   "fields.seoTooShort": "Trop court",
   "fields.seoTooLong": "Trop long",

package/src/editor/i18n/fr/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "Langue actuelle du contenu",
   "shell.coreCategory": "Principales",
   "shell.searchPages": "Rechercher des pages",
+  "shell.searchNamedEntries": "Rechercher dans {name}",
   "shell.template": "Modèle",
   "shell.chooseTemplate": "Choisir un modèle",
   "shell.search": "Rechercher",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "Édition du corps des articles",
   "shell.sidebar": "Barre latérale",
   "shell.inlinePreview": "Aperçu avec édition intégrée",
-  "shell.editorExperienceHint": "L’aperçu avec édition intégrée permet de cliquer sur le corps d’un article pour écrire directement sur la page. Les autres champs restent dans la barre latérale. Cette préférence est enregistrée dans ce navigateur ; le contenu nécessite toujours un clic sur Enregistrer.",
+  "shell.editorExperienceHint": "L’aperçu avec édition intégrée permet de cliquer sur les textes enrichis liés pour écrire directement sur la page. Les champs sans liaison d’aperçu restent dans la barre latérale. Cette préférence est enregistrée dans ce navigateur ; le contenu nécessite toujours un clic sur Enregistrer.",
   "shell.githubAccount": "Compte GitHub",
   "shell.noGithubAccount": "Aucun compte GitHub connecté.",
   "shell.repository": "Dépôt",

package/src/editor/i18n/it/fields.json

@@ -50,6 +50,8 @@
   "fields.editArticleBody": "Modifica il corpo dell’articolo nell’anteprima",
   "fields.loadingPreview": "Caricamento dell’anteprima…",
   "fields.editArticleBodyHint": "Fai clic sul corpo dell’articolo nell’anteprima per modificarlo. Premi Salva per salvare le modifiche ai contenuti.",
+  "fields.editRichText": "Modifica nell’anteprima",
+  "fields.editRichTextHint": "Fai clic su questo testo nell’anteprima per modificarlo. Premi Salva per salvare le modifiche ai contenuti.",
   "fields.seoNotSet": "Non impostato",
   "fields.seoTooShort": "Troppo breve",
   "fields.seoTooLong": "Troppo lungo",

package/src/editor/i18n/it/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "Lingua attuale del contenuto",
   "shell.coreCategory": "Principali",
   "shell.searchPages": "Cerca pagine",
+  "shell.searchNamedEntries": "Cerca in {name}",
   "shell.template": "Modello",
   "shell.chooseTemplate": "Scegli un modello",
   "shell.search": "Cerca",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "Modifica del corpo dell’articolo",
   "shell.sidebar": "Barra laterale",
   "shell.inlinePreview": "Anteprima con modifica diretta",
-  "shell.editorExperienceHint": "L’anteprima con modifica diretta permette di fare clic sul corpo di un articolo e scrivere direttamente nella pagina. Gli altri campi restano nella barra laterale. Questa preferenza viene salvata in questo browser; per salvare i contenuti devi comunque premere Salva.",
+  "shell.editorExperienceHint": "L’anteprima con modifica diretta permette di fare clic sui testi formattati collegati e scrivere direttamente nella pagina. I campi senza collegamento all’anteprima restano nella barra laterale. Questa preferenza viene salvata in questo browser; per salvare i contenuti devi comunque premere Salva.",
   "shell.githubAccount": "Account GitHub",
   "shell.noGithubAccount": "Nessun account GitHub collegato.",
   "shell.repository": "Repository",

package/src/editor/i18n/ja/fields.json

@@ -50,6 +50,8 @@
   "fields.editArticleBody": "プレビューで記事本文を編集",
   "fields.loadingPreview": "プレビューを読み込み中…",
   "fields.editArticleBodyHint": "プレビューの記事本文をクリックすると編集できます。コンテンツの変更には保存が必要です。",
+  "fields.editRichText": "プレビューで編集",
+  "fields.editRichTextHint": "プレビューのこのテキストをクリックすると編集できます。変更には保存が必要です。",
   "fields.seoNotSet": "未設定",
   "fields.seoTooShort": "短すぎます",
   "fields.seoTooLong": "長すぎます",

package/src/editor/i18n/ja/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "現在のコンテンツ言語",
   "shell.coreCategory": "基本",
   "shell.searchPages": "ページを検索",
+  "shell.searchNamedEntries": "{name}内を検索",
   "shell.template": "テンプレート",
   "shell.chooseTemplate": "テンプレートを選択",
   "shell.search": "検索",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "記事本文の編集",
   "shell.sidebar": "サイドバー",
   "shell.inlinePreview": "インラインプレビュー",
-  "shell.editorExperienceHint": "インラインプレビューでは、記事本文をクリックしてページ上で直接編集できます。他のフィールドはサイドバーに表示されます。この設定はこのブラウザーに保存されますが、コンテンツには引き続き「保存」が必要です。",
+  "shell.editorExperienceHint": "インラインプレビューでは、プレビューに紐づいたリッチテキストをクリックしてページ上で直接編集できます。プレビューに紐づかないフィールドはサイドバーに表示されます。この設定はこのブラウザーに保存されますが、コンテンツには引き続き「保存」が必要です。",
   "shell.githubAccount": "GitHubアカウント",
   "shell.noGithubAccount": "GitHubアカウントが接続されていません。",
   "shell.repository": "リポジトリ",

package/src/editor/i18n/nl/fields.json

@@ -50,6 +50,8 @@
   "fields.editArticleBody": "Artikeltekst in het voorbeeld bewerken",
   "fields.loadingPreview": "Voorbeeld laden…",
   "fields.editArticleBodyHint": "Klik op de artikeltekst in het voorbeeld om deze te bewerken. Wijzigingen in de inhoud moeten worden opgeslagen.",
+  "fields.editRichText": "Bewerken in het voorbeeld",
+  "fields.editRichTextHint": "Klik op deze tekst in het voorbeeld om deze te bewerken. Wijzigingen moeten worden opgeslagen.",
   "fields.seoNotSet": "Niet ingesteld",
   "fields.seoTooShort": "Te kort",
   "fields.seoTooLong": "Te lang",

package/src/editor/i18n/nl/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "Huidige inhoudstaal",
   "shell.coreCategory": "Standaard",
   "shell.searchPages": "Pagina’s zoeken",
+  "shell.searchNamedEntries": "Zoeken in {name}",
   "shell.template": "Sjabloon",
   "shell.chooseTemplate": "Kies een sjabloon",
   "shell.search": "Zoeken",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "Artikeltekst bewerken",
   "shell.sidebar": "Zijbalk",
   "shell.inlinePreview": "Inline voorbeeld",
-  "shell.editorExperienceHint": "Met het inline voorbeeld kun je op een artikeltekst klikken en direct op de pagina schrijven. Andere velden blijven in de zijbalk. Deze voorkeur wordt in deze browser opgeslagen; inhoud moet je nog steeds opslaan met Opslaan.",
+  "shell.editorExperienceHint": "Met het inline voorbeeld kun je op gekoppelde rich text klikken en direct op de pagina schrijven. Velden zonder koppeling met het voorbeeld blijven in de zijbalk. Deze voorkeur wordt in deze browser opgeslagen; inhoud moet je nog steeds opslaan met Opslaan.",
   "shell.githubAccount": "GitHub-account",
   "shell.noGithubAccount": "Er is geen GitHub-account gekoppeld.",
   "shell.repository": "Repository",

package/src/editor/i18n/ru/fields.json

@@ -52,6 +52,8 @@
   "fields.editArticleBody": "Редактировать текст статьи в предпросмотре",
   "fields.loadingPreview": "Загрузка предпросмотра…",
   "fields.editArticleBodyHint": "Нажмите на текст статьи в предпросмотре, чтобы редактировать его. Изменения содержимого нужно сохранить.",
+  "fields.editRichText": "Редактировать в предпросмотре",
+  "fields.editRichTextHint": "Нажмите на этот текст в предпросмотре, чтобы редактировать его. Изменения нужно сохранить.",
   "fields.seoNotSet": "Не задано",
   "fields.seoTooShort": "Слишком коротко",
   "fields.seoTooLong": "Слишком длинно",

package/src/editor/i18n/ru/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "Текущий язык содержимого",
   "shell.coreCategory": "Основные",
   "shell.searchPages": "Поиск страниц",
+  "shell.searchNamedEntries": "Поиск в {name}",
   "shell.template": "Шаблон",
   "shell.chooseTemplate": "Выберите шаблон",
   "shell.search": "Поиск",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "Редактирование текста статьи",
   "shell.sidebar": "Боковая панель",
   "shell.inlinePreview": "Прямо в предпросмотре",
-  "shell.editorExperienceHint": "Этот режим позволяет нажать на текст статьи и редактировать его прямо на странице. Остальные поля остаются на боковой панели. Настройка сохраняется в этом браузере; для сохранения содержимого по-прежнему нужно нажать «Сохранить».",
+  "shell.editorExperienceHint": "Этот режим позволяет нажать на связанный форматированный текст и редактировать его прямо на странице. Поля без привязки к предпросмотру остаются на боковой панели. Настройка сохраняется в этом браузере; для сохранения содержимого по-прежнему нужно нажать «Сохранить».",
   "shell.githubAccount": "Учётная запись GitHub",
   "shell.noGithubAccount": "Учётная запись GitHub не подключена.",
   "shell.repository": "Репозиторий",

package/src/editor/i18n/zh/fields.json

@@ -50,6 +50,8 @@
   "fields.editArticleBody": "在预览中编辑文章正文",
   "fields.loadingPreview": "正在加载预览…",
   "fields.editArticleBodyHint": "点击预览中的文章正文即可编辑。内容更改后需保存。",
+  "fields.editRichText": "在预览中编辑",
+  "fields.editRichTextHint": "点击预览中的这段文字即可编辑。更改后需保存。",
   "fields.seoNotSet": "未设置",
   "fields.seoTooShort": "过短",
   "fields.seoTooLong": "过长",

package/src/editor/i18n/zh/shell.json

@@ -5,6 +5,7 @@
   "shell.searchScopeCurrent": "当前内容语言",
   "shell.coreCategory": "基础",
   "shell.searchPages": "搜索页面",
+  "shell.searchNamedEntries": "在{name}中搜索",
   "shell.template": "模板",
   "shell.chooseTemplate": "选择模板",
   "shell.search": "搜索",
@@ -49,7 +50,7 @@
   "shell.articleBodyEditing": "文章正文编辑",
   "shell.sidebar": "侧边栏",
   "shell.inlinePreview": "行内预览",
-  "shell.editorExperienceHint": "行内预览让你点击文章正文，直接在页面上编辑。其他字段仍在侧边栏中。此偏好设置保存在当前浏览器中；内容仍需点击“保存”才会保存。",
+  "shell.editorExperienceHint": "行内预览让你点击预览中绑定的富文本，直接在页面上编辑。没有预览绑定的字段仍在侧边栏中。此偏好设置保存在当前浏览器中；内容仍需点击“保存”才会保存。",
   "shell.githubAccount": "GitHub 账号",
   "shell.noGithubAccount": "未连接 GitHub 账号。",
   "shell.repository": "仓库",

package/src/editor/lib/BlockEditor.svelte

@@ -25,8 +25,9 @@
   import { articleMarkdown } from "../../article-render";
   import Icon from "./Icon.svelte";
   import Select from "./Select.svelte";
-  let { value, oninput, editableRoot }: { value: ArticleBody; oninput: (value: ArticleBody) => void; editableRoot?: HTMLElement } = $props();
+  let { value, oninput, editableRoot, label }: { value: ArticleBody; oninput: (value: ArticleBody) => void; editableRoot?: HTMLElement; label?: string } = $props();
   const inline = $derived(!!editableRoot);
+  const regionLabel = $derived(label ?? $t("richtext.body"));
   let root: HTMLElement;
   let surface: HTMLDivElement;
   let menu: HTMLDivElement;
@@ -203,7 +204,7 @@
   onMount(() => {
     if (editableRoot) {
       root = editableRoot; root.classList.add("block-content", "rigel-article-content"); root.contentEditable = "true";
-      root.setAttribute("role", "textbox"); root.setAttribute("aria-label", $t("richtext.body")); root.setAttribute("aria-multiline", "true");
+      root.setAttribute("role", "textbox"); root.setAttribute("aria-label", regionLabel); root.setAttribute("aria-multiline", "true");
       root.setAttribute("aria-keyshortcuts", "Alt+F10");
     }
     view = root.ownerDocument.defaultView!;
@@ -278,7 +279,7 @@
     };
   });
 
-  $effect(() => { if (editableRoot) editableRoot.setAttribute("aria-label", $t("richtext.body")); });
+  $effect(() => { if (editableRoot) editableRoot.setAttribute("aria-label", regionLabel); });
 
   $effect(() => { if (!linkOpen) view?.CSS.highlights?.delete("rigel-link-selection"); });
 

package/src/editor/lib/CollectionPanel.svelte

@@ -16,14 +16,16 @@
   import type { ContentDocument } from "../../schema/types";
   import { slugify } from "../../slugs";
 
-  let { fields, values, storageSlug, body, selected, focusToken, devMode, documents = [], bodyInline = false, bodyLoading = false, oneditbody = () => {}, onchange, onbody }: {
+  let { fields, values, storageSlug, body, selected, focusToken, devMode, documents = [], bodyInline = false, bodyLoading = false, inlineFields = [], oneditbody = () => {}, oneditfield = () => {}, onchange, onbody }: {
     fields: CollectionField[];
     values: Record<string, unknown>;
     storageSlug: string;
     body: ArticleBody;
     bodyInline?: boolean;
     bodyLoading?: boolean;
+    inlineFields?: string[];
     oneditbody?: () => void;
+    oneditfield?: (path: string) => void;
     selected: SelectedField | null;
     focusToken: number;
     devMode: boolean;
@@ -66,7 +68,13 @@
             <span>{label}{devMode ? ` (${field.key})` : ""}</span>
           </label>
         {:else if field.type === "markdown"}
-          <MarkdownEditor {label} value={String(values[field.key] ?? "")} oninput={(value) => onchange(field.key, value)} />
+          {#if inlineFields.includes(field.key)}
+            <span class="schema-label">{label}{devMode ? ` (${field.key})` : ""}</span>
+            <button type="button" class="outlined" onclick={() => oneditfield(field.key)}>{$t("fields.editRichText")}</button>
+            <p class="hint">{$t("fields.editRichTextHint")}</p>
+          {:else}
+            <MarkdownEditor {label} value={String(values[field.key] ?? "")} oninput={(value) => onchange(field.key, value)} />
+          {/if}
         {:else if field.type === "image"}
           <label><span>{label}{devMode ? ` (${field.key})` : ""}</span><ImagePicker value={String(values[field.key] ?? "")} onpick={(value) => onchange(field.key, value)} /></label>
         {:else if field.type === "tags"}

package/src/editor/lib/MarkdownEditor.svelte

@@ -28,6 +28,28 @@
   let view: EditorView | undefined;
   let lastValue: string | undefined;
   let imageSelection: SelectionBookmark | undefined;
+  let toolbar: HTMLDivElement | undefined;
+  let floating = $state("");
+  let linkPosition = $state("");
+  let releaseFloating: (() => void) | undefined;
+  const inline = $derived(!!editableRoot);
+  function positionFloating() {
+    if (!inline || !editableRoot || !view || mode !== "visual") { floating = ""; linkPosition = ""; return; }
+    const owner = editableRoot.ownerDocument;
+    const active = owner.activeElement;
+    if (!editableRoot.contains(active) && !toolbar?.contains(active)) { floating = ""; linkPosition = ""; return; }
+    const anchor = view.state.selection.$from;
+    const block = anchor.depth > 0 ? view.nodeDOM(anchor.before(1)) : null;
+    const rect = block instanceof HTMLElement ? block.getBoundingClientRect() : editableRoot.getBoundingClientRect();
+    const { innerWidth, innerHeight } = owner.defaultView!;
+    if (rect.bottom < 0 || rect.top > innerHeight) { floating = ""; linkPosition = ""; return; }
+    const size = toolbar?.getBoundingClientRect();
+    const height = size?.height || 44, width = size?.width || 360;
+    const top = Math.max(8, Math.min(rect.top >= height + 12 ? rect.top - height - 8 : rect.bottom + 8, innerHeight - height - 8));
+    const left = Math.max(8, Math.min(rect.left, innerWidth - width - 8));
+    floating = `left:${left}px;top:${top}px`;
+    linkPosition = `left:${Math.max(8, Math.min(left, innerWidth - 356))}px;top:${Math.max(8, Math.min(top + height + 4, innerHeight - 128))}px`;
+  }
   function insertImage(url: string, alt: string, credit?: StockResult) {
     if (!view || !imageSelection || !safeImageUrl(url)) return;
     let tr = view.state.tr.setSelection(imageSelection.resolve(view.state.doc));
@@ -76,6 +98,7 @@
           state = view!.state.apply(transaction);
           view!.updateState(state);
           if (transaction.docChanged) emit(serializeMarkdown(state.doc));
+          positionFloating();
         },
         handlePaste(editor, event) {
           event.preventDefault();
@@ -85,8 +108,14 @@
         },
         handleDrop(_editor, _event, _slice, moved) { return !moved; },
         handleClickOn(_editor, _pos, node) { return node.type.name === "image"; },
-        handleDOMEvents: { click: (_editor, event) => { if ((event.target as Element).closest("a")) { event.preventDefault(); return true; } return false; } },
+        handleDOMEvents: { click: (_editor, event) => { if ((event.target as Element).closest("a")) { event.preventDefault(); return true; } return false; }, focus: () => { positionFloating(); return false; }, blur: () => { setTimeout(positionFloating); return false; } },
       });
+      const target = editableRoot ?? host;
+      const owner = target.ownerDocument;
+      const reposition = () => positionFloating();
+      owner.defaultView?.addEventListener("scroll", reposition, true);
+      owner.defaultView?.addEventListener("resize", reposition);
+      releaseFloating = () => { owner.defaultView?.removeEventListener("scroll", reposition, true); owner.defaultView?.removeEventListener("resize", reposition); };
     }
     if (value !== lastValue) {
       lastValue = value;
@@ -94,7 +123,8 @@
     }
   });
   $effect(() => { const editable = mode === "visual"; view?.setProps({ editable: () => editable }); });
-  onDestroy(() => view?.destroy());
+  $effect(() => { void mode; void inline; positionFloating(); });
+  onDestroy(() => { releaseFloating?.(); view?.destroy(); });
 
   function activeMark(type: string) {
     if (!state) return false;
@@ -164,7 +194,8 @@
 
 <svelte:window onpointerdown={event => { if (linkOpen && !document.getElementById(`${id}-link`)?.contains(event.target as Node) && !linkButton?.contains(event.target as Node)) linkOpen = false; }} />
 
-<div class="markdown-editor body-editor" class:markdown-inline={!!editableRoot}>
+<div class="markdown-editor body-editor" class:markdown-inline={inline} class:markdown-floating={inline && mode === "visual"}>
+  {#if !inline || mode === "source"}
   <div class="markdown-heading">
     <div class="field-label" id={`${id}-label`}>{label}</div>
     <div class="markdown-modes" role="group" aria-label={$t("richtext.editingMode", { label })}>
@@ -172,9 +203,10 @@
       <button type="button" aria-pressed={mode === "source"} onclick={() => { mode = "source"; linkOpen = false; }}>{$t("richtext.markdown")}</button>
     </div>
   </div>
+  {/if}
   {#if warning}<p class="markdown-warning" role="status">{warning}</p>{/if}
   <div class="markdown-visual" hidden={mode !== "visual"}>
-    <div class="body-toolbar formatting-toolbar" role="group" aria-label={$t("richtext.formatting", { label })}>
+    <div class="body-toolbar formatting-toolbar" bind:this={toolbar} role="group" aria-label={$t("richtext.formatting", { label })} style={inline ? floating : undefined} hidden={inline && !floating}>
       <Select ariaLabel={$t("richtext.textStyle")} data-tooltip={$t("richtext.textStyle")} value={format} options={[{ value: "paragraph", label: $t("richtext.paragraph") }, ...[1, 2, 3, 4, 5, 6].map(level => ({ value: `h${level}`, label: $t("richtext.heading", { level }) })), { value: "code_block", label: $t("richtext.codeBlock") }].map(option => ({ ...option, disabled: !!state && format !== option.value && !formatCommand(option.value)(state) }))} onchange={next => command(formatCommand(String(next)))} />
       <div class="format-group" role="group" aria-label={$t("richtext.textFormatting")}>
         {#each marks as item}
@@ -188,9 +220,10 @@
       </div>
       <button bind:this={linkButton} type="button" aria-label={$t("richtext.link")} data-tooltip={$t("richtext.link")} aria-pressed={activeMark("link")} aria-expanded={linkOpen} aria-controls={`${id}-link`} disabled={!state || !toggleMark(schema.marks.link)(state)} onmousedown={event => event.preventDefault()} onclick={openLink}><Icon name="link" size={18} /></button>
       <ImagePicker toolbar onopen={() => { imageSelection = view?.state.selection.getBookmark(); linkOpen = false; }} onpick={insertImage} onclose={() => { imageSelection = undefined; }} />
+      {#if inline}<button type="button" class="markdown-toggle" aria-label={$t("richtext.markdown")} data-tooltip={$t("richtext.markdown")} onmousedown={event => event.preventDefault()} onclick={() => { mode = "source"; linkOpen = false; }}>{$t("richtext.markdown")}</button>{/if}
     </div>
     {#if linkOpen}
-      <div class="markdown-link" id={`${id}-link`} role="group" aria-label={$t("richtext.editLink")} onkeydown={event => { if (event.key === "Escape") { event.stopPropagation(); linkOpen = false; linkButton.focus(); } if (event.key === "Enter") { event.preventDefault(); link(); } }}>
+      <div class="markdown-link" id={`${id}-link`} role="group" aria-label={$t("richtext.editLink")} style={inline ? linkPosition : undefined} onkeydown={event => { if (event.key === "Escape") { event.stopPropagation(); linkOpen = false; linkButton.focus(); } if (event.key === "Enter") { event.preventDefault(); link(); } }}>
         <label for={`${id}-url`}>{$t("richtext.linkUrl")}</label>
         <div class="markdown-link-controls">
           <input id={`${id}-url`} type="text" placeholder="https://…" bind:this={linkInput} bind:value={linkUrl} aria-invalid={!!linkError} aria-describedby={linkError ? `${id}-error` : undefined} />

package/src/editor/lib/PropertiesTabs.svelte

@@ -1,6 +1,13 @@
 <script lang="ts">
   import { t } from "../i18n";
   let { tab = $bindable("content") }: { tab?: "content" | "seo" } = $props();
+  let tabs: HTMLDivElement;
+  let height = $state(0);
+  $effect(() => {
+    const panel = tabs?.parentElement;
+    panel?.style.setProperty("--properties-tabs-height", `${height}px`);
+    return () => panel?.style.removeProperty("--properties-tabs-height");
+  });
   function onkey(event: KeyboardEvent) {
     if (!["ArrowLeft", "ArrowRight", "Home", "End"].includes(event.key)) return;
     event.preventDefault();
@@ -9,7 +16,7 @@
   }
 </script>
 
-<div class="panel-tabs" role="tablist" aria-label={$t("fields.properties")}>
+<div class="panel-tabs" role="tablist" aria-label={$t("fields.properties")} bind:this={tabs} bind:offsetHeight={height}>
   {#each ["content", "seo"] as value}
     <button type="button" role="tab" id={`properties-tab-${value}`} aria-controls={`properties-${value}`} aria-selected={tab === value} tabindex={tab === value ? 0 : -1} data-tab={value} onclick={() => (tab = value as "content" | "seo")} onkeydown={onkey}>{$t(value === "content" ? "fields.content" : "fields.seo")}</button>
   {/each}

package/src/editor/lib/SchemaField.svelte

@@ -18,7 +18,7 @@
   import type { ContentDocument, FieldDef, Schema } from "../../schema/types";
 
   let {
-    schema, field, value, base, documents, devMode = false, onvalue,
+    schema, field, value, base, documents, devMode = false, inlineFields = [], oneditfield = () => {}, onvalue,
   }: {
     schema: Schema;
     field: FieldDef;
@@ -26,6 +26,8 @@
     base: string;
     documents: ContentDocument[];
     devMode?: boolean;
+    inlineFields?: string[];
+    oneditfield?: (path: string) => void;
     onvalue: (next: unknown) => void;
   } = $props();
 
@@ -85,7 +87,15 @@
     <textarea rows="3" value={typeof value === "string" ? value : ""} oninput={(event) => onvalue(event.currentTarget.value)}></textarea>
   </label>
 {:else if field.type === "markdown"}
-  <MarkdownEditor label={fieldLabel} value={typeof value === "string" ? value : ""} oninput={(next) => onvalue(next)} />
+  {#if !field.sidebarOnly && inlineFields.includes(base)}
+    <div class="schema-field">
+      <span class="schema-label">{label}</span>
+      <button type="button" class="outlined" onclick={() => oneditfield(base)}>{$t("fields.editRichText")}</button>
+      <p class="hint">{$t("fields.editRichTextHint")}</p>
+    </div>
+  {:else}
+    <MarkdownEditor label={fieldLabel} value={typeof value === "string" ? value : ""} oninput={(next) => onvalue(next)} />
+  {/if}
 {:else if field.type === "image" || field.type === "file"}
   <div class="schema-field">
     <span class="schema-label">{label}</span>
@@ -113,6 +123,8 @@
         {schema}
         {documents}
         {devMode}
+        {inlineFields}
+        {oneditfield}
         field={sub}
         base={`${base}.${sub.key}`}
         value={value && typeof value === "object" ? (value as Record<string, unknown>)[sub.key] : undefined}
@@ -141,6 +153,8 @@
               {schema}
               {documents}
               {devMode}
+              {inlineFields}
+              {oneditfield}
               field={sub}
               base={`${base}.${(item as Record<string, unknown>)._key}.${sub.key}`}
               value={item && typeof item === "object" ? (item as Record<string, unknown>)[sub.key] : undefined}