Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(split-layout): hold last layout when the resize zone measures zero (#6123)

gbirman018a2cadb8ca
diff --git a/apps/web/src/lib/core/component/Resize/solver.test.ts b/apps/web/src/lib/core/component/Resize/solver.test.ts
index 436802f8f1..11d9df97de 100644
--- a/apps/web/src/lib/core/component/Resize/solver.test.ts
+++ b/apps/web/src/lib/core/component/Resize/solver.test.ts
@@ -711,6 +711,34 @@ describe('createResizeSolver', () => {
dispose();
});
+
+ it('holds a single split at full width when the zone measures zero', async () => {
+ const [size, setSize] = createSignal(1000);
+ const { solver, dispose } = createRoot((dispose) => ({
+ dispose,
+ solver: createResizeSolver({
+ direction: 'horizontal',
+ gutter: () => 0,
+ size,
+ panels: [],
+ }),
+ }));
+
+ await Promise.resolve();
+
+ solver.addPanel({ id: 'A', minSize: 400 });
+ expect(solver.solve().sizes.get('A')).toBe(1000);
+
+ // Zone momentarily reports 0 (unmeasured / hidden under a popover).
+ setSize(0);
+ expect(solver.solve().sizes.get('A')).toBe(1000);
+
+ // A real measurement still re-solves normally.
+ setSize(800);
+ expect(solver.solve().sizes.get('A')).toBe(800);
+
+ dispose();
+ });
});
describe('canFitPanel', () => {
diff --git a/apps/web/src/lib/core/component/Resize/solver.ts b/apps/web/src/lib/core/component/Resize/solver.ts
index 70274521c9..461ed574f8 100644
--- a/apps/web/src/lib/core/component/Resize/solver.ts
+++ b/apps/web/src/lib/core/component/Resize/solver.ts
@@ -382,18 +382,25 @@ export function createResizeSolver(params: {
// Preview Pair would keep its crushed proportions after space frees up).
createEffect(() => {
const ps = panelsInOrder();
+ const zoneSize = params.size();
+ const gutter = params.gutter();
+
+ // A zero (or negative) zone size means it's unmeasured or hidden. Solving
+ // against it collapses every panel to zero, and since the observer may not
+ // fire again that sticks. Keep the last good layout, and leave the pending
+ // solve kind untouched so it still applies on the next real solve.
+ if (zoneSize <= 0) return;
+
const solveKind = nextSolveKind;
nextSolveKind = 'automatic';
- const usable = getUsable(ps.length, params.size(), params.gutter());
+ const usable = getUsable(ps.length, zoneSize, gutter);
const solvePanels =
solveKind === 'automatic'
? applyRedistributionPreferences(ps, usable)
: ps;
- setLayout(
- computeFractionalShares(solvePanels, params.size(), params.gutter())
- );
+ setLayout(computeFractionalShares(solvePanels, zoneSize, gutter));
});
function addPanel(panel: PanelConfig, ndx?: number) {