@commonpub/editor 0.7.0 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonpub/editor",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "type": "module",
   "description": "TipTap block editor with 18+ maker-focused extensions for CommonPub",
   "license": "AGPL-3.0-or-later",
@@ -50,8 +50,8 @@
     "remark-rehype": "^11.1.2",
     "unified": "^11.0.5",
     "zod": "^4.3.6",
-    "@commonpub/config": "0.9.0",
-    "@commonpub/schema": "0.9.3"
+    "@commonpub/schema": "0.9.4",
+    "@commonpub/config": "0.9.0"
   },
   "peerDependencies": {
     "vue": "^3.4.0",

package/vue/components/BlockCanvas.vue

@@ -9,7 +9,7 @@
  * - Drag-and-drop reordering via BlockWrapper
  * - Floating text toolbar on selection (delegated to FloatingToolbar)
  */
-import { ref, inject, type Component } from 'vue';
+import { ref, inject, onMounted, onUnmounted, type Component } from 'vue';
 import type { EditorBlock, BlockTypeGroup } from '../types.js';
 import type { BlockEditor } from '../composables/useBlockEditor.js';
 import { BLOCK_COMPONENTS_KEY, UPLOAD_HANDLER_KEY, SEARCH_PRODUCTS_KEY } from '../provide.js';
@@ -140,7 +140,8 @@ const floatingToolbar = ref<{
   top: number;
   left: number;
   blockId: string;
-}>({ visible: false, top: 0, left: 0, blockId: '' });
+  activeMarks: { bold: boolean; italic: boolean; strike: boolean; code: boolean; link: boolean };
+}>({ visible: false, top: 0, left: 0, blockId: '', activeMarks: { bold: false, italic: false, strike: false, code: false, link: false } });
 
 function onSelectionChange(block: EditorBlock, hasSelection: boolean, rect: DOMRect | null): void {
   if (hasSelection && rect) {
@@ -148,14 +149,24 @@ function onSelectionChange(block: EditorBlock, hasSelection: boolean, rect: DOMR
     const toolbarHeight = 44;
     const rawTop = rect.top - toolbarHeight;
     const rawLeft = rect.left + rect.width / 2;
+    // Query active marks from the TipTap editor
+    const editor = getActiveEditorForBlock(block.id);
+    const marks = {
+      bold: editor?.isActive('bold') ?? false,
+      italic: editor?.isActive('italic') ?? false,
+      strike: editor?.isActive('strike') ?? false,
+      code: editor?.isActive('code') ?? false,
+      link: editor?.isActive('link') ?? false,
+    };
     floatingToolbar.value = {
       visible: true,
       top: Math.max(4, rawTop),
       left: Math.max(toolbarWidth / 2 + 4, Math.min(rawLeft, window.innerWidth - toolbarWidth / 2 - 4)),
       blockId: block.id,
+      activeMarks: marks,
     };
   } else {
-    floatingToolbar.value = { visible: false, top: 0, left: 0, blockId: '' };
+    floatingToolbar.value = { visible: false, top: 0, left: 0, blockId: '', activeMarks: { bold: false, italic: false, strike: false, code: false, link: false } };
   }
 }
 
@@ -168,6 +179,11 @@ function setBlockRef(blockId: string, el: unknown): void {
   }
 }
 
