@weasel-js/labkit 1.5.1 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -7
- package/dist/_dts/{CanvasStackContext-CJNMS6mz.d.ts → CanvasStackContext-DQgcH1ny.d.ts} +1 -1
- package/dist/_dts/LayerList.d-2c9yup5Y.d.ts +83 -0
- package/dist/_dts/{PrefsForm.d-DPy9I8It.d.ts → PrefsRow.d-DFpPIeIC.d.ts} +16 -1
- package/dist/_dts/{Select.d-Gwr8fLpK.d.ts → Select.d-BchGMC2Y.d.ts} +129 -12
- package/dist/_dts/{frac-B4okC2lX.d.ts → frac-DTRq7Xpb.d.ts} +31 -13
- package/dist/_dts/inDialog-D5ZKGjiD.d.ts +23 -0
- package/dist/_dts/{index-CSJoj4LC.d.ts → index-B0--8PEM.d.ts} +5 -4
- package/dist/_dts/index-DINmCuLA.d.ts +453 -0
- package/dist/_dts/number.d-OeQYQoUO.d.ts +28 -0
- package/dist/_dts/{types-DzoNY1pO.d.ts → types-B7y8hX1D.d.ts} +6 -6
- package/dist/_dts/{usePanZoom-Pzf9f2jh.d.ts → usePanZoom-Bq73pwFe.d.ts} +4 -47
- package/dist/_dts/{useTrialState-uLlmaccn.d.ts → useTrialState-CP4jfuKl.d.ts} +1 -1
- package/dist/canvas/index.d.ts +6 -5
- package/dist/canvas/index.js +1 -1
- package/dist/chrome/index.d.ts +5 -4
- package/dist/chrome/index.js +7 -7
- package/dist/chunk-2RVCB2PT.js +3 -0
- package/dist/chunk-2RVCB2PT.js.map +1 -0
- package/dist/{chunk-UN4U4P63.js → chunk-3FI7Y4R4.js} +9 -9
- package/dist/chunk-3FI7Y4R4.js.map +1 -0
- package/dist/{chunk-7PFH3CNM.js → chunk-AWH3SRPW.js} +31 -5
- package/dist/chunk-AWH3SRPW.js.map +1 -0
- package/dist/{chunk-ZDHY47EV.js → chunk-BVL7Y574.js} +25 -9
- package/dist/chunk-BVL7Y574.js.map +1 -0
- package/dist/{chunk-IHUVQ3TX.js → chunk-H5VIV7MQ.js} +31 -27
- package/dist/chunk-H5VIV7MQ.js.map +1 -0
- package/dist/chunk-HFRE4QQV.js +400 -0
- package/dist/chunk-HFRE4QQV.js.map +1 -0
- package/dist/{chunk-IXTQI7JX.js → chunk-MOLIUNVH.js} +4 -4
- package/dist/{chunk-IXTQI7JX.js.map → chunk-MOLIUNVH.js.map} +1 -1
- package/dist/{chunk-CEIUBPPW.js → chunk-TT5C5S6R.js} +3 -86
- package/dist/chunk-TT5C5S6R.js.map +1 -0
- package/dist/chunk-USO6TERP.js +90 -0
- package/dist/chunk-USO6TERP.js.map +1 -0
- package/dist/{chunk-PHK4W562.js → chunk-VQ47KWD5.js} +3 -3
- package/dist/{chunk-PHK4W562.js.map → chunk-VQ47KWD5.js.map} +1 -1
- package/dist/chunk-WUJXJC5O.js +14568 -0
- package/dist/chunk-WUJXJC5O.js.map +1 -0
- package/dist/{chunk-EHGVROVV.js → chunk-ZORVNOKX.js} +6 -25
- package/dist/chunk-ZORVNOKX.js.map +1 -0
- package/dist/config/index.d.ts +53 -11
- package/dist/config/index.js +5 -5
- package/dist/controls/index.d.ts +6 -3
- package/dist/controls/index.js +4 -4
- package/dist/dragdrop/index.d.ts +4 -3
- package/dist/index.d.ts +139 -114
- package/dist/index.js +470 -479
- package/dist/index.js.map +1 -1
- package/dist/layers/index.d.ts +6 -35
- package/dist/layers/index.js +2 -3
- package/dist/loupe/index.d.ts +6 -5
- package/dist/passthrough/weasel-ui.d.ts +421 -215
- package/dist/passthrough/weasel-ui.js +1 -1
- package/dist/primitives/index.d.ts +2 -13
- package/dist/primitives/index.js +4 -4
- package/dist/state/index.d.ts +6 -5
- package/dist/state/index.js +5 -5
- package/dist/styles.css +410 -190
- package/dist/undo/index.d.ts +4 -3
- package/package.json +9 -13
- package/src/annotations/frac.test.ts +7 -0
- package/src/annotations/paint.test.ts +21 -0
- package/src/annotations/paint.ts +12 -0
- package/src/annotations/store.test.ts +31 -0
- package/src/annotations/types.ts +3 -2
- package/src/canvas/Stage.test.tsx +18 -0
- package/src/canvas/index.ts +0 -9
- package/src/chrome/labTypes.ts +1 -1
- package/src/chrome/regions/PaletteRegion.test.tsx +18 -0
- package/src/chrome/regions/PaletteRegion.tsx +5 -4
- package/src/chrome/regions/SidebarRegion.less +197 -0
- package/src/chrome/regions/SidebarRegion.test.tsx +20 -0
- package/src/chrome/regions/SidebarRegion.tsx +7 -2
- package/src/chrome/regions/TitleBarRegion.tsx +1 -1
- package/src/chrome/types.ts +13 -4
- package/src/config/autoConfig.ts +2 -2
- package/src/config/builder.ts +23 -5
- package/src/config/entry.test.ts +8 -0
- package/src/config/index.ts +2 -0
- package/src/config/rules.ts +2 -0
- package/src/config/sectionTree.test.ts +146 -0
- package/src/config/sectionTree.ts +124 -0
- package/src/config/types.ts +4 -4
- package/src/controls/AutoControls.stories.tsx +6 -6
- package/src/controls/ControlPanel.less +27 -0
- package/src/controls/ControlPanel.stories.tsx +95 -1
- package/src/controls/ControlPanel.test.tsx +82 -112
- package/src/controls/ControlPanel.tsx +159 -396
- package/src/controls/inDialog.test.tsx +82 -0
- package/src/controls/inDialog.tsx +46 -0
- package/src/controls/index.ts +1 -0
- package/src/index.test.ts +0 -2
- package/src/index.ts +14 -35
- package/src/instrument/types.ts +5 -2
- package/src/lab/Lab.nebula.test.tsx +31 -0
- package/src/lab/Lab.tsx +57 -18
- package/src/lab/LabBoundary.test.tsx +66 -0
- package/src/lab/LabBoundary.tsx +56 -0
- package/src/lab/LabHeader.tsx +4 -23
- package/src/lab/LabRoot.tsx +2 -3
- package/src/lab/LabShell.less +0 -1
- package/src/lab/LabShell.stories.tsx +15 -0
- package/src/lab/LabShell.test.tsx +18 -0
- package/src/lab/LabShell.tsx +14 -1
- package/src/lab/LabSwitcher.less +1 -1
- package/src/lab/LabSwitcher.test.tsx +41 -0
- package/src/lab/LabSwitcher.tsx +30 -8
- package/src/lab/index.ts +1 -0
- package/src/layers/AGENTS.md +18 -74
- package/src/layers/index.ts +4 -2
- package/src/passthrough/weasel-ui.ts +25 -10
- package/src/primitives/FpsMeter.less +6 -1
- package/src/primitives/FpsMeter.test.tsx +12 -4
- package/src/primitives/FpsMeter.tsx +6 -1
- package/src/primitives/JobProgress.stories.tsx +1 -1
- package/src/primitives/StatusBar.less +6 -0
- package/src/primitives/index.ts +0 -2
- package/src/specimen/Specimen.tsx +42 -56
- package/src/state/types.ts +8 -2
- package/src/state/view.test.ts +4 -4
- package/src/styles.less +4 -2
- package/src/theme/Interstellar.stories.tsx +8 -9
- package/src/theme/base.less +3 -20
- package/src/theme/interstellar.test.ts +6 -3
- package/src/theme/interstellar.theme.json +0 -56
- package/src/theme/interstellar.ts +2 -2
- package/src/trial/Trial.canvas.test.tsx +9 -5
- package/src/trial/Trial.config.test.tsx +1 -1
- package/src/trial/Trial.tsx +30 -8
- package/dist/_dts/index-BNdz-tNd.d.ts +0 -423
- package/dist/chunk-7PFH3CNM.js.map +0 -1
- package/dist/chunk-CEIUBPPW.js.map +0 -1
- package/dist/chunk-EH7UEQV7.js +0 -590
- package/dist/chunk-EH7UEQV7.js.map +0 -1
- package/dist/chunk-EHGVROVV.js.map +0 -1
- package/dist/chunk-IHUVQ3TX.js.map +0 -1
- package/dist/chunk-MDVTK5U3.js +0 -170
- package/dist/chunk-MDVTK5U3.js.map +0 -1
- package/dist/chunk-PJ7WEQBJ.js +0 -18
- package/dist/chunk-PJ7WEQBJ.js.map +0 -1
- package/dist/chunk-T3EC2DXD.js +0 -12628
- package/dist/chunk-T3EC2DXD.js.map +0 -1
- package/dist/chunk-UN4U4P63.js.map +0 -1
- package/dist/chunk-ZDHY47EV.js.map +0 -1
- package/dist/ui/layers/index.d.ts +0 -66
- package/dist/ui/layers/index.js +0 -3
- package/dist/ui/layers/index.js.map +0 -1
- package/src/canvas/useOrbit.test.ts +0 -167
- package/src/canvas/useOrbit.ts +0 -156
- package/src/lab/useSystemMode.ts +0 -30
- package/src/layers/LayerList.less +0 -93
- package/src/layers/LayerList.stories.tsx +0 -66
- package/src/layers/LayerList.test.tsx +0 -232
- package/src/layers/LayerList.tsx +0 -268
- package/src/primitives/Sidebar.less +0 -112
- package/src/primitives/Sidebar.stories.tsx +0 -38
- package/src/primitives/Sidebar.test.tsx +0 -74
- package/src/primitives/Sidebar.tsx +0 -35
- package/src/ui/layers/index.ts +0 -5
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
import type { Meta, StoryObj } from '@weasel-js/forge';
|
|
2
|
-
import { useState } from 'react';
|
|
3
|
-
import { LayerList, type LayerTreeNode } from './LayerList';
|
|
4
|
-
|
|
5
|
-
const meta: Meta<typeof LayerList> = {
|
|
6
|
-
title: 'labkit/layers/LayerList',
|
|
7
|
-
component: LayerList,
|
|
8
|
-
};
|
|
9
|
-
export default meta;
|
|
10
|
-
type Story = StoryObj<typeof LayerList>;
|
|
11
|
-
|
|
12
|
-
const FLAT: LayerTreeNode[] = [
|
|
13
|
-
{ id: 'plants', label: 'Plants' },
|
|
14
|
-
{ id: 'grid', label: 'Grid' },
|
|
15
|
-
{ id: 'legend', label: 'Legend', alwaysOn: true },
|
|
16
|
-
];
|
|
17
|
-
|
|
18
|
-
const NESTED: LayerTreeNode[] = [
|
|
19
|
-
{
|
|
20
|
-
id: 'ingest',
|
|
21
|
-
label: 'Ingest',
|
|
22
|
-
children: [
|
|
23
|
-
{ id: 'ingest.fetch', label: 'Fetch' },
|
|
24
|
-
{ id: 'ingest.parse', label: 'Parse' },
|
|
25
|
-
],
|
|
26
|
-
},
|
|
27
|
-
{
|
|
28
|
-
id: 'solve',
|
|
29
|
-
label: 'Solve',
|
|
30
|
-
defaultCollapsed: true,
|
|
31
|
-
children: [
|
|
32
|
-
{ id: 'solve.seed', label: 'Seed' },
|
|
33
|
-
{
|
|
34
|
-
id: 'solve.relax',
|
|
35
|
-
label: 'Relax',
|
|
36
|
-
children: [
|
|
37
|
-
{ id: 'solve.relax.sweep', label: 'Sweep' },
|
|
38
|
-
{ id: 'solve.relax.check', label: 'Check' },
|
|
39
|
-
],
|
|
40
|
-
},
|
|
41
|
-
],
|
|
42
|
-
},
|
|
43
|
-
{ id: 'report', label: 'Report', alwaysOn: true },
|
|
44
|
-
];
|
|
45
|
-
|
|
46
|
-
function Demo({ seed }: { seed: LayerTreeNode[] }) {
|
|
47
|
-
const [layers, setLayers] = useState(seed);
|
|
48
|
-
const [visibility, setVisibility] = useState<Record<string, boolean>>({});
|
|
49
|
-
return (
|
|
50
|
-
<div style={{ width: 220 }}>
|
|
51
|
-
<LayerList
|
|
52
|
-
layers={layers}
|
|
53
|
-
visibility={visibility}
|
|
54
|
-
onReorder={setLayers}
|
|
55
|
-
onToggle={(id, visible) => setVisibility((v) => ({ ...v, [id]: visible }))}
|
|
56
|
-
/>
|
|
57
|
-
</div>
|
|
58
|
-
);
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
/** No node has children, so no row spends width on a twisty column. */
|
|
62
|
-
export const Flat: Story = { render: () => <Demo seed={FLAT} /> };
|
|
63
|
-
|
|
64
|
-
/** Dragging a row reorders it among its own siblings — a drag never moves a
|
|
65
|
-
* layer to a different parent. */
|
|
66
|
-
export const Tree: Story = { render: () => <Demo seed={NESTED} /> };
|
|
@@ -1,232 +0,0 @@
|
|
|
1
|
-
import { act, fireEvent, render, screen } from '@testing-library/react';
|
|
2
|
-
import { describe, expect, it, vi } from 'vitest';
|
|
3
|
-
import type { LayerDescriptor } from '../instrument/types';
|
|
4
|
-
import { LayerList, type LayerListProps, type LayerTreeNode } from './LayerList';
|
|
5
|
-
|
|
6
|
-
describe('<LayerList>', () => {
|
|
7
|
-
it('renders one row per layer', () => {
|
|
8
|
-
const layers: LayerDescriptor[] = [
|
|
9
|
-
{ id: 'a', label: 'A' },
|
|
10
|
-
{ id: 'b', label: 'B' },
|
|
11
|
-
];
|
|
12
|
-
const { container } = render(
|
|
13
|
-
<LayerList
|
|
14
|
-
layers={layers}
|
|
15
|
-
visibility={{ a: true, b: true }}
|
|
16
|
-
onReorder={vi.fn()}
|
|
17
|
-
onToggle={vi.fn()}
|
|
18
|
-
/>,
|
|
19
|
-
);
|
|
20
|
-
expect(container.querySelectorAll('.lk-layer-list__row')).toHaveLength(2);
|
|
21
|
-
});
|
|
22
|
-
|
|
23
|
-
it('renders empty state when no layers', () => {
|
|
24
|
-
render(<LayerList layers={[]} visibility={{}} onReorder={vi.fn()} onToggle={vi.fn()} />);
|
|
25
|
-
expect(screen.getByText('No layers')).toBeInTheDocument();
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
it('alwaysOn rows have no checkbox and show lock icon', () => {
|
|
29
|
-
const layers: LayerDescriptor[] = [{ id: 'a', label: 'A', alwaysOn: true }];
|
|
30
|
-
render(<LayerList layers={layers} visibility={{}} onReorder={vi.fn()} onToggle={vi.fn()} />);
|
|
31
|
-
expect(screen.queryByLabelText('Toggle A')).toBeNull();
|
|
32
|
-
expect(screen.getByLabelText('Always on')).toBeInTheDocument();
|
|
33
|
-
});
|
|
34
|
-
|
|
35
|
-
it('onToggle fires on checkbox click', () => {
|
|
36
|
-
const onToggle = vi.fn();
|
|
37
|
-
const layers: LayerDescriptor[] = [{ id: 'a', label: 'A' }];
|
|
38
|
-
render(
|
|
39
|
-
<LayerList
|
|
40
|
-
layers={layers}
|
|
41
|
-
visibility={{ a: true }}
|
|
42
|
-
onReorder={vi.fn()}
|
|
43
|
-
onToggle={onToggle}
|
|
44
|
-
/>,
|
|
45
|
-
);
|
|
46
|
-
fireEvent.click(screen.getByLabelText('Toggle A'));
|
|
47
|
-
expect(onToggle).toHaveBeenCalledWith('a', false);
|
|
48
|
-
});
|
|
49
|
-
});
|
|
50
|
-
|
|
51
|
-
const twoLayers: LayerDescriptor[] = [
|
|
52
|
-
{ id: 'a', label: 'A' },
|
|
53
|
-
{ id: 'b', label: 'B' },
|
|
54
|
-
];
|
|
55
|
-
|
|
56
|
-
function dispatchOn(target: EventTarget, type: string, init: PointerEventInit) {
|
|
57
|
-
act(() => {
|
|
58
|
-
target.dispatchEvent(new PointerEvent(type, { pointerId: 1, bubbles: true, ...init }));
|
|
59
|
-
});
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
/** jsdom measures every row at zero height, so `startDrag` falls back to a
|
|
63
|
-
* pitch of 1: one pixel of travel is one row. */
|
|
64
|
-
function renderDraggable(onReorder = vi.fn()) {
|
|
65
|
-
const result = render(
|
|
66
|
-
<LayerList
|
|
67
|
-
layers={twoLayers}
|
|
68
|
-
visibility={{ a: true, b: true }}
|
|
69
|
-
onReorder={onReorder}
|
|
70
|
-
onToggle={vi.fn()}
|
|
71
|
-
/>,
|
|
72
|
-
);
|
|
73
|
-
return { ...result, onReorder, handle: screen.getByLabelText('Reorder A') };
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
/** Index of the row the drag currently marks, or -1 when nothing is dragging. */
|
|
77
|
-
function draggingRow(container: HTMLElement): number {
|
|
78
|
-
const rows = Array.from(container.querySelectorAll('.lk-layer-list__row'));
|
|
79
|
-
return rows.findIndex((r) => r.classList.contains('lk-layer-list__row--dragging'));
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
describe('<LayerList> reordering', () => {
|
|
83
|
-
it('reorders from a release that lands off the handle', () => {
|
|
84
|
-
const { onReorder, handle } = renderDraggable();
|
|
85
|
-
fireEvent.pointerDown(handle, { pointerId: 1, buttons: 1, clientY: 0 });
|
|
86
|
-
dispatchOn(document, 'pointermove', { buttons: 1, clientY: 1 });
|
|
87
|
-
dispatchOn(document, 'pointerup', { clientY: 1 });
|
|
88
|
-
expect(onReorder).toHaveBeenCalledTimes(1);
|
|
89
|
-
expect(onReorder.mock.calls[0][0].map((l: LayerDescriptor) => l.id)).toEqual(['b', 'a']);
|
|
90
|
-
});
|
|
91
|
-
|
|
92
|
-
// The other half of the rule — a detached origin does cancel — is owned by
|
|
93
|
-
// pointerSession.test.ts, which exercises it without React in the way.
|
|
94
|
-
it('keeps dragging when capture is lost and the handle is still in the document', () => {
|
|
95
|
-
const { onReorder, handle, container } = renderDraggable();
|
|
96
|
-
fireEvent.pointerDown(handle, { pointerId: 1, buttons: 1, clientY: 0 });
|
|
97
|
-
// Chrome releases capture a beat before it delivers pointerup, so ending
|
|
98
|
-
// here throws away a release that has already been dispatched.
|
|
99
|
-
dispatchOn(handle, 'lostpointercapture', {});
|
|
100
|
-
dispatchOn(document, 'pointermove', { buttons: 1, clientY: 1 });
|
|
101
|
-
expect(draggingRow(container)).toBe(1);
|
|
102
|
-
dispatchOn(document, 'pointerup', { clientY: 1 });
|
|
103
|
-
expect(onReorder).toHaveBeenCalledTimes(1);
|
|
104
|
-
expect(onReorder.mock.calls[0][0].map((l: LayerDescriptor) => l.id)).toEqual(['b', 'a']);
|
|
105
|
-
});
|
|
106
|
-
|
|
107
|
-
it('reads a move with nothing held as the release that never arrived', () => {
|
|
108
|
-
const { onReorder, handle } = renderDraggable();
|
|
109
|
-
fireEvent.pointerDown(handle, { pointerId: 1, buttons: 1, clientY: 0 });
|
|
110
|
-
dispatchOn(document, 'pointermove', { buttons: 1, clientY: 1 });
|
|
111
|
-
dispatchOn(document, 'pointermove', { buttons: 0, clientY: 40 });
|
|
112
|
-
expect(onReorder).toHaveBeenCalledTimes(1);
|
|
113
|
-
expect(onReorder.mock.calls[0][0].map((l: LayerDescriptor) => l.id)).toEqual(['b', 'a']);
|
|
114
|
-
});
|
|
115
|
-
|
|
116
|
-
it('drops its listeners when the list unmounts mid-drag', () => {
|
|
117
|
-
const { onReorder, handle, unmount } = renderDraggable();
|
|
118
|
-
fireEvent.pointerDown(handle, { pointerId: 1, buttons: 1, clientY: 0 });
|
|
119
|
-
dispatchOn(document, 'pointermove', { buttons: 1, clientY: 1 });
|
|
120
|
-
unmount();
|
|
121
|
-
dispatchOn(document, 'pointerup', { clientY: 1 });
|
|
122
|
-
expect(onReorder).not.toHaveBeenCalled();
|
|
123
|
-
});
|
|
124
|
-
|
|
125
|
-
it('does not capture a second pointer into the same drag', () => {
|
|
126
|
-
const { onReorder, handle } = renderDraggable();
|
|
127
|
-
fireEvent.pointerDown(handle, { pointerId: 1, buttons: 1, clientY: 0 });
|
|
128
|
-
dispatchOn(document, 'pointermove', { pointerId: 2, buttons: 1, clientY: 40 });
|
|
129
|
-
dispatchOn(document, 'pointerup', { pointerId: 1, clientY: 0 });
|
|
130
|
-
expect(onReorder).not.toHaveBeenCalled();
|
|
131
|
-
});
|
|
132
|
-
});
|
|
133
|
-
|
|
134
|
-
const tree: LayerTreeNode[] = [
|
|
135
|
-
{
|
|
136
|
-
id: 'a',
|
|
137
|
-
label: 'A',
|
|
138
|
-
children: [
|
|
139
|
-
{ id: 'a1', label: 'A1' },
|
|
140
|
-
{ id: 'a2', label: 'A2' },
|
|
141
|
-
],
|
|
142
|
-
},
|
|
143
|
-
{ id: 'b', label: 'B' },
|
|
144
|
-
];
|
|
145
|
-
|
|
146
|
-
function renderTree(props: Partial<LayerListProps> = {}) {
|
|
147
|
-
return render(
|
|
148
|
-
<LayerList layers={tree} visibility={{}} onReorder={vi.fn()} onToggle={vi.fn()} {...props} />,
|
|
149
|
-
);
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
describe('<LayerList> nesting', () => {
|
|
153
|
-
it('renders a row for each descendant of an expanded node', () => {
|
|
154
|
-
const { container } = renderTree();
|
|
155
|
-
expect(container.querySelectorAll('.lk-layer-list__row')).toHaveLength(4);
|
|
156
|
-
expect(screen.getByText('A1')).toBeInTheDocument();
|
|
157
|
-
});
|
|
158
|
-
|
|
159
|
-
it('hides the children of a collapsed node', () => {
|
|
160
|
-
const { container } = renderTree();
|
|
161
|
-
fireEvent.click(screen.getByLabelText('A sublayers'));
|
|
162
|
-
expect(container.querySelectorAll('.lk-layer-list__row')).toHaveLength(2);
|
|
163
|
-
expect(screen.queryByText('A1')).toBeNull();
|
|
164
|
-
});
|
|
165
|
-
|
|
166
|
-
it('starts collapsed when the node says so', () => {
|
|
167
|
-
render(
|
|
168
|
-
<LayerList
|
|
169
|
-
layers={[{ ...tree[0], defaultCollapsed: true }, tree[1]]}
|
|
170
|
-
visibility={{}}
|
|
171
|
-
onReorder={vi.fn()}
|
|
172
|
-
onToggle={vi.fn()}
|
|
173
|
-
/>,
|
|
174
|
-
);
|
|
175
|
-
expect(screen.queryByText('A1')).toBeNull();
|
|
176
|
-
});
|
|
177
|
-
|
|
178
|
-
it('takes collapse from collapsedIds and reports the next set', () => {
|
|
179
|
-
const onCollapsedChange = vi.fn();
|
|
180
|
-
renderTree({ collapsedIds: ['a'], onCollapsedChange });
|
|
181
|
-
expect(screen.queryByText('A1')).toBeNull();
|
|
182
|
-
fireEvent.click(screen.getByLabelText('A sublayers'));
|
|
183
|
-
expect(onCollapsedChange).toHaveBeenCalledWith([]);
|
|
184
|
-
// Controlled: the click alone does not open it.
|
|
185
|
-
expect(screen.queryByText('A1')).toBeNull();
|
|
186
|
-
});
|
|
187
|
-
|
|
188
|
-
it('ties the twisty to the subtree it reveals', () => {
|
|
189
|
-
const { container } = renderTree();
|
|
190
|
-
const controls = screen.getByLabelText('A sublayers').getAttribute('aria-controls');
|
|
191
|
-
expect(controls).toBeTruthy();
|
|
192
|
-
expect(container.querySelector(`[id="${controls}"]`)).toHaveClass('lk-layer-list__children');
|
|
193
|
-
});
|
|
194
|
-
|
|
195
|
-
it('spends no twisty column on a flat list', () => {
|
|
196
|
-
const { container } = render(
|
|
197
|
-
<LayerList layers={twoLayers} visibility={{}} onReorder={vi.fn()} onToggle={vi.fn()} />,
|
|
198
|
-
);
|
|
199
|
-
expect(container.querySelector('.lk-layer-list__twisty-gap')).toBeNull();
|
|
200
|
-
expect(screen.queryByLabelText(/sublayers$/)).toBeNull();
|
|
201
|
-
});
|
|
202
|
-
|
|
203
|
-
it('holds the twisty column open on childless siblings', () => {
|
|
204
|
-
const { container } = renderTree();
|
|
205
|
-
expect(container.querySelectorAll('.lk-layer-list__twisty-gap')).toHaveLength(3);
|
|
206
|
-
});
|
|
207
|
-
|
|
208
|
-
it('reorders within a subtree and leaves the rest of the tree alone', () => {
|
|
209
|
-
const onReorder = vi.fn();
|
|
210
|
-
renderTree({ onReorder });
|
|
211
|
-
const handle = screen.getByLabelText('Reorder A1');
|
|
212
|
-
fireEvent.pointerDown(handle, { pointerId: 1, buttons: 1, clientY: 0 });
|
|
213
|
-
dispatchOn(document, 'pointermove', { buttons: 1, clientY: 1 });
|
|
214
|
-
dispatchOn(document, 'pointerup', { clientY: 1 });
|
|
215
|
-
expect(onReorder).toHaveBeenCalledTimes(1);
|
|
216
|
-
const next = onReorder.mock.calls[0][0] as LayerTreeNode[];
|
|
217
|
-
expect(next.map((l) => l.id)).toEqual(['a', 'b']);
|
|
218
|
-
expect(next[0].children?.map((l) => l.id)).toEqual(['a2', 'a1']);
|
|
219
|
-
});
|
|
220
|
-
|
|
221
|
-
it('reorders the top level without disturbing a subtree', () => {
|
|
222
|
-
const onReorder = vi.fn();
|
|
223
|
-
renderTree({ onReorder });
|
|
224
|
-
const handle = screen.getByLabelText('Reorder A');
|
|
225
|
-
fireEvent.pointerDown(handle, { pointerId: 1, buttons: 1, clientY: 0 });
|
|
226
|
-
dispatchOn(document, 'pointermove', { buttons: 1, clientY: 1 });
|
|
227
|
-
dispatchOn(document, 'pointerup', { clientY: 1 });
|
|
228
|
-
const next = onReorder.mock.calls[0][0] as LayerTreeNode[];
|
|
229
|
-
expect(next.map((l) => l.id)).toEqual(['b', 'a']);
|
|
230
|
-
expect(next[1].children?.map((l) => l.id)).toEqual(['a1', 'a2']);
|
|
231
|
-
});
|
|
232
|
-
});
|
package/src/layers/LayerList.tsx
DELETED
|
@@ -1,268 +0,0 @@
|
|
|
1
|
-
import { openPointerSession, type PointerSession } from '@weasel-js/core';
|
|
2
|
-
import { Disclosure } from '@weasel-js/ui';
|
|
3
|
-
import {
|
|
4
|
-
Fragment,
|
|
5
|
-
type ReactNode,
|
|
6
|
-
type PointerEvent as ReactPointerEvent,
|
|
7
|
-
useEffect,
|
|
8
|
-
useId,
|
|
9
|
-
useRef,
|
|
10
|
-
useState,
|
|
11
|
-
} from 'react';
|
|
12
|
-
import type { LayerDescriptor } from '../instrument/types';
|
|
13
|
-
import { DragHandleGlyph } from '../passthrough/weasel-ui';
|
|
14
|
-
|
|
15
|
-
/** A layer that may itself contain layers. A plain `LayerDescriptor` is one
|
|
16
|
-
* of these with no children, so a flat list needs no change. */
|
|
17
|
-
export interface LayerTreeNode extends LayerDescriptor {
|
|
18
|
-
children?: LayerTreeNode[];
|
|
19
|
-
/** Render this node's children hidden on first paint. Ignored once
|
|
20
|
-
* `collapsedIds` is supplied. */
|
|
21
|
-
defaultCollapsed?: boolean;
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
/** Props for `<LayerList>`. */
|
|
25
|
-
export interface LayerListProps {
|
|
26
|
-
layers: LayerTreeNode[];
|
|
27
|
-
visibility: Record<string, boolean>;
|
|
28
|
-
/** The whole tree, with the dragged node moved. Reordering is scoped to a
|
|
29
|
-
* node's siblings: a drag never changes which parent a layer sits under. */
|
|
30
|
-
onReorder: (newOrder: LayerTreeNode[]) => void;
|
|
31
|
-
onToggle: (id: string, visible: boolean) => void;
|
|
32
|
-
/** Ids whose children are hidden. Supplying it makes collapse controlled;
|
|
33
|
-
* without it the list keeps its own, seeded from `defaultCollapsed`. */
|
|
34
|
-
collapsedIds?: readonly string[];
|
|
35
|
-
onCollapsedChange?: (ids: string[]) => void;
|
|
36
|
-
className?: string;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
interface DragState {
|
|
40
|
-
/** Id of the dragged row's parent, or null at the top level. */
|
|
41
|
-
parentId: string | null;
|
|
42
|
-
fromIndex: number;
|
|
43
|
-
toIndex: number;
|
|
44
|
-
startY: number;
|
|
45
|
-
/** Row height plus row gap, measured when the drag starts. */
|
|
46
|
-
pitch: number;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
/** Which row the drag currently marks. */
|
|
50
|
-
interface DragMark {
|
|
51
|
-
parentId: string | null;
|
|
52
|
-
index: number;
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
function findNode(nodes: LayerTreeNode[], id: string): LayerTreeNode | null {
|
|
56
|
-
for (const node of nodes) {
|
|
57
|
-
if (node.id === id) return node;
|
|
58
|
-
const hit = node.children ? findNode(node.children, id) : null;
|
|
59
|
-
if (hit) return hit;
|
|
60
|
-
}
|
|
61
|
-
return null;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
function siblingsOf(layers: LayerTreeNode[], parentId: string | null): LayerTreeNode[] {
|
|
65
|
-
if (parentId === null) return layers;
|
|
66
|
-
return findNode(layers, parentId)?.children ?? [];
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
function withChildren(
|
|
70
|
-
nodes: LayerTreeNode[],
|
|
71
|
-
parentId: string | null,
|
|
72
|
-
next: LayerTreeNode[],
|
|
73
|
-
): LayerTreeNode[] {
|
|
74
|
-
if (parentId === null) return next;
|
|
75
|
-
return nodes.map((node) => {
|
|
76
|
-
if (node.id === parentId) return { ...node, children: next };
|
|
77
|
-
if (node.children) return { ...node, children: withChildren(node.children, parentId, next) };
|
|
78
|
-
return node;
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
function collectCollapsed(nodes: LayerTreeNode[], into: Set<string>): Set<string> {
|
|
83
|
-
for (const node of nodes) {
|
|
84
|
-
if (node.defaultCollapsed) into.add(node.id);
|
|
85
|
-
if (node.children) collectCollapsed(node.children, into);
|
|
86
|
-
}
|
|
87
|
-
return into;
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
function anyNested(nodes: LayerTreeNode[]): boolean {
|
|
91
|
-
return nodes.some((n) => (n.children?.length ?? 0) > 0);
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
/** A reorderable list of layers with per-layer visibility toggles. Layers
|
|
95
|
-
* marked `alwaysOn` are pinned and cannot be reordered or hidden. Layers with
|
|
96
|
-
* `children` render as an expandable subtree. */
|
|
97
|
-
export function LayerList({
|
|
98
|
-
layers,
|
|
99
|
-
visibility,
|
|
100
|
-
onReorder,
|
|
101
|
-
onToggle,
|
|
102
|
-
collapsedIds,
|
|
103
|
-
onCollapsedChange,
|
|
104
|
-
className,
|
|
105
|
-
}: LayerListProps) {
|
|
106
|
-
const [dragMark, setDragMark] = useState<DragMark | null>(null);
|
|
107
|
-
const [ownCollapsed, setOwnCollapsed] = useState<Set<string>>(() =>
|
|
108
|
-
collectCollapsed(layers, new Set()),
|
|
109
|
-
);
|
|
110
|
-
const dragRef = useRef<DragState | null>(null);
|
|
111
|
-
const sessionRef = useRef<PointerSession | null>(null);
|
|
112
|
-
const uid = useId();
|
|
113
|
-
// The session's callbacks outlive the render that opened them, so the commit
|
|
114
|
-
// reads its inputs here rather than from that render's closure.
|
|
115
|
-
const commitRef = useRef({ layers, onReorder });
|
|
116
|
-
commitRef.current = { layers, onReorder };
|
|
117
|
-
|
|
118
|
-
useEffect(() => () => sessionRef.current?.cancel(), []);
|
|
119
|
-
|
|
120
|
-
const collapsed = collapsedIds ? new Set(collapsedIds) : ownCollapsed;
|
|
121
|
-
|
|
122
|
-
const toggleCollapsed = (id: string) => {
|
|
123
|
-
const next = new Set(collapsed);
|
|
124
|
-
if (next.has(id)) next.delete(id);
|
|
125
|
-
else next.add(id);
|
|
126
|
-
if (!collapsedIds) setOwnCollapsed(next);
|
|
127
|
-
onCollapsedChange?.([...next]);
|
|
128
|
-
};
|
|
129
|
-
|
|
130
|
-
if (layers.length === 0) {
|
|
131
|
-
return (
|
|
132
|
-
<div className={className ? `lk-layer-list ${className}` : 'lk-layer-list'}>
|
|
133
|
-
<div className="lk-layer-list__empty">No layers</div>
|
|
134
|
-
</div>
|
|
135
|
-
);
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
const clearDrag = () => {
|
|
139
|
-
dragRef.current = null;
|
|
140
|
-
sessionRef.current = null;
|
|
141
|
-
setDragMark(null);
|
|
142
|
-
};
|
|
143
|
-
|
|
144
|
-
const startDrag = (e: ReactPointerEvent<HTMLElement>, parentId: string | null, index: number) => {
|
|
145
|
-
// Measured at grab time rather than hardcoded: a restyle that changes row
|
|
146
|
-
// height or gap would otherwise silently skew every drag distance.
|
|
147
|
-
const row = e.currentTarget.closest('.lk-layer-list__row');
|
|
148
|
-
const list = row?.parentElement;
|
|
149
|
-
const gap = list ? Number.parseFloat(getComputedStyle(list).rowGap) || 0 : 0;
|
|
150
|
-
const pitch = row ? row.getBoundingClientRect().height + gap : 0;
|
|
151
|
-
const drag: DragState = {
|
|
152
|
-
parentId,
|
|
153
|
-
fromIndex: index,
|
|
154
|
-
toIndex: index,
|
|
155
|
-
startY: e.clientY,
|
|
156
|
-
pitch: pitch > 0 ? pitch : 1,
|
|
157
|
-
};
|
|
158
|
-
dragRef.current = drag;
|
|
159
|
-
setDragMark({ parentId, index });
|
|
160
|
-
sessionRef.current = openPointerSession(e.currentTarget, e, {
|
|
161
|
-
onMove: (ev) => {
|
|
162
|
-
const delta = Math.round((ev.clientY - drag.startY) / drag.pitch);
|
|
163
|
-
const siblings = siblingsOf(commitRef.current.layers, parentId);
|
|
164
|
-
const last = siblings.filter((l) => !l.alwaysOn).length - 1;
|
|
165
|
-
drag.toIndex = Math.min(last, Math.max(0, drag.fromIndex + delta));
|
|
166
|
-
setDragMark({ parentId, index: drag.toIndex });
|
|
167
|
-
},
|
|
168
|
-
onEnd: () => {
|
|
169
|
-
const { layers: tree, onReorder: commit } = commitRef.current;
|
|
170
|
-
const { fromIndex, toIndex } = drag;
|
|
171
|
-
clearDrag();
|
|
172
|
-
if (toIndex === fromIndex) return;
|
|
173
|
-
const siblings = siblingsOf(tree, parentId);
|
|
174
|
-
const rows = siblings.filter((l) => !l.alwaysOn);
|
|
175
|
-
const locked = siblings.filter((l) => l.alwaysOn);
|
|
176
|
-
const next = [...rows];
|
|
177
|
-
const [moved] = next.splice(fromIndex, 1);
|
|
178
|
-
if (moved) next.splice(toIndex, 0, moved);
|
|
179
|
-
commit(withChildren(tree, parentId, [...next, ...locked]));
|
|
180
|
-
},
|
|
181
|
-
// An interrupted drag never named a destination, so it reorders nothing.
|
|
182
|
-
onCancel: clearDrag,
|
|
183
|
-
});
|
|
184
|
-
};
|
|
185
|
-
|
|
186
|
-
// A twisty column on every row keeps labels aligned across depths, but a
|
|
187
|
-
// flat list would only be paying 20px for it.
|
|
188
|
-
const nested = anyNested(layers);
|
|
189
|
-
|
|
190
|
-
function renderRow(
|
|
191
|
-
layer: LayerTreeNode,
|
|
192
|
-
parentId: string | null,
|
|
193
|
-
index: number,
|
|
194
|
-
path: string,
|
|
195
|
-
pinned: boolean,
|
|
196
|
-
): ReactNode {
|
|
197
|
-
const kids = layer.children ?? [];
|
|
198
|
-
const open = kids.length > 0 && !collapsed.has(layer.id);
|
|
199
|
-
const bodyId = `${uid}${path}`;
|
|
200
|
-
const dragging = !pinned && dragMark?.parentId === parentId && dragMark.index === index;
|
|
201
|
-
const cls = ['lk-layer-list__row'];
|
|
202
|
-
if (dragging) cls.push('lk-layer-list__row--dragging');
|
|
203
|
-
if (pinned) cls.push('lk-layer-list__row--pinned');
|
|
204
|
-
return (
|
|
205
|
-
<Fragment key={layer.id}>
|
|
206
|
-
<div className={cls.join(' ')}>
|
|
207
|
-
{nested &&
|
|
208
|
-
(kids.length > 0 ? (
|
|
209
|
-
<Disclosure
|
|
210
|
-
open={open}
|
|
211
|
-
onToggle={() => toggleCollapsed(layer.id)}
|
|
212
|
-
label={`${layer.label} sublayers`}
|
|
213
|
-
controls={bodyId}
|
|
214
|
-
/>
|
|
215
|
-
) : (
|
|
216
|
-
<span className="lk-layer-list__twisty-gap" />
|
|
217
|
-
))}
|
|
218
|
-
{pinned ? (
|
|
219
|
-
<span className="lk-layer-list__lock" role="img" aria-label="Always on">
|
|
220
|
-
🔒
|
|
221
|
-
</span>
|
|
222
|
-
) : (
|
|
223
|
-
<>
|
|
224
|
-
<button
|
|
225
|
-
type="button"
|
|
226
|
-
className="lk-layer-list__handle"
|
|
227
|
-
aria-label={`Reorder ${layer.label}`}
|
|
228
|
-
onPointerDown={(e) => startDrag(e, parentId, index)}
|
|
229
|
-
>
|
|
230
|
-
<DragHandleGlyph size={13} />
|
|
231
|
-
</button>
|
|
232
|
-
<input
|
|
233
|
-
className="lk-layer-list__check"
|
|
234
|
-
type="checkbox"
|
|
235
|
-
checked={visibility[layer.id] !== false}
|
|
236
|
-
onChange={(e) => onToggle(layer.id, e.target.checked)}
|
|
237
|
-
aria-label={`Toggle ${layer.label}`}
|
|
238
|
-
/>
|
|
239
|
-
</>
|
|
240
|
-
)}
|
|
241
|
-
<span className="lk-layer-list__label">{layer.label}</span>
|
|
242
|
-
</div>
|
|
243
|
-
{open && (
|
|
244
|
-
<div id={bodyId} className="lk-layer-list__children">
|
|
245
|
-
{renderLevel(kids, layer.id, path)}
|
|
246
|
-
</div>
|
|
247
|
-
)}
|
|
248
|
-
</Fragment>
|
|
249
|
-
);
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
function renderLevel(nodes: LayerTreeNode[], parentId: string | null, path: string): ReactNode {
|
|
253
|
-
const reorderable = nodes.filter((l) => !l.alwaysOn);
|
|
254
|
-
const pinned = nodes.filter((l) => l.alwaysOn);
|
|
255
|
-
return (
|
|
256
|
-
<>
|
|
257
|
-
{reorderable.map((layer, i) => renderRow(layer, parentId, i, `${path}-${i}`, false))}
|
|
258
|
-
{pinned.map((layer, i) => renderRow(layer, parentId, i, `${path}-p${i}`, true))}
|
|
259
|
-
</>
|
|
260
|
-
);
|
|
261
|
-
}
|
|
262
|
-
|
|
263
|
-
return (
|
|
264
|
-
<div className={className ? `lk-layer-list ${className}` : 'lk-layer-list'}>
|
|
265
|
-
{renderLevel(layers, null, '')}
|
|
266
|
-
</div>
|
|
267
|
-
);
|
|
268
|
-
}
|
|
@@ -1,112 +0,0 @@
|
|
|
1
|
-
.lk-sidebar {
|
|
2
|
-
display: flex;
|
|
3
|
-
flex-direction: column;
|
|
4
|
-
width: 280px;
|
|
5
|
-
flex: 1 1 auto;
|
|
6
|
-
background: var(--wzl-surface-raised);
|
|
7
|
-
border-right: 1px solid var(--wzl-border);
|
|
8
|
-
min-height: 0;
|
|
9
|
-
transition: width 150ms ease;
|
|
10
|
-
|
|
11
|
-
&--collapsed {
|
|
12
|
-
width: 32px;
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
.lk-sidebar-header {
|
|
17
|
-
display: flex;
|
|
18
|
-
align-items: center;
|
|
19
|
-
padding: var(--wzl-space-xs) var(--wzl-space-sm);
|
|
20
|
-
border-bottom: 1px solid var(--wzl-line-subtle);
|
|
21
|
-
min-height: var(--wzl-control-h);
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
.lk-sidebar-title {
|
|
25
|
-
flex: 1;
|
|
26
|
-
font-weight: var(--wzl-font-weight-bold);
|
|
27
|
-
color: var(--wzl-fg);
|
|
28
|
-
font-size: var(--wzl-font-size);
|
|
29
|
-
|
|
30
|
-
.lk-sidebar--collapsed & {
|
|
31
|
-
display: none;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
.lk-sidebar-toggle {
|
|
36
|
-
height: 24px;
|
|
37
|
-
width: 24px;
|
|
38
|
-
padding: 0;
|
|
39
|
-
background: transparent;
|
|
40
|
-
border: 1px solid transparent;
|
|
41
|
-
border-radius: var(--wzl-radius-sm);
|
|
42
|
-
color: var(--wzl-fg-muted);
|
|
43
|
-
cursor: pointer;
|
|
44
|
-
|
|
45
|
-
&:hover {
|
|
46
|
-
background: var(--wzl-surface);
|
|
47
|
-
color: var(--wzl-fg);
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
.lk-sidebar-body {
|
|
52
|
-
flex: 1;
|
|
53
|
-
overflow: auto;
|
|
54
|
-
padding: var(--wzl-space-sm);
|
|
55
|
-
|
|
56
|
-
.lk-sidebar--collapsed & {
|
|
57
|
-
display: none;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
.lk-sidebar-section {
|
|
62
|
-
border-bottom: var(--wzl-border-w) solid var(--wzl-line-subtle);
|
|
63
|
-
|
|
64
|
-
// The last section runs to the bottom of its pane. Stopped at its content,
|
|
65
|
-
// its rule and the bare pane under it read as a second, empty zone.
|
|
66
|
-
&:last-child {
|
|
67
|
-
flex-grow: 1;
|
|
68
|
-
border-bottom: 0;
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
.lk-sidebar-section__bar {
|
|
73
|
-
display: flex;
|
|
74
|
-
align-items: center;
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
.lk-sidebar-section__undock {
|
|
78
|
-
padding: 0 var(--wzl-space-xs);
|
|
79
|
-
border: 0;
|
|
80
|
-
background: transparent;
|
|
81
|
-
color: var(--wzl-fg-subtle);
|
|
82
|
-
cursor: pointer;
|
|
83
|
-
|
|
84
|
-
&:hover {
|
|
85
|
-
color: var(--wzl-fg);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
.lk-sidebar-section__head {
|
|
90
|
-
flex: 1;
|
|
91
|
-
width: 100%;
|
|
92
|
-
padding: var(--wzl-space-xs);
|
|
93
|
-
border: 0;
|
|
94
|
-
background: transparent;
|
|
95
|
-
color: var(--wzl-fg-muted);
|
|
96
|
-
font-family: var(--wzl-font-display);
|
|
97
|
-
font-size: var(--wzl-font-size-sm);
|
|
98
|
-
letter-spacing: 0.08em;
|
|
99
|
-
text-align: left;
|
|
100
|
-
text-transform: uppercase;
|
|
101
|
-
cursor: pointer;
|
|
102
|
-
|
|
103
|
-
&:hover {
|
|
104
|
-
color: var(--wzl-fg);
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
// The section body is the only thing that insets a panel — the panels
|
|
109
|
-
// themselves carry no padding, so this is the whole gutter.
|
|
110
|
-
.lk-sidebar-section__body {
|
|
111
|
-
padding: 0 var(--wzl-space-xs) var(--wzl-space-xs);
|
|
112
|
-
}
|