@bendyline/squisq-editor-react 2.0.0 → 2.1.0

package/src/scene/commands/SceneCommand.ts

@@ -16,8 +16,19 @@ import type { DiagramEdgeAnchor, Layer } from '@bendyline/squisq/schemas';
 export type SceneCommand =
   /** Commit a layer's new top-left position (in viewport units). */
   | { kind: 'moveLayer'; id: string; x: number; y: number }
-  /** Commit a layer's new size (in viewport units). */
-  | { kind: 'resizeLayer'; id: string; width: number; height: number }
+  /**
+   * Commit a layer's new size (in viewport units). `x`/`y` carry the final
+   * top-left for west/north handle drags so hosts can persist the whole
+   * resize atomically instead of reparsing between a move and a size write.
+   */
+  | {
+      kind: 'resizeLayer';
+      id: string;
+      width: number;
+      height: number;
+      x?: number;
+      y?: number;
+    }
   /** Append a new layer to the scene. */
   | { kind: 'addLayer'; layer: Layer }
   /** Remove a layer by id. */

package/src/scene/fitScale.ts

@@ -0,0 +1,17 @@
+export interface SceneSize {
+  width: number;
+  height: number;
+}
+
+/**
+ * Scale content so it is wholly visible, without enlarging it past the
+ * supplied maximum (100% by default). Invalid or not-yet-measured dimensions
+ * fall back to 100%.
+ */
+export function calculateFitScale(content: SceneSize, container: SceneSize, maxScale = 1): number {
+  if (content.width <= 0 || content.height <= 0 || container.width <= 0 || container.height <= 0) {
+    return Math.min(1, maxScale);
+  }
+
+  return Math.min(maxScale, container.width / content.width, container.height / content.height);
+}

package/src/scene/hooks/useScenePanZoom.ts

@@ -13,6 +13,7 @@
  */
 
 import { useCallback, useRef, useState } from 'react';
