mirror of
https://github.com/purrgrammer/grimoire.git
synced 2026-06-04 17:51:12 +02:00
feat: balance layout and kbd workspace navigation
This commit is contained in:
61
TODO.md
61
TODO.md
@@ -114,6 +114,67 @@ All event renderers now protected with error boundaries:
|
|||||||
- Retry button and collapsible details for debugging
|
- Retry button and collapsible details for debugging
|
||||||
- Auto-resets when event changes
|
- Auto-resets when event changes
|
||||||
|
|
||||||
|
### Layout System Enhancements
|
||||||
|
**Completed**: 2024-12-18
|
||||||
|
**Files**: `src/lib/layout-presets.ts`, `src/components/LayoutControls.tsx`, `src/components/TabBar.tsx`, `src/core/logic.ts`, `src/core/state.ts`
|
||||||
|
|
||||||
|
Quick-win improvements to window management:
|
||||||
|
- **Balance Splits**: New action to equalize all split percentages to 50/50 after manual resizing
|
||||||
|
- Recursive tree traversal preserves window IDs and directions
|
||||||
|
- Added to Actions section in LayoutControls dropdown
|
||||||
|
- Smooth animation on balance operation
|
||||||
|
- **Keyboard Workspace Switching**: Cmd+1-9 (or Ctrl+1-9) to instantly switch to workspace by number
|
||||||
|
- Browser-safe shortcuts (prevents default browser behavior)
|
||||||
|
- Significantly faster workflow for power users
|
||||||
|
- Comprehensive test coverage for balanceLayout function
|
||||||
|
|
||||||
|
## Window Management Improvements
|
||||||
|
|
||||||
|
### Fullscreen Mode
|
||||||
|
**Priority**: High | **Effort**: Medium (2-3 hours)
|
||||||
|
**Description**: Toggle window to fill entire workspace with minimal chrome
|
||||||
|
**Implementation**:
|
||||||
|
- CSS-based approach (hide siblings, expand target)
|
||||||
|
- Keep workspace tabs visible for navigation
|
||||||
|
- Toolbar button + right-click menu to enter fullscreen
|
||||||
|
- ESC or button click to exit
|
||||||
|
- Add `fullscreenWindowId` to workspace state
|
||||||
|
- Smooth animation on enter/exit
|
||||||
|
|
||||||
|
**Use Case**: Reading long-form content, focused analysis of single event/profile
|
||||||
|
|
||||||
|
### Move Window to Different Workspace
|
||||||
|
**Priority**: Medium | **Effort**: High (3-4 hours)
|
||||||
|
**Description**: Reorganize windows by moving them between workspaces
|
||||||
|
**Implementation**:
|
||||||
|
- Right-click window → "Move to Workspace N" submenu
|
||||||
|
- Extract window from current layout tree
|
||||||
|
- Insert into target workspace layout
|
||||||
|
- Handle edge cases (last window, invalid workspace)
|
||||||
|
|
||||||
|
**Use Case**: "This profile is actually relevant to workspace 2's topic"
|
||||||
|
|
||||||
|
### Rotate/Mirror Layout
|
||||||
|
**Priority**: Low | **Effort**: Medium (2 hours)
|
||||||
|
**Description**: Swap all row↔column directions in layout tree
|
||||||
|
**Implementation**:
|
||||||
|
- Recursive tree traversal
|
||||||
|
- Swap `direction: "row"` ↔ `direction: "column"`
|
||||||
|
- Keep split percentages unchanged
|
||||||
|
- Add to Actions section in LayoutControls
|
||||||
|
|
||||||
|
**Use Case**: "This arrangement works better vertically than horizontally"
|
||||||
|
|
||||||
|
### Tab Navigation Between Windows
|
||||||
|
**Priority**: Low | **Effort**: Low (1 hour)
|
||||||
|
**Description**: Keyboard navigation within workspace
|
||||||
|
**Implementation**:
|
||||||
|
- Tab/Shift+Tab to cycle focus between windows
|
||||||
|
- Focus management via mosaic window refs
|
||||||
|
- Visual focus indicator (border highlight)
|
||||||
|
|
||||||
|
**Use Case**: Keyboard-driven workflow without mouse
|
||||||
|
|
||||||
## Planned Improvements
|
## Planned Improvements
|
||||||
|
|
||||||
- **App-wide error boundary** - Splash crash screen for unhandled errors (separate from event-level boundaries)
|
- **App-wide error boundary** - Splash crash screen for unhandled errors (separate from event-level boundaries)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
Sparkles,
|
Sparkles,
|
||||||
SplitSquareHorizontal,
|
SplitSquareHorizontal,
|
||||||
SplitSquareVertical,
|
SplitSquareVertical,
|
||||||
|
Scale,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { Button } from "./ui/button";
|
import { Button } from "./ui/button";
|
||||||
import { useGrimoire } from "@/core/state";
|
import { useGrimoire } from "@/core/state";
|
||||||
@@ -22,7 +23,8 @@ import { toast } from "sonner";
|
|||||||
import type { LayoutConfig } from "@/types/app";
|
import type { LayoutConfig } from "@/types/app";
|
||||||
|
|
||||||
export function LayoutControls() {
|
export function LayoutControls() {
|
||||||
const { state, applyPresetLayout, updateLayoutConfig } = useGrimoire();
|
const { state, applyPresetLayout, balanceLayout, updateLayoutConfig } =
|
||||||
|
useGrimoire();
|
||||||
const { workspaces, activeWorkspaceId, layoutConfig } = state;
|
const { workspaces, activeWorkspaceId, layoutConfig } = state;
|
||||||
|
|
||||||
const activeWorkspace = workspaces[activeWorkspaceId];
|
const activeWorkspace = workspaces[activeWorkspaceId];
|
||||||
@@ -97,6 +99,26 @@ export function LayoutControls() {
|
|||||||
updateLayoutConfig({ splitPercentage: newValue });
|
updateLayoutConfig({ splitPercentage: newValue });
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleBalance = () => {
|
||||||
|
try {
|
||||||
|
// Enable animations for smooth transition
|
||||||
|
document.body.classList.add("animating-layout");
|
||||||
|
|
||||||
|
balanceLayout();
|
||||||
|
|
||||||
|
// Remove animation class after transition completes
|
||||||
|
setTimeout(() => {
|
||||||
|
document.body.classList.remove("animating-layout");
|
||||||
|
}, 180);
|
||||||
|
} catch (error) {
|
||||||
|
document.body.classList.remove("animating-layout");
|
||||||
|
toast.error(`Failed to balance layout`, {
|
||||||
|
description:
|
||||||
|
error instanceof Error ? error.message : "Unknown error occurred",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DropdownMenu>
|
<DropdownMenu>
|
||||||
<DropdownMenuTrigger asChild>
|
<DropdownMenuTrigger asChild>
|
||||||
@@ -214,6 +236,26 @@ export function LayoutControls() {
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<DropdownMenuSeparator />
|
||||||
|
|
||||||
|
{/* Actions Section */}
|
||||||
|
<div className="px-2 py-1.5 text-xs font-semibold text-muted-foreground">
|
||||||
|
Actions
|
||||||
|
</div>
|
||||||
|
<DropdownMenuItem
|
||||||
|
onClick={handleBalance}
|
||||||
|
disabled={windowCount < 2}
|
||||||
|
className="flex items-center gap-2 cursor-pointer"
|
||||||
|
>
|
||||||
|
<Scale className="h-3.5 w-3.5" />
|
||||||
|
<span className="flex-1">Balance Splits</span>
|
||||||
|
{windowCount < 2 && (
|
||||||
|
<span className="text-xs text-muted-foreground">
|
||||||
|
Need 2+ windows
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</DropdownMenuItem>
|
||||||
</DropdownMenuContent>
|
</DropdownMenuContent>
|
||||||
</DropdownMenu>
|
</DropdownMenu>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { Button } from "./ui/button";
|
|||||||
import { useGrimoire } from "@/core/state";
|
import { useGrimoire } from "@/core/state";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { LayoutControls } from "./LayoutControls";
|
import { LayoutControls } from "./LayoutControls";
|
||||||
|
import { useEffect } from "react";
|
||||||
|
|
||||||
export function TabBar() {
|
export function TabBar() {
|
||||||
const { state, setActiveWorkspace, createWorkspace } = useGrimoire();
|
const { state, setActiveWorkspace, createWorkspace } = useGrimoire();
|
||||||
@@ -12,11 +13,30 @@ export function TabBar() {
|
|||||||
createWorkspace();
|
createWorkspace();
|
||||||
};
|
};
|
||||||
|
|
||||||
// Sort workspaces by number
|
// Sort workspaces by number (for both rendering and keyboard shortcuts)
|
||||||
const sortedWorkspaces = Object.values(workspaces).sort(
|
const sortedWorkspaces = Object.values(workspaces).sort(
|
||||||
(a, b) => a.number - b.number,
|
(a, b) => a.number - b.number,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Keyboard shortcut: Cmd+1-9 to switch workspaces by position
|
||||||
|
useEffect(() => {
|
||||||
|
const handleKeyDown = (e: KeyboardEvent) => {
|
||||||
|
// Check for Cmd/Ctrl + number key (1-9)
|
||||||
|
if ((e.metaKey || e.ctrlKey) && e.key >= "1" && e.key <= "9") {
|
||||||
|
const index = Number.parseInt(e.key, 10) - 1; // Convert key to array index
|
||||||
|
const targetWorkspace = sortedWorkspaces[index];
|
||||||
|
|
||||||
|
if (targetWorkspace) {
|
||||||
|
e.preventDefault(); // Prevent browser default (like Cmd+1 = first tab)
|
||||||
|
setActiveWorkspace(targetWorkspace.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener("keydown", handleKeyDown);
|
||||||
|
return () => window.removeEventListener("keydown", handleKeyDown);
|
||||||
|
}, [sortedWorkspaces, setActiveWorkspace]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className="h-8 border-t border-border bg-background flex items-center px-2 gap-1 overflow-x-auto">
|
<div className="h-8 border-t border-border bg-background flex items-center px-2 gap-1 overflow-x-auto">
|
||||||
|
|||||||
@@ -2,7 +2,11 @@ import { v4 as uuidv4 } from "uuid";
|
|||||||
import type { MosaicNode } from "react-mosaic-component";
|
import type { MosaicNode } from "react-mosaic-component";
|
||||||
import { GrimoireState, WindowInstance, UserRelays } from "@/types/app";
|
import { GrimoireState, WindowInstance, UserRelays } from "@/types/app";
|
||||||
import { insertWindow } from "@/lib/layout-utils";
|
import { insertWindow } from "@/lib/layout-utils";
|
||||||
import { applyPresetToLayout, type LayoutPreset } from "@/lib/layout-presets";
|
import {
|
||||||
|
applyPresetToLayout,
|
||||||
|
balanceLayout,
|
||||||
|
type LayoutPreset,
|
||||||
|
} from "@/lib/layout-presets";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Finds the lowest available workspace number.
|
* Finds the lowest available workspace number.
|
||||||
@@ -394,3 +398,28 @@ export const applyPresetLayout = (
|
|||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Balances all split percentages in the active workspace to 50/50.
|
||||||
|
* Useful for equalizing splits after manual resizing.
|
||||||
|
*/
|
||||||
|
export const balanceLayoutInWorkspace = (
|
||||||
|
state: GrimoireState,
|
||||||
|
): GrimoireState => {
|
||||||
|
const activeId = state.activeWorkspaceId;
|
||||||
|
const ws = state.workspaces[activeId];
|
||||||
|
|
||||||
|
// Balance the layout tree
|
||||||
|
const balancedLayout = balanceLayout(ws.layout);
|
||||||
|
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
workspaces: {
|
||||||
|
...state.workspaces,
|
||||||
|
[activeId]: {
|
||||||
|
...ws,
|
||||||
|
layout: balancedLayout,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|||||||
@@ -241,6 +241,11 @@ export const useGrimoire = () => {
|
|||||||
[setState],
|
[setState],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const balanceLayout = useCallback(
|
||||||
|
() => setState((prev) => Logic.balanceLayoutInWorkspace(prev)),
|
||||||
|
[setState],
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
state,
|
state,
|
||||||
locale: state.locale || browserLocale,
|
locale: state.locale || browserLocale,
|
||||||
@@ -256,5 +261,6 @@ export const useGrimoire = () => {
|
|||||||
setActiveAccountRelays,
|
setActiveAccountRelays,
|
||||||
updateLayoutConfig,
|
updateLayoutConfig,
|
||||||
applyPresetLayout,
|
applyPresetLayout,
|
||||||
|
balanceLayout,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { describe, it, expect } from "vitest";
|
|||||||
import {
|
import {
|
||||||
collectWindowIds,
|
collectWindowIds,
|
||||||
applyPresetToLayout,
|
applyPresetToLayout,
|
||||||
|
balanceLayout,
|
||||||
BUILT_IN_PRESETS,
|
BUILT_IN_PRESETS,
|
||||||
} from "./layout-presets";
|
} from "./layout-presets";
|
||||||
import type { MosaicNode } from "react-mosaic-component";
|
import type { MosaicNode } from "react-mosaic-component";
|
||||||
@@ -193,6 +194,84 @@ describe("layout-presets", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("balanceLayout", () => {
|
||||||
|
it("returns null for null layout", () => {
|
||||||
|
expect(balanceLayout(null)).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns single window unchanged", () => {
|
||||||
|
expect(balanceLayout("w1")).toBe("w1");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("balances a simple binary split", () => {
|
||||||
|
const unbalanced: MosaicNode<string> = {
|
||||||
|
direction: "row",
|
||||||
|
first: "w1",
|
||||||
|
second: "w2",
|
||||||
|
splitPercentage: 70,
|
||||||
|
};
|
||||||
|
const balanced = balanceLayout(unbalanced);
|
||||||
|
expect(balanced).toEqual({
|
||||||
|
direction: "row",
|
||||||
|
first: "w1",
|
||||||
|
second: "w2",
|
||||||
|
splitPercentage: 50,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("balances nested splits recursively", () => {
|
||||||
|
const unbalanced: MosaicNode<string> = {
|
||||||
|
direction: "row",
|
||||||
|
first: {
|
||||||
|
direction: "column",
|
||||||
|
first: "w1",
|
||||||
|
second: "w2",
|
||||||
|
splitPercentage: 30,
|
||||||
|
},
|
||||||
|
second: {
|
||||||
|
direction: "column",
|
||||||
|
first: "w3",
|
||||||
|
second: "w4",
|
||||||
|
splitPercentage: 80,
|
||||||
|
},
|
||||||
|
splitPercentage: 60,
|
||||||
|
};
|
||||||
|
const balanced = balanceLayout(unbalanced);
|
||||||
|
|
||||||
|
// All splits should be 50%
|
||||||
|
expect(balanced).toMatchObject({
|
||||||
|
splitPercentage: 50,
|
||||||
|
first: { splitPercentage: 50 },
|
||||||
|
second: { splitPercentage: 50 },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves window IDs and directions", () => {
|
||||||
|
const original: MosaicNode<string> = {
|
||||||
|
direction: "column",
|
||||||
|
first: "w1",
|
||||||
|
second: {
|
||||||
|
direction: "row",
|
||||||
|
first: "w2",
|
||||||
|
second: "w3",
|
||||||
|
splitPercentage: 75,
|
||||||
|
},
|
||||||
|
splitPercentage: 25,
|
||||||
|
};
|
||||||
|
const balanced = balanceLayout(original);
|
||||||
|
const windowIds = collectWindowIds(balanced);
|
||||||
|
expect(windowIds).toEqual(["w1", "w2", "w3"]);
|
||||||
|
|
||||||
|
// Check directions preserved
|
||||||
|
if (balanced && typeof balanced !== "string") {
|
||||||
|
expect(balanced.direction).toBe("column");
|
||||||
|
if (typeof balanced.second !== "string") {
|
||||||
|
expect(balanced.second.direction).toBe("row");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("applyPresetToLayout", () => {
|
describe("applyPresetToLayout", () => {
|
||||||
it("throws error if too few windows", () => {
|
it("throws error if too few windows", () => {
|
||||||
const layout: MosaicNode<string> = "w1";
|
const layout: MosaicNode<string> = "w1";
|
||||||
|
|||||||
@@ -203,6 +203,31 @@ export function applyPresetToLayout(
|
|||||||
return preset.generate(windowIds);
|
return preset.generate(windowIds);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Balances all split percentages in a layout tree to 50/50
|
||||||
|
* Useful for equalizing splits after manual resizing
|
||||||
|
*/
|
||||||
|
export function balanceLayout(
|
||||||
|
layout: MosaicNode<string> | null
|
||||||
|
): MosaicNode<string> | null {
|
||||||
|
if (layout === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Leaf node (window ID), return as-is
|
||||||
|
if (typeof layout === "string") {
|
||||||
|
return layout;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Branch node, balance this split and recurse
|
||||||
|
return {
|
||||||
|
direction: layout.direction,
|
||||||
|
first: balanceLayout(layout.first),
|
||||||
|
second: balanceLayout(layout.second),
|
||||||
|
splitPercentage: 50,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a preset by ID
|
* Get a preset by ID
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user