@dxos/plugin-navtree 0.8.4-main.1da679c → 0.8.4-main.21d9917
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-YKTYPINZ.mjs +19 -0
- package/dist/lib/browser/chunk-YKTYPINZ.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +82 -93
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/{keyboard-R2APW7UM.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 -105
- 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 +5 -3
- 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 +3 -3
- package/dist/types/src/components/NavTreeItem/NavTreeItemAction.stories.d.ts.map +1 -1
- package/dist/types/src/components/NavTreeItem/NavTreeItemColumns.d.ts +1 -1
- package/dist/types/src/components/NavTreeItem/NavTreeItemColumns.d.ts.map +1 -1
- package/dist/types/src/components/Sidebar/L0Menu.d.ts +6 -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/UserAccountAvatar/UserAccountAvatar.d.ts.map +1 -1
- package/dist/types/src/components/UserAccountAvatar/UserAccountAvatar.stories.d.ts +1 -2
- package/dist/types/src/components/UserAccountAvatar/UserAccountAvatar.stories.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/experimental/Tree.d.ts +1 -2
- package/dist/types/src/experimental/Tree.d.ts.map +1 -1
- package/dist/types/src/experimental/Tree.stories.d.ts +2 -3
- package/dist/types/src/experimental/Tree.stories.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 +3 -4
- 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} +10 -9
- 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 +54 -53
- package/src/NavTreePlugin.tsx +65 -83
- 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 +109 -98
- package/src/components/CommandsDialog/CommandsTrigger.tsx +6 -15
- package/src/components/NavTree/NavTree.stories.tsx +93 -88
- package/src/components/NavTree/NavTree.tsx +9 -15
- package/src/components/NavTreeContainer.tsx +254 -256
- package/src/components/NavTreeDocumentTitle.tsx +5 -4
- package/src/components/NavTreeItem/NavTreeItemAction.stories.tsx +18 -10
- package/src/components/NavTreeItem/NavTreeItemAction.tsx +23 -16
- package/src/components/NavTreeItem/NavTreeItemColumns.tsx +32 -26
- package/src/components/Sidebar/L0Menu.tsx +112 -137
- package/src/components/Sidebar/L1Panel.tsx +16 -17
- package/src/components/Sidebar/L1Tabs.tsx +6 -31
- package/src/components/UserAccountAvatar/UserAccountAvatar.stories.tsx +3 -4
- package/src/components/UserAccountAvatar/UserAccountAvatar.tsx +20 -12
- package/src/components/index.ts +1 -0
- package/src/components/types.ts +7 -7
- package/src/experimental/Tree.stories.tsx +26 -30
- package/src/experimental/Tree.tsx +7 -24
- package/src/hooks.ts +54 -2
- package/src/index.ts +1 -2
- package/src/meta.ts +11 -8
- package/src/testing/app-graph-builder.ts +159 -234
- package/src/testing/generator.ts +20 -18
- 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} +9 -8
- package/src/util.ts +13 -16
- package/dist/lib/browser/app-graph-builder-DU57YHO5.mjs +0 -45
- package/dist/lib/browser/app-graph-builder-DU57YHO5.mjs.map +0 -7
- package/dist/lib/browser/chunk-EMIN6D7Q.mjs +0 -1469
- package/dist/lib/browser/chunk-EMIN6D7Q.mjs.map +0 -7
- package/dist/lib/browser/chunk-ERDGQTH5.mjs +0 -16
- package/dist/lib/browser/chunk-ERDGQTH5.mjs.map +0 -7
- package/dist/lib/browser/chunk-WCARAZ7J.mjs +0 -15
- package/dist/lib/browser/chunk-WCARAZ7J.mjs.map +0 -7
- package/dist/lib/browser/intent-resolver-RPZ5O7AJ.mjs +0 -47
- package/dist/lib/browser/intent-resolver-RPZ5O7AJ.mjs.map +0 -7
- package/dist/lib/browser/keyboard-R2APW7UM.mjs.map +0 -7
- package/dist/lib/browser/react-surface-DF7FNA34.mjs +0 -51
- package/dist/lib/browser/react-surface-DF7FNA34.mjs.map +0 -7
- package/dist/lib/browser/state-W5JDWIJL.mjs +0 -117
- package/dist/lib/browser/state-W5JDWIJL.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 -52
- 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
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import React, { useMemo } from 'react';
|
|
5
|
+
import React, { forwardRef, useMemo } from 'react';
|
|
6
6
|
|
|
7
7
|
import { type TreeProps } from '@dxos/react-ui-list';
|
|
8
8
|
import { Tabs } from '@dxos/react-ui-tabs';
|
|
@@ -16,21 +16,11 @@ export const NAV_TREE_ITEM = 'NavTreeItem';
|
|
|
16
16
|
|
|
17
17
|
export type NavTreeProps = Pick<TreeProps<NavTreeItemGraphNode>, 'id' | 'root'> & Pick<L1TabsProps, 'open'>;
|
|
18
18
|
|
|
19
|
-
export const NavTree = ({ id, root, ...props }
|
|
19
|
+
export const NavTree = forwardRef<HTMLDivElement, NavTreeProps>(({ id, root, ...props }, forwardedRef) => {
|
|
20
20
|
const { tab, useItems, onBack } = useNavTreeContext();
|
|
21
21
|
const topLevelActions = useItems(root, { disposition: 'menu', sort: true });
|
|
22
|
-
const topLevelCollections = useItems(root, { disposition: 'collection' });
|
|
23
22
|
const topLevelWorkspaces = useItems(root, { disposition: 'workspace' });
|
|
24
|
-
const
|
|
25
|
-
const l0Items = useMemo(
|
|
26
|
-
() => [
|
|
27
|
-
// prettier-ignore
|
|
28
|
-
...topLevelCollections,
|
|
29
|
-
...topLevelWorkspaces,
|
|
30
|
-
...topLevelNavigation,
|
|
31
|
-
],
|
|
32
|
-
[topLevelCollections, topLevelWorkspaces, topLevelNavigation],
|
|
33
|
-
);
|
|
23
|
+
const l0Items = topLevelWorkspaces;
|
|
34
24
|
const pinnedItems = useItems(root, { disposition: 'pin-end', sort: true });
|
|
35
25
|
const userAccountItem = useItems(root, { disposition: 'user-account' })[0];
|
|
36
26
|
const topLevelItems = useMemo(
|
|
@@ -47,7 +37,11 @@ export const NavTree = ({ id, root, ...props }: NavTreeProps) => {
|
|
|
47
37
|
const path = useMemo(() => [id], [id]);
|
|
48
38
|
|
|
49
39
|
return (
|
|
50
|
-
|
|
40
|
+
// TODO(thure): `Tabs.Root` forces all items that should be able to receive focus to use `Tabs.Tab(Primitive)` since
|
|
41
|
+
// it uses RovingFocus and doesn’t support moving focus to an item that is not a tab. Assess whether this situation
|
|
42
|
+
// should change including whether it should motivate a change in the design/taxonomy, or if this means this should
|
|
43
|
+
// not use `react-ui-tabs` at all.
|
|
44
|
+
<Tabs.Root value={tab} orientation='vertical' verticalVariant='stateless' classNames='relative' ref={forwardedRef}>
|
|
51
45
|
<L0Menu
|
|
52
46
|
menuActions={topLevelActions}
|
|
53
47
|
topLevelItems={l0Items}
|
|
@@ -59,4 +53,4 @@ export const NavTree = ({ id, root, ...props }: NavTreeProps) => {
|
|
|
59
53
|
<L1Tabs topLevelItems={topLevelItems} path={path} currentItemId={tab} onBack={onBack} {...props} />
|
|
60
54
|
</Tabs.Root>
|
|
61
55
|
);
|
|
62
|
-
};
|
|
56
|
+
});
|
|
@@ -4,28 +4,20 @@
|
|
|
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 {
|
|
28
|
-
import {
|
|
19
|
+
import { useIsAlternateTree, useIsCurrent, useIsOpen, useNavTreeState } from '../hooks';
|
|
20
|
+
import { meta } from '../meta';
|
|
29
21
|
import { type FlattenedActions, type NavTreeItemGraphNode } from '../types';
|
|
30
22
|
import { getChildren, getParent, resolveMigrationOperation } from '../util';
|
|
31
23
|
|
|
@@ -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,243 +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
|
-
|
|
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
|
+
);
|
|
126
167
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
});
|
|
134
|
-
},
|
|
135
|
-
[graph],
|
|
136
|
-
);
|
|
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
|
+
);
|
|
137
174
|
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
setItem(path, 'open', open);
|
|
142
|
-
graph.expand(id, 'outbound');
|
|
143
|
-
},
|
|
144
|
-
[graph],
|
|
145
|
-
);
|
|
175
|
+
const canDrop = useCallback(({ source, target }: { source: TreeData; target: TreeData }) => {
|
|
176
|
+
return target.item.properties.canDrop?.(source) ?? false;
|
|
177
|
+
}, []);
|
|
146
178
|
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
? navigationSidebarState === 'expanded'
|
|
156
|
-
? isLg
|
|
157
|
-
? 'collapsed'
|
|
158
|
-
: 'closed'
|
|
159
|
-
: 'expanded'
|
|
160
|
-
: 'expanded',
|
|
161
|
-
},
|
|
162
|
-
}),
|
|
163
|
-
);
|
|
164
|
-
|
|
165
|
-
await dispatch(createIntent(LayoutAction.SwitchWorkspace, { part: 'workspace', subject: node.id }));
|
|
166
|
-
|
|
167
|
-
// Open the first item if the workspace is empty.
|
|
168
|
-
if (layout.active.length === 0) {
|
|
169
|
-
const [item] = getItems(graph, node).filter((node) => !isActionLike(node));
|
|
170
|
-
if (item && item.data) {
|
|
171
|
-
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;
|
|
172
187
|
}
|
|
173
|
-
}
|
|
174
|
-
},
|
|
175
|
-
[dispatch, layout.active, tab, navigationSidebarState, isLg],
|
|
176
|
-
);
|
|
177
188
|
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
return;
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
if (isAction(node)) {
|
|
189
|
-
const [parent] = graph.getConnections(node.id, 'inbound');
|
|
190
|
-
void (parent && node.data({ parent, caller: NAV_TREE_ITEM }));
|
|
191
|
-
return;
|
|
192
|
-
}
|
|
193
|
-
|
|
194
|
-
const current = isCurrent(path, node);
|
|
195
|
-
if (!current) {
|
|
196
|
-
void dispatch(
|
|
197
|
-
createIntent(LayoutAction.Open, {
|
|
198
|
-
part: 'main',
|
|
199
|
-
subject: [node.id],
|
|
200
|
-
options: { key: node.properties.key },
|
|
201
|
-
}),
|
|
202
|
-
);
|
|
203
|
-
} else if (option) {
|
|
204
|
-
void dispatch(
|
|
205
|
-
createIntent(LayoutAction.Close, { part: 'main', subject: [node.id], options: { state: false } }),
|
|
206
|
-
);
|
|
207
|
-
} else {
|
|
208
|
-
void dispatch(createIntent(LayoutAction.ScrollIntoView, { part: 'current', subject: node.id }));
|
|
209
|
-
}
|
|
210
|
-
|
|
211
|
-
const defaultAction = graph.getActions(node.id).find((action) => action.properties?.disposition === 'default');
|
|
212
|
-
if (isAction(defaultAction)) {
|
|
213
|
-
void (defaultAction.data as () => void)();
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
if (!isLg) {
|
|
217
|
-
void dispatch(createIntent(LayoutAction.UpdateSidebar, { part: 'sidebar', options: { state: 'closed' } }));
|
|
218
|
-
}
|
|
219
|
-
},
|
|
220
|
-
[graph, dispatch, isCurrent, isLg],
|
|
221
|
-
);
|
|
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
|
+
}
|
|
222
196
|
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
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
|
+
}
|
|
227
205
|
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
// Didn't drop on anything.
|
|
234
|
-
if (!location.current.dropTargets.length) {
|
|
235
|
-
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);
|
|
236
211
|
}
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
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
|
-
|
|
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);
|
|
275
273
|
break;
|
|
276
274
|
}
|
|
277
|
-
void target?.properties.onTransferStart(sourceNode, migrationIndex);
|
|
278
|
-
void sourceParent?.properties.onTransferEnd?.(sourceNode, target);
|
|
279
|
-
break;
|
|
280
275
|
}
|
|
281
276
|
}
|
|
282
|
-
}
|
|
283
|
-
}
|
|
284
|
-
});
|
|
285
|
-
}, [graph]);
|
|
286
|
-
|
|
287
|
-
const setAlternateTree = useCallback(
|
|
288
|
-
(path: string[], open: boolean) => {
|
|
289
|
-
setItem(path, 'alternateTree', open);
|
|
290
|
-
},
|
|
291
|
-
[setItem],
|
|
292
|
-
);
|
|
277
|
+
},
|
|
278
|
+
});
|
|
279
|
+
}, [graph]);
|
|
293
280
|
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
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
|
-
|
|
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
|
+
);
|
|
333
336
|
|
|
334
|
-
|
|
335
|
-
<NavTreeContext.Provider value={navTreeContextValue}>
|
|
336
|
-
<NavTree id={ROOT_ID} root={graph.root} open={layout.sidebarOpen} />
|
|
337
|
-
</NavTreeContext.Provider>
|
|
338
|
-
);
|
|
339
|
-
});
|
|
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
|
-
import {
|
|
10
|
+
import { meta } from '../meta';
|
|
10
11
|
|
|
11
|
-
export const NavTreeDocumentTitle = ({ node }: { node?: Node }) => {
|
|
12
|
-
const { t } = useTranslation(
|
|
12
|
+
export const NavTreeDocumentTitle = ({ node }: { node?: Node.Node }) => {
|
|
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
|
};
|