@bendyline/squisq-editor-react 1.6.1 → 2.0.0

package/src/Toolbar.tsx

@@ -9,21 +9,35 @@
 
 import type { ReactNode } from 'react';
 import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
-import type { Editor as TiptapEditor } from '@tiptap/core';
+import type { Editor as TiptapEditor, JSONContent } from '@tiptap/core';
 import { TextSelection } from '@tiptap/pm/state';
 import { Fragment } from '@tiptap/pm/model';
 import type { IRange } from 'monaco-editor';
+import type { Block } from '@bendyline/squisq/schemas';
+import { VIEWPORT_PRESETS } from '@bendyline/squisq/schemas';
+import { DEFAULT_THEME, flattenBlocks } from '@bendyline/squisq/doc';
+import {
+  KNOWN_BLOCK_META_KEYS,
+  matchTrailingTemplateAnnotation,
+  splitKeyValueToken,
+  tokenizeAttrTokens,
+} from '@bendyline/squisq/markdown';
 import { useEditorContext, type EditorView } from './EditorContext';
 import { VersionHistoryPanel } from './VersionHistoryPanel';
 import { RecorderEntry } from './RecorderEntry';
 import { ViewMenuPanel } from './ViewMenuPanel';
-import { TemplatePicker, TEMPLATE_NAMES } from './TemplatePicker';
-import { TransitionPicker } from './TransitionPicker';
+import {
+  TemplatePicker,
+  TEMPLATE_NAMES,
+  TEMPLATE_GALLERY_PORTAL_SELECTOR,
+  templateLabel,
+} from './TemplatePicker';
+import { TransitionPicker, TRANSITION_FLYOUT_PORTAL_ID } from './TransitionPicker';
 import {
   readHeadingLineTransition,
   setHeadingLineTransition,
   readBlockAttrsTransition,
-  setBlockAttrsTransition,
+  setHeadingAttrsTransition,
   EMPTY_TRANSITION,
   type TransitionFields,
 } from './headingTransition';
@@ -36,25 +50,31 @@ import { CustomLayoutManager } from './customTemplates/CustomLayoutManager';
 import { Icon } from './Icon';
 import type { PickerEntry } from './emojiData';
 import { createPortal } from 'react-dom';
+import { PreviewModeMenu, displayModeLabel, usePreviewSettingsOptional } from './PreviewControls';
+import { filterVisibleMediaEntries } from './mediaEntries';
 
 const VIEWS: { id: EditorView; label: string; shortLabel?: string; shortcut: string }[] = [
-  { id: 'wysiwyg', label: 'Editor', shortcut: '⌘1' },
-  { id: 'raw', label: 'Markdown', shortLabel: 'MD', shortcut: '⌘2' },
-  { id: 'preview', label: 'Play', shortcut: '⌘3' },
+  { id: 'wysiwyg', label: 'Write', shortcut: '⌘1' },
+  { id: 'raw', label: 'Source', shortcut: '⌘2' },
+  { id: 'preview', label: 'Use', shortcut: '⌘3' },
 ];
 
