@dxos/plugin-navtree 0.8.4-main.ae835ea → 0.8.4-main.bc674ce
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/dist/lib/browser/app-graph-builder-RSMA6I22.mjs +43 -0
- package/dist/lib/browser/app-graph-builder-RSMA6I22.mjs.map +7 -0
- package/dist/lib/browser/chunk-6YPQ625I.mjs +1293 -0
- package/dist/lib/browser/chunk-6YPQ625I.mjs.map +7 -0
- package/dist/lib/browser/chunk-AGQDZBPL.mjs +23 -0
- package/dist/lib/browser/chunk-AGQDZBPL.mjs.map +7 -0
- package/dist/lib/browser/{chunk-E6MZBCU5.mjs → chunk-YKTYPINZ.mjs} +1 -1
- package/dist/lib/browser/chunk-YKTYPINZ.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +82 -91
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/{keyboard-YYTYJW4M.mjs → keyboard-32EH3N4K.mjs} +20 -19
- package/dist/lib/browser/keyboard-32EH3N4K.mjs.map +7 -0
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/operation-resolver-IB75DC5O.mjs +52 -0
- package/dist/lib/browser/operation-resolver-IB75DC5O.mjs.map +7 -0
- package/dist/lib/browser/react-surface-F6CVMS3Y.mjs +58 -0
- package/dist/lib/browser/react-surface-F6CVMS3Y.mjs.map +7 -0
- package/dist/lib/browser/state-EVYQOUI3.mjs +120 -0
- package/dist/lib/browser/state-EVYQOUI3.mjs.map +7 -0
- package/dist/types/src/NavTreePlugin.d.ts +2 -1
- package/dist/types/src/NavTreePlugin.d.ts.map +1 -1
- package/dist/types/src/capabilities/app-graph-builder/app-graph-builder.d.ts +6 -0
- package/dist/types/src/capabilities/app-graph-builder/app-graph-builder.d.ts.map +1 -0
- package/dist/types/src/capabilities/app-graph-builder/index.d.ts +3 -0
- package/dist/types/src/capabilities/app-graph-builder/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/index.d.ts +5 -108
- package/dist/types/src/capabilities/index.d.ts.map +1 -1
- package/dist/types/src/capabilities/keyboard/index.d.ts +3 -0
- package/dist/types/src/capabilities/keyboard/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/keyboard/keyboard.d.ts +5 -0
- package/dist/types/src/capabilities/keyboard/keyboard.d.ts.map +1 -0
- package/dist/types/src/capabilities/operation-resolver/index.d.ts +3 -0
- package/dist/types/src/capabilities/operation-resolver/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/operation-resolver/operation-resolver.d.ts +5 -0
- package/dist/types/src/capabilities/operation-resolver/operation-resolver.d.ts.map +1 -0
- package/dist/types/src/capabilities/react-surface/index.d.ts +3 -0
- package/dist/types/src/capabilities/react-surface/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/react-surface/react-surface.d.ts +5 -0
- package/dist/types/src/capabilities/react-surface/react-surface.d.ts.map +1 -0
- package/dist/types/src/capabilities/state/index.d.ts +3 -0
- package/dist/types/src/capabilities/state/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/state/state.d.ts +6 -0
- package/dist/types/src/capabilities/state/state.d.ts.map +1 -0
- package/dist/types/src/components/CommandsDialog/CommandsDialog.d.ts +3 -2
- package/dist/types/src/components/CommandsDialog/CommandsDialog.d.ts.map +1 -1
- package/dist/types/src/components/CommandsDialog/CommandsTrigger.d.ts.map +1 -1
- package/dist/types/src/components/NavTree/NavTree.d.ts +30 -1
- package/dist/types/src/components/NavTree/NavTree.d.ts.map +1 -1
- package/dist/types/src/components/NavTree/NavTree.stories.d.ts +4 -1
- package/dist/types/src/components/NavTree/NavTree.stories.d.ts.map +1 -1
- package/dist/types/src/components/NavTreeContainer.d.ts +8 -1
- package/dist/types/src/components/NavTreeContainer.d.ts.map +1 -1
- package/dist/types/src/components/NavTreeDocumentTitle.d.ts +1 -1
- package/dist/types/src/components/NavTreeDocumentTitle.d.ts.map +1 -1
- package/dist/types/src/components/NavTreeItem/NavTreeItemAction.d.ts +6 -6
- package/dist/types/src/components/NavTreeItem/NavTreeItemAction.d.ts.map +1 -1
- package/dist/types/src/components/NavTreeItem/NavTreeItemAction.stories.d.ts +2 -1
- package/dist/types/src/components/NavTreeItem/NavTreeItemAction.stories.d.ts.map +1 -1
- package/dist/types/src/components/Sidebar/L0Menu.d.ts +4 -4
- package/dist/types/src/components/Sidebar/L0Menu.d.ts.map +1 -1
- package/dist/types/src/components/Sidebar/L1Panel.d.ts +1 -1
- package/dist/types/src/components/Sidebar/L1Panel.d.ts.map +1 -1
- package/dist/types/src/components/Sidebar/L1Tabs.d.ts +2 -2
- package/dist/types/src/components/Sidebar/L1Tabs.d.ts.map +1 -1
- package/dist/types/src/components/index.d.ts.map +1 -1
- package/dist/types/src/components/types.d.ts +7 -7
- package/dist/types/src/components/types.d.ts.map +1 -1
- package/dist/types/src/hooks.d.ts +32 -1
- package/dist/types/src/hooks.d.ts.map +1 -1
- package/dist/types/src/index.d.ts +1 -2
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/meta.d.ts +2 -2
- package/dist/types/src/meta.d.ts.map +1 -1
- package/dist/types/src/testing/app-graph-builder.d.ts +2 -3
- package/dist/types/src/testing/app-graph-builder.d.ts.map +1 -1
- package/dist/types/src/testing/generator.d.ts +5 -6
- package/dist/types/src/testing/generator.d.ts.map +1 -1
- package/dist/types/src/testing/update-state.d.ts +2 -2
- package/dist/types/src/testing/update-state.d.ts.map +1 -1
- package/dist/types/src/types/capabilities.d.ts +16 -0
- package/dist/types/src/types/capabilities.d.ts.map +1 -0
- package/dist/types/src/types/events.d.ts +5 -0
- package/dist/types/src/types/events.d.ts.map +1 -0
- package/dist/types/src/types/index.d.ts +4 -0
- package/dist/types/src/types/index.d.ts.map +1 -0
- package/dist/types/src/{types.d.ts → types/schema.d.ts} +6 -6
- package/dist/types/src/types/schema.d.ts.map +1 -0
- package/dist/types/src/util.d.ts +7 -7
- package/dist/types/src/util.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +53 -52
- package/src/NavTreePlugin.tsx +53 -70
- package/src/capabilities/app-graph-builder/app-graph-builder.ts +41 -0
- package/src/capabilities/app-graph-builder/index.ts +7 -0
- package/src/capabilities/index.ts +5 -9
- package/src/capabilities/keyboard/index.ts +7 -0
- package/src/capabilities/keyboard/keyboard.ts +65 -0
- package/src/capabilities/operation-resolver/index.ts +7 -0
- package/src/capabilities/operation-resolver/operation-resolver.ts +41 -0
- package/src/capabilities/react-surface/index.ts +7 -0
- package/src/capabilities/react-surface/react-surface.tsx +54 -0
- package/src/capabilities/state/index.ts +7 -0
- package/src/capabilities/state/state.ts +121 -0
- package/src/components/CommandsDialog/CommandsDialog.tsx +108 -97
- package/src/components/CommandsDialog/CommandsTrigger.tsx +4 -13
- package/src/components/NavTree/NavTree.stories.tsx +33 -42
- package/src/components/NavTree/NavTree.tsx +5 -15
- package/src/components/NavTreeContainer.tsx +253 -262
- package/src/components/NavTreeDocumentTitle.tsx +3 -2
- package/src/components/NavTreeItem/NavTreeItemAction.stories.tsx +17 -7
- package/src/components/NavTreeItem/NavTreeItemAction.tsx +18 -12
- package/src/components/NavTreeItem/NavTreeItemColumns.tsx +5 -5
- package/src/components/Sidebar/L0Menu.tsx +67 -93
- package/src/components/Sidebar/L1Panel.tsx +9 -9
- package/src/components/Sidebar/L1Tabs.tsx +6 -31
- package/src/components/index.ts +1 -0
- package/src/components/types.ts +7 -7
- package/src/experimental/Tree.stories.tsx +4 -4
- package/src/experimental/Tree.tsx +3 -3
- package/src/hooks.ts +54 -2
- package/src/index.ts +1 -2
- package/src/meta.ts +2 -2
- package/src/testing/app-graph-builder.ts +159 -235
- package/src/testing/generator.ts +19 -17
- package/src/testing/update-state.ts +6 -6
- package/src/types/capabilities.ts +21 -0
- package/src/types/events.ts +11 -0
- package/src/types/index.ts +7 -0
- package/src/{types.ts → types/schema.ts} +5 -5
- package/src/util.ts +13 -16
- package/dist/lib/browser/app-graph-builder-D7NLWZLU.mjs +0 -46
- package/dist/lib/browser/app-graph-builder-D7NLWZLU.mjs.map +0 -7
- package/dist/lib/browser/chunk-5VLWX4PK.mjs +0 -15
- package/dist/lib/browser/chunk-5VLWX4PK.mjs.map +0 -7
- package/dist/lib/browser/chunk-BNGPXJB7.mjs +0 -1482
- package/dist/lib/browser/chunk-BNGPXJB7.mjs.map +0 -7
- package/dist/lib/browser/chunk-E6MZBCU5.mjs.map +0 -7
- package/dist/lib/browser/intent-resolver-YUVXVPHG.mjs +0 -47
- package/dist/lib/browser/intent-resolver-YUVXVPHG.mjs.map +0 -7
- package/dist/lib/browser/keyboard-YYTYJW4M.mjs.map +0 -7
- package/dist/lib/browser/react-surface-7OUBD57A.mjs +0 -51
- package/dist/lib/browser/react-surface-7OUBD57A.mjs.map +0 -7
- package/dist/lib/browser/state-EUSVT6BI.mjs +0 -117
- package/dist/lib/browser/state-EUSVT6BI.mjs.map +0 -7
- package/dist/types/src/capabilities/app-graph-builder.d.ts +0 -4
- package/dist/types/src/capabilities/app-graph-builder.d.ts.map +0 -1
- package/dist/types/src/capabilities/capabilities.d.ts +0 -21
- package/dist/types/src/capabilities/capabilities.d.ts.map +0 -1
- package/dist/types/src/capabilities/intent-resolver.d.ts +0 -4
- package/dist/types/src/capabilities/intent-resolver.d.ts.map +0 -1
- package/dist/types/src/capabilities/keyboard.d.ts +0 -4
- package/dist/types/src/capabilities/keyboard.d.ts.map +0 -1
- package/dist/types/src/capabilities/react-surface.d.ts +0 -4
- package/dist/types/src/capabilities/react-surface.d.ts.map +0 -1
- package/dist/types/src/capabilities/state.d.ts +0 -20
- package/dist/types/src/capabilities/state.d.ts.map +0 -1
- package/dist/types/src/events.d.ts +0 -4
- package/dist/types/src/events.d.ts.map +0 -1
- package/dist/types/src/types.d.ts.map +0 -1
- package/src/capabilities/app-graph-builder.ts +0 -53
- package/src/capabilities/capabilities.ts +0 -20
- package/src/capabilities/intent-resolver.ts +0 -37
- package/src/capabilities/keyboard.ts +0 -59
- package/src/capabilities/react-surface.tsx +0 -45
- package/src/capabilities/state.ts +0 -105
- package/src/events.ts +0 -11
|
@@ -4,27 +4,19 @@
|
|
|
4
4
|
|
|
5
5
|
import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
|
|
6
6
|
import { type Instruction, extractInstruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
import {
|
|
11
|
-
LayoutAction,
|
|
12
|
-
Surface,
|
|
13
|
-
createIntent,
|
|
14
|
-
useAppGraph,
|
|
15
|
-
useCapability,
|
|
16
|
-
useIntentDispatcher,
|
|
17
|
-
useLayout,
|
|
18
|
-
} from '@dxos/app-framework';
|
|
19
|
-
import { type Node, ROOT_ID, type ReadableGraph, isAction, isActionLike } from '@dxos/app-graph';
|
|
7
|
+
import React, { forwardRef, memo, useCallback, useEffect, useMemo } from 'react';
|
|
8
|
+
|
|
9
|
+
import { Common } from '@dxos/app-framework';
|
|
10
|
+
import { Surface, useAppGraph, useLayout, useOperationInvoker } from '@dxos/app-framework/react';
|
|
20
11
|
import { PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
|
|
12
|
+
import { Graph, Node, useActionRunner } from '@dxos/plugin-graph';
|
|
21
13
|
import { useConnections, useActions as useGraphActions } from '@dxos/plugin-graph';
|
|
22
14
|
import { useMediaQuery, useSidebars } from '@dxos/react-ui';
|
|
23
15
|
import { type TreeData, type TreeItemDataProps, isTreeData } from '@dxos/react-ui-list';
|
|
24
|
-
import { mx } from '@dxos/
|
|
16
|
+
import { mx } from '@dxos/ui-theme';
|
|
25
17
|
import { arrayMove, byPosition } from '@dxos/util';
|
|
26
18
|
|
|
27
|
-
import {
|
|
19
|
+
import { useIsAlternateTree, useIsCurrent, useIsOpen, useNavTreeState } from '../hooks';
|
|
28
20
|
import { meta } from '../meta';
|
|
29
21
|
import { type FlattenedActions, type NavTreeItemGraphNode } from '../types';
|
|
30
22
|
import { getChildren, getParent, resolveMigrationOperation } from '../util';
|
|
@@ -36,38 +28,38 @@ import { type NavTreeContextValue } from './types';
|
|
|
36
28
|
// TODO(thure): Is NavTree truly authoritative in this regard?
|
|
37
29
|
export const NODE_TYPE = 'dxos/app-graph/node';
|
|
38
30
|
|
|
39
|
-
const renderItemEnd = ({ node, open }: { node: Node; open: boolean }) => (
|
|
31
|
+
const renderItemEnd = ({ node, open }: { node: Node.Node; open: boolean }) => (
|
|
40
32
|
<Surface role='navtree-item-end' data={{ id: node.id, subject: node.data, open }} limit={1} />
|
|
41
33
|
);
|
|
42
34
|
|
|
43
|
-
const getChildrenFilter = (node: Node): node is Node =>
|
|
44
|
-
|
|
45
|
-
() => !isActionLike(node) && node.type !== PLANK_COMPANION_TYPE && node.properties.disposition !== 'hidden',
|
|
46
|
-
);
|
|
35
|
+
const getChildrenFilter = (node: Node.Node): node is Node.Node =>
|
|
36
|
+
!Node.isActionLike(node) && node.type !== PLANK_COMPANION_TYPE && node.properties.disposition !== 'hidden';
|
|
47
37
|
|
|
48
|
-
const filterItems = (node: Node, disposition?: string) => {
|
|
38
|
+
const filterItems = (node: Node.Node, disposition?: string) => {
|
|
49
39
|
if (!disposition && (node.properties.disposition === 'hidden' || node.properties.disposition === 'alternate-tree')) {
|
|
50
40
|
return false;
|
|
51
41
|
} else if (!disposition) {
|
|
52
|
-
const action = isAction(node);
|
|
42
|
+
const action = Node.isAction(node);
|
|
53
43
|
return !action || node.properties.disposition === 'item';
|
|
54
44
|
} else {
|
|
55
45
|
return node.properties.disposition === disposition;
|
|
56
46
|
}
|
|
57
47
|
};
|
|
58
48
|
|
|
59
|
-
const getItems = (graph: ReadableGraph, node?: Node, disposition?: string) => {
|
|
60
|
-
return
|
|
49
|
+
const getItems = (graph: Graph.ReadableGraph, node?: Node.Node, disposition?: string) => {
|
|
50
|
+
return Graph.getConnections(graph, node?.id ?? Node.RootId, 'outbound').filter((node) =>
|
|
51
|
+
filterItems(node, disposition),
|
|
52
|
+
);
|
|
61
53
|
};
|
|
62
54
|
|
|
63
|
-
const useItems = (node?: Node, options?: { disposition?: string; sort?: boolean }) => {
|
|
55
|
+
const useItems = (node?: Node.Node, options?: { disposition?: string; sort?: boolean }) => {
|
|
64
56
|
const { graph } = useAppGraph();
|
|
65
|
-
const connections = useConnections(graph, node?.id ??
|
|
57
|
+
const connections = useConnections(graph, node?.id ?? Node.RootId);
|
|
66
58
|
const filtered = connections.filter((node) => filterItems(node, options?.disposition));
|
|
67
59
|
return options?.sort ? filtered.toSorted((a, b) => byPosition(a.properties, b.properties)) : filtered;
|
|
68
60
|
};
|
|
69
61
|
|
|
70
|
-
const useActions = (node: Node): FlattenedActions => {
|
|
62
|
+
const useActions = (node: Node.Node): FlattenedActions => {
|
|
71
63
|
const { graph } = useAppGraph();
|
|
72
64
|
const actions = useGraphActions(graph, node.id);
|
|
73
65
|
|
|
@@ -80,8 +72,8 @@ const useActions = (node: Node): FlattenedActions => {
|
|
|
80
72
|
}
|
|
81
73
|
|
|
82
74
|
acc.actions.push(arg);
|
|
83
|
-
if (!isAction(arg)) {
|
|
84
|
-
const actionGroup =
|
|
75
|
+
if (!Node.isAction(arg)) {
|
|
76
|
+
const actionGroup = Graph.getActions(graph, arg.id);
|
|
85
77
|
acc.groupedActions[arg.id] = actionGroup;
|
|
86
78
|
}
|
|
87
79
|
return acc;
|
|
@@ -97,250 +89,249 @@ export type NavTreeContainerProps = {
|
|
|
97
89
|
topbar?: boolean;
|
|
98
90
|
} & Pick<NavTreeContextValue, 'tab'>;
|
|
99
91
|
|
|
100
|
-
export const NavTreeContainer =
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
children
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
92
|
+
export const NavTreeContainer$ = forwardRef<HTMLDivElement, NavTreeContainerProps>(
|
|
93
|
+
({ tab, popoverAnchorId, topbar }, forwardedRef) => {
|
|
94
|
+
const [isLg] = useMediaQuery('lg');
|
|
95
|
+
const { invokeSync, invokePromise } = useOperationInvoker();
|
|
96
|
+
const runAction = useActionRunner();
|
|
97
|
+
const { graph } = useAppGraph();
|
|
98
|
+
const { getItem, setItem } = useNavTreeState();
|
|
99
|
+
const layout = useLayout();
|
|
100
|
+
const { navigationSidebarState } = useSidebars(meta.id);
|
|
101
|
+
|
|
102
|
+
const getProps = useCallback(
|
|
103
|
+
(node: Node.Node, path: string[]): TreeItemDataProps => {
|
|
104
|
+
const children = getChildren(graph, node, path).filter(getChildrenFilter);
|
|
105
|
+
const parentOf =
|
|
106
|
+
children.length > 0 ? children.map(({ id }) => id) : node.properties.role === 'branch' ? [] : undefined;
|
|
107
|
+
return {
|
|
108
|
+
id: node.id,
|
|
109
|
+
parentOf,
|
|
110
|
+
disabled: node.properties.disabled,
|
|
111
|
+
label: node.properties.label ?? node.id,
|
|
112
|
+
className: mx(node.properties.className, node.properties.modified && 'italic'), // TODO(burdon): Italic?
|
|
113
|
+
headingClassName: node.properties.headingClassName,
|
|
114
|
+
icon: node.properties.icon,
|
|
115
|
+
iconHue: node.properties.iconHue,
|
|
116
|
+
testId: node.properties.testId,
|
|
117
|
+
};
|
|
118
|
+
},
|
|
119
|
+
[graph],
|
|
120
|
+
);
|
|
121
|
+
|
|
122
|
+
const loadDescendents = useCallback(
|
|
123
|
+
(node: Node.Node) => {
|
|
124
|
+
Graph.expand(graph, node.id, 'outbound');
|
|
125
|
+
// Load one level deeper, which resolves some juddering observed on open/close.
|
|
126
|
+
Graph.getConnections(graph, node.id, 'outbound').forEach((child) => {
|
|
127
|
+
Graph.expand(graph, child.id, 'outbound');
|
|
128
|
+
});
|
|
129
|
+
},
|
|
130
|
+
[graph],
|
|
131
|
+
);
|
|
132
|
+
|
|
133
|
+
const handleOpenChange = useCallback(
|
|
134
|
+
({ item: { id }, path, open }: { item: Node.Node; path: string[]; open: boolean }) => {
|
|
135
|
+
// TODO(thure): This might become a localstorage leak; openItemIds that no longer exist should be removed from this map.
|
|
136
|
+
setItem(path, 'open', open);
|
|
137
|
+
Graph.expand(graph, id, 'outbound');
|
|
138
|
+
},
|
|
139
|
+
[graph],
|
|
140
|
+
);
|
|
141
|
+
|
|
142
|
+
const handleTabChange = useCallback(
|
|
143
|
+
(node: NavTreeItemGraphNode) => {
|
|
144
|
+
invokeSync(Common.LayoutOperation.UpdateSidebar, {
|
|
145
|
+
state:
|
|
146
|
+
node.id === tab
|
|
147
|
+
? navigationSidebarState === 'expanded'
|
|
148
|
+
? isLg
|
|
149
|
+
? 'collapsed'
|
|
150
|
+
: 'closed'
|
|
151
|
+
: 'expanded'
|
|
152
|
+
: 'expanded',
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
invokeSync(Common.LayoutOperation.SwitchWorkspace, { subject: node.id });
|
|
156
|
+
|
|
157
|
+
// Open the first item if the workspace is empty.
|
|
158
|
+
if (layout.active.length === 0) {
|
|
159
|
+
const [item] = getItems(graph, node).filter((node) => !Node.isActionLike(node));
|
|
160
|
+
if (item && item.data) {
|
|
161
|
+
invokeSync(Common.LayoutOperation.Open, { subject: [item.id] });
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
},
|
|
165
|
+
[invokeSync, layout.active, tab, navigationSidebarState, isLg],
|
|
166
|
+
);
|
|
127
167
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
});
|
|
135
|
-
},
|
|
136
|
-
[graph],
|
|
137
|
-
);
|
|
168
|
+
const blockInstruction = useCallback(
|
|
169
|
+
({ instruction, source, target }: { instruction: Instruction; source: TreeData; target: TreeData }) => {
|
|
170
|
+
return target.item.properties.blockInstruction?.(source, instruction) ?? false;
|
|
171
|
+
},
|
|
172
|
+
[],
|
|
173
|
+
);
|
|
138
174
|
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
setItem(path, 'open', open);
|
|
143
|
-
graph.expand(id, 'outbound');
|
|
144
|
-
},
|
|
145
|
-
[graph],
|
|
146
|
-
);
|
|
175
|
+
const canDrop = useCallback(({ source, target }: { source: TreeData; target: TreeData }) => {
|
|
176
|
+
return target.item.properties.canDrop?.(source) ?? false;
|
|
177
|
+
}, []);
|
|
147
178
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
? navigationSidebarState === 'expanded'
|
|
157
|
-
? isLg
|
|
158
|
-
? 'collapsed'
|
|
159
|
-
: 'closed'
|
|
160
|
-
: 'expanded'
|
|
161
|
-
: 'expanded',
|
|
162
|
-
},
|
|
163
|
-
}),
|
|
164
|
-
);
|
|
165
|
-
|
|
166
|
-
await dispatch(createIntent(LayoutAction.SwitchWorkspace, { part: 'workspace', subject: node.id }));
|
|
167
|
-
|
|
168
|
-
// Open the first item if the workspace is empty.
|
|
169
|
-
if (layout.active.length === 0) {
|
|
170
|
-
const [item] = getItems(graph, node).filter((node) => !isActionLike(node));
|
|
171
|
-
if (item && item.data) {
|
|
172
|
-
await dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [item.id] }));
|
|
179
|
+
const canSelect = useCallback(({ item }: { item: Node.Node }) => {
|
|
180
|
+
return item.properties.selectable ?? true;
|
|
181
|
+
}, []);
|
|
182
|
+
|
|
183
|
+
const handleSelect = useCallback(
|
|
184
|
+
({ item: node, path, option }: { item: Node.Node; path: string[]; option: boolean }) => {
|
|
185
|
+
if (!node.data) {
|
|
186
|
+
return;
|
|
173
187
|
}
|
|
174
|
-
}
|
|
175
|
-
},
|
|
176
|
-
[dispatch, layout.active, tab, navigationSidebarState, isLg],
|
|
177
|
-
);
|
|
178
188
|
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
const handleSelect = useCallback(
|
|
188
|
-
({ item: node, path, option }: { item: Node; path: string[]; option: boolean }) => {
|
|
189
|
-
if (!node.data) {
|
|
190
|
-
return;
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
if (isAction(node)) {
|
|
194
|
-
const [parent] = graph.getConnections(node.id, 'inbound');
|
|
195
|
-
void (parent && node.data({ parent, caller: NAV_TREE_ITEM }));
|
|
196
|
-
return;
|
|
197
|
-
}
|
|
198
|
-
|
|
199
|
-
const current = isCurrent(path, node);
|
|
200
|
-
if (!current) {
|
|
201
|
-
void dispatch(
|
|
202
|
-
createIntent(LayoutAction.Open, {
|
|
203
|
-
part: 'main',
|
|
204
|
-
subject: [node.id],
|
|
205
|
-
options: { key: node.properties.key },
|
|
206
|
-
}),
|
|
207
|
-
);
|
|
208
|
-
} else if (option) {
|
|
209
|
-
void dispatch(
|
|
210
|
-
createIntent(LayoutAction.Close, { part: 'main', subject: [node.id], options: { state: false } }),
|
|
211
|
-
);
|
|
212
|
-
} else {
|
|
213
|
-
void dispatch(createIntent(LayoutAction.ScrollIntoView, { part: 'current', subject: node.id }));
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
const defaultAction = graph.getActions(node.id).find((action) => action.properties?.disposition === 'default');
|
|
217
|
-
if (isAction(defaultAction)) {
|
|
218
|
-
void (defaultAction.data as () => void)();
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
if (!isLg) {
|
|
222
|
-
void dispatch(createIntent(LayoutAction.UpdateSidebar, { part: 'sidebar', options: { state: 'closed' } }));
|
|
223
|
-
}
|
|
224
|
-
},
|
|
225
|
-
[graph, dispatch, isCurrent, isLg],
|
|
226
|
-
);
|
|
189
|
+
if (Node.isAction(node)) {
|
|
190
|
+
const [parent] = Graph.getConnections(graph, node.id, 'inbound');
|
|
191
|
+
if (parent) {
|
|
192
|
+
void runAction(node, { parent, caller: NAV_TREE_ITEM });
|
|
193
|
+
}
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
227
196
|
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
197
|
+
const current = getItem(path).current;
|
|
198
|
+
if (!current) {
|
|
199
|
+
invokeSync(Common.LayoutOperation.Open, { subject: [node.id], key: node.properties.key });
|
|
200
|
+
} else if (option) {
|
|
201
|
+
invokeSync(Common.LayoutOperation.Close, { subject: [node.id] });
|
|
202
|
+
} else {
|
|
203
|
+
void invokePromise(Common.LayoutOperation.ScrollIntoView, { subject: node.id });
|
|
204
|
+
}
|
|
232
205
|
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
// Didn't drop on anything.
|
|
239
|
-
if (!location.current.dropTargets.length) {
|
|
240
|
-
return;
|
|
206
|
+
const defaultAction = Graph.getActions(graph, node.id).find(
|
|
207
|
+
(action) => action.properties?.disposition === 'default',
|
|
208
|
+
);
|
|
209
|
+
if (Node.isAction(defaultAction)) {
|
|
210
|
+
void runAction(defaultAction);
|
|
241
211
|
}
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
}
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
212
|
+
|
|
213
|
+
if (!isLg) {
|
|
214
|
+
invokeSync(Common.LayoutOperation.UpdateSidebar, { state: 'closed' });
|
|
215
|
+
}
|
|
216
|
+
},
|
|
217
|
+
[graph, invokeSync, invokePromise, getItem, isLg, runAction],
|
|
218
|
+
);
|
|
219
|
+
|
|
220
|
+
const handleBack = useCallback(() => invokeSync(Common.LayoutOperation.RevertWorkspace), [invokeSync]);
|
|
221
|
+
|
|
222
|
+
// TODO(wittjosiah): Factor out hook.
|
|
223
|
+
useEffect(() => {
|
|
224
|
+
return monitorForElements({
|
|
225
|
+
canMonitor: ({ source }) => isTreeData(source.data),
|
|
226
|
+
onDrop: ({ location, source }) => {
|
|
227
|
+
// Didn't drop on anything.
|
|
228
|
+
if (!location.current.dropTargets.length) {
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
231
|
+
const target = location.current.dropTargets[0];
|
|
232
|
+
const instruction: Instruction | null = extractInstruction(target.data);
|
|
233
|
+
if (instruction !== null && instruction.type !== 'instruction-blocked') {
|
|
234
|
+
const sourceNode = source.data.item as NavTreeItemGraphNode;
|
|
235
|
+
const targetNode = target.data.item as NavTreeItemGraphNode;
|
|
236
|
+
const sourcePath = source.data.path as string[];
|
|
237
|
+
const targetPath = target.data.path as string[];
|
|
238
|
+
const operation =
|
|
239
|
+
sourcePath.slice(0, -1).join() === targetPath.slice(0, -1).join() && instruction.type !== 'make-child'
|
|
240
|
+
? 'rearrange'
|
|
241
|
+
: resolveMigrationOperation(graph, sourceNode, targetPath, targetNode);
|
|
242
|
+
const sourceParent = getParent(graph, sourceNode, sourcePath);
|
|
243
|
+
const targetParent = getParent(graph, targetNode, targetPath);
|
|
244
|
+
const sourceItems = getItems(graph, sourceParent);
|
|
245
|
+
const targetItems = getItems(graph, targetParent);
|
|
246
|
+
const sourceIndex = sourceItems.findIndex(({ id }) => id === sourceNode.id);
|
|
247
|
+
const targetIndex = targetItems.findIndex(({ id }) => id === targetNode.id);
|
|
248
|
+
const migrationIndex =
|
|
249
|
+
instruction.type === 'make-child'
|
|
250
|
+
? undefined
|
|
251
|
+
: instruction.type === 'reorder-below'
|
|
252
|
+
? targetIndex + 1
|
|
253
|
+
: targetIndex;
|
|
254
|
+
switch (operation) {
|
|
255
|
+
case 'rearrange': {
|
|
256
|
+
const nextItems = sourceItems.map(({ data }) => data);
|
|
257
|
+
arrayMove(nextItems, sourceIndex, targetIndex);
|
|
258
|
+
void sourceNode.properties.onRearrange?.(nextItems);
|
|
259
|
+
break;
|
|
260
|
+
}
|
|
261
|
+
case 'copy': {
|
|
262
|
+
const target = instruction.type === 'make-child' ? targetNode : targetParent;
|
|
263
|
+
void target?.properties.onCopy?.(sourceNode, migrationIndex);
|
|
264
|
+
break;
|
|
265
|
+
}
|
|
266
|
+
case 'transfer': {
|
|
267
|
+
const target = instruction.type === 'make-child' ? targetNode : targetParent;
|
|
268
|
+
if (!target?.properties.onTransferStart || !sourceParent?.properties.onTransferEnd) {
|
|
269
|
+
break;
|
|
270
|
+
}
|
|
271
|
+
void target?.properties.onTransferStart(sourceNode, migrationIndex);
|
|
272
|
+
void sourceParent?.properties.onTransferEnd?.(sourceNode, target);
|
|
280
273
|
break;
|
|
281
274
|
}
|
|
282
|
-
void target?.properties.onTransferStart(sourceNode, migrationIndex);
|
|
283
|
-
void sourceParent?.properties.onTransferEnd?.(sourceNode, target);
|
|
284
|
-
break;
|
|
285
275
|
}
|
|
286
276
|
}
|
|
287
|
-
}
|
|
288
|
-
}
|
|
289
|
-
});
|
|
290
|
-
}, [graph]);
|
|
291
|
-
|
|
292
|
-
const setAlternateTree = useCallback(
|
|
293
|
-
(path: string[], open: boolean) => {
|
|
294
|
-
setItem(path, 'alternateTree', open);
|
|
295
|
-
},
|
|
296
|
-
[setItem],
|
|
297
|
-
);
|
|
277
|
+
},
|
|
278
|
+
});
|
|
279
|
+
}, [graph]);
|
|
298
280
|
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
281
|
+
const setAlternateTree = useCallback(
|
|
282
|
+
(path: string[], open: boolean) => {
|
|
283
|
+
setItem(path, 'alternateTree', open);
|
|
284
|
+
},
|
|
285
|
+
[setItem],
|
|
286
|
+
);
|
|
287
|
+
|
|
288
|
+
const navTreeContextValue = useMemo(
|
|
289
|
+
() => ({
|
|
290
|
+
blockInstruction,
|
|
291
|
+
canDrop,
|
|
292
|
+
canSelect,
|
|
293
|
+
getProps,
|
|
294
|
+
useIsAlternateTree,
|
|
295
|
+
useIsCurrent,
|
|
296
|
+
useIsOpen,
|
|
297
|
+
loadDescendents,
|
|
298
|
+
onBack: handleBack,
|
|
299
|
+
onOpenChange: handleOpenChange,
|
|
300
|
+
onSelect: handleSelect,
|
|
301
|
+
onTabChange: handleTabChange,
|
|
302
|
+
popoverAnchorId,
|
|
303
|
+
renderItemEnd,
|
|
304
|
+
setAlternateTree,
|
|
305
|
+
tab,
|
|
306
|
+
topbar,
|
|
307
|
+
useActions,
|
|
308
|
+
useItems,
|
|
309
|
+
}),
|
|
310
|
+
[
|
|
311
|
+
blockInstruction,
|
|
312
|
+
canDrop,
|
|
313
|
+
canSelect,
|
|
314
|
+
getProps,
|
|
315
|
+
handleBack,
|
|
316
|
+
handleOpenChange,
|
|
317
|
+
handleSelect,
|
|
318
|
+
handleTabChange,
|
|
319
|
+
loadDescendents,
|
|
320
|
+
popoverAnchorId,
|
|
321
|
+
renderItemEnd,
|
|
322
|
+
setAlternateTree,
|
|
323
|
+
tab,
|
|
324
|
+
topbar,
|
|
325
|
+
useActions,
|
|
326
|
+
],
|
|
327
|
+
);
|
|
328
|
+
|
|
329
|
+
return (
|
|
330
|
+
<NavTreeContext.Provider value={navTreeContextValue}>
|
|
331
|
+
<NavTree id={Node.RootId} root={Graph.getRoot(graph)} open={layout.sidebarOpen} ref={forwardedRef} />
|
|
332
|
+
</NavTreeContext.Provider>
|
|
333
|
+
);
|
|
334
|
+
},
|
|
335
|
+
);
|
|
340
336
|
|
|
341
|
-
|
|
342
|
-
<NavTreeContext.Provider value={navTreeContextValue}>
|
|
343
|
-
<NavTree id={ROOT_ID} root={graph.root} open={layout.sidebarOpen} />
|
|
344
|
-
</NavTreeContext.Provider>
|
|
345
|
-
);
|
|
346
|
-
});
|
|
337
|
+
export const NavTreeContainer = memo(NavTreeContainer$);
|
|
@@ -5,13 +5,14 @@ import { useEffect } from 'react';
|
|
|
5
5
|
|
|
6
6
|
import { type Node } from '@dxos/app-graph';
|
|
7
7
|
import { toLocalizedString, useTranslation } from '@dxos/react-ui';
|
|
8
|
+
import { osTranslations } from '@dxos/ui-theme';
|
|
8
9
|
|
|
9
10
|
import { meta } from '../meta';
|
|
10
11
|
|
|
11
|
-
export const NavTreeDocumentTitle = ({ node }: { node?: Node }) => {
|
|
12
|
+
export const NavTreeDocumentTitle = ({ node }: { node?: Node.Node }) => {
|
|
12
13
|
const { t } = useTranslation(meta.id);
|
|
13
14
|
useEffect(() => {
|
|
14
|
-
document.title = node ? toLocalizedString(node.properties.label, t) : t('current app name', { ns:
|
|
15
|
+
document.title = node ? toLocalizedString(node.properties.label, t) : t('current app name', { ns: osTranslations });
|
|
15
16
|
}, [node?.properties?.label]);
|
|
16
17
|
return null;
|
|
17
18
|
};
|
|
@@ -3,8 +3,12 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { type Meta, type StoryObj } from '@storybook/react-vite';
|
|
6
|
+
import * as Effect from 'effect/Effect';
|
|
6
7
|
|
|
7
|
-
import {
|
|
8
|
+
import { RuntimePlugin } from '@dxos/app-framework';
|
|
9
|
+
import { withPluginManager } from '@dxos/app-framework/testing';
|
|
10
|
+
import { type Node } from '@dxos/app-graph';
|
|
11
|
+
import { corePlugins } from '@dxos/plugin-testing';
|
|
8
12
|
import { faker } from '@dxos/random';
|
|
9
13
|
import { withTheme } from '@dxos/react-ui/testing';
|
|
10
14
|
|
|
@@ -18,7 +22,7 @@ const parent = {
|
|
|
18
22
|
label: faker.lorem.words(2),
|
|
19
23
|
icon: 'ph--circle--regular',
|
|
20
24
|
},
|
|
21
|
-
} satisfies NodeArg<any>;
|
|
25
|
+
} satisfies Node.NodeArg<any>;
|
|
22
26
|
|
|
23
27
|
// TODO(burdon): Factor out across tests.
|
|
24
28
|
const menuActions = faker.helpers.multiple(
|
|
@@ -26,14 +30,15 @@ const menuActions = faker.helpers.multiple(
|
|
|
26
30
|
({
|
|
27
31
|
id: faker.string.uuid(),
|
|
28
32
|
type: 'action',
|
|
29
|
-
data: () =>
|
|
30
|
-
|
|
31
|
-
|
|
33
|
+
data: () =>
|
|
34
|
+
Effect.sync(() => {
|
|
35
|
+
console.log('invoke');
|
|
36
|
+
}),
|
|
32
37
|
properties: {
|
|
33
38
|
label: faker.lorem.words(2),
|
|
34
39
|
icon: 'ph--circle--regular',
|
|
35
40
|
},
|
|
36
|
-
}) satisfies NodeArg<any>,
|
|
41
|
+
}) satisfies Node.NodeArg<any>,
|
|
37
42
|
{ count: 20 },
|
|
38
43
|
);
|
|
39
44
|
|
|
@@ -46,7 +51,12 @@ const meta = {
|
|
|
46
51
|
menuActions,
|
|
47
52
|
label: 'Select action',
|
|
48
53
|
} satisfies Partial<NavTreeItemActionMenuProps>,
|
|
49
|
-
decorators: [
|
|
54
|
+
decorators: [
|
|
55
|
+
withTheme,
|
|
56
|
+
withPluginManager({
|
|
57
|
+
plugins: [...corePlugins(), RuntimePlugin()],
|
|
58
|
+
}),
|
|
59
|
+
],
|
|
50
60
|
parameters: {
|
|
51
61
|
layout: 'centered',
|
|
52
62
|
},
|