@dxos/react-ui-menu 0.8.4-main.f5c0578 → 0.8.4-main.fcfe5033a5

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.
Files changed (62) hide show
  1. package/dist/lib/browser/index.mjs +556 -391
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node-esm/index.mjs +556 -391
  5. package/dist/lib/node-esm/index.mjs.map +4 -4
  6. package/dist/lib/node-esm/meta.json +1 -1
  7. package/dist/types/src/builder.d.ts +28 -3
  8. package/dist/types/src/builder.d.ts.map +1 -1
  9. package/dist/types/src/builder.test.d.ts +2 -0
  10. package/dist/types/src/builder.test.d.ts.map +1 -0
  11. package/dist/types/src/components/ActionLabel.d.ts +3 -3
  12. package/dist/types/src/components/ActionLabel.d.ts.map +1 -1
  13. package/dist/types/src/components/DropdownMenu.d.ts +4 -2
  14. package/dist/types/src/components/DropdownMenu.d.ts.map +1 -1
  15. package/dist/types/src/components/Menu.d.ts +50 -0
  16. package/dist/types/src/components/Menu.d.ts.map +1 -0
  17. package/dist/types/src/components/Menu.stories.d.ts +21 -0
  18. package/dist/types/src/components/Menu.stories.d.ts.map +1 -0
  19. package/dist/types/src/components/Menu.test.d.ts +2 -0
  20. package/dist/types/src/components/Menu.test.d.ts.map +1 -0
  21. package/dist/types/src/components/ToolbarMenu.d.ts +7 -6
  22. package/dist/types/src/components/ToolbarMenu.d.ts.map +1 -1
  23. package/dist/types/src/components/ToolbarMenu.stories.d.ts +22 -0
  24. package/dist/types/src/components/ToolbarMenu.stories.d.ts.map +1 -0
  25. package/dist/types/src/components/index.d.ts +1 -3
  26. package/dist/types/src/components/index.d.ts.map +1 -1
  27. package/dist/types/src/hooks/useMenuActions.d.ts +8 -7
  28. package/dist/types/src/hooks/useMenuActions.d.ts.map +1 -1
  29. package/dist/types/src/index.d.ts +1 -2
  30. package/dist/types/src/index.d.ts.map +1 -1
  31. package/dist/types/src/testing/generator.d.ts +19 -13
  32. package/dist/types/src/testing/generator.d.ts.map +1 -1
  33. package/dist/types/src/translations.d.ts +2 -2
  34. package/dist/types/src/translations.d.ts.map +1 -1
  35. package/dist/types/src/types.d.ts +37 -26
  36. package/dist/types/src/types.d.ts.map +1 -1
  37. package/dist/types/src/util.d.ts +14 -5
  38. package/dist/types/src/util.d.ts.map +1 -1
  39. package/dist/types/tsconfig.tsbuildinfo +1 -1
  40. package/package.json +35 -29
  41. package/src/builder.test.ts +224 -0
  42. package/src/builder.ts +76 -26
  43. package/src/components/ActionLabel.tsx +5 -5
  44. package/src/components/DropdownMenu.tsx +12 -6
  45. package/src/components/Menu.stories.tsx +265 -0
  46. package/src/components/Menu.test.tsx +447 -0
  47. package/src/components/Menu.tsx +348 -0
  48. package/src/components/ToolbarMenu.stories.tsx +82 -0
  49. package/src/components/ToolbarMenu.tsx +153 -95
  50. package/src/components/index.ts +1 -3
  51. package/src/hooks/useMenuActions.ts +30 -53
  52. package/src/index.ts +1 -3
  53. package/src/testing/generator.ts +74 -64
  54. package/src/translations.ts +1 -1
  55. package/src/types.ts +39 -27
  56. package/src/util.ts +34 -15
  57. package/dist/types/src/components/MenuContext.d.ts +0 -13
  58. package/dist/types/src/components/MenuContext.d.ts.map +0 -1
  59. package/dist/types/src/components/Menus.stories.d.ts +0 -25
  60. package/dist/types/src/components/Menus.stories.d.ts.map +0 -1
  61. package/src/components/MenuContext.tsx +0 -50
  62. package/src/components/Menus.stories.tsx +0 -69
