gitmaps 1.0.0 → 1.1.1

package/app/lib/card-arrangement.ts

@@ -8,7 +8,7 @@
  */
 import { measure } from 'measure-fn';
 import type { CanvasContext } from './context';
-import { savePosition } from './positions';
+import { savePosition, flushPositions } from './positions';
 import { updateMinimap } from './canvas';
 import { renderConnections } from './connections';
 
@@ -35,11 +35,19 @@ function getSelectedCardsInfo(ctx: CanvasContext): CardInfo[] {
             const x = parseFloat(card.style.left);
             const y = parseFloat(card.style.top);
             if (isNaN(x) || isNaN(y)) return;
+            // In pill mode, card might be display:none (0px) or rendered as a pill (~24px).
+            let cw = card.offsetWidth;
+            let ch = card.offsetHeight;
+            if (!cw || cw < 100) cw = 580;
+            if (!ch || ch < 100) ch = 700;
+
+            const pos = ctx.positions?.get(path);
+            const def = ctx.deferredCards?.get(path);
             infos.push({
                 path, card,
                 x, y,
-                w: card.offsetWidth || 580,
-                h: card.offsetHeight || 400,
+                w: pos?.width || def?.size?.width || cw,
+                h: pos?.height || def?.size?.height || ch,
             });
         }
     });
@@ -69,16 +77,19 @@ function getSelectedCardsInfo(ctx: CanvasContext): CardInfo[] {
     if (infos.length < selected.length) {
         selected.forEach(path => {
             if (seen.has(path)) return;
-            const pill = document.querySelector(`.file-card-pill[data-path="${CSS.escape(path)}"]`) as HTMLElement;
+            const pill = document.querySelector(`.file-pill[data-path="${CSS.escape(path)}"]`) as HTMLElement;
             if (pill) {
                 const x = parseFloat(pill.style.left);
                 const y = parseFloat(pill.style.top);
                 if (isNaN(x) || isNaN(y)) return;
+                // Pills are tiny (~24px) — use stored size or default card size
+                const pos = ctx.positions?.get(path);
+                const def = ctx.deferredCards?.get(path);
                 infos.push({
                     path, card: null,
                     x, y,
-                    w: pill.offsetWidth || 580,
-                    h: pill.offsetHeight || 400,
+                    w: pos?.width || def?.size?.width || 580,
+                    h: pos?.height || def?.size?.height || 700,
                 });
             }
         });
@@ -104,7 +115,7 @@ function applyPosition(ctx: CanvasContext, info: CardInfo, newX: number, newY: n
     }
 
     // Update pill element
-    const pill = document.querySelector(`.file-card-pill[data-path="${CSS.escape(info.path)}"]`) as HTMLElement;
+    const pill = document.querySelector(`.file-pill[data-path="${CSS.escape(info.path)}"]`) as HTMLElement;
     if (pill) {
         pill.style.left = `${newX}px`;
         pill.style.top = `${newY}px`;
@@ -126,6 +137,7 @@ export function arrangeRow(ctx: CanvasContext) {
             savePosition(ctx, commitHash, info.path, curX, startY);
             curX += info.w + gap;
         });
+        flushPositions(ctx); // Force immediate save — don't rely on debounce for batch arrange
         renderConnections(ctx);
         updateMinimap(ctx);
     });
@@ -146,6 +158,7 @@ export function arrangeColumn(ctx: CanvasContext) {
             savePosition(ctx, commitHash, info.path, startX, curY);
             curY += info.h + gap;
         });
+        flushPositions(ctx);
         renderConnections(ctx);
         updateMinimap(ctx);
     });
@@ -182,6 +195,7 @@ export function arrangeGrid(ctx: CanvasContext) {
             savePosition(ctx, commitHash, info.path, x, y);
         });
 
+        flushPositions(ctx);
         renderConnections(ctx);
         updateMinimap(ctx);
     });

package/app/lib/card-context-menu.tsx

@@ -93,8 +93,8 @@ function ContextMenu({ onAction, onActionLayer, onSelectFolder, isInActiveLayer,
                 </div>
             </div>
             {isInActiveLayer && (
-                <button className="ctx-item" onClick={() => onAction('remove-from-layer')} style="color: #ef4444">
-                    ✕ Remove from Layer
+                <button className="ctx-item" onClick={() => onAction('remove-from-layer')} style="color: #60a5fa">
+                    ↩ Move to Main
                 </button>
             )}
             <div className="ctx-divider"></div>

package/app/lib/card-groups.ts

@@ -24,8 +24,8 @@ const activeGroups = new Map<string, CollapsedGroup>();
 
 // ─── Persistence ─────────────────────────────────────────
 function getStorageKey(): string {
-    const hash = location.hash?.slice(1) || 'default';
-    return `gitmaps:collapsed-dirs:${hash}`;
+    const repoPath = _ctx?.snap().context.repoPath || 'default';
+    return `gitmaps:collapsed-dirs:${repoPath}`;
 }
 
 function saveState() {
@@ -45,6 +45,13 @@ function loadState() {
     } catch { }
 }
 
+export function resetCardGroups() {
+    for (const group of activeGroups.values()) {
+        group.groupCard.remove();
+    }
+    activeGroups.clear();
+}
+
 // ─── Group card rendering ────────────────────────────────
 function createGroupCard(dir: string, files: CollapsedGroup['files']): HTMLElement {
     const card = document.createElement('div');