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

package/dist/lib/node-esm/index.mjs

@@ -1,48 +1,39 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 
-// src/index.ts
-import { rxFromSignal } from "@dxos/app-graph";
-
-// src/components/DropdownMenu.tsx
-import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
-import { useControllableState } from "@radix-ui/react-use-controllable-state";
-import React3, { useCallback } from "react";
-import { Icon, DropdownMenu as NaturalDropdownMenu } from "@dxos/react-ui";
-
-// src/components/ActionLabel.tsx
-import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
-import React from "react";
-import { keySymbols } from "@dxos/keyboard";
-import { toLocalizedString, useTranslation } from "@dxos/react-ui";
-import { descriptionText, mx } from "@dxos/react-ui-theme";
-
-// src/translations.ts
-var translationKey = "react-ui-menu";
-var translations = [
-  {
-    "en-US": {
-      [translationKey]: {}
-    }
-  }
-];
+// src/components/Menu.tsx
+import { Atom, RegistryContext, useAtomValue } from "@effect-atom/atom-react";
+import { createContextScope } from "@radix-ui/react-context";
+import { useControllableState as useControllableState2 } from "@radix-ui/react-use-controllable-state";
+import React4, { createContext, useCallback as useCallback3, useContext, useMemo } from "react";
+import { log } from "@dxos/log";
+import { Icon as Icon3, DropdownMenu as NaturalDropdownMenu2 } from "@dxos/react-ui";
 
 // src/util.ts
-import { ACTION_GROUP_TYPE, ACTION_TYPE, actionGroupSymbol } from "@dxos/app-graph";
+import * as Effect from "effect/Effect";
+import { Node } from "@dxos/app-graph";
+import { runAndForwardErrors } from "@dxos/effect";
 import { getHostPlatform } from "@dxos/util";
