collabmd 0.1.32 → 0.1.34

package/src/client/presentation/comments-panel.js

@@ -37,6 +37,47 @@ function sortThreads(threads = []) {
   ));
 }
 
+export function countThreadsForSourceBlocks(blocks = [], threads = []) {
+  const normalizedBlocks = blocks
+    .map((block, index) => {
+      const startLine = Number(block?.startLine);
+      const endLine = Number(block?.endLine ?? startLine);
+      if (!Number.isFinite(startLine) || startLine <= 0) {
+        return null;
+      }
+
+      return {
+        endExclusive: Math.max(endLine, startLine + 1),
+        index,
+        startLine,
+      };
+    })
+    .filter(Boolean)
+    .sort((left, right) => (
+      left.startLine - right.startLine
+        || left.endExclusive - right.endExclusive
+        || left.index - right.index
+    ));
+  const counts = new Array(blocks.length).fill(0);
+  let threadIndex = 0;
+
+  normalizedBlocks.forEach((block) => {
+    while (threadIndex < threads.length && (threads[threadIndex]?.anchor?.startLine ?? 0) < block.startLine) {
+      threadIndex += 1;
+    }
+
+    let countIndex = threadIndex;
+    while (countIndex < threads.length && (threads[countIndex]?.anchor?.startLine ?? 0) < block.endExclusive) {
+      countIndex += 1;
+    }
+
+    counts[block.index] = countIndex - threadIndex;
+    threadIndex = countIndex;
+  });
+
+  return counts;
+}
+
 export class CommentsPanel {
   constructor({
     panelElement,
@@ -236,18 +277,22 @@ export class CommentsPanel {
 
     const blocks = Array.from(this.previewElement.querySelectorAll('[data-source-line]'))
       .filter((element) => isLeafSourceBlock(element) && isCommentablePreviewBlock(element));
+    const threadCounts = countThreadsForSourceBlocks(
+      blocks.map((block) => ({
+        endLine: parseLineNumber(block.getAttribute('data-source-line-end')) ?? parseLineNumber(block.getAttribute('data-source-line')) ?? 1,
+        startLine: parseLineNumber(block.getAttribute('data-source-line')),
+      })),
+      this.threads,
+    );
 
-    blocks.forEach((block) => {
+    blocks.forEach((block, index) => {
       const startLine = parseLineNumber(block.getAttribute('data-source-line'));
       const endLine = parseLineNumber(block.getAttribute('data-source-line-end')) ?? (startLine ?? 1);
       if (!startLine) {
         return;
       }
 
-      const matchingThreads = this.threads.filter((thread) => (
-        thread.anchor?.startLine >= startLine && thread.anchor?.startLine < Math.max(endLine, startLine + 1)
-      ));
-      const totalCount = matchingThreads.length;
+      const totalCount = threadCounts[index] ?? 0;
       const button = document.createElement('button');
       button.type = 'button';
       button.className = 'comment-anchor-btn';

package/src/client/presentation/excalidraw-embed-controller.js

@@ -153,6 +153,7 @@ export class ExcalidrawEmbedController {
     this.hydrationIdleId = null;
     this.hydrationQueue = [];
     this.hydrationInProgress = false;
+    this._exitMaximizedEmbed();
     if (this.overlayRoot) {
       this.overlayRoot.hidden = true;
     }
@@ -762,7 +763,9 @@ export class ExcalidrawEmbedController {
         enterMaximize();
       }
     });
-    openBtn.addEventListener('click', () => {
+    openBtn.addEventListener('click', (event) => {
+      event.preventDefault();
+      this._exitMaximizedEmbed();
       this.onOpenFile?.(entry.filePath);
     });
 

package/src/client/presentation/file-history-view-controller.js

@@ -516,9 +516,15 @@ export class FileHistoryViewController {
         additions: Number(selectedEntry.additions || 0),
         deletions: Number(selectedEntry.deletions || 0),
       } : null);
+    const hasSelection = Boolean(selectedEntry);
+
+    this.syncToolbarIndicators(selectedEntry, selectedSummary, hasSelection);
+    this.syncToolbarButtonStates(hasSelection);
+  }
+
+  syncToolbarIndicators(selectedEntry, selectedSummary, hasSelection) {
     const additions = Number(selectedSummary?.additions || 0);
     const deletions = Number(selectedSummary?.deletions || 0);
-    const hasSelection = Boolean(selectedEntry);
 
     if (this.fileIndicator) {
       this.fileIndicator.textContent = selectedEntry?.type === 'commit'
@@ -535,7 +541,9 @@ export class FileHistoryViewController {
       `;
       this.stats.classList.toggle('hidden', !hasSelection);
     }
+  }
 
+  syncToolbarButtonStates(hasSelection) {
     this.backToHistoryButton?.classList.add('hidden');
     this.gitActionsGroup?.classList.add('hidden');
     this.layoutToggle?.classList.add('hidden');

package/src/client/presentation/git-panel-controller.js

@@ -149,115 +149,125 @@ export class GitPanelController {
     };
   }
 
-  initialize() {
-    this.panel?.addEventListener('click', (event) => {
-      const modeButton = event.target instanceof Element
-        ? event.target.closest('[data-git-panel-mode]')
-        : null;
-      if (modeButton) {
-        const nextMode = modeButton.getAttribute('data-git-panel-mode');
-        if (nextMode === 'changes' || nextMode === 'history') {
-          void this.setMode(nextMode);
-        }
-        return;
+  _handlePanelModeClick(event) {
+    const modeButton = event.target instanceof Element
+      ? event.target.closest('[data-git-panel-mode]')
+      : null;
+    if (modeButton) {
+      const nextMode = modeButton.getAttribute('data-git-panel-mode');
+      if (nextMode === 'changes' || nextMode === 'history') {
+        void this.setMode(nextMode);
       }
+      return true;
+    }
+    return false;
+  }
 
-      const toggleButton = event.target instanceof Element
-        ? event.target.closest('[data-git-section-toggle]')
-        : null;
-      if (toggleButton) {
-        const sectionKey = toggleButton.getAttribute('data-git-section-toggle');
-        this.toggleSection(sectionKey);
-        return;
-      }
+  _handleSectionToggleClick(event) {
+    const toggleButton = event.target instanceof Element
+      ? event.target.closest('[data-git-section-toggle]')
+      : null;
+    if (toggleButton) {
+      this.toggleSection(toggleButton.getAttribute('data-git-section-toggle'));
+      return true;
+    }
+    return false;
+  }
 
-      const historyButton = event.target instanceof Element
-        ? event.target.closest('[data-git-commit-hash]')
-        : null;
-      if (historyButton && !event.target.closest('[data-git-history-load-more]')) {
-        const hash = historyButton.getAttribute('data-git-commit-hash');
-        if (!hash) {
-          return;
-        }
+  _handleCommitHistoryClick(event) {
+    const historyButton = event.target instanceof Element
+      ? event.target.closest('[data-git-commit-hash]')
+      : null;
+    if (historyButton && !event.target.closest('[data-git-history-load-more]')) {
+      const hash = historyButton.getAttribute('data-git-commit-hash');
+      if (hash) {
         this.onSelectCommit(hash, { path: this.selection.commitHash === hash ? this.selection.path : null });
-        return;
       }
+      return true;
+    }
+    return false;
+  }
 
-      const loadMoreButton = event.target instanceof Element
-        ? event.target.closest('[data-git-history-load-more]')
-        : null;
-      if (loadMoreButton) {
-        void this.loadMoreHistory();
-        return;
+  _handleFileSelectionClick(event) {
+    const fileButton = event.target instanceof Element
+      ? event.target.closest('[data-git-path]')
+      : null;
+    if (fileButton && !event.target.closest('[data-git-file-action]')) {
+      const filePath = fileButton.getAttribute('data-git-path');
+      if (filePath) {
+        this.onSelectDiff(filePath, { scope: fileButton.getAttribute('data-git-scope') || 'working-tree' });
       }
+      return true;
+    }
+    return false;
+  }
 
-      const fileButton = event.target instanceof Element
-        ? event.target.closest('[data-git-path]')
-        : null;
-      if (fileButton && !event.target.closest('[data-git-file-action]')) {
-        const filePath = fileButton.getAttribute('data-git-path');
-        const scope = fileButton.getAttribute('data-git-scope') || 'working-tree';
-        if (!filePath) {
-          return;
-        }
-        this.onSelectDiff(filePath, { scope });
-        return;
+  _handleFileActionClick(event) {
+    const actionButton = event.target instanceof Element
+      ? event.target.closest('[data-git-file-action]')
+      : null;
+    if (actionButton) {
+      const action = actionButton.getAttribute('data-git-file-action');
+      const filePath = actionButton.getAttribute('data-git-path');
+      if (action && filePath) {
+        event.preventDefault();
+        event.stopPropagation();
+        void this.handleFileAction(action, filePath, actionButton.getAttribute('data-git-scope') || 'working-tree');
       }
+      return true;
+    }
+    return false;
+  }
 
-      const pullBackupButton = event.target instanceof Element
-        ? event.target.closest('[data-git-pull-backup-path]')
-        : null;
-      if (pullBackupButton) {
-        const summaryPath = pullBackupButton.getAttribute('data-git-pull-backup-path');
-        if (!summaryPath) {
-          return;
-        }
+  _handlePanelClick(event) {
+    if (this._handlePanelModeClick(event)) return;
+    if (this._handleSectionToggleClick(event)) return;
+    if (this._handleCommitHistoryClick(event)) return;
+
+    if (event.target instanceof Element && event.target.closest('[data-git-history-load-more]')) {
+      void this.loadMoreHistory();
+      return;
+    }
+
+    if (this._handleFileSelectionClick(event)) return;
+
+    const pullBackupButton = event.target instanceof Element
+      ? event.target.closest('[data-git-pull-backup-path]')
+      : null;
+    if (pullBackupButton) {
+      const summaryPath = pullBackupButton.getAttribute('data-git-pull-backup-path');
+      if (summaryPath) {
         this.onOpenPullBackup(summaryPath);
-        return;
       }
+      return;
+    }
 
-      const actionButton = event.target instanceof Element
-        ? event.target.closest('[data-git-file-action]')
-        : null;
-      if (actionButton) {
-        const action = actionButton.getAttribute('data-git-file-action');
-        const filePath = actionButton.getAttribute('data-git-path');
-        const scope = actionButton.getAttribute('data-git-scope') || 'working-tree';
-        if (!action || !filePath) {
-          return;
-        }
+    if (this._handleFileActionClick(event)) return;
 
-        event.preventDefault();
-        event.stopPropagation();
-        void this.handleFileAction(action, filePath, scope);
-        return;
-      }
+    if (event.target instanceof Element && event.target.closest('[data-git-view-all]')) {
+      this.onViewAllDiff();
+      return;
+    }
 
-      const viewAllButton = event.target instanceof Element
-        ? event.target.closest('[data-git-view-all]')
-        : null;
-      if (viewAllButton) {
-        this.onViewAllDiff();
-        return;
-      }
+    if (event.target instanceof Element && event.target.closest('[data-git-commit-staged]')) {
+      void this.handleCommitStaged();
+      return;
+    }
 
-      const commitStagedButton = event.target instanceof Element
-        ? event.target.closest('[data-git-commit-staged]')
-        : null;
-      if (commitStagedButton) {
-        void this.handleCommitStaged();
-        return;
+    const syncButton = event.target instanceof Element
+      ? event.target.closest('[data-git-sync-action]')
+      : null;
+    if (syncButton) {
+      const action = syncButton.getAttribute('data-git-sync-action');
+      if (action === 'pull' || action === 'push') {
+        void this.handleSyncAction(action);
       }
+    }
+  }
 
-      const syncButton = event.target instanceof Element
-        ? event.target.closest('[data-git-sync-action]')
-        : null;
-      if (syncButton) {
-        const action = syncButton.getAttribute('data-git-sync-action');
-        if (action === 'pull' || action === 'push') {
-          void this.handleSyncAction(action);
-        }
-      }
+  initialize() {
+    this.panel?.addEventListener('click', (event) => {
+      this._handlePanelClick(event);
     });
 
     this.searchInput?.addEventListener('input', (event) => {

package/src/client/styles/components/scrollbars.css

@@ -5,6 +5,7 @@
 .file-tree,
 .git-panel,
 .diff-scroll,
+.backlinks-body,
 .comments-drawer-list,
 .comments-drawer-item-quote,
 .comment-card-quote,
@@ -26,6 +27,7 @@
 .file-tree::-webkit-scrollbar,
 .git-panel::-webkit-scrollbar,
 .diff-scroll::-webkit-scrollbar,
+.backlinks-body::-webkit-scrollbar,
 .comments-drawer-list::-webkit-scrollbar,
 .comments-drawer-item-quote::-webkit-scrollbar,
 .comment-card-quote::-webkit-scrollbar,
@@ -47,6 +49,7 @@
 .file-tree::-webkit-scrollbar-track,
 .git-panel::-webkit-scrollbar-track,
 .diff-scroll::-webkit-scrollbar-track,
+.backlinks-body::-webkit-scrollbar-track,
 .comments-drawer-list::-webkit-scrollbar-track,
 .comments-drawer-item-quote::-webkit-scrollbar-track,
 .comment-card-quote::-webkit-scrollbar-track,
@@ -67,6 +70,7 @@
 .file-tree::-webkit-scrollbar-thumb,
 .git-panel::-webkit-scrollbar-thumb,
 .diff-scroll::-webkit-scrollbar-thumb,
+.backlinks-body::-webkit-scrollbar-thumb,
 .comments-drawer-list::-webkit-scrollbar-thumb,
 .comments-drawer-item-quote::-webkit-scrollbar-thumb,
 .comment-card-quote::-webkit-scrollbar-thumb,
@@ -88,6 +92,7 @@
 .file-tree::-webkit-scrollbar-thumb:hover,
 .git-panel::-webkit-scrollbar-thumb:hover,
 .diff-scroll::-webkit-scrollbar-thumb:hover,
+.backlinks-body::-webkit-scrollbar-thumb:hover,
 .comments-drawer-list::-webkit-scrollbar-thumb:hover,
 .comments-drawer-item-quote::-webkit-scrollbar-thumb:hover,
 .comment-card-quote::-webkit-scrollbar-thumb:hover,