@@ -2,16 +2,16 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import React, { Fragment, useCallback } from 'react';
5
+ import React, { useCallback } from 'react';
6
6
 
7
7
  import { Icon, Toolbar as NaturalToolbar, type ToolbarRootProps, useTranslation } from '@dxos/react-ui';
8
8
  import { useAttention } from '@dxos/react-ui-attention';
9
- import { mx, textBlockWidth, toolbarLayout } from '@dxos/react-ui-theme';
9
+ import { composable, composableProps } from '@dxos/ui-theme';
10
+ import { type MenuActionProperties } from '@dxos/ui-types';
10
11
 
11
12
  import { translationKey } from '../translations';
12
13
  import {
13
14
  type MenuAction,
14
- type MenuActionProperties,
15
15
  type MenuItem,
16
16
  type MenuItemGroup,
17
17
  type MenuMultipleSelectActionGroup,
@@ -19,10 +19,10 @@ import {
19
19
  isMenuGroup,
20
20
  isSeparator,
21
21
  } from '../types';
22
-
22
+ import { executeMenuAction } from '../util';
23
23
  import { ActionLabel, actionLabel } from './ActionLabel';
24
24
  import { DropdownMenu } from './DropdownMenu';
25
- import { type MenuScopedProps, useMenu, useMenuItems } from './MenuContext';
25
+ import { type MenuScopedProps, useMenuItems, useMenuScoped } from './Menu';
26
26
 
27
27
  export type ToolbarMenuDropdownMenuActionGroup = Omit<MenuActionProperties, 'variant' | 'icon'> & {
28
28
  variant: 'dropdownMenu';
@@ -40,7 +40,7 @@ export type ToolbarMenuActionGroupProperties = (
40
40
  ) &
41
41
  (MenuSingleSelectActionGroup | MenuMultipleSelectActionGroup);
42
42
 
43
- export type ToolbarMenuProps = ToolbarRootProps & { textBlockWidth?: boolean };
43
+ export type ToolbarMenuProps = ToolbarRootProps;
44
44
 
45
45
  export type ToolbarMenuActionGroupProps = {
46
46
  group: MenuItemGroup<ToolbarMenuActionGroupProperties>;
@@ -52,36 +52,58 @@ export type ToolbarMenuActionProps = {
52
52
  action: MenuAction;
53
53
  };
54
54
 
55
- const ActionToolbarItem = ({ action, __menuScope }: MenuScopedProps<{ action: MenuAction }>) => {
56
- const { iconSize } = useMenu('ActionToolbarItem', __menuScope);
55
+ const ActionToolbarItem = ({ __menuScope, action }: MenuScopedProps<{ action: MenuAction }>) => {
56
+ const { iconSize, onAction } = useMenuScoped('ActionToolbarItem', __menuScope);
57
57
  const { t } = useTranslation(translationKey);
58
- const handleClick = useCallback(() => action.data?.(), [action]);
58
+
59
59
  const { icon, iconOnly = true, disabled, testId, hidden, classNames } = action.properties;
60
- const Root = icon ? NaturalToolbar.IconButton : NaturalToolbar.Button;
61
- const rootProps = icon
62
- ? { icon, size: iconSize, iconOnly, label: actionLabel(action, t) }
63
- : { children: <ActionLabel action={action} /> };
64
- return hidden ? null : (
65
- <Root
60
+ const buttonVariant =
61
+ (action.properties as { variant?: string }).variant === 'primary' ? ('primary' as const) : ('ghost' as const);
62
+
63
+ const handleClick = useCallback(() => {
64
+ if (onAction) {
65
+ onAction(action, {});
66
+ } else {
67
+ void executeMenuAction(action);
68
+ }
69
+ }, [action, onAction]);
70
+
71
+ const commonProps = {
72
+ variant: buttonVariant,
73
+ disabled,
74
+ classNames,
75
+ onClick: handleClick,
76
+ ...(testId && { 'data-testid': testId }),
77
+ };
78
+
79
+ if (hidden) {
80
+ return null;
81
+ }
82
+
83
+ return icon ? (
84
+ <NaturalToolbar.IconButton
66
85
  key={action.id}
67
- disabled={disabled}
68
- onClick={handleClick}
69
- variant='ghost'
70
- {...(testId && { 'data-testid': testId })}
71
- {...(rootProps as any)}
72
- classNames={classNames}
86
+ {...commonProps}
87
+ icon={icon}
88
+ size={iconSize}
89
+ iconOnly={iconOnly}
90
+ label={actionLabel(action, t)}
73
91
  />
92
+ ) : (
93
+ <NaturalToolbar.Button key={action.id} {...commonProps}>
94
+ <ActionLabel action={action} />
95
+ </NaturalToolbar.Button>
74
96
  );
75
97
  };
76
98
 
77
99
  const DropdownMenuToolbarItem = ({
100
+ __menuScope,
78
101
  group,
79
102
  items: propsItems,
80
- __menuScope,
81
103
  }: MenuScopedProps<ToolbarMenuActionGroupProps>) => {
82
104
  const { iconOnly, disabled, testId } = group.properties;
83
105
  const { t } = useTranslation(translationKey);
84
- const { iconSize } = useMenu('DropdownMenuToolbarItem', __menuScope);
106
+ const { iconSize } = useMenuScoped('DropdownMenuToolbarItem', __menuScope);
85
107
  const items = useMenuItems(group, propsItems, 'DropdownMenuToolbarItem', __menuScope);
86
108
  const activeItem = items?.find((item) => !!(item as MenuAction).properties.checked);
87
109
  const icon =
@@ -92,15 +114,22 @@ const DropdownMenuToolbarItem = ({
92
114
  const Root = icon ? NaturalToolbar.IconButton : NaturalToolbar.Button;
93
115
  const labelAction = (group.properties as any).applyActive && activeItem ? (activeItem as MenuAction) : group;
94
116
  const rootProps = icon
95
- ? { icon, size: iconSize, iconOnly, label: actionLabel(labelAction, t), caretDown: true }
117
+ ? {
118
+ icon,
119
+ size: iconSize,
120
+ iconOnly,
121
+ label: actionLabel(labelAction, t),
122
+ caretDown: true,
123
+ }
96
124
  : {
97
125
  children: (
98
126
  <>
99
127
  <ActionLabel action={labelAction} />
100
- <Icon size={3} icon='ph--caret-down--bold' classNames='mis-1' />
128
+ <Icon size={3} icon='ph--caret-down--bold' classNames='ms-1' />
101
129
  </>
102
130
  ),
103
131
  };
132
+
104
133
  return (
105
134
  <DropdownMenu.Root group={group} items={items}>
106
135
  <DropdownMenu.Trigger asChild>
@@ -110,85 +139,114 @@ const DropdownMenuToolbarItem = ({
110
139
  );
111
140
  };
112
141
 
113
- const ToggleGroupItem = ({ group, action, __menuScope }: MenuScopedProps<ToolbarMenuActionProps>) => {
114
- const { iconSize } = useMenu('ToggleGroupItem', __menuScope);
142
+ const ToggleGroupItem = ({ __menuScope, group, action }: MenuScopedProps<ToolbarMenuActionProps>) => {
143
+ const { iconSize, onAction } = useMenuScoped('ToggleGroupItem', __menuScope);
115
144
  const { t } = useTranslation(translationKey);
116
145
  const { icon, iconOnly = true, disabled, testId, hidden, classNames } = action.properties;
117
- const handleClick = useCallback(() => action.data?.({ parent: group }), [action, group]);
118
- const Root = icon ? NaturalToolbar.ToggleGroupIconItem : NaturalToolbar.ToggleGroupItem;
119
- const rootProps = icon
120
- ? { icon, size: iconSize, iconOnly, label: actionLabel(action, t) }
121
- : { children: <ActionLabel action={action} /> };
122
- return hidden ? null : (
123
- <Root
124
- key={action.id}
125
- value={action.id as any}
126
- disabled={disabled}
127
- onClick={handleClick}
128
- variant='ghost'
129
- {...(testId && { 'data-testid': testId })}
130
- {...(rootProps as any)}
131
- classNames={classNames}
146
+
147
+ const handleClick = useCallback(() => {
148
+ if (onAction) {
149
+ onAction(action, { parent: group });
150
+ } else {
151
+ void executeMenuAction(action, { parent: group });
152
+ }
153
+ }, [action, group, onAction]);
154
+
155
+ const commonProps = {
156
+ value: action.id,
157
+ disabled,
158
+ variant: 'ghost' as const,
159
+ classNames,
160
+ onClick: handleClick,
161
+ ...(testId && { 'data-testid': testId }),
162
+ };
163
+
164
+ return hidden ? null : icon ? (
165
+ <NaturalToolbar.ToggleGroupIconItem
166
+ {...commonProps}
167
+ icon={icon}
168
+ size={iconSize}
169
+ iconOnly={iconOnly}
170
+ label={actionLabel(action, t)}
132
171
  />
172
+ ) : (
173
+ <NaturalToolbar.ToggleGroupItem {...commonProps}>
174
+ <ActionLabel action={action} />
175
+ </NaturalToolbar.ToggleGroupItem>
133
176
  );
134
177
  };
135
178
 
136
179
  const ToggleGroupToolbarItem = ({
137
- group,
138
- items: propsItems,
139
180
  __menuScope,
181
+ group,
182
+ items: itemsProp,
140
183
  }: MenuScopedProps<ToolbarMenuActionGroupProps>) => {
141
- const items = useMenuItems(group, propsItems, 'ToggleGroupToolbarItem', __menuScope);
142
- const { selectCardinality, value } = group.properties;
143
- return (
144
- // TODO(thure): The type here is difficult to manage, what do?
145
- // @ts-ignore
146
- <NaturalToolbar.ToggleGroup type={selectCardinality} value={value}>
147
- {
148
- // TODO(thure): Handle other menu item types.
149
- (items as MenuAction[]).map((action) => (
150
- <ToggleGroupItem key={action.id} group={group} action={action} />
151
- ))
152
- }
153
- </NaturalToolbar.ToggleGroup>
154
- );
184
+ const items = useMenuItems(group, itemsProp, 'ToggleGroupToolbarItem', __menuScope);
185
+ const { selectCardinality } = group.properties;
186
+
187
+ // TODO(thure): Handle other menu item types.
188
+ const children = (items as MenuAction[]).map((action) => (
189
+ <ToggleGroupItem key={action.id} group={group} action={action} />
190
+ ));
191
+
192
+ if (selectCardinality === 'multiple') {
193
+ return (
194
+ <NaturalToolbar.ToggleGroup type='multiple' value={group.properties.value}>
195
+ {children}
196
+ </NaturalToolbar.ToggleGroup>
197
+ );
198
+ } else {
199
+ return (
200
+ <NaturalToolbar.ToggleGroup type='single' value={group.properties.value}>
201
+ {children}
202
+ </NaturalToolbar.ToggleGroup>
203
+ );
204
+ }
155
205
  };
156
206
 
157
- export const ToolbarMenu = ({
158
- __menuScope,
159
- classNames,
160
- textBlockWidth: wrapContents,
161
- ...props
162
- }: MenuScopedProps<ToolbarMenuProps>) => {
163
- const items = useMenuItems(undefined, undefined, 'ToolbarMenu', __menuScope);
164
- const { attendableId } = useMenu('ToolbarMenu', __menuScope);
165
- const { hasAttention } = useAttention(attendableId);
166
- const InnerRoot = wrapContents ? 'div' : Fragment;
167
- const innerRootProps = wrapContents ? { role: 'none', className: mx(textBlockWidth, toolbarLayout, 'bs-full') } : {};
168
- return (
169
- <NaturalToolbar.Root
170
- {...props}
171
- layoutManaged={wrapContents}
172
- classNames={[attendableId && !hasAttention && '*:opacity-20 !bg-transparent', classNames]}
173
- >
174
- <InnerRoot {...innerRootProps}>
175
- {items?.map((item: MenuItem, i: number) =>
176
- isSeparator(item) ? (
177
- <NaturalToolbar.Separator key={i} variant={item.properties.variant} />
178
- ) : isMenuGroup(item) ? (
179
- item.properties.variant === 'dropdownMenu' ? (
180
- // TODO(thure): Figure out type narrowing that doesn’t require so much use of `as`.
181
- <DropdownMenuToolbarItem key={item.id} group={item as MenuItemGroup<ToolbarMenuActionGroupProperties>} />
182
- ) : (
183
- // TODO(thure): Figure out type narrowing that doesn’t require so much use of `as`.
184
- <ToggleGroupToolbarItem key={item.id} group={item as MenuItemGroup<ToolbarMenuActionGroupProperties>} />
185
- )
186
- ) : (
187
- // TODO(thure): Figure out type narrowing that doesn’t require so much use of `as`.
188
- <ActionToolbarItem key={item.id} action={item as MenuAction} />
189
- ),
190
- )}
191
- </InnerRoot>
192
- </NaturalToolbar.Root>
193
- );
207
+ export const ToolbarMenu = composable<HTMLDivElement, MenuScopedProps<ToolbarMenuProps>>(
208
+ ({ __menuScope, children, ...props }, forwardedRef) => {
209
+ const items = useMenuItems(undefined, undefined, 'ToolbarMenu', __menuScope);
210
+ const { attendableId, alwaysActive } = useMenuScoped('ToolbarMenu', __menuScope);
211
+ const { hasAttention } = useAttention(attendableId);
212
+
213
+ return (
214
+ <NaturalToolbar.Root
215
+ {...composableProps(props, { classNames: attendableId })}
216
+ disabled={!alwaysActive && !hasAttention}
217
+ ref={forwardedRef}
218
+ >
219
+ {items?.map((item: MenuItem) => (
220
+ <ToolbarMenuItem key={item.id} __menuScope={__menuScope} item={item} />
221
+ ))}
222
+ {children}
223
+ </NaturalToolbar.Root>
224
+ );
225
+ },
226
+ );
227
+
228
+ const ToolbarMenuItem = ({ __menuScope, item }: MenuScopedProps<{ item: MenuItem }>) => {
229
+ if (isSeparator(item)) {
230
+ return <NaturalToolbar.Separator variant={item.properties.variant} />;
231
+ }
232
+
233
+ if (isMenuGroup(item)) {
234
+ if (item.properties.variant === 'dropdownMenu') {
235
+ return (
236
+ <DropdownMenuToolbarItem
237
+ __menuScope={__menuScope}
238
+ group={item as MenuItemGroup<ToolbarMenuActionGroupProperties>}
239
+ />
240
+ );
241
+ } else {
242
+ return (
243
+ <ToggleGroupToolbarItem
244
+ __menuScope={__menuScope}
245
+ group={item as MenuItemGroup<ToolbarMenuActionGroupProperties>}
246
+ />
247
+ );
248
+ }
249
+ }
250
+
251
+ return <ActionToolbarItem __menuScope={__menuScope} action={item as MenuAction} />;
194
252
  };
@@ -2,6 +2,4 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- export * from './DropdownMenu';
6
- export * from './ToolbarMenu';
7
- export * from './MenuContext';
5
+ export * from './Menu';
@@ -2,68 +2,45 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { RegistryContext, type Rx, useRxValue } from '@effect-rx/rx-react';
6
- import { useCallback, useContext, useEffect, useState } from 'react';
5
+ import { type Atom, RegistryContext, useAtomValue } from '@effect-atom/atom-react';
6
+ import { useCallback, useContext, useMemo } from 'react';
7
7
 
8
- import { type Edge, type Edges, Graph, type Node, type NodeArg, ROOT_ID } from '@dxos/app-graph';
8
+ import { Graph, Node } from '@dxos/app-graph';
9
9
 
10
- import { type MenuItem, type MenuItemGroup } from '../types';
10
+ import { type MenuItem, type MenuItemGroup, type MenuItemsAccessor } from '../types';
11
11
 
12
- const edgesArrayToRecord = (edges: Edge[]): Record<string, Edges> => {
13
- return Object.fromEntries(
14
- Object.entries(
15
- edges.reduce((acc: Record<string, { inbound: string[]; outbound: string[] }>, { source, target }) => {
16
- if (!acc[source]) {
17
- acc[source] = { inbound: [], outbound: [] };
18
- }
19
- if (!acc[target]) {
20
- acc[target] = { inbound: [], outbound: [] };
21
- }
22
-
23
- const sourceEdges = acc[source];
24
- if (!sourceEdges.outbound.includes(target)) {
25
- sourceEdges.outbound.push(target);
26
- }
27
-
28
- const targetEdges = acc[target];
29
- if (!targetEdges.inbound.includes(source)) {
30
- targetEdges.inbound.push(source);
31
- }
32
-
33
- return acc;
34
- }, {}),
35
- ),
36
- );
12
+ export type ActionGraphNodes = Node.NodeArg<any>[];
13
+ export type ActionGraphEdges = Graph.Edge[];
14
+ export type ActionGraphProps = {
15
+ nodes: ActionGraphNodes;
16
+ edges: ActionGraphEdges;
37
17
  };
38
18
 
39
- export type ActionGraphNodes = NodeArg<any>[];
40
- export type ActionGraphEdges = Edge[];
41
- export type ActionGraphProps = { nodes: ActionGraphNodes; edges: ActionGraphEdges };
19
+ export type MenuActions = {
20
+ items: MenuItemsAccessor;
21
+ };
42
22
 
43
- export const useMenuActions = (props: Rx.Rx<ActionGraphProps>) => {
23
+ export const useMenuActions = (props: Atom.Atom<ActionGraphProps>): MenuActions => {
44
24
  const registry = useContext(RegistryContext);
45
- const menuGraphProps = useRxValue(props);
46
-
47
- const [graph] = useState(
48
- new Graph({
49
- registry,
50
- nodes: menuGraphProps.nodes as Node[],
51
- edges: edgesArrayToRecord(menuGraphProps.edges),
52
- }),
53
- );
54
-
55
- useEffect(() => {
56
- graph.addNodes(menuGraphProps.nodes);
57
- graph.addEdges(menuGraphProps.edges);
58
- }, [menuGraphProps]);
59
-
60
- const useGroupItems = useCallback(
61
- (sourceNode?: MenuItemGroup) => {
62
- const items = useRxValue(graph.connections(sourceNode?.id || ROOT_ID)) as MenuItem[];
63
- return items;
25
+ const menuGraphProps = useAtomValue(props);
26
+
27
+ // Create a new graph whenever props change to preserve correct order.
28
+ // (Graph.addEdges appends rather than replaces, which breaks ordering on updates.)
29
+ // NOTE: Using useMemo rather than a ref-mutation pattern to avoid calling registry.set during render,
30
+ // which would trigger atom state updates in other components (setState-in-render React warning).
31
+ const graph = useMemo(() => {
32
+ const newGraph = Graph.make({ registry });
33
+ newGraph.pipe(Graph.addNodes(menuGraphProps.nodes as Node.NodeArg<any>[]), Graph.addEdges(menuGraphProps.edges));
34
+ return newGraph;
35
+ }, [registry, menuGraphProps]);
36
+
37
+ const items: MenuItemsAccessor = useCallback(
38
+ (group?: MenuItemGroup) => {
39
+ // TODO(wittjosiah): Migrate to using action relation instead of child.
40
+ return graph.connections(group?.id || Node.RootId, 'child') as Atom.Atom<MenuItem[] | null>;
64
41
  },
65
42
  [graph],
66
43
  );
67
44
 
68
- return { useGroupItems };
45
+ return { items };
69
46
  };
package/src/index.ts CHANGED
@@ -2,10 +2,8 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- export { rxFromSignal } from '@dxos/app-graph';
6
-
7
5
  export * from './components';
8
6
  export * from './hooks';
9
7
  export * from './types';
10
8
  export { createMenuAction, createMenuItemGroup, createLineSeparator, createGapSeparator } from './util';
11
- export { MenuBuilder } from './builder';
9
+ export { type ActionGroupBuilder, type ActionGroupBuilderFn, MenuBuilder } from './builder';
@@ -2,27 +2,17 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { Rx } from '@effect-rx/rx-react';
6
- import { useEffect } from 'react';
5
+ import { Atom, Registry, RegistryContext } from '@effect-atom/atom-react';
6
+ import { useContext, useEffect } from 'react';
7
7
 
8
- import {
9
- ACTION_GROUP_TYPE,
10
- ACTION_TYPE,
11
- type Action,
12
- Graph,
13
- type NodeArg,
14
- ROOT_ID,
15
- actionGroupSymbol,
16
- } from '@dxos/app-graph';
17
- import { live } from '@dxos/live-object';
18
- import { faker } from '@dxos/random';
19
- import { type DeepWriteable } from '@dxos/util';
8
+ import { Graph, Node } from '@dxos/app-graph';
9
+ import { random } from '@dxos/random';
20
10
 
21
11
  import { type ActionGraphProps } from '../hooks/useMenuActions';
22
- import { type MenuAction, type MenuItem, type MenuItemGroup } from '../types';
12
+ import { type MenuItem, type MenuItemGroup, type MenuItemsAccessor } from '../types';
23
13
 
24
- export type CreateActionsParams = Partial<{
25
- type?: typeof ACTION_TYPE | typeof ACTION_GROUP_TYPE;
14
+ export type CreateActionsProps = Partial<{
15
+ type?: typeof Node.ActionType | typeof Node.ActionGroupType;
26
16
  callback: () => void;
27
17
  count: number;
28
18
  }>;
@@ -46,71 +36,91 @@ const icons = {
46
36
  ],
47
37
  };
48
38
 
49
- export const createActions = (params?: CreateActionsParams) => {
50
- // eslint-disable-next-line no-console
51
- const { callback = () => console.log('invoke'), count = 12, type = ACTION_TYPE } = params ?? {};
52
- return faker.helpers.multiple(
53
- () =>
54
- live({
55
- id: faker.string.uuid(),
56
- type,
57
- data: type === ACTION_GROUP_TYPE ? actionGroupSymbol : callback,
58
- properties: {
59
- label: faker.lorem.words(2),
60
- icon: faker.helpers.arrayElement(icons[faker.helpers.arrayElement(Object.keys(icons)) as keyof typeof icons]),
61
- disabled: faker.helpers.arrayElement([true, false]),
62
- ...(type === ACTION_GROUP_TYPE && { variant: 'dropdownMenu' }),
63
- },
64
- }),
39
+ export const createActions = (params?: CreateActionsProps) => {
40
+ const { callback = () => console.log('invoke'), count = 12, type = Node.ActionType } = params ?? {};
41
+ return random.helpers.multiple(
42
+ () => ({
43
+ id: random.string.uuid(),
44
+ type,
45
+ data: type === Node.ActionGroupType ? Node.actionGroupSymbol : callback,
46
+ properties: {
47
+ label: random.lorem.words(2),
48
+ icon: random.helpers.arrayElement(icons[random.helpers.arrayElement(Object.keys(icons)) as keyof typeof icons]),
49
+ disabled: random.helpers.arrayElement([true, false]),
50
+ ...(type === Node.ActionGroupType && { variant: 'dropdownMenu' }),
51
+ },
52
+ }),
65
53
  { count },
66
54
  );
67
55
  };
68
56
 
69
- export const createNestedActions = Rx.make(() => {
57
+ const buildNestedActions = (): ActionGraphProps => {
70
58
  const result: ActionGraphProps = { edges: [], nodes: [] };
71
- const actionGroups = createActions({ type: ACTION_GROUP_TYPE });
59
+ const actionGroups = createActions({ type: Node.ActionGroupType });
72
60
  actionGroups.forEach((group) => {
73
61
  const actions = createActions();
74
62
  result.nodes.push(group, ...actions);
75
63
  result.edges.push(
76
- { source: 'root', target: group.id },
77
- ...actions.map((action) => ({ source: group.id, target: action.id })),
64
+ { source: 'root', target: group.id, relation: 'child' },
65
+ ...actions.map((action) => ({ source: group.id, target: action.id, relation: 'child' })),
78
66
  );
79
67
  });
80
68
  return result;
81
- });
69
+ };
70
+
71
+ export const createNestedActions = Atom.make(buildNestedActions()).pipe(Atom.keepAlive);
82
72
 
83
- export const createNestedActionsResolver = (groupParams?: CreateActionsParams, params?: CreateActionsParams) => {
84
- const graph = new Graph();
85
- const actionGroups = createActions({ type: ACTION_GROUP_TYPE, ...groupParams });
73
+ export const createNestedActionsResolver = (props?: {
74
+ groupParams?: CreateActionsProps;
75
+ params?: CreateActionsProps;
76
+ registry?: Registry.Registry;
77
+ }) => {
78
+ const { groupParams, params, registry } = props ?? {};
79
+ const graph = Graph.make({ ...(registry && { registry }) });
80
+ const actionGroups = createActions({ type: Node.ActionGroupType, ...groupParams });
86
81
  actionGroups.forEach((group) => {
87
82
  const actions = createActions(params);
88
- graph.addNodes([group as NodeArg<any>, ...(actions as NodeArg<any>[])]);
89
- graph.addEdges([
90
- { source: 'root', target: group.id },
91
- ...actions.map((action) => ({ source: group.id, target: action.id })),
92
- ]);
93
- void graph.expand(group.id);
83
+ graph.pipe(
84
+ Graph.addNodes([group as Node.NodeArg<any>, ...(actions as Node.NodeArg<any>[])]),
85
+ Graph.addEdges([
86
+ { source: 'root', target: group.id, relation: 'child' },
87
+ ...actions.map((action) => ({ source: group.id, target: action.id, relation: 'child' })),
88
+ ]),
89
+ Graph.expand(group.id, 'child'),
90
+ );
94
91
  });
95
- const resolveGroupItems = (groupNode?: MenuItemGroup) =>
96
- (graph.getActions(groupNode?.id ?? ROOT_ID) || null) as MenuItem[] | null;
97
- return { resolveGroupItems };
92
+ const items: MenuItemsAccessor = (group?: MenuItemGroup) =>
93
+ graph.connections(group?.id ?? Node.RootId, 'child') as Atom.Atom<MenuItem[] | null>;
94
+ return { items };
98
95
  };
99
96
 
100
- export const mutateActionsOnInterval = (actions: Action[]) => {
101
- let cursor = 0;
102
- return setInterval(() => {
103
- const action = actions[cursor] as DeepWriteable<Action>;
104
- action.properties.icon = faker.helpers.arrayElement(
105
- action.properties.icon.endsWith('regular') ? icons.fill : icons.regular,
106
- );
107
- action.properties.disabled = !action.properties.disabled;
108
- cursor = (cursor + actions.length + 1) % actions.length;
109
- }, 1_000);
110
- };
97
+ /**
98
+ * Hook to mutate actions in an atom on an interval for testing reactivity.
99
+ */
100
+ export const useMutateActions = (actionsAtom: Atom.Writable<ActionGraphProps>) => {
101
+ const registry = useContext(RegistryContext);
111
102
 
112
- export const useMutateActions = (actions: MenuAction[]) =>
113
103
  useEffect(() => {
114
- const interval = mutateActionsOnInterval(actions);
104
+ let cursor = 0;
105
+ const interval = setInterval(() => {
106
+ const current = registry.get(actionsAtom);
107
+ const nodes = current.nodes.map((node, index) => {
108
+ if (index !== cursor) {
109
+ return node;
110
+ }
111
+ return {
112
+ ...node,
113
+ properties: {
114
+ ...node.properties,
115
+ icon: random.helpers.arrayElement(node.properties?.icon?.endsWith('regular') ? icons.fill : icons.regular),
116
+ disabled: !node.properties?.disabled,
117
+ },
118
+ };
119
+ });
120
+ registry.set(actionsAtom, { ...current, nodes });
121
+ cursor = (cursor + 1) % current.nodes.length;
122
+ }, 1_000);
123
+
115
124
  return () => clearInterval(interval);
116
- }, []);
125
+ }, [actionsAtom, registry]);
126
+ };
@@ -4,7 +4,7 @@
4
4
 
5
5
  import { type Resource } from '@dxos/react-ui';
6
6
 
7
- export const translationKey = 'react-ui-menu';
7
+ export const translationKey = '@dxos/react-ui-menu';
8
8
 
9
9
  export const translations = [
10
10
  {