autumnnote 1.6.5 → 1.6.7

package/src/js/module/TableTooltip.js

@@ -190,10 +190,7 @@ export class TableTooltip {
       on(editable, 'mousedown', onSelMousedown),
       on(editable, 'mousemove', onSelMousemove),
       on(document, 'mouseup',   onSelMouseup),
-    );
-    // ────────────────────────────────────────────────────────────────────────
-
-    this._disposers.push(
+      // ──────────────────────────────────────────────────────────────────────
       on(editable, 'mouseover', (e) => {
         if (this.context.layoutInfo.container.classList.contains('an-disabled')) return;
         const table = /** @type {Element} */ (e.target)?.closest('table');
@@ -309,22 +306,27 @@ export class TableTooltip {
       _startY   = e.clientY;
       _table    = _nearCell.closest('table');
       if (_edge === 'col') {
-        _startW   = _nearCell.offsetWidth;
-        _colIdx   = getVisualColIndex(_nearCell);
-        // Cache column cells once so onDocMove never runs querySelectorAll per frame.
-        // F-1: skip merged cells (colSpan > 1) — setting width on a merged cell
-        // distributes it equally across all spanned columns instead of resizing
-        // only the target column.  Rows that have an individual cell at this
-        // visual column index are resized independently as expected.
+        // Right edge of a merged cell = last spanned column, not the start column
+        _colIdx = getVisualColIndex(_nearCell) + (_nearCell.colSpan || 1) - 1;
+        // Cache non-merged cells at that column — merged cells cannot be individually
+        // resized per column (F-1: colSpan > 1 distributes width across all spanned cols)
         _colCells = _colIdx >= 0
           ? Array.from(_table.querySelectorAll('tr'))
               .map(r => getCellAtVisualCol(r, _colIdx))
               .filter(Boolean)
               .filter(c => (c.colSpan || 1) === 1)
           : [];
+        // Use the actual column width from a non-merged cell; fall back to per-column estimate
+        _startW = _colCells.length > 0
+          ? _colCells[0].offsetWidth
+          : Math.max(30, Math.round(_nearCell.offsetWidth / (_nearCell.colSpan || 1)));
         document.body.style.cursor = 'col-resize';
       } else {
-        _row    = _nearCell.closest('tr');
+        // Bottom edge of a merged cell = last spanned row, not the cell's own <tr>
+        const tr = _nearCell.closest('tr');
+        const rowStart = tr ? Array.from(_table.rows).indexOf(tr) : 0;
+        const lastRowIdx = rowStart + (_nearCell.rowSpan || 1) - 1;
+        _row    = _table.rows[lastRowIdx] || tr;
         _startH = _row ? _row.offsetHeight : 40;
         document.body.style.cursor = 'row-resize';
       }
@@ -386,7 +388,7 @@ export class TableTooltip {
     this._clearTimers();
     this._disposers.forEach((d) => d());
     this._disposers = [];
-    if (this._el && this._el.parentNode) this._el.remove();
+    if (this._el?.parentNode) this._el.remove();
     this._el = null;
     if (this._sizePopover?.parentNode) {
       this._sizePopover.remove();
@@ -734,7 +736,8 @@ export class TableTooltip {
     const refRow = selectedRows.reduce((best, r) => {
       const bi = allRows.indexOf(best);
       const ri = allRows.indexOf(r);
-      return position === 'above' ? (ri < bi ? r : best) : (ri > bi ? r : best);
+      if (position === 'above') return ri < bi ? r : best;
+      return ri > bi ? r : best;
     }, selectedRows[0]);
     const colCount = Array.from(refRow.cells).reduce((sum, c) => sum + (c.colSpan || 1), 0);
     const newRow = document.createElement('tr');
@@ -747,7 +750,7 @@ export class TableTooltip {
       newRow.appendChild(td);
     }
     if (position === 'above') refRow.parentElement?.insertBefore(newRow, refRow);
-    else refRow.insertAdjacentElement('afterend', newRow);
+    else refRow.after(newRow);
     requestAnimationFrame(() => this._positionNear(this._activeTable));
     this.context.invoke('editor.afterCommand');
   }
@@ -865,8 +868,21 @@ export class TableTooltip {
     first.colSpan = maxC - minC + 1;
     first.rowSpan = maxR - minR + 1;
     first.style.verticalAlign = 'middle';
-    first.innerHTML = rectCells.map((c) => c.innerHTML).join('');
-    rectCells.slice(1).forEach((c) => c.remove());
+    first.style.height = '';
+    first.style.minHeight = '';
+
+    // Merge content: collect non-empty inner HTML, join with <br> separator
+    const parts = rectCells
+      .map((c) => c.innerHTML.replace(/^(<br\s*\/?>|\s)+$/i, '').trim())
+      .filter((h) => h !== '');
+    first.innerHTML = parts.length ? parts.join('<br>') : '<br>';
+
+    rectCells.slice(1).forEach((c) => {
+      const row = c.parentElement;
+      c.remove();
+      // Remove the parent <tr> if it is now completely empty
+      if (row && row.cells.length === 0) row.remove();
+    });
 
     this._clearSelection();
     this.context.invoke('editor.afterCommand');
@@ -939,7 +955,7 @@ export class TableTooltip {
       let ref = null;
       for (const tc of targetRow.cells) {
         const tp = cellPos.get(tc);
-        if (tp && tp.c > c) { ref = tc; break; }
+        if (tp?.c > c) { ref = tc; break; }
       }
       for (let dc = 0; dc < cs; dc++) {
         targetRow.insertBefore(createElement(tag, {}, ['\u00a0']), ref);
@@ -1043,9 +1059,12 @@ export class TableTooltip {
         : this.context.locale.tooltips.table.rowHeightPx;
       this._sizeInputEl.min   = '1';
       this._sizeInputEl.max   = '2000';
-      this._sizeInputEl.value = isCol
-        ? (cell.offsetWidth || 120)
-        : (cell.closest('tr') ? (cell.closest('tr').offsetHeight || 40) : 40);
+      if (isCol) {
+        this._sizeInputEl.value = cell.offsetWidth || 120;
+      } else {
+        const refRow = cell.closest('tr');
+        this._sizeInputEl.value = refRow ? (refRow.offsetHeight || 40) : 40;
+      }
       this._sizeApply = (val) => {
         const table = cell.closest('table');
         if (!table) return;
@@ -1140,19 +1159,18 @@ export class TableTooltip {
       on(pop, 'mousedown', (e) => e.preventDefault()),
       on(pop, 'mouseenter', () => this._clearTimers()),
       on(pop, 'mouseleave', () => this._scheduleHide()),
+      // Close on outside click
+      on(document, 'click', (e) => {
+        const et = /** @type {Node} */ (e.target);
+        if (this._shadePopover &&
+            this._shadePopover.style.display !== 'none' &&
+            !this._shadePopover.contains(et) &&
+            !this._el?.contains(et)) {
+          this._hideCellShadePopover();
+        }
+      }),
     );
 
-    // Close on outside click
-    this._disposers.push(on(document, 'click', (e) => {
-      const et = /** @type {Node} */ (e.target);
-      if (this._shadePopover &&
-          this._shadePopover.style.display !== 'none' &&
-          !this._shadePopover.contains(et) &&
-          !this._el?.contains(et)) {
-        this._hideCellShadePopover();
-      }
-    }));
-
     return pop;
   }
 

package/src/js/module/Toolbar.js

@@ -145,7 +145,7 @@ export class Toolbar {
     this._refreshRaf = null;
     this._disposers.forEach((d) => d());
     this._disposers = [];
-    if (this.el && this.el.parentNode) {
+    if (this.el?.parentNode) {
       this.el.remove();
     }
     this.el = null;
@@ -410,7 +410,7 @@ export class Toolbar {
         sel.removeAllRanges();
         sel.addRange(savedRange);
       } catch (_) {
-        // Range target may be detached if DOM changed while popup was open
+        void _; // range may be stale if DOM changed while popup was open
       }
     };
 
@@ -541,11 +541,14 @@ export class Toolbar {
 
     items.forEach((item) => {
       const value    = (typeof item === 'object') ? item.value    : item;
-      const label    = (typeof item === 'object')
-        ? (def.name === 'paragraphStyle'
-            ? (this.context.locale.toolbar.paragraphItems?.[item.value] || item.label)
-            : item.label)
-        : item;
+      let label;
+      if (typeof item !== 'object') {
+        label = item;
+      } else if (def.name === 'paragraphStyle') {
+        label = this.context.locale.toolbar.paragraphItems?.[item.value] || item.label;
+      } else {
+        label = item.label;
+      }
       const isHeader = (typeof item === 'object') && !!item.disabled;
       const attrs    = { value };
       if (isHeader) attrs.disabled = '';
@@ -576,7 +579,7 @@ export class Toolbar {
         try {
           const sel = globalThis.getSelection();
           if (sel) { sel.removeAllRanges(); sel.addRange(_savedRange); }
-        } catch (_) { /* range may be stale if DOM changed */ }
+        } catch (_) { void _; /* range may be stale if DOM changed */ }
       }
       def.action(this.context, value);
       this.context.invoke('editor.afterCommand');
@@ -700,13 +703,13 @@ export class Toolbar {
       // Fallback: when no selection/font set, use the configured default font
       if (!raw) {
         raw = this.options.defaultFontFamily
-          || (this.options.fontFamilies && this.options.fontFamilies[0])
+          || this.options.fontFamilies?.[0]
           || '';
       }
       // Try to match against available options (case-insensitive)
       const sel = /** @type {HTMLSelectElement} */ (select);
       const matched = Array.from(sel.options).find(
-        (opt) => opt.value && opt.value.toLowerCase() === raw.toLowerCase()
+        (opt) => opt.value?.toLowerCase() === raw.toLowerCase()
       );
       sel.value = matched ? matched.value : '';
     });

package/src/js/module/VideoDialog.js

@@ -68,7 +68,10 @@ export class VideoDialog extends BaseDialog {
     // Live URL hint
     const d0 = on(urlInput, 'input', () => {
       const info = this._parseVideoUrl(urlInput.value.trim());
-      hintEl.textContent = info ? this.context.locale.videoDialog.detected(info.type) : (urlInput.value ? this.context.locale.videoDialog.unknownFormat : '');
+      let hint = '';
+      if (info) { hint = this.context.locale.videoDialog.detected(info.type); }
+      else if (urlInput.value) { hint = this.context.locale.videoDialog.unknownFormat; }
+      hintEl.textContent = hint;
     });
     const d4 = on(urlInput, 'keydown', (e) => { if (/** @type {KeyboardEvent} */ (e).key === 'Enter') { e.preventDefault(); this._onInsert(); } });
     this._disposers.push(d0, d4);
@@ -167,7 +170,7 @@ export class VideoDialog extends BaseDialog {
       );
     }
 
-    if (info && info.type === 'Direct video') {
+    if (info?.type === 'Direct video') {
       const src = info.embedUrl.replaceAll('"', '%22');
       return (
         `<div class="an-video-wrapper" style="position:relative;display:block;width:${width}px;max-width:100%">` +

package/src/js/renderer.js

@@ -36,7 +36,7 @@ export function renderLayout(targetEl, options) {
   // Restore auto-saved content when available; fall back to element content
   let initialContent = '';
   if (options.autoSave && options.autoSaveKey) {
-    try { initialContent = localStorage.getItem(options.autoSaveKey) || ''; } catch (_) {}
+    try { initialContent = localStorage.getItem(options.autoSaveKey) || ''; } catch (_) { void _; }
   }
   if (!initialContent) {
     initialContent = targetEl.tagName === 'TEXTAREA'
@@ -111,7 +111,7 @@ export function renderLayout(targetEl, options) {
 
   // Hide the original element; keep it in DOM for form submission
   targetEl.style.display = 'none';
-  targetEl.insertAdjacentElement('afterend', container);
+  targetEl.after(container);
 
   return { container, editable };
 }