@dxos/react-ui-menu 0.8.4-main.dedc0f3 → 0.8.4-main.e00bdcdb52

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 (63) hide show
  1. package/dist/lib/browser/index.mjs +533 -420
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/browser/translations.mjs +14 -0
  5. package/dist/lib/browser/translations.mjs.map +7 -0
  6. package/dist/lib/node-esm/index.mjs +533 -420
  7. package/dist/lib/node-esm/index.mjs.map +4 -4
  8. package/dist/lib/node-esm/meta.json +1 -1
  9. package/dist/lib/node-esm/translations.mjs +16 -0
  10. package/dist/lib/node-esm/translations.mjs.map +7 -0
  11. package/dist/types/src/builder.d.ts +27 -2
  12. package/dist/types/src/builder.d.ts.map +1 -1
  13. package/dist/types/src/builder.test.d.ts +2 -0
  14. package/dist/types/src/builder.test.d.ts.map +1 -0
  15. package/dist/types/src/components/ActionLabel.d.ts +3 -3
  16. package/dist/types/src/components/ActionLabel.d.ts.map +1 -1
  17. package/dist/types/src/components/DropdownMenu.d.ts +4 -2
  18. package/dist/types/src/components/DropdownMenu.d.ts.map +1 -1
  19. package/dist/types/src/components/Menu.d.ts +50 -0
  20. package/dist/types/src/components/Menu.d.ts.map +1 -0
  21. package/dist/types/src/components/Menu.stories.d.ts +21 -0
  22. package/dist/types/src/components/Menu.stories.d.ts.map +1 -0
  23. package/dist/types/src/components/Menu.test.d.ts +2 -0
  24. package/dist/types/src/components/Menu.test.d.ts.map +1 -0
  25. package/dist/types/src/components/ToolbarMenu.d.ts +7 -6
  26. package/dist/types/src/components/ToolbarMenu.d.ts.map +1 -1
  27. package/dist/types/src/components/ToolbarMenu.stories.d.ts +4 -3
  28. package/dist/types/src/components/ToolbarMenu.stories.d.ts.map +1 -1
  29. package/dist/types/src/components/index.d.ts +1 -3
  30. package/dist/types/src/components/index.d.ts.map +1 -1
  31. package/dist/types/src/hooks/useMenuActions.d.ts +8 -7
  32. package/dist/types/src/hooks/useMenuActions.d.ts.map +1 -1
  33. package/dist/types/src/index.d.ts +1 -2
  34. package/dist/types/src/index.d.ts.map +1 -1
  35. package/dist/types/src/testing/generator.d.ts +20 -14
  36. package/dist/types/src/testing/generator.d.ts.map +1 -1
  37. package/dist/types/src/translations.d.ts +2 -2
  38. package/dist/types/src/translations.d.ts.map +1 -1
  39. package/dist/types/src/types.d.ts +38 -27
  40. package/dist/types/src/types.d.ts.map +1 -1
  41. package/dist/types/src/util.d.ts +14 -5
  42. package/dist/types/src/util.d.ts.map +1 -1
  43. package/dist/types/tsconfig.tsbuildinfo +1 -1
  44. package/package.json +44 -32
  45. package/src/builder.test.ts +224 -0
  46. package/src/builder.ts +69 -19
  47. package/src/components/ActionLabel.tsx +7 -6
  48. package/src/components/DropdownMenu.tsx +12 -6
  49. package/src/components/Menu.stories.tsx +266 -0
  50. package/src/components/Menu.test.tsx +447 -0
  51. package/src/components/Menu.tsx +348 -0
  52. package/src/components/ToolbarMenu.stories.tsx +39 -31
  53. package/src/components/ToolbarMenu.tsx +140 -90
  54. package/src/components/index.ts +1 -3
  55. package/src/hooks/useMenuActions.ts +30 -53
  56. package/src/index.ts +1 -3
  57. package/src/testing/generator.ts +74 -64
  58. package/src/translations.ts +1 -1
  59. package/src/types.ts +39 -27
  60. package/src/util.ts +34 -15
  61. package/dist/types/src/components/MenuContext.d.ts +0 -13
  62. package/dist/types/src/components/MenuContext.d.ts.map +0 -1
  63. package/src/components/MenuContext.tsx +0 -50
@@ -2,16 +2,17 @@
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';
11
+
12
+ import { translationKey } from '#translations';
10
13
 
