fix: persist manual node sizes and add width/height inputs
Nested vm/lxc/docker leaf nodes lost their size on reload: the deserialize restore branch excluded those types entirely, so a resized child snapped back to content-fit. Gate the restore on container_mode instead of node type. Also prefer explicit width/height over the DOM-measured value when serializing, so a manual resize persists its exact target rather than drifting to the fractional content-fit size. Add a Size section to the detail panel with W/H number inputs (setNodeSize store action, clamped to the resizer minimums). Inputs resync live when the node is resized by corner drag, without clobbering active keystrokes. ha-relevant: yes
This commit is contained in:
@@ -36,6 +36,7 @@ function setupStore(nodeData: Partial<NodeData> = {}, serviceStatuses: Record<st
|
||||
snapshotHistory: vi.fn(),
|
||||
createGroup: vi.fn(),
|
||||
ungroup: vi.fn(),
|
||||
setNodeSize: vi.fn(),
|
||||
serviceStatuses,
|
||||
}
|
||||
// Support both the bare destructure call and the selector-based call.
|
||||
@@ -571,4 +572,69 @@ describe('DetailPanel', () => {
|
||||
expect(row?.textContent).not.toMatch(/Invalid Date/)
|
||||
})
|
||||
})
|
||||
|
||||
describe('Size section', () => {
|
||||
function setupSized(node: Partial<Node<NodeData>>, setNodeSize = vi.fn()) {
|
||||
const state = {
|
||||
nodes: [{ ...makeNode({}), ...node }],
|
||||
selectedNodeId: 'n1',
|
||||
selectedNodeIds: [],
|
||||
setSelectedNode: vi.fn(),
|
||||
deleteNode: vi.fn(),
|
||||
updateNode: vi.fn(),
|
||||
snapshotHistory: vi.fn(),
|
||||
createGroup: vi.fn(),
|
||||
ungroup: vi.fn(),
|
||||
setNodeSize,
|
||||
serviceStatuses: {},
|
||||
}
|
||||
vi.mocked(canvasStore.useCanvasStore).mockImplementation(
|
||||
((sel?: (s: typeof state) => unknown) => (sel ? sel(state) : state)) as unknown as typeof canvasStore.useCanvasStore,
|
||||
)
|
||||
return setNodeSize
|
||||
}
|
||||
|
||||
it('shows the current width/height, preferring explicit over measured', () => {
|
||||
setupSized({ width: 220, height: 130, measured: { width: 999, height: 999 } })
|
||||
render(<DetailPanel onEdit={vi.fn()} />)
|
||||
expect((screen.getByLabelText('Width') as HTMLInputElement).value).toBe('220')
|
||||
expect((screen.getByLabelText('Height') as HTMLInputElement).value).toBe('130')
|
||||
})
|
||||
|
||||
it('falls back to the measured size before a resize', () => {
|
||||
setupSized({ measured: { width: 187, height: 73 } })
|
||||
render(<DetailPanel onEdit={vi.fn()} />)
|
||||
expect((screen.getByLabelText('Width') as HTMLInputElement).value).toBe('187')
|
||||
expect((screen.getByLabelText('Height') as HTMLInputElement).value).toBe('73')
|
||||
})
|
||||
|
||||
it('commits a manual width on blur', () => {
|
||||
const setNodeSize = setupSized({ width: 200, height: 100 })
|
||||
render(<DetailPanel onEdit={vi.fn()} />)
|
||||
const w = screen.getByLabelText('Width')
|
||||
fireEvent.change(w, { target: { value: '260' } })
|
||||
fireEvent.blur(w)
|
||||
expect(setNodeSize).toHaveBeenCalledWith('n1', { width: 260 })
|
||||
})
|
||||
|
||||
it('reverts invalid input without committing', () => {
|
||||
const setNodeSize = setupSized({ width: 200, height: 100 })
|
||||
render(<DetailPanel onEdit={vi.fn()} />)
|
||||
const w = screen.getByLabelText('Width') as HTMLInputElement
|
||||
fireEvent.change(w, { target: { value: 'abc' } })
|
||||
fireEvent.blur(w)
|
||||
expect(setNodeSize).not.toHaveBeenCalled()
|
||||
expect(w.value).toBe('200')
|
||||
})
|
||||
|
||||
it('resyncs the field when the node is resized by corner drag', () => {
|
||||
setupSized({ width: 200, height: 100 })
|
||||
const { rerender } = render(<DetailPanel onEdit={vi.fn()} />)
|
||||
expect((screen.getByLabelText('Width') as HTMLInputElement).value).toBe('200')
|
||||
// Simulate a corner-drag resize updating the store dimension.
|
||||
setupSized({ width: 340, height: 100 })
|
||||
rerender(<DetailPanel onEdit={vi.fn()} />)
|
||||
expect((screen.getByLabelText('Width') as HTMLInputElement).value).toBe('340')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user