+function getActiveEditorForBlock(blockId: string): TipTapEditor | null {
+  const ref = blockRefs.value.get(blockId);
+  return (ref?.getEditor?.() as TipTapEditor) ?? null;
+}
+
 function getActiveEditor(): unknown {
   const ref = blockRefs.value.get(floatingToolbar.value.blockId);
   return ref?.getEditor?.() ?? null;
@@ -193,6 +209,9 @@ function toggleMark(mark: string): void {
   editor.chain().focus().toggleMark(mark).run();
 }
 
+// --- Link URL inline prompt ---
+const linkPrompt = ref<{ visible: boolean; url: string }>({ visible: false, url: '' });
+
 function toggleLink(): void {
   const editor = getActiveEditor() as TipTapEditor | null;
   if (!editor) return;
@@ -200,10 +219,23 @@ function toggleLink(): void {
     editor.chain().focus().unsetLink().run();
     return;
   }
-  const url = window.prompt('Enter URL:');
-  if (url) {
-    editor.chain().focus().extendMarkRange('link').setLink({ href: url }).run();
-  }
+  // Open inline prompt instead of window.prompt
+  linkPrompt.value = { visible: true, url: '' };
+}
+
+function applyLink(): void {
+  const url = linkPrompt.value.url.trim();
+  linkPrompt.value = { visible: false, url: '' };
+  if (!url) return;
+  const editor = getActiveEditor() as TipTapEditor | null;
+  if (!editor) return;
+  editor.chain().focus().extendMarkRange('link').setLink({ href: url }).run();
+}
+
+function cancelLink(): void {
+  linkPrompt.value = { visible: false, url: '' };
+  const editor = getActiveEditor() as TipTapEditor | null;
+  editor?.chain().focus().run();
 }
 
 // --- Empty state ---
@@ -275,7 +307,7 @@ function onDrop(atIndex: number, event: DragEvent): void {
 // --- Click outside to deselect ---
 function onCanvasClick(): void {
   props.blockEditor.selectBlock(null);
-  floatingToolbar.value = { visible: false, top: 0, left: 0, blockId: '' };
+  floatingToolbar.value = { visible: false, top: 0, left: 0, blockId: '', activeMarks: { bold: false, italic: false, strike: false, code: false, link: false } };
 }
 
 // --- Resolve block component (injected overrides take priority) ---
@@ -309,6 +341,57 @@ function needsUpload(type: string): boolean {
 function needsSearch(type: string): boolean {
   return type === 'partsList';
 }
+
+// --- Keyboard shortcuts ---
+function onKeydown(event: KeyboardEvent): void {
+  const mod = event.metaKey || event.ctrlKey;
+  const el = document.activeElement;
+  const inProseMirror = !!el?.closest('.ProseMirror');
+  const inFormField = el?.tagName === 'TEXTAREA' || el?.tagName === 'INPUT' || el?.tagName === 'SELECT';
+
+  // Undo/Redo: Ctrl+Z / Ctrl+Shift+Z
+  if (mod && event.key.toLowerCase() === 'z') {
+    if (inProseMirror || inFormField) return;
+    event.preventDefault();
+    if (event.shiftKey) { props.blockEditor.redo(); } else { props.blockEditor.undo(); }
+    return;
+  }
+
+  // Block operations only when a block is selected and not editing text
+  const selectedId = props.blockEditor.selectedBlockId.value;
+  if (!selectedId || inProseMirror || inFormField) return;
+
+  // Ctrl+Shift+ArrowUp: move block up
+  if (mod && event.shiftKey && event.key === 'ArrowUp') {
+    event.preventDefault();
+    props.blockEditor.moveBlockUp(selectedId);
+    return;
+  }
+
+  // Ctrl+Shift+ArrowDown: move block down
+  if (mod && event.shiftKey && event.key === 'ArrowDown') {
+    event.preventDefault();
+    props.blockEditor.moveBlockDown(selectedId);
+    return;
+  }
+
+  // Ctrl+D: duplicate block
+  if (mod && event.key.toLowerCase() === 'd') {
+    event.preventDefault();
+    props.blockEditor.duplicateBlock(selectedId);
+    return;
+  }
+
+  // Delete / Backspace: remove selected block
+  if (event.key === 'Delete' || event.key === 'Backspace') {
+    event.preventDefault();
+    props.blockEditor.removeBlock(selectedId);
+    return;
+  }
+}
+
+onMounted(() => { document.addEventListener('keydown', onKeydown); });
+onUnmounted(() => { document.removeEventListener('keydown', onKeydown); });
 </script>
 
 <template>
@@ -385,23 +468,45 @@ function needsSearch(type: string): boolean {
         class="cpub-floating-toolbar"
         :style="{ top: floatingToolbar.top + 'px', left: floatingToolbar.left + 'px' }"
       >
-        <button class="cpub-ft-btn" title="Bold" @mousedown.prevent="toggleMark('bold')">
+        <button class="cpub-ft-btn" :class="{ 'cpub-ft-btn--active': floatingToolbar.activeMarks.bold }" title="Bold" @mousedown.prevent="toggleMark('bold')">
           <i class="fa-solid fa-bold"></i>
         </button>
-        <button class="cpub-ft-btn" title="Italic" @mousedown.prevent="toggleMark('italic')">
+        <button class="cpub-ft-btn" :class="{ 'cpub-ft-btn--active': floatingToolbar.activeMarks.italic }" title="Italic" @mousedown.prevent="toggleMark('italic')">
           <i class="fa-solid fa-italic"></i>
         </button>
-        <button class="cpub-ft-btn" title="Strikethrough" @mousedown.prevent="toggleMark('strike')">
+        <button class="cpub-ft-btn" :class="{ 'cpub-ft-btn--active': floatingToolbar.activeMarks.strike }" title="Strikethrough" @mousedown.prevent="toggleMark('strike')">
           <i class="fa-solid fa-strikethrough"></i>
         </button>
-        <button class="cpub-ft-btn" title="Inline code" @mousedown.prevent="toggleMark('code')">
+        <button class="cpub-ft-btn" :class="{ 'cpub-ft-btn--active': floatingToolbar.activeMarks.code }" title="Inline code" @mousedown.prevent="toggleMark('code')">
           <i class="fa-solid fa-code"></i>
         </button>
         <div class="cpub-ft-divider" />
-        <button class="cpub-ft-btn" title="Link" @mousedown.prevent="toggleLink">
+        <button class="cpub-ft-btn" :class="{ 'cpub-ft-btn--active': floatingToolbar.activeMarks.link }" title="Link" @mousedown.prevent="toggleLink">
           <i class="fa-solid fa-link"></i>
         </button>
       </div>
+      <!-- Inline link URL prompt -->
+      <div
+        v-if="linkPrompt.visible && floatingToolbar.visible"
+        class="cpub-link-prompt"
+        :style="{ top: (floatingToolbar.top + 38) + 'px', left: floatingToolbar.left + 'px' }"
+      >
+        <input
+          v-model="linkPrompt.url"
+          class="cpub-link-prompt-input"
+          type="url"
+          placeholder="https://..."
+          autofocus
+          @keydown.enter.prevent="applyLink"
+          @keydown.escape.prevent="cancelLink"
+        />
+        <button class="cpub-link-prompt-btn" @mousedown.prevent="applyLink">
+          <i class="fa-solid fa-check"></i>
+        </button>
+        <button class="cpub-link-prompt-btn cpub-link-prompt-btn--cancel" @mousedown.prevent="cancelLink">
+          <i class="fa-solid fa-xmark"></i>
+        </button>
+      </div>
     </Teleport>
   </div>
 </template>
@@ -512,10 +617,59 @@ function needsSearch(type: string): boolean {
   color: var(--surface, #fff);
 }
 
+.cpub-ft-btn--active {
+  background: var(--ft-surface);
+  color: var(--accent, #5b9cf6);
+}
+
 .cpub-ft-divider {
   width: 2px;
   height: 18px;
   background: var(--ft-surface);
   margin: 0 2px;
 }
+
+.cpub-link-prompt {
+  position: fixed;
+  z-index: 201;
+  display: flex;
+  align-items: center;
+  gap: 0;
+  background: var(--text, #1a1a1a);
+  border: var(--border-width-default, 2px) solid var(--border, #1a1a1a);
+  box-shadow: var(--shadow-md);
+  padding: 3px;
+  transform: translateX(-50%);
+}
+
+.cpub-link-prompt-input {
+  width: 200px;
+  padding: 4px 8px;
+  background: transparent;
+  border: none;
+  color: var(--surface3, #eaeae7);
+  font-family: var(--font-mono, monospace);
+  font-size: 11px;
+  outline: none;
+}
+
+.cpub-link-prompt-input::placeholder {
+  color: rgba(255, 255, 255, 0.3);
+}
+
+.cpub-link-prompt-btn {
+  width: 26px;
+  height: 26px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: transparent;
+  border: none;
+  color: var(--surface3, #eaeae7);
+  cursor: pointer;
+  font-size: 10px;
+}
+
+.cpub-link-prompt-btn:hover { background: rgba(255, 255, 255, 0.15); color: #fff; }
+.cpub-link-prompt-btn--cancel:hover { background: var(--red, #e04030); color: #fff; }
 </style>

package/vue/components/BlockInsertZone.vue

@@ -47,6 +47,23 @@ function onDragLeave(): void {
   transition: height 0.15s;
 }
 
+/* Always-visible thin line */
+.cpub-insert-zone::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 50%;
+  height: 1px;
+  background: var(--border2, rgba(0, 0, 0, 0.06));
+  pointer-events: none;
+}
+
+.cpub-insert-zone:hover::before,
+.cpub-insert-zone--dragover::before {
+  background: transparent;
+}
+
 .cpub-insert-zone:hover,
 .cpub-insert-zone--dragover {
   height: 36px;

package/vue/components/BlockWrapper.vue

@@ -6,6 +6,7 @@
  * - Selected state (accent outline)
  * - Click-to-select
  */
+import { ref, watch } from 'vue';
 import type { EditorBlock } from '../types.js';
 
 const props = defineProps<{
@@ -23,6 +24,29 @@ const emit = defineEmits<{
   'drag-end': [event: DragEvent];
 }>();
 
+// Two-step delete: first click arms, second click confirms
+const deleteArmed = ref(false);
+let deleteTimer: ReturnType<typeof setTimeout> | null = null;
+
+function handleDelete(): void {
+  if (deleteArmed.value) {
+    emit('delete');
+    deleteArmed.value = false;
+    if (deleteTimer) { clearTimeout(deleteTimer); deleteTimer = null; }
+  } else {
+    deleteArmed.value = true;
+    deleteTimer = setTimeout(() => { deleteArmed.value = false; }, 2000);
+  }
+}
+
+// Reset armed state when block loses selection
+watch(() => props.selected, (sel) => {
+  if (!sel) {
+    deleteArmed.value = false;
+    if (deleteTimer) { clearTimeout(deleteTimer); deleteTimer = null; }
+  }
+});
+
 function onDragStart(event: DragEvent): void {
   event.dataTransfer?.setData('text/plain', props.block.id);
   event.dataTransfer!.effectAllowed = 'move';
@@ -53,6 +77,9 @@ function onDragEnd(event: DragEvent): void {
       </button>
     </div>
 
+    <!-- Block type badge (top-left, shown on hover) -->
+    <div class="cpub-block-type-badge">{{ block.type.replace(/_/g, ' ') }}</div>
+
     <!-- Block controls (top-right, shown on hover) -->
     <div class="cpub-block-controls">
       <button class="cpub-block-ctrl" title="Move up" @click.stop="emit('move-up')">
@@ -64,8 +91,18 @@ function onDragEnd(event: DragEvent): void {
       <button class="cpub-block-ctrl" title="Duplicate" @click.stop="emit('duplicate')">
         <i class="fa-solid fa-copy"></i>
       </button>
-      <button class="cpub-block-ctrl cpub-block-ctrl--danger" title="Delete" @click.stop="emit('delete')">
-        <i class="fa-solid fa-trash"></i>
+      <button
+        class="cpub-block-ctrl"
+        :class="deleteArmed ? 'cpub-block-ctrl--armed' : 'cpub-block-ctrl--danger'"
+        :title="deleteArmed ? 'Click again to confirm' : 'Delete'"
+        @click.stop="handleDelete"
+      >
+        <template v-if="deleteArmed">
+          <i class="fa-solid fa-check"></i>
+        </template>
+        <template v-else>
+          <i class="fa-solid fa-trash"></i>
+        </template>
       </button>
     </div>
 
@@ -133,6 +170,25 @@ function onDragEnd(event: DragEvent): void {
   cursor: grabbing;
 }
 
+.cpub-block-type-badge {
+  position: absolute;
+  top: -22px;
+  left: 0;
+  font-family: var(--font-mono);
+  font-size: 9px;
+  font-weight: 600;
+  text-transform: capitalize;
+  letter-spacing: 0.04em;
+  color: var(--text-faint);
+  opacity: 0;
+  transition: opacity 0.12s;
+  pointer-events: none;
+}
+
+.cpub-block-wrap:hover .cpub-block-type-badge {
+  opacity: 1;
+}
+
 .cpub-block-controls {
   --ctrl-surface: rgba(255, 255, 255, 0.15);
   position: absolute;
@@ -177,6 +233,17 @@ function onDragEnd(event: DragEvent): void {
   color: var(--surface);
 }
 
+.cpub-block-ctrl--armed {
+  background: var(--red);
+  color: var(--surface);
+  animation: cpub-pulse 0.6s ease-in-out infinite alternate;
+}
+
+@keyframes cpub-pulse {
+  from { opacity: 1; }
+  to { opacity: 0.6; }
+}
+
 .cpub-block-inner {
   min-height: 20px;
 }

package/vue/composables/useBlockEditor.ts

@@ -115,6 +115,10 @@ export function useBlockEditor(initialBlocks?: BlockTuple[], options?: BlockEdit
       type,
       content: { ...content },
     }));
+    // Reset history — loading new content is not an undoable operation
+    history.splice(0, history.length);
+    historyIndex.value = -1;
+    pushHistory();
   }
 
   if (initialBlocks && initialBlocks.length > 0) {