+var executeMenuAction = async (action, params = {}) => {
+  let effect = action.data(params);
+  if (action._actionContext) {
+    effect = effect.pipe(Effect.provide(action._actionContext));
+  }
+  await runAndForwardErrors(effect);
+};
 var getShortcut = (action) => {
   return typeof action.properties?.keyBinding === "string" ? action.properties.keyBinding : action.properties?.keyBinding?.[getHostPlatform()];
 };
 var createMenuAction = (id, invoke, properties) => ({
   id,
-  type: ACTION_TYPE,
+  type: Node.ActionType,
   properties,
-  data: invoke
+  data: () => Effect.sync(invoke)
 });
 var createMenuItemGroup = (id, properties) => ({
   id,
-  type: ACTION_GROUP_TYPE,
+  type: Node.ActionGroupType,
   properties,
-  data: actionGroupSymbol
+  data: Node.actionGroupSymbol
 });
 var createGapSeparator = (id = "gap", source = "root") => ({
   nodes: [
@@ -58,7 +49,8 @@ var createGapSeparator = (id = "gap", source = "root") => ({
   edges: [
     {
       source,
-      target: id
+      target: id,
+      relation: "child"
     }
   ]
 });
@@ -76,128 +68,109 @@ var createLineSeparator = (id = "line", source = "root") => ({
   edges: [
     {
       source,
-      target: id
+      target: id,
+      relation: "child"
     }
   ]
 });
 
 // src/components/ActionLabel.tsx
+import React from "react";
+import { keySymbols } from "@dxos/keyboard";
+import { toLocalizedString, useTranslation } from "@dxos/react-ui";
+import { mx } from "@dxos/ui-theme";
+import { translationKey } from "#translations";
 var ActionLabel = ({ action }) => {
-  var _effect = _useSignals();
-  try {
-    const { t } = useTranslation(translationKey);
-    const shortcut = getShortcut(action);
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("span", {
-      className: "grow truncate"
-    }, toLocalizedString(action.properties.label, t)), shortcut && /* @__PURE__ */ React.createElement("span", {
-      className: mx("shrink-0", descriptionText)
-    }, keySymbols(shortcut).join("")));
-  } finally {
-    _effect.f();
-  }
+  const { t } = useTranslation(translationKey);
+  const shortcut = getShortcut(action);
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("span", {
+    className: "grow truncate"
+  }, toLocalizedString(action.properties.label, t)), shortcut && /* @__PURE__ */ React.createElement("span", {
+    className: mx("shrink-0", "text-description")
+  }, keySymbols(shortcut).join("")));
 };
 var actionLabel = (action, t) => {
   const shortcut = getShortcut(action);
   return `${toLocalizedString(action.properties.label, t)}${shortcut ? ` (${keySymbols(shortcut).join("")})` : ""}`;
 };
 
-// src/components/MenuContext.tsx
-import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
-import { createContextScope } from "@radix-ui/react-context";
-import React2, { useMemo } from "react";
-var MENU_NAME = "GraphMenu";
-var [createMenuContext, createMenuScope] = createContextScope(MENU_NAME, []);
-var [MenuContextProvider, useMenu] = createMenuContext(MENU_NAME);
-var menuContextDefaults = {
-  iconSize: 5,
-  useGroupItems: () => null
-};
-var useMenuScope = createMenuScope();
-var MenuProvider = ({ children, useGroupItems = menuContextDefaults.useGroupItems, iconSize = menuContextDefaults.iconSize, attendableId }) => {
-  var _effect = _useSignals2();
-  try {
-    const { scope } = useMenuScope(void 0);
-    return /* @__PURE__ */ React2.createElement(MenuContextProvider, {
-      useGroupItems,
-      iconSize,
-      attendableId,
-      scope
-    }, children);
-  } finally {
-    _effect.f();
-  }
-};
-var useMenuItems = (group, propsItems, consumerName = "useMenuItemConsumer", __menuScope) => {
-  const { useGroupItems } = useMenu(consumerName, __menuScope);
-  const groupItems = useGroupItems(group);
-  return useMemo(() => propsItems ?? groupItems ?? void 0, [
-    propsItems,
-    groupItems
-  ]);
-};
+// src/components/ToolbarMenu.tsx
+import React3, { useCallback as useCallback2 } from "react";
+import { Icon as Icon2, Toolbar as NaturalToolbar, useTranslation as useTranslation2 } from "@dxos/react-ui";
+import { useAttention } from "@dxos/react-ui-attention";
+import { composable, composableProps } from "@dxos/ui-theme";
+import { translationKey as translationKey2 } from "#translations";
+
+// src/types.ts
+import { Node as Node2 } from "@dxos/app-graph";
+var MenuSeparatorType = "@dxos/react-ui-toolbar/separator";
+var isSeparator = (node) => node.type === MenuSeparatorType;
+var isMenuGroup = (node) => node.type === Node2.ActionGroupType;
 
 // src/components/DropdownMenu.tsx
+import { useControllableState } from "@radix-ui/react-use-controllable-state";
+import React2, { useCallback } from "react";
+import { Icon, DropdownMenu as NaturalDropdownMenu } from "@dxos/react-ui";
 var DropdownMenuItem = ({ item, onClick, __menuScope }) => {
-  var _effect = _useSignals3();
-  try {
-    const action = item;
-    const handleClick = useCallback((event) => onClick(action, event), [
-      action,
-      onClick
-    ]);
-    const { iconSize } = useMenu("DropdownMenuItem", __menuScope);
-    return /* @__PURE__ */ React3.createElement(NaturalDropdownMenu.Item, {
-      onClick: handleClick,
-      classNames: "gap-2",
-      disabled: action.properties?.disabled,
-      ...action.properties?.testId && {
-        "data-testid": action.properties.testId
-      }
-    }, action.properties?.icon && /* @__PURE__ */ React3.createElement(Icon, {
-      icon: action.properties.icon,
-      size: iconSize
-    }), /* @__PURE__ */ React3.createElement(ActionLabel, {
-      action
-    }));
-  } finally {
-    _effect.f();
-  }
+  const action = item;
+  const handleClick = useCallback((event) => onClick(action, event), [
+    action,
+    onClick
+  ]);
+  const { iconSize } = useMenuScoped("DropdownMenuItem", __menuScope);
+  return /* @__PURE__ */ React2.createElement(NaturalDropdownMenu.Item, {
+    onClick: handleClick,
+    classNames: "gap-2",
+    disabled: action.properties?.disabled,
+    ...action.properties?.testId && {
+      "data-testid": action.properties.testId
+    }
+  }, action.properties?.icon && /* @__PURE__ */ React2.createElement(Icon, {
+    icon: action.properties.icon,
+    size: iconSize
+  }), /* @__PURE__ */ React2.createElement(ActionLabel, {
+    action
+  }));
 };
 var DropdownMenuRoot = ({ items: propsItems, group, open, defaultOpen, onOpenChange, caller, children, __menuScope, ...naturalProps }) => {
-  var _effect = _useSignals3();
-  try {
-    const [optionsMenuOpen, setOptionsMenuOpen] = useControllableState({
-      prop: open,
-      defaultProp: defaultOpen,
-      onChange: onOpenChange
-    });
-    const handleActionClick = useCallback((action, event) => {
-      if (action.properties?.disabled) {
-        return;
-      }
-      event.stopPropagation();
-      setOptionsMenuOpen(false);
-      void action.data?.({
+  const [optionsMenuOpen, setOptionsMenuOpen] = useControllableState({
+    prop: open,
+    defaultProp: defaultOpen,
+    onChange: onOpenChange
+  });
+  const { onAction } = useMenuScoped("DropdownMenuRoot", __menuScope);
+  const handleActionClick = useCallback((action, event) => {
+    if (action.properties?.disabled) {
+      return;
+    }
+    event.stopPropagation();
+    setOptionsMenuOpen(false);
+    if (onAction) {
+      onAction(action, {
         parent: group,
         caller
       });
-    }, [
-      group,
-      caller
-    ]);
-    const items = useMenuItems(group, propsItems);
-    return /* @__PURE__ */ React3.createElement(NaturalDropdownMenu.Root, {
-      open: optionsMenuOpen,
-      onOpenChange: setOptionsMenuOpen,
-      ...naturalProps
-    }, children, /* @__PURE__ */ React3.createElement(NaturalDropdownMenu.Portal, null, /* @__PURE__ */ React3.createElement(NaturalDropdownMenu.Content, null, /* @__PURE__ */ React3.createElement(NaturalDropdownMenu.Viewport, null, items?.map((item) => /* @__PURE__ */ React3.createElement(DropdownMenuItem, {
-      key: item.id,
-      item,
-      onClick: handleActionClick
-    }))), /* @__PURE__ */ React3.createElement(NaturalDropdownMenu.Arrow, null))));
-  } finally {
-    _effect.f();
-  }
+    } else {
+      void executeMenuAction(action, {
+        parent: group,
+        caller
+      });
+    }
+  }, [
+    group,
+    caller,
+    onAction
+  ]);
+  const items = useMenuItems(group, propsItems);
+  return /* @__PURE__ */ React2.createElement(NaturalDropdownMenu.Root, {
+    open: optionsMenuOpen,
+    onOpenChange: setOptionsMenuOpen,
+    ...naturalProps
+  }, children, /* @__PURE__ */ React2.createElement(NaturalDropdownMenu.Portal, null, /* @__PURE__ */ React2.createElement(NaturalDropdownMenu.Content, null, /* @__PURE__ */ React2.createElement(NaturalDropdownMenu.Viewport, null, items?.map((item) => /* @__PURE__ */ React2.createElement(DropdownMenuItem, {
+    key: item.id,
+    item,
+    onClick: handleActionClick
+  }))), /* @__PURE__ */ React2.createElement(NaturalDropdownMenu.Arrow, null))));
 };
 var DropdownMenu = {
   Root: DropdownMenuRoot,
@@ -206,320 +179,436 @@ var DropdownMenu = {
 };
 
 // src/components/ToolbarMenu.tsx
-import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
-import React4, { Fragment, useCallback as useCallback2 } from "react";
-import { Icon as Icon2, Toolbar as NaturalToolbar, useTranslation as useTranslation2 } from "@dxos/react-ui";
-import { useAttention } from "@dxos/react-ui-attention";
-import { mx as mx2, textBlockWidth, toolbarLayout } from "@dxos/react-ui-theme";
-
-// src/types.ts
-import { ACTION_GROUP_TYPE as ACTION_GROUP_TYPE2 } from "@dxos/app-graph";
-var MenuSeparatorType = "@dxos/react-ui-toolbar/separator";
-var isSeparator = (node) => node.type === MenuSeparatorType;
-var isMenuGroup = (node) => node.type === ACTION_GROUP_TYPE2;
-
-// src/components/ToolbarMenu.tsx
-var ActionToolbarItem = ({ action, __menuScope }) => {
-  var _effect = _useSignals4();
-  try {
-    const { iconSize } = useMenu("ActionToolbarItem", __menuScope);
-    const { t } = useTranslation2(translationKey);
-    const handleClick = useCallback2(() => action.data?.(), [
-      action
-    ]);
-    const { icon, iconOnly = true, disabled, testId, hidden, classNames } = action.properties;
-    const Root = icon ? NaturalToolbar.IconButton : NaturalToolbar.Button;
-    const rootProps = icon ? {
-      icon,
-      size: iconSize,
-      iconOnly,
-      label: actionLabel(action, t)
-    } : {
-      children: /* @__PURE__ */ React4.createElement(ActionLabel, {
-        action
-      })
-    };
-    return hidden ? null : /* @__PURE__ */ React4.createElement(Root, {
-      key: action.id,
-      disabled,
-      onClick: handleClick,
-      variant: "ghost",
-      ...testId && {
-        "data-testid": testId
-      },
-      ...rootProps,
-      classNames
-    });
-  } finally {
-    _effect.f();
+var ActionToolbarItem = ({ __menuScope, action }) => {
+  const { iconSize, onAction } = useMenuScoped("ActionToolbarItem", __menuScope);
+  const { t } = useTranslation2(translationKey2);
+  const { icon, iconOnly = true, disabled, testId, hidden, classNames } = action.properties;
+  const buttonVariant = action.properties.variant === "primary" ? "primary" : "ghost";
+  const handleClick = useCallback2(() => {
+    if (onAction) {
+      onAction(action, {});
+    } else {
+      void executeMenuAction(action);
+    }
+  }, [
+    action,
+    onAction
+  ]);
+  const commonProps = {
+    variant: buttonVariant,
+    disabled,
+    classNames,
+    onClick: handleClick,
+    ...testId && {
+      "data-testid": testId
+    }
+  };
+  if (hidden) {
+    return null;
   }
+  return icon ? /* @__PURE__ */ React3.createElement(NaturalToolbar.IconButton, {
+    key: action.id,
+    ...commonProps,
+    icon,
+    size: iconSize,
+    iconOnly,
+    label: actionLabel(action, t)
+  }) : /* @__PURE__ */ React3.createElement(NaturalToolbar.Button, {
+    key: action.id,
+    ...commonProps
+  }, /* @__PURE__ */ React3.createElement(ActionLabel, {
+    action
+  }));
+};
+var DropdownMenuToolbarItem = ({ __menuScope, group, items: propsItems }) => {
+  const { iconOnly, disabled, testId } = group.properties;
+  const { t } = useTranslation2(translationKey2);
+  const { iconSize } = useMenuScoped("DropdownMenuToolbarItem", __menuScope);
+  const items = useMenuItems(group, propsItems, "DropdownMenuToolbarItem", __menuScope);
+  const activeItem = items?.find((item) => !!item.properties.checked);
+  const icon = group.properties.applyActive && // TODO(thure): Handle other menu item types.
+  activeItem?.properties.icon || group.properties.icon;
+  const Root = icon ? NaturalToolbar.IconButton : NaturalToolbar.Button;
+  const labelAction = group.properties.applyActive && activeItem ? activeItem : group;
+  const rootProps = icon ? {
+    icon,
+    size: iconSize,
+    iconOnly,
+    label: actionLabel(labelAction, t),
+    caretDown: true
+  } : {
+    children: /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(ActionLabel, {
+      action: labelAction
+    }), /* @__PURE__ */ React3.createElement(Icon2, {
+      size: 3,
+      icon: "ph--caret-down--bold",
+      classNames: "ms-1"
+    }))
+  };
+  return /* @__PURE__ */ React3.createElement(DropdownMenu.Root, {
+    group,
+    items
+  }, /* @__PURE__ */ React3.createElement(DropdownMenu.Trigger, {
+    asChild: true
+  }, /* @__PURE__ */ React3.createElement(Root, {
+    variant: "ghost",
+    disabled,
+    ...rootProps,
+    ...testId && {
+      "data-testid": testId
+    }
+  })));
 };
-var DropdownMenuToolbarItem = ({ group, items: propsItems, __menuScope }) => {
-  var _effect = _useSignals4();
-  try {
-    const { iconOnly, disabled, testId } = group.properties;
-    const { t } = useTranslation2(translationKey);
-    const { iconSize } = useMenu("DropdownMenuToolbarItem", __menuScope);
-    const items = useMenuItems(group, propsItems, "DropdownMenuToolbarItem", __menuScope);
-    const activeItem = items?.find((item) => !!item.properties.checked);
-    const icon = group.properties.applyActive && // TODO(thure): Handle other menu item types.
-    activeItem?.properties.icon || group.properties.icon;
-    const Root = icon ? NaturalToolbar.IconButton : NaturalToolbar.Button;
-    const labelAction = group.properties.applyActive && activeItem ? activeItem : group;
-    const rootProps = icon ? {
-      icon,
-      size: iconSize,
-      iconOnly,
-      label: actionLabel(labelAction, t),
-      caretDown: true
-    } : {
-      children: /* @__PURE__ */ React4.createElement(React4.Fragment, null, /* @__PURE__ */ React4.createElement(ActionLabel, {
-        action: labelAction
-      }), /* @__PURE__ */ React4.createElement(Icon2, {
-        size: 3,
-        icon: "ph--caret-down--bold",
-        classNames: "mis-1"
-      }))
-    };
-    return /* @__PURE__ */ React4.createElement(DropdownMenu.Root, {
-      group,
-      items
-    }, /* @__PURE__ */ React4.createElement(DropdownMenu.Trigger, {
-      asChild: true
-    }, /* @__PURE__ */ React4.createElement(Root, {
-      variant: "ghost",
-      disabled,
-      ...rootProps,
-      ...testId && {
-        "data-testid": testId
-      }
-    })));
-  } finally {
-    _effect.f();
+var ToggleGroupItem = ({ __menuScope, group, action }) => {
+  const { iconSize, onAction } = useMenuScoped("ToggleGroupItem", __menuScope);
+  const { t } = useTranslation2(translationKey2);
+  const { icon, iconOnly = true, disabled, testId, hidden, classNames } = action.properties;
+  const handleClick = useCallback2(() => {
+    if (onAction) {
+      onAction(action, {
+        parent: group
+      });
+    } else {
+      void executeMenuAction(action, {
+        parent: group
+      });
+    }
+  }, [
+    action,
+    group,
+    onAction
+  ]);
+  const commonProps = {
+    value: action.id,
+    disabled,
+    variant: "ghost",
+    classNames,
+    onClick: handleClick,
+    ...testId && {
+      "data-testid": testId
+    }
+  };
+  return hidden ? null : icon ? /* @__PURE__ */ React3.createElement(NaturalToolbar.ToggleGroupIconItem, {
+    ...commonProps,
+    icon,
+    size: iconSize,
+    iconOnly,
+    label: actionLabel(action, t)
+  }) : /* @__PURE__ */ React3.createElement(NaturalToolbar.ToggleGroupItem, commonProps, /* @__PURE__ */ React3.createElement(ActionLabel, {
+    action
+  }));
+};
+var ToggleGroupToolbarItem = ({ __menuScope, group, items: itemsProp }) => {
+  const items = useMenuItems(group, itemsProp, "ToggleGroupToolbarItem", __menuScope);
+  const { selectCardinality } = group.properties;
+  const children = items.map((action) => /* @__PURE__ */ React3.createElement(ToggleGroupItem, {
+    key: action.id,
+    group,
+    action
+  }));
+  if (selectCardinality === "multiple") {
+    return /* @__PURE__ */ React3.createElement(NaturalToolbar.ToggleGroup, {
+      type: "multiple",
+      value: group.properties.value
+    }, children);
+  } else {
+    return /* @__PURE__ */ React3.createElement(NaturalToolbar.ToggleGroup, {
+      type: "single",
+      value: group.properties.value
+    }, children);
   }
 };
-var ToggleGroupItem = ({ group, action, __menuScope }) => {
-  var _effect = _useSignals4();
-  try {
-    const { iconSize } = useMenu("ToggleGroupItem", __menuScope);
-    const { t } = useTranslation2(translationKey);
-    const { icon, iconOnly = true, disabled, testId, hidden, classNames } = action.properties;
-    const handleClick = useCallback2(() => action.data?.({
-      parent: group
-    }), [
-      action,
-      group
-    ]);
-    const Root = icon ? NaturalToolbar.ToggleGroupIconItem : NaturalToolbar.ToggleGroupItem;
-    const rootProps = icon ? {
-      icon,
-      size: iconSize,
-      iconOnly,
-      label: actionLabel(action, t)
-    } : {
-      children: /* @__PURE__ */ React4.createElement(ActionLabel, {
-        action
-      })
-    };
-    return hidden ? null : /* @__PURE__ */ React4.createElement(Root, {
-      key: action.id,
-      value: action.id,
-      disabled,
-      onClick: handleClick,
-      variant: "ghost",
-      ...testId && {
-        "data-testid": testId
-      },
-      ...rootProps,
-      classNames
+var ToolbarMenu = composable(({ __menuScope, children, ...props }, forwardedRef) => {
+  const items = useMenuItems(void 0, void 0, "ToolbarMenu", __menuScope);
+  const { attendableId, alwaysActive } = useMenuScoped("ToolbarMenu", __menuScope);
+  const { hasAttention } = useAttention(attendableId);
+  return /* @__PURE__ */ React3.createElement(NaturalToolbar.Root, {
+    ...composableProps(props, {
+      classNames: attendableId
+    }),
+    disabled: !alwaysActive && !hasAttention,
+    ref: forwardedRef
+  }, items?.map((item) => /* @__PURE__ */ React3.createElement(ToolbarMenuItem, {
+    key: item.id,
+    __menuScope,
+    item
+  })), children);
+});
+var ToolbarMenuItem = ({ __menuScope, item }) => {
+  if (isSeparator(item)) {
+    return /* @__PURE__ */ React3.createElement(NaturalToolbar.Separator, {
+      variant: item.properties.variant
     });
-  } finally {
-    _effect.f();
   }
+  if (isMenuGroup(item)) {
+    if (item.properties.variant === "dropdownMenu") {
+      return /* @__PURE__ */ React3.createElement(DropdownMenuToolbarItem, {
+        __menuScope,
+        group: item
+      });
+    } else {
+      return /* @__PURE__ */ React3.createElement(ToggleGroupToolbarItem, {
+        __menuScope,
+        group: item
+      });
+    }
+  }
+  return /* @__PURE__ */ React3.createElement(ActionToolbarItem, {
+    __menuScope,
+    action: item
+  });
 };
-var ToggleGroupToolbarItem = ({ group, items: propsItems, __menuScope }) => {
-  var _effect = _useSignals4();
-  try {
-    const items = useMenuItems(group, propsItems, "ToggleGroupToolbarItem", __menuScope);
-    const { selectCardinality, value } = group.properties;
-    return (
-      // TODO(thure): Fix.
-      // @ts-ignore
-      /* @__PURE__ */ React4.createElement(
-        NaturalToolbar.ToggleGroup,
-        {
-          type: selectCardinality,
-          value
-        },
-        // TODO(thure): Handle other menu item types.
-        items.map((action) => /* @__PURE__ */ React4.createElement(ToggleGroupItem, {
-          key: action.id,
-          group,
-          action
-        }))
-      )
-    );
-  } finally {
-    _effect.f();
+
+// src/components/Menu.tsx
+var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-menu/src/components/Menu.tsx";
+var MENU_NAME = "Menu";
+var [createMenuContext, createMenuScope] = createContextScope(MENU_NAME, []);
+var nullItemsAtom = Atom.make(null);
+var defaultItemsAccessor = () => nullItemsAtom;
+var menuContextDefaults = {
+  iconSize: 5,
+  items: defaultItemsAccessor,
+  onAction: void 0,
+  menuItemsAtom: Atom.make(/* @__PURE__ */ new Map()),
+  addMenuItems: () => {
+  },
+  removeMenuItems: () => {
   }
 };
-var ToolbarMenu = ({ __menuScope, classNames, textBlockWidth: wrapContents, ...props }) => {
-  var _effect = _useSignals4();
-  try {
-    const items = useMenuItems(void 0, void 0, "ToolbarMenu", __menuScope);
-    const { attendableId } = useMenu("ToolbarMenu", __menuScope);
-    const { hasAttention } = useAttention(attendableId);
-    const InnerRoot = wrapContents ? "div" : Fragment;
-    const innerRootProps = wrapContents ? {
-      role: "none",
-      className: mx2(textBlockWidth, toolbarLayout, "bs-full")
-    } : {};
-    return /* @__PURE__ */ React4.createElement(NaturalToolbar.Root, {
-      ...props,
-      layoutManaged: wrapContents,
-      classNames: [
-        attendableId && !hasAttention && "*:opacity-20 !bg-transparent",
-        classNames
-      ]
-    }, /* @__PURE__ */ React4.createElement(InnerRoot, innerRootProps, items?.map((item, i) => /* @__PURE__ */ React4.createElement(ToolbarMenuItem, {
-      key: item.id ?? i,
-      item
-    }))));
-  } finally {
-    _effect.f();
+var [MenuContextProvider, useMenuScoped] = createMenuContext(MENU_NAME, menuContextDefaults);
+var useMenuScope = createMenuScope();
+var MenuDropdownContext = /* @__PURE__ */ createContext({
+  closeMenu: () => {
   }
+});
+var DEFAULT_PRIORITY = 100;
+var sortMenuItems = (items) => [
+  ...items
+].sort((a, b) => {
+  if (a.priority !== b.priority) {
+    return a.priority - b.priority;
+  }
+  return a.id.localeCompare(b.id);
+});
+var MenuProvider = ({ children, items = menuContextDefaults.items, iconSize = menuContextDefaults.iconSize, attendableId, alwaysActive, onAction }) => {
+  const { scope } = useMenuScope(void 0);
+  const registry = useContext(RegistryContext);
+  const menuItemsAtom = useMemo(() => Atom.make(/* @__PURE__ */ new Map()).pipe(Atom.keepAlive), []);
+  const addMenuItems = useCallback3((props) => {
+    const priority = props.priority ?? DEFAULT_PRIORITY;
+    const prev = registry.get(menuItemsAtom);
+    const next = new Map(prev);
+    next.set(props.id, {
+      ...props,
+      priority
+    });
+    registry.set(menuItemsAtom, next);
+  }, [
+    registry,
+    menuItemsAtom
+  ]);
+  const removeMenuItems = useCallback3((id) => {
+    const prev = registry.get(menuItemsAtom);
+    const next = new Map(prev);
+    next.delete(id);
+    registry.set(menuItemsAtom, next);
+  }, [
+    registry,
+    menuItemsAtom
+  ]);
+  return /* @__PURE__ */ React4.createElement(MenuContextProvider, {
+    items,
+    iconSize,
+    attendableId,
+    alwaysActive,
+    menuItemsAtom,
+    addMenuItems,
+    removeMenuItems,
+    onAction,
+    scope
+  }, children);
 };
-var ToolbarMenuItem = ({ item }) => {
-  var _effect = _useSignals4();
-  try {
-    if (isSeparator(item)) {
-      return /* @__PURE__ */ React4.createElement(NaturalToolbar.Separator, {
-        variant: item.properties.variant
-      });
-    }
-    if (isMenuGroup(item)) {
-      if (item.properties.variant === "dropdownMenu") {
-        return /* @__PURE__ */ React4.createElement(DropdownMenuToolbarItem, {
-          group: item
-        });
-      } else {
-        return /* @__PURE__ */ React4.createElement(ToggleGroupToolbarItem, {
-          group: item
-        });
-      }
+var resolveItems = (baseItems, group, entries) => {
+  const applicable = [
+    ...entries.values()
+  ].filter((entry) => !entry.groupFilter || entry.groupFilter(group));
+  if (applicable.length === 0) {
+    return baseItems;
+  }
+  const sorted = sortMenuItems(applicable);
+  const replacements = sorted.filter((entry) => entry.mode === "replacement");
+  if (replacements.length > 0) {
+    if (replacements.length > 1) {
+      log.warn("multiple replacement entries found", {
+        ids: replacements.map((r) => r.id).join(", "),
+        using: replacements[0].id
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 94, S: void 0 });
     }
-    return /* @__PURE__ */ React4.createElement(ActionToolbarItem, {
-      action: item
-    });
-  } finally {
-    _effect.f();
+    return replacements[0].items;
+  }
+  const additive = sorted.filter((entry) => entry.mode === "additive");
+  const additiveItems = additive.flatMap((entry) => entry.items);
+  if (!baseItems || baseItems.length === 0) {
+    return additiveItems.length > 0 ? additiveItems : null;
   }
+  return [
+    ...baseItems,
+    ...additiveItems
+  ];
 };
-
-// src/hooks/useMenuActions.ts
-import { RegistryContext, useRxValue } from "@effect-rx/rx-react";
-import { useCallback as useCallback3, useContext, useEffect, useState } from "react";
-import { Graph, ROOT_ID } from "@dxos/app-graph";
-var edgesArrayToRecord = (edges) => {
-  return Object.fromEntries(Object.entries(edges.reduce((acc, { source, target }) => {
-    if (!acc[source]) {
-      acc[source] = {
-        inbound: [],
-        outbound: []
-      };
+var useMenuItems = (group, propsItems, consumerName = "useMenuItemConsumer", __menuScope) => {
+  const { items, menuItemsAtom } = useMenuScoped(consumerName, __menuScope);
+  const groupItems = useAtomValue(items(group));
+  const entries = useAtomValue(menuItemsAtom) ?? /* @__PURE__ */ new Map();
+  const baseItems = useMemo(() => propsItems ?? groupItems ?? null, [
+    propsItems,
+    groupItems
+  ]);
+  const resolved = useMemo(() => resolveItems(baseItems, group, entries), [
+    baseItems,
+    group,
+    entries
+  ]);
+  return resolved ?? void 0;
+};
+var useMenu = (consumerName) => {
+  return useMenuScoped(consumerName, void 0);
+};
+var MenuRoot = ({ children, open, defaultOpen, onOpenChange, caller, ...props }) => {
+  const [menuOpen, setMenuOpen] = useControllableState2({
+    prop: open,
+    defaultProp: defaultOpen,
+    onChange: onOpenChange
+  });
+  const closeMenu = useCallback3(() => setMenuOpen(false), [
+    setMenuOpen
+  ]);
+  return /* @__PURE__ */ React4.createElement(MenuProvider, props, /* @__PURE__ */ React4.createElement(MenuDropdownContext.Provider, {
+    value: {
+      closeMenu,
+      caller
     }
-    if (!acc[target]) {
-      acc[target] = {
-        inbound: [],
-        outbound: []
-      };
+  }, /* @__PURE__ */ React4.createElement(NaturalDropdownMenu2.Root, {
+    open: menuOpen,
+    onOpenChange: setMenuOpen
+  }, children)));
+};
+var MenuContentItem = ({ item, onClick, __menuScope }) => {
+  const action = item;
+  const handleClick = useCallback3((event) => onClick(action, event), [
+    action,
+    onClick
+  ]);
+  const { iconSize } = useMenuScoped("MenuContentItem", __menuScope);
+  return /* @__PURE__ */ React4.createElement(NaturalDropdownMenu2.Item, {
+    onClick: handleClick,
+    classNames: "gap-2",
+    disabled: action.properties?.disabled,
+    ...action.properties?.testId && {
+      "data-testid": action.properties.testId
     }
-    const sourceEdges = acc[source];
-    if (!sourceEdges.outbound.includes(target)) {
-      sourceEdges.outbound.push(target);
+  }, action.properties?.icon && /* @__PURE__ */ React4.createElement(Icon3, {
+    icon: action.properties.icon,
+    size: iconSize
+  }), /* @__PURE__ */ React4.createElement(ActionLabel, {
+    action
+  }));
+};
+var MenuContent = ({ group, items: propsItems, caller: callerOverride, __menuScope }) => {
+  const { closeMenu, caller: contextCaller } = useContext(MenuDropdownContext);
+  const caller = callerOverride ?? contextCaller;
+  const { onAction } = useMenuScoped("MenuContent", __menuScope);
+  const resolvedItems = useMenuItems(group, propsItems, "MenuContent", __menuScope);
+  const handleActionClick = useCallback3((action, event) => {
+    if (action.properties?.disabled) {
+      return;
     }
-    const targetEdges = acc[target];
-    if (!targetEdges.inbound.includes(source)) {
-      targetEdges.inbound.push(source);
+    event.stopPropagation();
+    closeMenu();
+    if (onAction) {
+      onAction(action, {
+        parent: group,
+        caller
+      });
+    } else {
+      void executeMenuAction(action, {
+        parent: group,
+        caller
+      });
     }
-    return acc;
-  }, {})));
+  }, [
+    group,
+    caller,
+    onAction,
+    closeMenu
+  ]);
+  return /* @__PURE__ */ React4.createElement(NaturalDropdownMenu2.Portal, null, /* @__PURE__ */ React4.createElement(NaturalDropdownMenu2.Content, null, /* @__PURE__ */ React4.createElement(NaturalDropdownMenu2.Viewport, null, resolvedItems?.map((item) => /* @__PURE__ */ React4.createElement(MenuContentItem, {
+    key: item.id,
+    item,
+    onClick: handleActionClick
+  }))), /* @__PURE__ */ React4.createElement(NaturalDropdownMenu2.Arrow, null)));
+};
+var Menu = {
+  Root: MenuRoot,
+  Trigger: NaturalDropdownMenu2.Trigger,
+  Content: MenuContent,
+  VirtualTrigger: NaturalDropdownMenu2.VirtualTrigger,
+  Toolbar: ToolbarMenu
 };
+
+// src/hooks/useMenuActions.ts
+import { RegistryContext as RegistryContext2, useAtomValue as useAtomValue2 } from "@effect-atom/atom-react";
+import { useCallback as useCallback4, useContext as useContext2, useMemo as useMemo2 } from "react";
+import { Graph, Node as Node3 } from "@dxos/app-graph";
 var useMenuActions = (props) => {
-  const registry = useContext(RegistryContext);
-  const menuGraphProps = useRxValue(props);
-  const [graph] = useState(new Graph({
-    registry,
-    nodes: menuGraphProps.nodes,
-    edges: edgesArrayToRecord(menuGraphProps.edges)
-  }));
-  useEffect(() => {
-    graph.addNodes(menuGraphProps.nodes);
-    graph.addEdges(menuGraphProps.edges);
+  const registry = useContext2(RegistryContext2);
+  const menuGraphProps = useAtomValue2(props);
+  const graph = useMemo2(() => {
+    const newGraph = Graph.make({
+      registry
+    });
+    newGraph.pipe(Graph.addNodes(menuGraphProps.nodes), Graph.addEdges(menuGraphProps.edges));
+    return newGraph;
   }, [
+    registry,
     menuGraphProps
   ]);
-  const useGroupItems = useCallback3((sourceNode) => {
-    const items = useRxValue(graph.connections(sourceNode?.id || ROOT_ID));
-    return items;
+  const items = useCallback4((group) => {
+    return graph.connections(group?.id || Node3.RootId, "child");
   }, [
     graph
   ]);
   return {
-    useGroupItems
+    items
   };
 };
 
 // src/builder.ts
 import { invariant } from "@dxos/invariant";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-menu/src/builder.ts";
-var MenuBuilder = Object.freeze({
-  make: () => new MenuBuilderImpl({
-    nodes: [],
-    edges: []
-  }, "root")
-});
+var __dxlog_file2 = "/__w/dxos/dxos/packages/ui/react-ui-menu/src/builder.ts";
 var MenuBuilderImpl = class _MenuBuilderImpl {
+  _data;
+  _rootId;
+  _separatorCount = 0;
+  constructor(_data, _rootId) {
+    this._data = _data;
+    this._rootId = _rootId;
+  }
   root(props) {
-    invariant(this._rootId === "root", "Root group can only be at the top level", {
-      F: __dxlog_file,
-      L: 36,
-      S: this,
-      A: [
-        "this._rootId === 'root'",
-        "'Root group can only be at the top level'"
-      ]
-    });
-    invariant(this._data.nodes.find((node) => node.id === "root") === void 0, "Root group can only be created once", {
-      F: __dxlog_file,
-      L: 37,
-      S: this,
-      A: [
-        "this._data.nodes.find((node) => node.id === 'root') === undefined",
-        "'Root group can only be created once'"
-      ]
-    });
+    invariant(this._rootId === "root", "Root group can only be at the top level", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 16, S: this, A: ["this._rootId === 'root'", "'Root group can only be at the top level'"] });
+    invariant(this._data.nodes.find((node) => node.id === "root") === void 0, "Root group can only be created once", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 17, S: this, A: ["this._data.nodes.find((node)=>node.id === 'root') === undefined", "'Root group can only be created once'"] });
     this._data.nodes.push(createMenuItemGroup("root", props));
     return this;
   }
+  build() {
+    return this._data;
+  }
   action(id, props, invoke) {
     this._data.nodes.push(createMenuAction(id, invoke, props));
     this._data.edges.push({
       source: this._rootId,
-      target: id
+      target: id,
+      relation: "child"
     });
     return this;
   }
@@ -527,38 +616,62 @@ var MenuBuilderImpl = class _MenuBuilderImpl {
     this._data.nodes.push(createMenuItemGroup(id, props));
     this._data.edges.push({
       source: this._rootId,
-      target: id
+      target: id,
+      relation: "child"
     });
     cb(new _MenuBuilderImpl(this._data, id));
     return this;
   }
-  build() {
-    return this._data;
+  subgraph(subgraphOrCb) {
+    if (!subgraphOrCb) {
+      return this;
+    }
+    if (typeof subgraphOrCb === "function") {
+      subgraphOrCb(new _MenuBuilderImpl(this._data, this._rootId));
+    } else {
+      this._data.nodes.push(...subgraphOrCb.nodes);
+      this._data.edges.push(...subgraphOrCb.edges);
+    }
+    return this;
   }
-  constructor(_data, _rootId) {
-    _define_property(this, "_data", void 0);
-    _define_property(this, "_rootId", void 0);
-    this._data = _data;
-    this._rootId = _rootId;
+  separator(variant = "gap") {
+    const id = `separator-${++this._separatorCount}`;
+    this._data.nodes.push({
+      id,
+      type: MenuSeparatorType,
+      properties: {
+        variant
+      },
+      data: void 0
+    });
+    this._data.edges.push({
+      source: this._rootId,
+      target: id,
+      relation: "child"
+    });
+    return this;
   }
 };
+var MenuBuilder = Object.freeze({
+  make: () => new MenuBuilderImpl({
+    nodes: [],
+    edges: []
+  }, "root")
+});
 export {
-  DropdownMenu,
+  Menu,
   MenuBuilder,
-  MenuProvider,
   MenuSeparatorType,
-  ToolbarMenu,
   createGapSeparator,
   createLineSeparator,
   createMenuAction,
   createMenuItemGroup,
-  createMenuScope,
   isMenuGroup,
   isSeparator,
   menuContextDefaults,
-  rxFromSignal,
   useMenu,
   useMenuActions,
-  useMenuItems
+  useMenuItems,
+  useMenuScoped
 };
 //# sourceMappingURL=index.mjs.map