+const BLOCK_META_KEYS = new Set<string>(Object.keys(KNOWN_BLOCK_META_KEYS));
+
 export interface ToolbarProps {
   /** Additional class name */
   className?: string;
   /** Whether the Files panel is currently shown */
   showFiles?: boolean;
+  /** Number of files currently available through the MediaProvider. */
+  fileCount?: number;
   /** Toggle the Files panel. When provided, a "Files" button appears in the toolbar. */
   onToggleFiles?: () => void;
   /** Content rendered at the left edge of the toolbar, before the view tabs. */
   slotLeft?: ReactNode;
   /** Content rendered immediately after the view tabs, on the left side of the
    *  toolbar (before the formatting controls). Used for the preview mode
-   *  switch in Play view. */
+   *  switch in Use view. */
   slotAfterTabs?: ReactNode;
   /** Content rendered after the formatting controls (in the middle area). */
   slotAfterActions?: ReactNode;
@@ -185,6 +205,14 @@ const BUTTONS: ToolbarButton[] = [
     group: 'media',
     faIcon: 'fa-solid fa-table',
   },
+  {
+    id: 'tasklist',
+    label: 'tasks',
+    icon: '',
+    title: 'Insert Task List',
+    group: 'media',
+    faIcon: 'fa-solid fa-list-check',
+  },
   {
     id: 'diagram',
     label: 'diagram',
@@ -193,6 +221,22 @@ const BUTTONS: ToolbarButton[] = [
     group: 'media',
     faIcon: 'fa-solid fa-diagram-project',
   },
+  {
+    id: 'tree',
+    label: 'tree',
+    icon: '',
+    title: 'Insert tree',
+    group: 'media',
+    faIcon: 'fa-solid fa-folder-tree',
+  },
+  {
+    id: 'timeline',
+    label: 'timeline',
+    icon: '',
+    title: 'Insert timeline',
+    group: 'media',
+    faIcon: 'fa-solid fa-timeline',
+  },
   {
     id: 'drawing',
     label: 'drawing',
@@ -230,12 +274,51 @@ const BUTTONS: ToolbarButton[] = [
 const FIRST_MEDIA_INDEX = BUTTONS.findIndex((b) => b.group === 'media');
 const MEDIA_BUTTONS = BUTTONS.filter((b) => b.group === 'media');
 const INSERT_MENU_WIDTH = 200;
+const TASK_LIST_ITEMS = ['Task 1', 'Task 2', 'Task 3'] as const;
+const TASK_LIST_MARKDOWN = TASK_LIST_ITEMS.map((item) => `- [ ] ${item}`).join('\n');
+
+// BUTTONS position per id — stamped on each rendered button as
+// data-btn-index so the overflow measurement can map a clipped DOM button
+// back to its BUTTONS entry. Walking a counter over the DOM instead would
+// drift whenever some entries render no button of their own (hidden H5/H6
+// heading levels, the media group collapsed behind the Insert dropdown).
+const BUTTON_INDEX_BY_ID = new Map(BUTTONS.map((b, i) => [b.id, i]));
 
 /** Renders a button's icon: a Font Awesome glyph when set, else the text label. */
 function buttonIcon(btn: ToolbarButton): ReactNode {
   return btn.faIcon ? <Icon icon={btn.faIcon} /> : btn.icon;
 }
 
+function fileCountLabel(count: number): string {
+  return `${count} ${count === 1 ? 'file' : 'files'}`;
+}
+
+function fileCountBadge(count: number): string {
+  return count > 99 ? '99+' : String(count);
+}
+
+function taskListContent(): JSONContent {
+  return {
+    type: 'taskList',
+    content: TASK_LIST_ITEMS.map((item) => ({
+      type: 'taskItem',
+      attrs: { checked: false },
+      content: [
+        {
+          type: 'paragraph',
+          content: [{ type: 'text', text: item }],
+        },
+      ],
+    })),
+  };
+}
+
+function insertTaskList(editor: TiptapEditor): void {
+  const supportsTaskList = !!editor.schema.nodes.taskList && !!editor.schema.nodes.taskItem;
+  const content = supportsTaskList ? taskListContent() : TASK_LIST_MARKDOWN;
+  editor.chain().focus().insertContent(content).run();
+}
+
 // ─── Tiptap active-state map ────────────────────────────
 
 /** Returns true if the given button id is currently active in Tiptap */
@@ -289,6 +372,79 @@ const LAYOUT_STARTER_TEXT_PARAMS =
 /** Multi-line markdown for a new layout (raw / code views). */
 const LAYOUT_STARTER_MARKDOWN = `\n## Layout {[layout]}\n\n### {#text-1} {[text ${LAYOUT_STARTER_TEXT_PARAMS}]}\n\nLayout\n`;
 
+/**
+ * Starter art for a new diagram — diagrams are authored as ASCII-art code
+ * fences (the fence is the source of truth; `AsciiDiagramExtension` mounts
+ * the interactive canvas over it). This exact art is the codec's own
+ * canonical rendering of a two-node flow, so it re-parses and re-renders
+ * byte-stably.
+ */
+const DIAGRAM_STARTER_ART = [
+  '┌─────────┐',
+  '│  Start  │',
+  '└────┬────┘',
+  '     │',
+  '     ▼',
+  '┌────┴────┐',
+  '│  Next   │',
+  '└─────────┘',
+].join('\n');
+/**
+ * Fenced form for raw / code views — tagged with the explicit `diagram`
+ * language so the block's identity survives markdown ↔ Tiptap round-trips
+ * (the language class round-trips; fence meta does not).
+ */
+const DIAGRAM_STARTER_MARKDOWN = '\n```diagram\n' + DIAGRAM_STARTER_ART + '\n```\n';
+
+/** Insert a starter ASCII-diagram code fence after the current top-level block. */
+function insertAsciiDiagramBlock(editor: TiptapEditor): void {
+  insertFenceBlock(editor, DIAGRAM_STARTER_ART, 'diagram');
+}
+
+/**
+ * Starter art for a new file tree — an ASCII tree fence (the fence is the
+ * source of truth; `TreeViewExtension` mounts the interactive outline).
+ */
+const TREE_STARTER_ART = ['src/', '├── index.ts', '└── utils/', '    └── helpers.ts'].join('\n');
+const TREE_STARTER_MARKDOWN = '\n```tree\n' + TREE_STARTER_ART + '\n```\n';
+
+/** Insert a starter ASCII tree code fence after the current top-level block. */
+function insertTreeBlock(editor: TiptapEditor): void {
+  insertFenceBlock(editor, TREE_STARTER_ART, 'tree');
+}
+
+/** Starter multi-event rail for the authored timeline view. */
+const TIMELINE_STARTER_ART =
+  'Milestones: ● Start {#start} ─────● Review {#review} ─────● Ship {#ship} ───►';
+const TIMELINE_STARTER_MARKDOWN = '\n```timeline\n' + TIMELINE_STARTER_ART + '\n```\n';
+
+/** Insert a starter ASCII timeline code fence after the current top-level block. */
+function insertTimelineBlock(editor: TiptapEditor): void {
+  insertFenceBlock(editor, TIMELINE_STARTER_ART, 'timeline');
+}
+
+/**
+ * Insert a code fence after the current top-level block. `lang` tags the
+ * fence's `language` attribute — pass the explicit authored-view tag so its
+ * identity round-trips through markdown and Tiptap.
+ */
+function insertFenceBlock(editor: TiptapEditor, art: string, lang?: string): void {
+  editor
+    .chain()
+    .focus()
+    .command(({ tr, state, dispatch }) => {
+      const codeBlockType = state.schema.nodes.codeBlock;
+      if (!codeBlockType) return false;
+      const attrs = lang ? { language: lang } : null;
+      const block = codeBlockType.create(attrs, state.schema.text(art));
+      const { $from } = state.selection;
+      const insertPos = $from.depth > 0 ? $from.after(1) : state.doc.content.size;
+      if (dispatch) tr.insert(insertPos, block);
+      return true;
+    })
+    .run();
+}
+
 /**
  * Insert a block-level heading carrying a Scene template (`diagram` /
  * `drawing` / `layout`) at the top level, after the block the caret sits
@@ -365,6 +521,44 @@ function insertLayoutBlock(editor: TiptapEditor): void {
     .run();
 }
 
+function findBlockBySourceLine(blocks: readonly Block[], lineNumber: number): Block | null {
+  for (const block of blocks) {
+    const pos = block.sourceHeading?.position;
+    if (!pos) continue;
+    if (pos.start.line <= lineNumber && pos.end.line >= lineNumber) return block;
+  }
+  return null;
+}
+
+function splitTemplateAnnotationParams(text: string): { text: string; params: string[] } {
+  const match = matchTrailingTemplateAnnotation(text);
+  if (!match) return { text: text.trimEnd(), params: [] };
+  const tokens = tokenizeAttrTokens(match.inner.trim());
+  const firstIsParam = tokens.length > 0 && tokens[0].indexOf('=') > 0;
+  return {
+    text: text.slice(0, match.index).trimEnd(),
+    params: keepBlockMetaParamTokens(tokens.slice(firstIsParam ? 0 : 1)),
+  };
+}
+
+function buildTemplateAnnotation(template: string, params: string[]): string | null {
+  const parts = template ? [template, ...params] : params;
+  return parts.length > 0 ? `{[${parts.join(' ')}]}` : null;
+}
+
+function keepBlockMetaParamTokens(tokens: readonly string[]): string[] {
+  return tokens.filter((token) => {
+    const kv = splitKeyValueToken(token);
+    return kv ? BLOCK_META_KEYS.has(kv.key) : false;
+  });
+}
+
+function keepBlockMetaParamString(inner: string | null | undefined): string | null {
+  if (!inner) return null;
+  const params = keepBlockMetaParamTokens(tokenizeAttrTokens(inner));
+  return params.length > 0 ? params.join(' ') : null;
+}
+
 /**
  * Formatting toolbar.
  * - WYSIWYG: calls Tiptap chain commands (toggleBold, etc.)
@@ -373,6 +567,7 @@ function insertLayoutBlock(editor: TiptapEditor): void {
 export function Toolbar({
   className,
   showFiles,
+  fileCount,
   onToggleFiles,
   slotLeft,
   slotAfterTabs,
@@ -384,17 +579,24 @@ export function Toolbar({
     activeView,
     setActiveView,
     markdownSource,
+    doc,
     setMarkdownSource,
     tiptapEditor,
     monacoEditor,
     activeSceneText,
     mediaProvider,
     editorMode,
+    layoutMode,
+    activeBlockStartLine,
     versioning,
     allowRecording,
     documentLinkProvider,
     colorScheme,
+    mediaRevision,
+    bumpMediaRevision,
   } = useEditorContext();
+  const previewSettings = usePreviewSettingsOptional();
+  const [useModeMenuRequest, requestUseModeMenu] = useReducer((count: number) => count + 1, 0);
   // When a canvas textbox is being edited, its Tiptap instance takes over
   // the formatting buttons; otherwise they drive the document editor. The
   // `level` gates which buttons apply (inline labels vs. rich textboxes).
@@ -409,6 +611,30 @@ export function Toolbar({
     return true;
   });
   const showViewTabs = visibleViews.length > 1;
+  const [scannedFileCount, setScannedFileCount] = useState(0);
+  const resolvedFileCount = fileCount ?? scannedFileCount;
+
+  useEffect(() => {
+    if (fileCount !== undefined) return;
+    if (!mediaProvider) {
+      setScannedFileCount(0);
+      return;
+    }
+
+    let cancelled = false;
+    mediaProvider.listMedia().then(
+      (entries) => {
+        if (!cancelled) setScannedFileCount(filterVisibleMediaEntries(entries).length);
+      },
+      () => {
+        if (!cancelled) setScannedFileCount(0);
+      },
+    );
+
+    return () => {
+      cancelled = true;
+    };
+  }, [fileCount, mediaProvider, mediaRevision, showFiles]);
 
   // Hidden file input for image picker
   const imageInputRef = useRef<HTMLInputElement>(null);
@@ -490,6 +716,11 @@ export function Toolbar({
   // ── Overflow detection ────────────────────────────────
   const actionsRef = useRef<HTMLDivElement>(null);
   const [measuredOverflowIndex, setMeasuredOverflowIndex] = useState<number | null>(null);
+  // '|'-joined data-contextual ids of the contextual groups (template /
+  // transition pickers, table controls) whose right edge doesn't fit in the
+  // actions row. Stored as a string so identical measurements bail out of
+  // re-rendering.
+  const [clippedContextualKey, setClippedContextualKey] = useState('');
   const [showOverflow, setShowOverflow] = useState(false);
   const overflowRef = useRef<HTMLDivElement>(null);
 
@@ -500,6 +731,7 @@ export function Toolbar({
   const [showLayoutManager, setShowLayoutManager] = useState(false);
 
   const overflowIndex = measuredOverflowIndex;
+  const clippedContextual = new Set(clippedContextualKey ? clippedContextualKey.split('|') : []);
 
   useEffect(() => {
     const container = actionsRef.current;
@@ -507,39 +739,79 @@ export function Toolbar({
 
     const measure = () => {
       const containerRight = container.getBoundingClientRect().right;
+      // Contextual groups aren't BUTTONS entries, so they must not shift the
+      // btnIndex mapping below — measure them separately.
       const children = container.querySelectorAll<HTMLElement>(
-        ':scope > .squisq-toolbar-group > .squisq-toolbar-button',
+        ':scope > .squisq-toolbar-group:not(.squisq-toolbar-contextual) > .squisq-toolbar-button',
       );
       let firstHidden: number | null = null;
-      let btnIndex = 0;
       children.forEach((child) => {
         if (firstHidden !== null) return;
-        // data-btn-count lets a single DOM button represent multiple BUTTONS entries
-        // (e.g. the Insert dropdown button represents the entire media group).
-        const btnCount = Number(child.dataset.btnCount ?? 1);
-        const rect = child.getBoundingClientRect();
-        // A button is hidden if its right edge extends past the container
-        if (rect.right > containerRight + 2) {
-          firstHidden = btnIndex;
+        // A button is hidden if its right edge extends past the container.
+        // Its data-btn-index carries its BUTTONS position (see
+        // BUTTON_INDEX_BY_ID for why the DOM can't be walked positionally).
+        if (child.getBoundingClientRect().right > containerRight + 2) {
+          const index = Number(child.dataset.btnIndex);
+          firstHidden = Number.isNaN(index) ? null : index;
         }
-        btnIndex += btnCount;
       });
       setMeasuredOverflowIndex(firstHidden);
+      // Contextual groups (template/transition pickers, table controls) that
+      // don't fit move into the overflow menu instead of painting cropped.
+      const clipped: string[] = [];
+      container
+        .querySelectorAll<HTMLElement>(':scope > .squisq-toolbar-contextual')
+        .forEach((group) => {
+          if (group.getBoundingClientRect().right > containerRight + 2) {
+            clipped.push(group.dataset.contextual ?? '');
+          }
+        });
+      setClippedContextualKey(clipped.join('|'));
     };
 
-    const ro = new ResizeObserver(measure);
-    ro.observe(container);
+    // Observe the row and every group in it: contextual groups mount/unmount
+    // with the cursor context and change width with their value, all without
+    // resizing the flex:1 container itself — a container-only observer would
+    // go stale.
+    const ro = typeof ResizeObserver === 'undefined' ? null : new ResizeObserver(measure);
+    const observeAll = () => {
+      ro?.disconnect();
+      ro?.observe(container);
+      container
+        .querySelectorAll<HTMLElement>(':scope > .squisq-toolbar-group')
+        .forEach((group) => ro?.observe(group));
+    };
+    const mo = new MutationObserver(() => {
+      observeAll();
+      measure();
+    });
+    mo.observe(container, { childList: true });
+    if (!ro) window.addEventListener('resize', measure);
+    observeAll();
     measure();
-    return () => ro.disconnect();
+    return () => {
+      ro?.disconnect();
+      if (!ro) window.removeEventListener('resize', measure);
+      mo.disconnect();
+    };
   }, [activeView]);
 
-  // Close overflow menu on outside click
+  // Close overflow menu on outside click. Clicks inside the template
+  // gallery / transition flyout portals count as inside: those popovers are
+  // hosted by pickers living in this menu, and closing the menu on their
+  // mousedown would unmount them before the click completes.
   useEffect(() => {
     if (!showOverflow) return;
     const handleClick = (e: MouseEvent) => {
-      if (overflowRef.current && !overflowRef.current.contains(e.target as Node)) {
-        setShowOverflow(false);
+      const target = e.target as Node;
+      if (overflowRef.current?.contains(target)) return;
+      if (
+        target instanceof Element &&
+        target.closest(`${TEMPLATE_GALLERY_PORTAL_SELECTOR}, #${TRANSITION_FLYOUT_PORTAL_ID}`)
+      ) {
+        return;
       }
+      setShowOverflow(false);
     };
     document.addEventListener('mousedown', handleClick);
     return () => document.removeEventListener('mousedown', handleClick);
@@ -673,10 +945,23 @@ export function Toolbar({
         case 'table':
           tiptapEditor.chain().focus().insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run();
           break;
+        case 'tasklist':
+          insertTaskList(tiptapEditor);
+          break;
         case 'diagram':
-          // Empty diagram is usable via its "+ Add first node" affordance;
-          // sub-headings under this block become nodes.
-          insertTemplateHeading(tiptapEditor, { template: 'diagram', text: 'Diagram' });
+          // Diagrams are ASCII-art code fences; the AsciiDiagramExtension
+          // mounts the interactive canvas over the inserted starter.
+          insertAsciiDiagramBlock(tiptapEditor);
+          break;
+        case 'tree':
+          // File trees are ASCII tree fences; TreeViewExtension mounts the
+          // interactive outline over the inserted starter.
+          insertTreeBlock(tiptapEditor);
+          break;
+        case 'timeline':
+          // The authored fence is immediately replaced by the WYSIWYG rail
+          // canvas; Preview uses the same events as vector layers.
+          insertTimelineBlock(tiptapEditor);
           break;
         case 'drawing':
           // Empty drawing is usable via the canvas's "Shapes ▾" palette;
@@ -827,10 +1112,25 @@ export function Toolbar({
             newCursorOffset = 3; // after \n|
             break;
           }
+          case 'tasklist': {
+            replacement = `\n${TASK_LIST_MARKDOWN}\n`;
+            newCursorOffset = replacement.length;
+            break;
+          }
           case 'diagram': {
-            // A diagram is just a heading with the `{[diagram]}` template
-            // annotation; the WYSIWYG view renders its editable canvas.
-            replacement = '\n## Diagram {[diagram]}\n';
+            // A diagram is an ASCII-art code fence; the WYSIWYG view
+            // renders its editable canvas, preview renders it as a slide.
+            replacement = DIAGRAM_STARTER_MARKDOWN;
+            newCursorOffset = replacement.length;
+            break;
+          }
+          case 'tree': {
+            replacement = TREE_STARTER_MARKDOWN;
+            newCursorOffset = replacement.length;
+            break;
+          }
+          case 'timeline': {
+            replacement = TIMELINE_STARTER_MARKDOWN;
             newCursorOffset = replacement.length;
             break;
           }
@@ -908,8 +1208,17 @@ export function Toolbar({
             insertion =
               '\n| Header 1 | Header 2 | Header 3 |\n| --- | --- | --- |\n| Cell | Cell | Cell |\n| Cell | Cell | Cell |\n';
             break;
+          case 'tasklist':
+            insertion = `\n${TASK_LIST_MARKDOWN}\n`;
+            break;
           case 'diagram':
-            insertion = '\n## Diagram {[diagram]}\n';
+            insertion = DIAGRAM_STARTER_MARKDOWN;
+            break;
+          case 'tree':
+            insertion = TREE_STARTER_MARKDOWN;
+            break;
+          case 'timeline':
+            insertion = TIMELINE_STARTER_MARKDOWN;
             break;
           case 'drawing':
             insertion = '\n## Drawing {[drawing]}\n';
@@ -932,6 +1241,7 @@ export function Toolbar({
       if (!mediaProvider) return;
       const buffer = await file.arrayBuffer();
       const relativePath = await mediaProvider.addMedia(file.name, buffer, file.type);
+      bumpMediaRevision();
       const altText = file.name.replace(/\.[^.]+$/, '').replace(/[-_]/g, ' ');
 
       if (activeView === 'wysiwyg' && tiptapEditor) {
@@ -948,7 +1258,15 @@ export function Toolbar({
         setMarkdownSource(markdownSource + `\n![${altText}](${relativePath})\n`);
       }
     },
-    [mediaProvider, activeView, tiptapEditor, monacoEditor, markdownSource, setMarkdownSource],
+    [
+      mediaProvider,
+      activeView,
+      tiptapEditor,
+      monacoEditor,
+      markdownSource,
+      setMarkdownSource,
+      bumpMediaRevision,
+    ],
   );
 
   const handleAction = useCallback(
@@ -1230,11 +1548,11 @@ export function Toolbar({
       }
       setRawHeadingLine(pos.lineNumber);
       setRawTransition(readHeadingLineTransition(line));
-      const annotMatch = headingMatch[1].match(/\s*\{\[([^\]]+)\]\}[\s\]}]*$/);
+      const annotMatch = matchTrailingTemplateAnnotation(headingMatch[1]);
       if (annotMatch) {
-        // First whitespace-delimited token is the template name; the rest are params.
-        const name = annotMatch[1].trim().split(/\s+/)[0];
-        setRawTemplate(name);
+        const tokens = tokenizeAttrTokens(annotMatch.inner.trim());
+        const firstIsParam = tokens.length > 0 && tokens[0].indexOf('=') > 0;
+        setRawTemplate(firstIsParam ? '' : (tokens[0] ?? ''));
       } else {
         setRawTemplate('');
       }
@@ -1302,6 +1620,57 @@ export function Toolbar({
     return recommendTemplatesForBlock(profile, TEMPLATE_NAMES).recommended;
   }, [currentTemplate, isRawView, isWysiwyg, rawHeadingLine, wysiwygHeadingIndex, markdownSource]);
 
+  const templatePreviewBlock = useMemo(() => {
+    if (!doc || currentTemplate === null) return null;
+    const flat = flattenBlocks(doc.blocks);
+    if (flat.length === 0) return null;
+
+    if (isRawView && rawHeadingLine !== null) {
+      return findBlockBySourceLine(flat, rawHeadingLine);
+    }
+
+    if (isWysiwyg) {
+      if (layoutMode !== 'document' && activeBlockStartLine !== null) {
+        return findBlockBySourceLine(flat, activeBlockStartLine);
+      }
+      if (wysiwygHeadingIndex !== null) {
+        return flat[wysiwygHeadingIndex] ?? null;
+      }
+    }
+
+    return null;
+  }, [
+    activeBlockStartLine,
+    currentTemplate,
+    doc,
+    isRawView,
+    isWysiwyg,
+    layoutMode,
+    rawHeadingLine,
+    wysiwygHeadingIndex,
+  ]);
+
+  const templatePreviewSource = useMemo(
+    () =>
+      templatePreviewBlock
+        ? {
+            block: templatePreviewBlock,
+            theme: previewSettings?.activeTheme ?? DEFAULT_THEME,
+            viewport: previewSettings?.activeViewport ?? VIEWPORT_PRESETS.landscape,
+            basePath: '/',
+            mediaProvider,
+            customTemplates: doc?.customTemplates,
+          }
+        : undefined,
+    [
+      mediaProvider,
+      doc?.customTemplates,
+      previewSettings?.activeTheme,
+      previewSettings?.activeViewport,
+      templatePreviewBlock,
+    ],
+  );
+
   const handleTemplatePick = (value: string) => {
     // Raw (Monaco) — rewrite the heading line's annotation suffix in place.
     if (isRawView && monacoEditor) {
@@ -1313,9 +1682,9 @@ export function Toolbar({
       const headingMatch = lineText.match(/^(#{1,6}\s+)(.+)$/);
       if (!headingMatch) return;
       const prefix = headingMatch[1];
-      // Strip any existing trailing annotation
-      const bareText = headingMatch[2].replace(/\s*\{\[[^\]]+\]\}[\s\]}]*$/, '').trimEnd();
-      const newLine = value === '' ? `${prefix}${bareText}` : `${prefix}${bareText} {[${value}]}`;
+      const { text: bareText, params } = splitTemplateAnnotationParams(headingMatch[2]);
+      const annotation = buildTemplateAnnotation(value, params);
+      const newLine = annotation ? `${prefix}${bareText} ${annotation}` : `${prefix}${bareText}`;
       monacoEditor.executeEdits('toolbar-template-pick', [
         {
           range: {
@@ -1332,14 +1701,22 @@ export function Toolbar({
     }
     // WYSIWYG — update the heading node attributes.
     if (!tiptapEditor) return;
+    const attrs = tiptapEditor.getAttributes('heading') as {
+      dataTemplateParams?: string | null;
+    };
+    const dataTemplateParams = keepBlockMetaParamString(attrs.dataTemplateParams);
     if (value === '') {
       tiptapEditor
         .chain()
         .focus()
-        .updateAttributes('heading', { dataTemplate: null, dataTemplateParams: null })
+        .updateAttributes('heading', { dataTemplate: null, dataTemplateParams })
         .run();
     } else {
-      tiptapEditor.chain().focus().updateAttributes('heading', { dataTemplate: value }).run();
+      tiptapEditor
+        .chain()
+        .focus()
+        .updateAttributes('heading', { dataTemplate: value, dataTemplateParams })
+        .run();
     }
   };
 
@@ -1382,13 +1759,36 @@ export function Toolbar({
       monacoEditor.focus();
       return;
     }
-    // WYSIWYG — rewrite the heading node's `dataBlockAttrs` (Pandoc inner).
+    // WYSIWYG — write transitions into `{[…]}` params and migrate legacy
+    // Pandoc transition keys out of `dataBlockAttrs`.
     if (!tiptapEditor) return;
-    const attrs = tiptapEditor.getAttributes('heading') as { dataBlockAttrs?: string | null };
-    const inner = setBlockAttrsTransition(attrs.dataBlockAttrs, next);
-    tiptapEditor.chain().focus().updateAttributes('heading', { dataBlockAttrs: inner }).run();
+    const attrs = tiptapEditor.getAttributes('heading') as {
+      dataBlockAttrs?: string | null;
+      dataTemplateParams?: string | null;
+    };
+    const updated = setHeadingAttrsTransition(attrs.dataBlockAttrs, attrs.dataTemplateParams, next);
+    tiptapEditor
+      .chain()
+      .focus()
+      .updateAttributes('heading', {
+        dataBlockAttrs: updated.blockAttrsInner,
+        dataTemplateParams: updated.templateParams,
+      })
+      .run();
   };
 
+  // ── Per-block controls in the overflow menu ────────────
+  // The template + transition pickers configure the active heading block, so
+  // when either is pushed into the ··· menu we group them under a labeled
+  // "<name> Block:" heading. `currentTemplate`/`currentTransition` are non-null
+  // together (both gated on a heading being active); an empty template string
+  // is a heading with no visual template, labeled "Heading".
+  const showTemplateInOverflow = currentTemplate !== null && clippedContextual.has('template');
+  const showTransitionInOverflow =
+    currentTransition !== null && clippedContextual.has('transition');
+  const showBlockSectionInOverflow = showTemplateInOverflow || showTransitionInOverflow;
+  const overflowBlockLabel = currentTemplate ? templateLabel(currentTemplate) : 'Heading';
+
   return (
     <div
       className={`squisq-toolbar ${className || ''}`}
@@ -1413,35 +1813,65 @@ export function Toolbar({
       {/* View tabs — hidden when only one view is available (e.g. code mode). */}
       {showViewTabs && (
         <div className="squisq-toolbar-view-tabs" role="tablist" aria-label="Editor view">
-          {visibleViews.map((view) => (
-            <button
-              key={view.id}
-              role="tab"
-              data-view={view.id}
-              aria-selected={activeView === view.id}
-              className={`squisq-toolbar-view-tab${activeView === view.id ? ' squisq-toolbar-view-tab--active' : ''}`}
-              onClick={() => setActiveView(view.id)}
-              data-tooltip={`${view.label} (${view.shortcut})`}
-            >
-              <span
-                className="squisq-toolbar-view-tab-label squisq-toolbar-view-tab-label--long"
-                data-label={view.label}
+          {visibleViews.map((view) => {
+            const viewLabel =
+              view.id === 'preview' && previewSettings
+                ? displayModeLabel(previewSettings.activeDisplayMode)
+                : view.label;
+            const tab = (
+              <button
+                role="tab"
+                data-view={view.id}
+                aria-selected={activeView === view.id}
+                className={`squisq-toolbar-view-tab${activeView === view.id ? ' squisq-toolbar-view-tab--active' : ''}`}
+                onClick={() => {
+                  if (view.id === 'preview' && activeView === 'preview' && previewSettings) {
+                    requestUseModeMenu();
+                    return;
+                  }
+                  setActiveView(view.id);
+                }}
+                data-tooltip={`${viewLabel} (${view.shortcut})`}
               >
-                {view.label}
-              </span>
-              {view.shortLabel && view.shortLabel !== view.label && (
                 <span
-                  className="squisq-toolbar-view-tab-label squisq-toolbar-view-tab-label--short"
-                  data-label={view.shortLabel}
+                  className="squisq-toolbar-view-tab-label squisq-toolbar-view-tab-label--long"
+                  data-label={viewLabel}
                 >
-                  {view.shortLabel}
+                  {viewLabel}
                 </span>
-              )}
-            </button>
-          ))}
+                {view.shortLabel && view.shortLabel !== view.label && (
+                  <span
+                    className="squisq-toolbar-view-tab-label squisq-toolbar-view-tab-label--short"
+                    data-label={view.shortLabel}
+                  >
+                    {view.shortLabel}
+                  </span>
+                )}
+              </button>
+            );
+
+            if (view.id !== 'preview' || !previewSettings) {
+              return (
+                <div key={view.id} className="squisq-toolbar-view-tab-wrap" role="presentation">
+                  {tab}
+                </div>
+              );
+            }
+
+            return (
+              <div
+                key={view.id}
+                className={`squisq-toolbar-view-tab-wrap squisq-toolbar-use-tab${activeView === 'preview' ? ' squisq-toolbar-use-tab--active' : ''}`}
+                role="presentation"
+              >
+                {tab}
+                <PreviewModeMenu openRequest={useModeMenuRequest} />
+              </div>
+            );
+          })}
         </div>
       )}
-      {/* After-tabs slot — left side, before formatting controls (preview mode switch) */}
+      {/* After-tabs slot — left side, before formatting or preview controls. */}
       {slotAfterTabs}
       {/* Formatting buttons — hidden in preview mode and code mode */}
       {!isPreview && !isCodeMode && (
@@ -1462,6 +1892,7 @@ export function Toolbar({
                     key={btn.id}
                     ref={btn.id === 'emoji' ? emojiButtonRef : undefined}
                     className={`squisq-toolbar-button${active ? ' squisq-toolbar-button--active' : ''}`}
+                    data-btn-index={BUTTON_INDEX_BY_ID.get(btn.id)}
                     data-tooltip={disabled ? 'Insert image (requires media provider)' : btn.title}
                     onClick={() => handleAction(btn.id)}
                     aria-label={btn.title}
@@ -1481,7 +1912,7 @@ export function Toolbar({
             <button
               ref={insertMenuButtonRef}
               className={`squisq-toolbar-button${insertMenuAnchor ? ' squisq-toolbar-button--active' : ''}`}
-              data-btn-count={String(MEDIA_BUTTONS.length)}
+              data-btn-index={FIRST_MEDIA_INDEX}
               data-tooltip="Insert..."
               onClick={() => (insertMenuAnchor ? closeInsertMenu() : openInsertMenu())}
               aria-label="Insert"
@@ -1494,192 +1925,207 @@ export function Toolbar({
 
           {/* Template picker — visible when the cursor is in a heading.
               In WYSIWYG, reads from the heading node's `dataTemplate`; in
-              Markdown view, parses the `{[...]}` suffix on the cursor's line. */}
+              Markdown view, parses the `{[...]}` suffix on the cursor's line.
+              The `squisq-toolbar-contextual` class + data-contextual id opt
+              this group (and the two below) into the clipping measurement:
+              when it doesn't fit it hides here and moves into the ··· menu. */}
           {currentTemplate !== null && (
-            <>
+            <div
+              className={`squisq-toolbar-group squisq-toolbar-contextual squisq-template-picker${clippedContextual.has('template') ? ' squisq-toolbar-contextual--clipped' : ''}`}
+              data-contextual="template"
+            >
               <div className="squisq-toolbar-separator" />
-              <div className="squisq-toolbar-group squisq-template-picker">
-                <TemplatePicker
-                  value={currentTemplate}
-                  onChange={handleTemplatePick}
-                  recommended={recommendedTemplates}
-                />
-              </div>
-            </>
+              <TemplatePicker
+                value={currentTemplate}
+                onChange={handleTemplatePick}
+                colorScheme={colorScheme}
+                recommended={recommendedTemplates}
+                previewSource={templatePreviewSource}
+              />
+            </div>
           )}
 
           {/* Transition picker — visible alongside the template picker when a
               block (heading) is active. Writes `transition=` into the block's
               Pandoc `{…}` attribute block (the canonical home for transitions). */}
           {currentTransition !== null && (
-            <>
+            <div
+              className={`squisq-toolbar-group squisq-toolbar-contextual squisq-transition-picker-group${clippedContextual.has('transition') ? ' squisq-toolbar-contextual--clipped' : ''}`}
+              data-contextual="transition"
+            >
               <div className="squisq-toolbar-separator" />
-              <div className="squisq-toolbar-group squisq-transition-picker-group">
-                <TransitionPicker value={currentTransition} onChange={handleTransitionPick} />
-              </div>
-            </>
+              <TransitionPicker
+                value={currentTransition}
+                onChange={handleTransitionPick}
+                colorScheme={colorScheme}
+                accentColor={previewSettings?.activeTheme.colors.primary}
+              />
+            </div>
           )}
 
           {/* Table controls — visible when cursor is in a table (WYSIWYG) */}
           {isInTable && (
-            <>
+            <div
+              className={`squisq-toolbar-group squisq-toolbar-contextual squisq-table-controls${clippedContextual.has('table') ? ' squisq-toolbar-contextual--clipped' : ''}`}
+              data-contextual="table"
+            >
               <div className="squisq-toolbar-separator" />
-              <div className="squisq-toolbar-group squisq-table-controls">
-                <span className="squisq-table-controls-label">Table:</span>
-                <button
-                  className="squisq-toolbar-button"
-                  data-tooltip="Add column before"
-                  onClick={() => tiptapEditor!.chain().focus().addColumnBefore().run()}
-                  aria-label="Add column before"
+              <span className="squisq-table-controls-label">Table:</span>
+              <button
+                className="squisq-toolbar-button"
+                data-tooltip="Add column before"
+                onClick={() => tiptapEditor!.chain().focus().addColumnBefore().run()}
+                aria-label="Add column before"
+              >
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 16 16"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
                 >
-                  <svg
-                    width="16"
-                    height="16"
-                    viewBox="0 0 16 16"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                  >
-                    <rect x="7" y="2" width="8" height="12" rx="1" />
-                    <line x1="11" y1="2" x2="11" y2="14" />
-                    <line x1="1" y1="8" x2="4.5" y2="8" />
-                    <line x1="2.75" y1="6.25" x2="2.75" y2="9.75" />
-                  </svg>
-                </button>
-                <button
-                  className="squisq-toolbar-button"
-                  data-tooltip="Add column after"
-                  onClick={() => tiptapEditor!.chain().focus().addColumnAfter().run()}
-                  aria-label="Add column after"
+                  <rect x="7" y="2" width="8" height="12" rx="1" />
+                  <line x1="11" y1="2" x2="11" y2="14" />
+                  <line x1="1" y1="8" x2="4.5" y2="8" />
+                  <line x1="2.75" y1="6.25" x2="2.75" y2="9.75" />
+                </svg>
+              </button>
+              <button
+                className="squisq-toolbar-button"
+                data-tooltip="Add column after"
+                onClick={() => tiptapEditor!.chain().focus().addColumnAfter().run()}
+                aria-label="Add column after"
+              >
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 16 16"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
                 >
-                  <svg
-                    width="16"
-                    height="16"
-                    viewBox="0 0 16 16"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                  >
-                    <rect x="1" y="2" width="8" height="12" rx="1" />
-                    <line x1="5" y1="2" x2="5" y2="14" />
-                    <line x1="11.5" y1="8" x2="15" y2="8" />
-                    <line x1="13.25" y1="6.25" x2="13.25" y2="9.75" />
-                  </svg>
-                </button>
-                <button
-                  className="squisq-toolbar-button"
-                  data-tooltip="Delete column"
-                  onClick={() => tiptapEditor!.chain().focus().deleteColumn().run()}
-                  aria-label="Delete column"
+                  <rect x="1" y="2" width="8" height="12" rx="1" />
+                  <line x1="5" y1="2" x2="5" y2="14" />
+                  <line x1="11.5" y1="8" x2="15" y2="8" />
+                  <line x1="13.25" y1="6.25" x2="13.25" y2="9.75" />
+                </svg>
+              </button>
+              <button
+                className="squisq-toolbar-button"
+                data-tooltip="Delete column"
+                onClick={() => tiptapEditor!.chain().focus().deleteColumn().run()}
+                aria-label="Delete column"
+              >
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 16 16"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
                 >
-                  <svg
-                    width="16"
-                    height="16"
-                    viewBox="0 0 16 16"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                  >
-                    <rect x="4" y="1" width="8" height="14" rx="1" />
-                    <line x1="6" y1="5.5" x2="10" y2="10.5" />
-                    <line x1="10" y1="5.5" x2="6" y2="10.5" />
-                  </svg>
-                </button>
-                <button
-                  className="squisq-toolbar-button"
-                  data-tooltip="Add row above"
-                  onClick={() => tiptapEditor!.chain().focus().addRowBefore().run()}
-                  aria-label="Add row above"
+                  <rect x="4" y="1" width="8" height="14" rx="1" />
+                  <line x1="6" y1="5.5" x2="10" y2="10.5" />
+                  <line x1="10" y1="5.5" x2="6" y2="10.5" />
+                </svg>
+              </button>
+              <button
+                className="squisq-toolbar-button"
+                data-tooltip="Add row above"
+                onClick={() => tiptapEditor!.chain().focus().addRowBefore().run()}
+                aria-label="Add row above"
+              >
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 16 16"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
                 >
-                  <svg
-                    width="16"
-                    height="16"
-                    viewBox="0 0 16 16"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                  >
-                    <rect x="2" y="6" width="12" height="9" rx="1" />
-                    <line x1="2" y1="10.5" x2="14" y2="10.5" />
-                    <line x1="8" y1="1" x2="8" y2="4.5" />
-                    <line x1="6.25" y1="2.75" x2="9.75" y2="2.75" />
-                  </svg>
-                </button>
-                <button
-                  className="squisq-toolbar-button"
-                  data-tooltip="Add row below"
-                  onClick={() => tiptapEditor!.chain().focus().addRowAfter().run()}
-                  aria-label="Add row below"
+                  <rect x="2" y="6" width="12" height="9" rx="1" />
+                  <line x1="2" y1="10.5" x2="14" y2="10.5" />
+                  <line x1="8" y1="1" x2="8" y2="4.5" />
+                  <line x1="6.25" y1="2.75" x2="9.75" y2="2.75" />
+                </svg>
+              </button>
+              <button
+                className="squisq-toolbar-button"
+                data-tooltip="Add row below"
+                onClick={() => tiptapEditor!.chain().focus().addRowAfter().run()}
+                aria-label="Add row below"
+              >
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 16 16"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
                 >
-                  <svg
-                    width="16"
-                    height="16"
-                    viewBox="0 0 16 16"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                  >
-                    <rect x="2" y="1" width="12" height="9" rx="1" />
-                    <line x1="2" y1="5.5" x2="14" y2="5.5" />
-                    <line x1="8" y1="11.5" x2="8" y2="15" />
-                    <line x1="6.25" y1="13.25" x2="9.75" y2="13.25" />
-                  </svg>
-                </button>
-                <button
-                  className="squisq-toolbar-button"
-                  data-tooltip="Delete row"
-                  onClick={() => tiptapEditor!.chain().focus().deleteRow().run()}
-                  aria-label="Delete row"
+                  <rect x="2" y="1" width="12" height="9" rx="1" />
+                  <line x1="2" y1="5.5" x2="14" y2="5.5" />
+                  <line x1="8" y1="11.5" x2="8" y2="15" />
+                  <line x1="6.25" y1="13.25" x2="9.75" y2="13.25" />
+                </svg>
+              </button>
+              <button
+                className="squisq-toolbar-button"
+                data-tooltip="Delete row"
+                onClick={() => tiptapEditor!.chain().focus().deleteRow().run()}
+                aria-label="Delete row"
+              >
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 16 16"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
                 >
-                  <svg
-                    width="16"
-                    height="16"
-                    viewBox="0 0 16 16"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                  >
-                    <rect x="1" y="4" width="14" height="8" rx="1" />
-                    <line x1="5.5" y1="6" x2="10.5" y2="10" />
-                    <line x1="10.5" y1="6" x2="5.5" y2="10" />
-                  </svg>
-                </button>
-                <button
-                  className="squisq-toolbar-button squisq-toolbar-button--danger"
-                  data-tooltip="Delete table"
-                  onClick={() => tiptapEditor!.chain().focus().deleteTable().run()}
-                  aria-label="Delete table"
+                  <rect x="1" y="4" width="14" height="8" rx="1" />
+                  <line x1="5.5" y1="6" x2="10.5" y2="10" />
+                  <line x1="10.5" y1="6" x2="5.5" y2="10" />
+                </svg>
+              </button>
+              <button
+                className="squisq-toolbar-button squisq-toolbar-button--danger"
+                data-tooltip="Delete table"
+                onClick={() => tiptapEditor!.chain().focus().deleteTable().run()}
+                aria-label="Delete table"
+              >
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 16 16"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
                 >
-                  <svg
-                    width="16"
-                    height="16"
-                    viewBox="0 0 16 16"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="1.5"
-                    strokeLinecap="round"
-                  >
-                    <rect x="1" y="1" width="14" height="14" rx="1" />
-                    <line x1="1" y1="5.5" x2="15" y2="5.5" />
-                    <line x1="5.5" y1="1" x2="5.5" y2="15" />
-                    <line x1="4.5" y1="4.5" x2="11.5" y2="11.5" strokeWidth="2" />
-                    <line x1="11.5" y1="4.5" x2="4.5" y2="11.5" strokeWidth="2" />
-                  </svg>
-                </button>
-              </div>
-            </>
+                  <rect x="1" y="1" width="14" height="14" rx="1" />
+                  <line x1="1" y1="5.5" x2="15" y2="5.5" />
+                  <line x1="5.5" y1="1" x2="5.5" y2="15" />
+                  <line x1="4.5" y1="4.5" x2="11.5" y2="11.5" strokeWidth="2" />
+                  <line x1="11.5" y1="4.5" x2="4.5" y2="11.5" strokeWidth="2" />
+                </svg>
+              </button>
+            </div>
           )}
         </div>
       )}
 
-      {/* Overflow menu — outside the overflow:hidden actions container */}
-      {!isPreview && !isCodeMode && overflowIndex !== null && (
+      {/* Overflow menu — outside the overflow:hidden actions container.
+          Also appears when a contextual group (template/transition picker,
+          table controls) is clipped, even if every plain button fits. */}
+      {!isPreview && !isCodeMode && (overflowIndex !== null || clippedContextual.size > 0) && (
         <div className="squisq-toolbar-overflow" ref={overflowRef}>
           <button
             className={`squisq-toolbar-button squisq-toolbar-overflow-trigger${showOverflow ? ' squisq-toolbar-button--active' : ''}`}
@@ -1694,7 +2140,7 @@ export function Toolbar({
             <div
               className={`squisq-toolbar-overflow-menu squisq-toolbar-overflow-menu--${overflowPlacement}`}
             >
-              {BUTTONS.slice(overflowIndex)
+              {BUTTONS.slice(overflowIndex ?? BUTTONS.length)
                 .filter((b) => isButtonVisible(b.id))
                 // Media buttons are represented by the synthetic Insert dropdown
                 // in both the visible toolbar and the overflow menu.
@@ -1748,23 +2194,53 @@ export function Toolbar({
                 </button>
               )}
 
-              {/* Contextual: template picker in overflow */}
-              {currentTemplate !== null && (
+              {/* Per-block section — the template + transition pickers move
+                  here when clipped, under a divider and a "<name> Block:"
+                  heading that names the block they configure. */}
+              {showBlockSectionInOverflow && (
+                <>
+                  <div
+                    className="squisq-toolbar-separator"
+                    style={{ margin: '4px 0', width: '100%', height: 1 }}
+                  />
+                  <div className="squisq-toolbar-overflow-heading">{overflowBlockLabel} Block:</div>
+                </>
+              )}
+
+              {/* Contextual: template picker in overflow — only when the
+                  inline one is clipped, so the control lives in exactly one
+                  visible place at a time. */}
+              {showTemplateInOverflow && (
                 <div className="squisq-toolbar-overflow-item squisq-toolbar-overflow-template">
-                  <span>Template:</span>
                   <TemplatePicker
-                    value={currentTemplate}
+                    value={currentTemplate!}
                     onChange={(v) => {
                       handleTemplatePick(v);
                       setShowOverflow(false);
                     }}
+                    colorScheme={colorScheme}
                     recommended={recommendedTemplates}
+                    previewSource={templatePreviewSource}
+                  />
+                </div>
+              )}
+
+              {/* Contextual: transition picker in overflow — mirrors the
+                  template picker above. The menu stays open on change since
+                  the flyout carries follow-up controls (direction/duration). */}
+              {showTransitionInOverflow && (
+                <div className="squisq-toolbar-overflow-item squisq-toolbar-overflow-template">
+                  <TransitionPicker
+                    value={currentTransition!}
+                    onChange={handleTransitionPick}
+                    colorScheme={colorScheme}
+                    accentColor={previewSettings?.activeTheme.colors.primary}
                   />
                 </div>
               )}
 
               {/* Contextual: table controls in overflow */}
-              {isInTable && (
+              {isInTable && clippedContextual.has('table') && (
                 <>
                   <div
                     className="squisq-toolbar-separator"
@@ -1863,11 +2339,16 @@ export function Toolbar({
         <button
           className={`squisq-toolbar-button squisq-toolbar-files-toggle${showFiles ? ' squisq-toolbar-button--active' : ''}`}
           onClick={onToggleFiles}
-          data-tooltip={showFiles ? 'Hide Files panel' : 'Show Files panel'}
+          data-tooltip={`${showFiles ? 'Hide' : 'Show'} Files panel${resolvedFileCount > 0 ? ` (${fileCountLabel(resolvedFileCount)})` : ''}`}
           aria-pressed={showFiles}
-          aria-label="Toggle Files panel"
+          aria-label={`Toggle Files panel${resolvedFileCount > 0 ? `, ${fileCountLabel(resolvedFileCount)}` : ''}`}
         >
           <Icon icon="fa-solid fa-paperclip" />
+          {resolvedFileCount > 0 && (
+            <span className="squisq-toolbar-files-badge" aria-hidden="true">
+              {fileCountBadge(resolvedFileCount)}
+            </span>
+          )}
         </button>
       )}
       {/* Right slot — rightmost end of toolbar */}