+import { calculateFitScale } from '../fitScale';
 
 export interface SceneTransform {
   /** Translation in screen pixels. */
@@ -25,7 +26,7 @@ export interface SceneTransform {
 export const IDENTITY_TRANSFORM: SceneTransform = Object.freeze({ tx: 0, ty: 0, scale: 1 });
 
 /** Clamp scale to a sensible range so a single accidental wheel doesn't escape. */
-const MIN_SCALE = 0.1;
+const MIN_SCALE = 0.02;
 const MAX_SCALE = 8;
 
 export interface UseScenePanZoomResult {
@@ -45,13 +46,14 @@ export interface UseScenePanZoomResult {
   reset: () => void;
   /**
    * Fit a viewport-unit bounding box into a container of `containerSize`
-   * screen pixels, with optional padding (also in screen pixels). When
-   * the box is empty, no-ops.
+   * screen pixels, with optional padding (also in screen pixels) and an
+   * optional maximum scale. When the box is empty, no-ops.
    */
   fitBox: (
     box: { x: number; y: number; width: number; height: number },
     containerSize: { width: number; height: number },
     padding?: number,
+    maxScale?: number,
   ) => void;
   /** Convert a screen-pixel point (container-relative) → viewport units. */
   screenToViewport: (sx: number, sy: number) => { x: number; y: number };
@@ -104,12 +106,17 @@ export function useScenePanZoom(
       box: { x: number; y: number; width: number; height: number },
       containerSize: { width: number; height: number },
       padding = 24,
+      maxScale = MAX_SCALE,
     ) => {
       if (box.width <= 0 || box.height <= 0) return;
       if (containerSize.width <= 0 || containerSize.height <= 0) return;
       const availW = Math.max(1, containerSize.width - padding * 2);
       const availH = Math.max(1, containerSize.height - padding * 2);
-      const scale = clamp(Math.min(availW / box.width, availH / box.height), MIN_SCALE, MAX_SCALE);
+      const scale = calculateFitScale(
+        { width: box.width, height: box.height },
+        { width: availW, height: availH },
+        Math.min(MAX_SCALE, Math.max(Number.EPSILON, maxScale)),
+      );
       // Center the box in the container.
       const scaledW = box.width * scale;
       const scaledH = box.height * scale;

package/src/scene/scene.css

@@ -266,6 +266,18 @@
   border-color: #cbd5e1;
 }
 
+.squisq-scene-action--active,
+.squisq-scene-action--active:hover:not(:disabled) {
+  background: #e0e7ff;
+  border-color: #4f46e5;
+  color: #4338ca;
+}
+
+.squisq-scene-action-popover-anchor {
+  position: relative;
+  display: inline-flex;
+}
+
 .squisq-scene-action:focus-visible {
   outline: 2px solid #6366f1;
   outline-offset: 1px;
@@ -322,7 +334,9 @@
 }
 
 .squisq-editor-shell[data-theme='dark'] .squisq-scene-tool--active,
-.squisq-editor-shell[data-theme='dark'] .squisq-scene-tool--active:hover {
+.squisq-editor-shell[data-theme='dark'] .squisq-scene-tool--active:hover,
+.squisq-editor-shell[data-theme='dark'] .squisq-scene-action--active,
+.squisq-editor-shell[data-theme='dark'] .squisq-scene-action--active:hover:not(:disabled) {
   background: #312e81;
   border-color: #818cf8;
   color: #f8fafc;
@@ -350,7 +364,8 @@
   padding: 12px;
 }
 .squisq-scene-block-max > .squisq-diagram-canvas,
-.squisq-scene-block-max > .squisq-scene-stage {
+.squisq-scene-block-max > .squisq-scene-stage,
+.squisq-scene-block-max > .squisq-mermaid-canvas {
   flex: 1;
   min-width: 0;
   min-height: 0;
@@ -403,6 +418,12 @@
   right: calc(100% + 6px);
 }
 
+.squisq-scene-side-toolbar .squisq-scene-action-popover-anchor > [role='dialog'] {
+  top: 0;
+  left: auto;
+  right: calc(100% + 6px);
+}
+
 /* ── Narrow-width fallback bar ─────────────────────────────────
    When SceneSideToolbar measures that the right gutter can't hold the 180px
    column, it renders the same toolbar as an in-flow horizontal bar above the
@@ -420,7 +441,68 @@
   margin: 0;
 }
 
-/* ── Maximize button ──────────────────────────────────────── */
+/* ── View controls + maximize ─────────────────────────────── */
+
+.squisq-scene-view-controls {
+  position: absolute;
+  top: 8px;
+  left: 8px;
+  z-index: 10;
+  display: inline-flex;
+  align-items: center;
+  overflow: hidden;
+  border: 1px solid var(--squisq-border, #e2e8f0);
+  border-radius: 6px;
+  background: var(--squisq-surface, #ffffff);
+  color: var(--squisq-text, #1e293b);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08);
+}
+
+.squisq-scene-view-controls button,
+.squisq-scene-view-scale {
+  box-sizing: border-box;
+  min-width: 32px;
+  height: 32px;
+  padding: 0 8px;
+  border: 0;
+  border-right: 1px solid var(--squisq-border, #e2e8f0);
+  background: transparent;
+  color: inherit;
+  font: inherit;
+  font-size: 12px;
+  line-height: 32px;
+  text-align: center;
+}
+
+.squisq-scene-view-controls button {
+  cursor: pointer;
+}
+
+.squisq-scene-view-controls button:last-child {
+  border-right: 0;
+}
+
+.squisq-scene-view-controls button:hover,
+.squisq-scene-view-fit[data-active='true'] {
+  background: var(--squisq-surface-hover, #f1f5f9);
+}
+
+.squisq-scene-view-fit[data-active='true'] {
+  color: #4338ca;
+  font-weight: 600;
+}
+
+.squisq-editor-shell[data-theme='dark'] .squisq-scene-view-controls {
+  background: #111827;
+  border-color: #475569;
+  color: #e5e7eb;
+}
+
+.squisq-editor-shell[data-theme='dark'] .squisq-scene-view-controls button:hover,
+.squisq-editor-shell[data-theme='dark'] .squisq-scene-view-fit[data-active='true'] {
+  background: #312e81;
+  color: #f8fafc;
+}
 
 .squisq-scene-maximize-btn {
   position: absolute;

package/src/scene/tools/SelectTool.ts

@@ -212,11 +212,11 @@ export const SelectTool: SceneTool = {
       }
     } else if (dragState.kind === 'resize') {
       const { x, y, width, height } = dragState.currentBounds;
-      // Resize translates into a move (if origin shifted) + a size change.
-      // We dispatch both so a single grab on a corner can change all four
-      // fields atomically from the host's point of view.
-      ctx.dispatch({ kind: 'moveLayer', id: dragState.layerId, x, y });
-      ctx.dispatch({ kind: 'resizeLayer', id: dragState.layerId, width, height });
+      // Keep the final origin + size in one command. In particular, the ASCII
+      // diagram adapter must render/reparse only once: committing a move and
+      // then a resize used to normalize the art between the two halves of one
+      // pointer gesture and could snap the node to a different grid position.
+      ctx.dispatch({ kind: 'resizeLayer', id: dragState.layerId, x, y, width, height });
     }
     (e.currentTarget as Element).releasePointerCapture?.(e.pointerId);
     setDragState(ctx.interaction, null);

package/src/selectionConversions.ts

@@ -0,0 +1,155 @@
+/**
+ * Plain-text selection conversions used by the toolbar's Convert menu.
+ * Keeping delimiter detection separate from the editor integrations makes
+ * the behavior identical in Monaco and Tiptap.
+ */
+
+export type SelectionTableDelimiter = 'pipe' | 'comma' | 'tab' | 'multispace' | null;
+
+export interface SelectionTable {
+  delimiter: SelectionTableDelimiter;
+  rows: string[][];
+}
+
+export interface SelectionTaskItem {
+  checked: boolean;
+  text: string;
+}
+
+type CandidateDelimiter = Exclude<SelectionTableDelimiter, null>;
+
+/** Non-empty selected lines, trimmed without changing their order. */
+export function selectionLines(text: string): string[] {
+  return text
+    .replace(/\r\n?/g, '\n')
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0);
+}
+
+function splitPipeLine(line: string): string[] {
+  let value = line.trim();
+  if (value.startsWith('|')) value = value.slice(1);
+  if (value.endsWith('|') && !value.endsWith('\\|')) value = value.slice(0, -1);
+
+  const cells: string[] = [];
+  let cell = '';
+  for (let i = 0; i < value.length; i++) {
+    const char = value[i];
+    if (char === '\\' && value[i + 1] === '|') {
+      cell += '|';
+      i++;
+    } else if (char === '|') {
+      cells.push(cell.trim());
+      cell = '';
+    } else {
+      cell += char;
+    }
+  }
+  cells.push(cell.trim());
+  return cells;
+}
+
+/** A small CSV-row parser so quoted commas remain inside their cell. */
+function splitCommaLine(line: string): string[] {
+  const cells: string[] = [];
+  let cell = '';
+  let quoted = false;
+
+  for (let i = 0; i < line.length; i++) {
+    const char = line[i];
+    if (char === '"' && !quoted && cell.trim().length === 0) {
+      // A quote only opens CSV quoting at the start of a field. Literal
+      // quotes elsewhere (for example 5" screen) remain part of the value.
+      quoted = true;
+      cell = '';
+    } else if (char === '"' && quoted) {
+      if (line[i + 1] === '"') {
+        cell += '"';
+        i++;
+      } else {
+        quoted = false;
+      }
+    } else if (char === ',' && !quoted) {
+      cells.push(cell.trim());
+      cell = '';
+    } else {
+      cell += char;
+    }
+  }
+  if (quoted) return line.split(',').map((value) => value.trim());
+  cells.push(cell.trim());
+  return cells;
+}
+
+function splitLine(line: string, delimiter: CandidateDelimiter): string[] {
+  switch (delimiter) {
+    case 'pipe':
+      return splitPipeLine(line);
+    case 'comma':
+      return splitCommaLine(line);
+    case 'tab':
+      return line
+        .trim()
+        .split('\t')
+        .map((cell) => cell.trim());
+    case 'multispace':
+      return line
+        .trim()
+        .split(/[ \u00a0]{2,}/)
+        .map((cell) => cell.trim());
+  }
+}
+
+/**
+ * Detect a delimiter only when at least two lines use it and every line
+ * produces the same number of columns. Inconsistent prose therefore falls
+ * back to a useful one-column table instead of losing text.
+ */
+export function selectionToTable(text: string): SelectionTable {
+  const lines = selectionLines(text);
+  const candidates: CandidateDelimiter[] = ['pipe', 'comma', 'tab', 'multispace'];
+
+  if (lines.length >= 2) {
+    for (const delimiter of candidates) {
+      const rows = lines.map((line) => splitLine(line, delimiter));
+      const columnCount = rows[0]?.length ?? 0;
+      if (columnCount >= 2 && rows.every((row) => row.length === columnCount)) {
+        return { delimiter, rows };
+      }
+    }
+  }
+
+  return { delimiter: null, rows: lines.map((line) => [line]) };
+}
+
+function escapeTableCell(cell: string): string {
+  return cell.replace(/\|/g, '\\|');
+}
+
+/** Render a selection as a GFM table, using its first row as the header. */
+export function selectionToTableMarkdown(text: string): string {
+  const { rows } = selectionToTable(text);
+  if (rows.length === 0) return '';
+
+  const formatRow = (row: string[]) => `| ${row.map(escapeTableCell).join(' | ')} |`;
+  const separator = rows[0].map(() => '---');
+  return [formatRow(rows[0]), formatRow(separator), ...rows.slice(1).map(formatRow)].join('\n');
+}
+
+/** Convert selected lines to task items, normalizing existing list markers. */
+export function selectionToTaskItems(text: string): SelectionTaskItem[] {
+  return selectionLines(text).map((line) => {
+    const task = /^[-*+]\s+\[([ xX])\]\s*(.*)$/.exec(line);
+    if (task) return { checked: task[1].toLowerCase() === 'x', text: task[2].trim() };
+
+    const withoutListMarker = line.replace(/^(?:[-*+]\s+|\d+[.)]\s+)/, '');
+    return { checked: false, text: withoutListMarker.trim() };
+  });
+}
+
+export function selectionToTaskListMarkdown(text: string): string {
+  return selectionToTaskItems(text)
+    .map((item) => `- [${item.checked ? 'x' : ' '}] ${item.text}`)
+    .join('\n');
+}

package/src/styles/ascii-timeline.css

@@ -13,7 +13,7 @@
 
 .squisq-ascii-timeline-editor {
   --squisq-ascii-timeline-accent: var(--squisq-theme-primary, #6366f1);
-  --squisq-ascii-timeline-label-width: 120px;
+  --squisq-ascii-timeline-label-width: 160px;
   border: 1px solid var(--squisq-border, #e2e8f0);
   border-radius: 10px;
   background: var(--squisq-input-bg, #fff);
@@ -44,6 +44,33 @@
   color: var(--squisq-text-muted, #64748b);
 }
 
+.squisq-ascii-timeline-header-actions {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
+.squisq-ascii-timeline-header-actions button {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  padding: 4px 8px;
+  border: 1px solid var(--squisq-border, #cbd5e1);
+  border-radius: 5px;
+  background: var(--squisq-input-bg, #fff);
+  color: var(--squisq-ascii-timeline-accent);
+  font: inherit;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.squisq-ascii-timeline-header-actions button:hover,
+.squisq-ascii-timeline-header-actions button:focus-visible {
+  border-color: var(--squisq-ascii-timeline-accent);
+  outline: 2px solid color-mix(in srgb, var(--squisq-ascii-timeline-accent) 22%, transparent);
+}
+
 .squisq-ascii-timeline-canvas {
   position: relative;
   min-width: 600px;
@@ -72,9 +99,70 @@
   white-space: nowrap;
 }
 
-.squisq-ascii-timeline-track-label > span {
+.squisq-ascii-timeline-track-name {
+  min-width: 0;
+  flex: 1 1 auto;
+  padding: 3px 4px;
   overflow: hidden;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  background: transparent;
+  color: inherit;
+  font: inherit;
+  text-align: right;
   text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+button.squisq-ascii-timeline-track-name {
+  cursor: text;
+}
+
+button.squisq-ascii-timeline-track-name:hover,
+button.squisq-ascii-timeline-track-name:focus-visible {
+  border-color: var(--squisq-border, #cbd5e1);
+  background: var(--squisq-input-bg, #fff);
+  outline: none;
+}
+
+.squisq-ascii-timeline-track-name-input {
+  width: 100%;
+  min-width: 0;
+  flex: 1 1 auto;
+  padding: 3px 4px;
+  border: 1px solid var(--squisq-ascii-timeline-accent);
+  border-radius: 4px;
+  background: var(--squisq-input-bg, #fff);
+  color: var(--squisq-text, #1e293b);
+  font: inherit;
+  text-align: right;
+  outline: 2px solid color-mix(in srgb, var(--squisq-ascii-timeline-accent) 22%, transparent);
+}
+
+.squisq-ascii-timeline-track-delete {
+  display: grid;
+  width: 22px;
+  height: 22px;
+  flex: 0 0 22px;
+  place-items: center;
+  padding: 0;
+  border: 0;
+  border-radius: 4px;
+  background: transparent;
+  color: var(--squisq-text-muted, #64748b);
+  cursor: pointer;
+}
+
+.squisq-ascii-timeline-track-delete:hover,
+.squisq-ascii-timeline-track-delete:focus-visible {
+  background: color-mix(in srgb, #ef4444 12%, transparent);
+  color: #dc2626;
+  outline: 2px solid color-mix(in srgb, #ef4444 25%, transparent);
+}
+
+.squisq-ascii-timeline-track-delete:disabled {
+  opacity: 0.35;
+  cursor: not-allowed;
 }
 
 .squisq-ascii-timeline-track-add {
@@ -95,7 +183,8 @@
 }
 
 .squisq-ascii-timeline-track-add:hover,
-.squisq-ascii-timeline-track-add:focus-visible {
+.squisq-ascii-timeline-track-add:focus-visible,
+.squisq-ascii-timeline-track-add[aria-pressed='true'] {
   border-color: var(--squisq-ascii-timeline-accent);
   outline: 2px solid color-mix(in srgb, var(--squisq-ascii-timeline-accent) 22%, transparent);
 }
@@ -105,6 +194,10 @@
   height: 96px;
   min-width: 420px;
   outline: none;
+  cursor: default;
+}
+
+.squisq-ascii-timeline-rail--adding {
   cursor: crosshair;
 }
 
@@ -460,7 +553,7 @@
 
 @media (max-width: 760px) {
   .squisq-ascii-timeline-editor {
-    --squisq-ascii-timeline-label-width: 88px;
+    --squisq-ascii-timeline-label-width: 132px;
   }
 
   .squisq-ascii-timeline-inspector {
@@ -475,6 +568,10 @@
   .squisq-ascii-timeline-delete {
     grid-column: 2 / 3;
   }
+
+  .squisq-ascii-timeline-header-actions small {
+    display: none;
+  }
 }
 
 @media (prefers-reduced-motion: reduce) {

package/src/styles/code-snippet.css

@@ -0,0 +1,76 @@
+/* Monaco inset for ordinary explicit-language Markdown code fences. */
+
+.squisq-wysiwyg-editor pre.squisq-code-snippet-fence-hidden {
+  display: none;
+}
+
+.squisq-code-snippet-widget-host {
+  margin: 0.75rem 0 1.25rem;
+}
+
+.squisq-code-snippet-shell {
+  box-sizing: border-box;
+  display: flex;
+  width: 100%;
+  height: 240px;
+  min-height: 128px;
+  max-height: 70vh;
+  flex-direction: column;
+  overflow: hidden;
+  resize: vertical;
+  border: 1px solid var(--squisq-border, #d1d5db);
+  border-radius: 8px;
+  background: var(--squisq-surface, #ffffff);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+}
+
+.squisq-code-snippet-header {
+  box-sizing: border-box;
+  display: flex;
+  min-height: 34px;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 0 10px;
+  border-bottom: 1px solid var(--squisq-border, #d1d5db);
+  background: var(--squisq-surface-muted, #f8fafc);
+  color: var(--squisq-text-muted, #64748b);
+  font-family: var(--squisq-ux-font, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif);
+  font-size: 12px;
+  user-select: none;
+}
+
+.squisq-code-snippet-title {
+  display: inline-flex;
+  min-width: 0;
+  align-items: center;
+  gap: 7px;
+  color: var(--squisq-text, #334155);
+  font-weight: 600;
+}
+
+.squisq-code-snippet-header code {
+  overflow: hidden;
+  color: inherit;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, 'Liberation Mono', monospace;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.squisq-code-snippet-editor {
+  position: relative;
+  min-height: 0;
+  flex: 1;
+  overflow: hidden;
+}
+
+.squisq-code-snippet-loading {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+  color: var(--squisq-text-muted, #64748b);
+  font-family: var(--squisq-ux-font, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif);
+  font-size: 12px;
+}