11
- import { translationKey } from '../translations';
12
14
  import {
13
15
  type MenuAction,
14
- type MenuActionProperties,
15
16
  type MenuItem,
16
17
  type MenuItemGroup,
17
18
  type MenuMultipleSelectActionGroup,
@@ -19,10 +20,10 @@ import {
19
20
  isMenuGroup,
20
21
  isSeparator,
21
22
  } from '../types';
22
-
23
+ import { executeMenuAction } from '../util';
23
24
  import { ActionLabel, actionLabel } from './ActionLabel';
24
25
  import { DropdownMenu } from './DropdownMenu';
25
- import { type MenuScopedProps, useMenu, useMenuItems } from './MenuContext';
26
+ import { type MenuScopedProps, useMenuItems, useMenuScoped } from './Menu';
26
27
 
27
28
  export type ToolbarMenuDropdownMenuActionGroup = Omit<MenuActionProperties, 'variant' | 'icon'> & {
28
29
  variant: 'dropdownMenu';
@@ -40,7 +41,7 @@ export type ToolbarMenuActionGroupProperties = (
40
41
  ) &
41
42
  (MenuSingleSelectActionGroup | MenuMultipleSelectActionGroup);
42
43
 
43
- export type ToolbarMenuProps = ToolbarRootProps & { textBlockWidth?: boolean };
44
+ export type ToolbarMenuProps = ToolbarRootProps;
44
45
 
45
46
  export type ToolbarMenuActionGroupProps = {
46
47
  group: MenuItemGroup<ToolbarMenuActionGroupProperties>;
@@ -52,37 +53,58 @@ export type ToolbarMenuActionProps = {
52
53
  action: MenuAction;
53
54
  };
54
55
 
55
- const ActionToolbarItem = ({ action, __menuScope }: MenuScopedProps<{ action: MenuAction }>) => {
56
- const { iconSize } = useMenu('ActionToolbarItem', __menuScope);
56
+ const ActionToolbarItem = ({ __menuScope, action }: MenuScopedProps<{ action: MenuAction }>) => {
57
+ const { iconSize, onAction } = useMenuScoped('ActionToolbarItem', __menuScope);
57
58
  const { t } = useTranslation(translationKey);
58
- const handleClick = useCallback(() => action.data?.(), [action]);
59
+
59
60
  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} /> };
61
+ const buttonVariant =
62
+ (action.properties as { variant?: string }).variant === 'primary' ? ('primary' as const) : ('ghost' as const);
64
63
 
65
- return hidden ? null : (
66
- <Root
64
+ const handleClick = useCallback(() => {
65
+ if (onAction) {
66
+ onAction(action, {});
67
+ } else {
68
+ void executeMenuAction(action);
69
+ }
70
+ }, [action, onAction]);
71
+
72
+ const commonProps = {
73
+ variant: buttonVariant,
74
+ disabled,
75
+ classNames,
76
+ onClick: handleClick,
77
+ ...(testId && { 'data-testid': testId }),
78
+ };
79
+
80
+ if (hidden) {
81
+ return null;
82
+ }
83
+
84
+ return icon ? (
85
+ <NaturalToolbar.IconButton
67
86
  key={action.id}
68
- disabled={disabled}
69
- onClick={handleClick}
70
- variant='ghost'
71
- {...(testId && { 'data-testid': testId })}
72
- {...(rootProps as any)}
73
- classNames={classNames}
87
+ {...commonProps}
88
+ icon={icon}
89
+ size={iconSize}
90
+ iconOnly={iconOnly}
91
+ label={actionLabel(action, t)}
74
92
  />
93
+ ) : (
94
+ <NaturalToolbar.Button key={action.id} {...commonProps}>
95
+ <ActionLabel action={action} />
96
+ </NaturalToolbar.Button>
75
97
  );
76
98
  };
77
99
 
78
100
  const DropdownMenuToolbarItem = ({
101
+ __menuScope,
79
102
  group,
80
103
  items: propsItems,
81
- __menuScope,
82
104
  }: MenuScopedProps<ToolbarMenuActionGroupProps>) => {
83
105
  const { iconOnly, disabled, testId } = group.properties;
84
106
  const { t } = useTranslation(translationKey);
85
- const { iconSize } = useMenu('DropdownMenuToolbarItem', __menuScope);
107
+ const { iconSize } = useMenuScoped('DropdownMenuToolbarItem', __menuScope);
86
108
  const items = useMenuItems(group, propsItems, 'DropdownMenuToolbarItem', __menuScope);
87
109
  const activeItem = items?.find((item) => !!(item as MenuAction).properties.checked);
88
110
  const icon =
@@ -93,12 +115,18 @@ const DropdownMenuToolbarItem = ({
93
115
  const Root = icon ? NaturalToolbar.IconButton : NaturalToolbar.Button;
94
116
  const labelAction = (group.properties as any).applyActive && activeItem ? (activeItem as MenuAction) : group;
95
117
  const rootProps = icon
96
- ? { icon, size: iconSize, iconOnly, label: actionLabel(labelAction, t), caretDown: true }
118
+ ? {
119
+ icon,
120
+ size: iconSize,
121
+ iconOnly,
122
+ label: actionLabel(labelAction, t),
123
+ caretDown: true,
124
+ }
97
125
  : {
98
126
  children: (
99
127
  <>
100
128
  <ActionLabel action={labelAction} />
101
- <Icon size={3} icon='ph--caret-down--bold' classNames='mis-1' />
129
+ <Icon size={3} icon='ph--caret-down--bold' classNames='ms-1' />
102
130
  </>
103
131
  ),
104
132
  };
@@ -112,92 +140,114 @@ const DropdownMenuToolbarItem = ({
112
140
  );
113
141
  };
114
142
 
115
- const ToggleGroupItem = ({ group, action, __menuScope }: MenuScopedProps<ToolbarMenuActionProps>) => {
116
- const { iconSize } = useMenu('ToggleGroupItem', __menuScope);
143
+ const ToggleGroupItem = ({ __menuScope, group, action }: MenuScopedProps<ToolbarMenuActionProps>) => {
144
+ const { iconSize, onAction } = useMenuScoped('ToggleGroupItem', __menuScope);
117
145
  const { t } = useTranslation(translationKey);
118
146
  const { icon, iconOnly = true, disabled, testId, hidden, classNames } = action.properties;
119
- const handleClick = useCallback(() => action.data?.({ parent: group }), [action, group]);
120
- const Root = icon ? NaturalToolbar.ToggleGroupIconItem : NaturalToolbar.ToggleGroupItem;
121
- const rootProps = icon
122
- ? { icon, size: iconSize, iconOnly, label: actionLabel(action, t) }
123
- : { children: <ActionLabel action={action} /> };
124
147
 
125
- return hidden ? null : (
126
- <Root
127
- key={action.id}
128
- value={action.id as any}
129
- disabled={disabled}
130
- onClick={handleClick}
131
- variant='ghost'
132
- {...(testId && { 'data-testid': testId })}
133
- {...(rootProps as any)}
134
- classNames={classNames}
148
+ const handleClick = useCallback(() => {
149
+ if (onAction) {
150
+ onAction(action, { parent: group });
151
+ } else {
152
+ void executeMenuAction(action, { parent: group });
153
+ }
154
+ }, [action, group, onAction]);
155
+
156
+ const commonProps = {
157
+ value: action.id,
158
+ disabled,
159
+ variant: 'ghost' as const,
160
+ classNames,
161
+ onClick: handleClick,
162
+ ...(testId && { 'data-testid': testId }),
163
+ };
164
+
165
+ return hidden ? null : icon ? (
166
+ <NaturalToolbar.ToggleGroupIconItem
167
+ {...commonProps}
168
+ icon={icon}
169
+ size={iconSize}
170
+ iconOnly={iconOnly}
171
+ label={actionLabel(action, t)}
135
172
  />
173
+ ) : (
174
+ <NaturalToolbar.ToggleGroupItem {...commonProps}>
175
+ <ActionLabel action={action} />
176
+ </NaturalToolbar.ToggleGroupItem>
136
177
  );
137
178
  };
138
179
 
139
180
  const ToggleGroupToolbarItem = ({
140
- group,
141
- items: propsItems,
142
181
  __menuScope,
182
+ group,
183
+ items: itemsProp,
143
184
  }: MenuScopedProps<ToolbarMenuActionGroupProps>) => {
144
- const items = useMenuItems(group, propsItems, 'ToggleGroupToolbarItem', __menuScope);
145
- const { selectCardinality, value } = group.properties;
146
-
147
- return (
148
- // TODO(thure): Fix.
149
- // @ts-ignore
150
- <NaturalToolbar.ToggleGroup type={selectCardinality} value={value}>
151
- {
152
- // TODO(thure): Handle other menu item types.
153
- (items as MenuAction[]).map((action) => (
154
- <ToggleGroupItem key={action.id} group={group} action={action} />
155
- ))
156
- }
157
- </NaturalToolbar.ToggleGroup>
158
- );
185
+ const items = useMenuItems(group, itemsProp, 'ToggleGroupToolbarItem', __menuScope);
186
+ const { selectCardinality } = group.properties;
187
+
188
+ // TODO(thure): Handle other menu item types.
189
+ const children = (items as MenuAction[]).map((action) => (
190
+ <ToggleGroupItem key={action.id} group={group} action={action} />
191
+ ));
192
+
193
+ if (selectCardinality === 'multiple') {
194
+ return (
195
+ <NaturalToolbar.ToggleGroup type='multiple' value={group.properties.value}>
196
+ {children}
197
+ </NaturalToolbar.ToggleGroup>
198
+ );
199
+ } else {
200
+ return (
201
+ <NaturalToolbar.ToggleGroup type='single' value={group.properties.value}>
202
+ {children}
203
+ </NaturalToolbar.ToggleGroup>
204
+ );
205
+ }
159
206
  };
160
207
 
161
- export const ToolbarMenu = ({
162
- __menuScope,
163
- classNames,
164
- textBlockWidth: wrapContents,
165
- ...props
166
- }: MenuScopedProps<ToolbarMenuProps>) => {
167
- const items = useMenuItems(undefined, undefined, 'ToolbarMenu', __menuScope);
168
- const { attendableId } = useMenu('ToolbarMenu', __menuScope);
169
- const { hasAttention } = useAttention(attendableId);
170
- const InnerRoot = wrapContents ? 'div' : Fragment;
171
- const innerRootProps = wrapContents ? { role: 'none', className: mx(textBlockWidth, toolbarLayout, 'bs-full') } : {};
172
-
173
- return (
174
- <NaturalToolbar.Root
175
- {...props}
176
- layoutManaged={wrapContents}
177
- classNames={[attendableId && !hasAttention && '*:opacity-20 !bg-transparent', classNames]}
178
- >
179
- <InnerRoot {...innerRootProps}>
180
- {items?.map((item: MenuItem, i: number) => (
181
- <ToolbarMenuItem key={item.id ?? i} item={item} />
208
+ export const ToolbarMenu = composable<HTMLDivElement, MenuScopedProps<ToolbarMenuProps>>(
209
+ ({ __menuScope, children, ...props }, forwardedRef) => {
210
+ const items = useMenuItems(undefined, undefined, 'ToolbarMenu', __menuScope);
211
+ const { attendableId, alwaysActive } = useMenuScoped('ToolbarMenu', __menuScope);
212
+ const { hasAttention } = useAttention(attendableId);
213
+
214
+ return (
215
+ <NaturalToolbar.Root
216
+ {...composableProps(props, { classNames: attendableId })}
217
+ disabled={!alwaysActive && !hasAttention}
218
+ ref={forwardedRef}
219
+ >
220
+ {items?.map((item: MenuItem) => (
221
+ <ToolbarMenuItem key={item.id} __menuScope={__menuScope} item={item} />
182
222
  ))}
183
- </InnerRoot>
184
- </NaturalToolbar.Root>
185
- );
186
- };
223
+ {children}
224
+ </NaturalToolbar.Root>
225
+ );
226
+ },
227
+ );
187
228
 
188
- const ToolbarMenuItem = ({ item }: { item: MenuItem }) => {
229
+ const ToolbarMenuItem = ({ __menuScope, item }: MenuScopedProps<{ item: MenuItem }>) => {
189
230
  if (isSeparator(item)) {
190
231
  return <NaturalToolbar.Separator variant={item.properties.variant} />;
191
232
  }
192
233
 
193
- // TODO(thure): Figure out type narrowing that doesn’t require so much use of `as`.
194
234
  if (isMenuGroup(item)) {
195
235
  if (item.properties.variant === 'dropdownMenu') {
196
- return <DropdownMenuToolbarItem group={item as MenuItemGroup<ToolbarMenuActionGroupProperties>} />;
236
+ return (
237
+ <DropdownMenuToolbarItem
238
+ __menuScope={__menuScope}
239
+ group={item as MenuItemGroup<ToolbarMenuActionGroupProperties>}
240
+ />
241
+ );
197
242
  } else {
198
- return <ToggleGroupToolbarItem group={item as MenuItemGroup<ToolbarMenuActionGroupProperties>} />;
243
+ return (
244
+ <ToggleGroupToolbarItem
245
+ __menuScope={__menuScope}
246
+ group={item as MenuItemGroup<ToolbarMenuActionGroupProperties>}
247
+ />
248
+ );
199
249
  }
200
250
  }
201
251
 
202
- return <ActionToolbarItem action={item as MenuAction} />;
252
+ return <ActionToolbarItem __menuScope={__menuScope} action={item as MenuAction} />;
203
253
  };
@@ -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
  {