@dxos/plugin-navtree 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/src/containers/CommandsDialogContent/CommandsDialogContent.tsx

@@ -71,55 +71,51 @@ export const CommandsDialogContent = forwardRef<HTMLDivElement, CommandsDialogCo
     return (
       <Dialog.Content ref={forwardedRef}>
         <Dialog.Title srOnly>{t('commands-dialog.title', { ns: meta.id })}</Dialog.Title>
-        <Dialog.Body>
-          <SearchList.Root onSearch={handleSearch}>
-            <SearchList.Content>
-              <SearchList.Input placeholder={t('command-list-input.placeholder')} />
-              <SearchList.Viewport>
-                {results.map((action) => {
-                  const shortcut =
-                    typeof action.properties.keyBinding === 'string'
-                      ? action.properties.keyBinding
-                      : action.properties.keyBinding?.[getHostPlatform()];
+        <SearchList.Root onSearch={handleSearch}>
+          <SearchList.Input placeholder={t('command-list-input.placeholder')} />
+          <SearchList.Viewport>
+            {results.map((action) => {
+              const shortcut =
+                typeof action.properties.keyBinding === 'string'
+                  ? action.properties.keyBinding
+                  : action.properties.keyBinding?.[getHostPlatform()];
 
-                  return (
-                    <SearchList.Item
-                      value={action.id}
-                      key={action.id}
-                      label={toLocalizedString(action.properties.label, t)}
-                      icon={action.properties.icon}
-                      suffix={shortcut ? keySymbols(shortcut).join('') : undefined}
-                      onSelect={() => {
-                        if (action.properties.disabled) {
-                          return;
-                        }
+              return (
+                <SearchList.Item
+                  value={action.id}
+                  key={action.id}
+                  label={toLocalizedString(action.properties.label, t)}
+                  icon={action.properties.icon}
+                  suffix={shortcut ? keySymbols(shortcut).join('') : undefined}
+                  onSelect={() => {
+                    if (action.properties.disabled) {
+                      return;
+                    }
 
-                        if (Node.isActionGroup(action)) {
-                          setSelected(action.id);
-                          return;
-                        }
+                    if (Node.isActionGroup(action)) {
+                      setSelected(action.id);
+                      return;
+                    }
 
-                        void invokePromise(LayoutOperation.UpdateDialog, { state: false });
-                        setTimeout(() => {
-                          const lookupId = group?.id ?? action.id;
-                          const node = Graph.getConnections(graph, lookupId, Node.actionRelation('inbound'))[0];
-                          if (node && Node.isAction(action)) {
-                            void runAction(action, { parent: node, caller: KEY_BINDING });
-                          }
-                        });
-                      }}
-                      classNames='flex items-center gap-2'
-                      disabled={action.properties.disabled}
-                      {...(action.properties?.testId && {
-                        'data-testid': action.properties.testId,
-                      })}
-                    />
-                  );
-                })}
-              </SearchList.Viewport>
-            </SearchList.Content>
-          </SearchList.Root>
-        </Dialog.Body>
+                    void invokePromise(LayoutOperation.UpdateDialog, { state: false });
+                    setTimeout(() => {
+                      const lookupId = group?.id ?? action.id;
+                      const node = Graph.getConnections(graph, lookupId, Node.actionRelation('inbound'))[0];
+                      if (node && Node.isAction(action)) {
+                        void runAction(action, { parent: node, caller: KEY_BINDING });
+                      }
+                    });
+                  }}
+                  classNames='flex items-center gap-2'
+                  disabled={action.properties.disabled}
+                  {...(action.properties?.testId && {
+                    'data-testid': action.properties.testId,
+                  })}
+                />
+              );
+            })}
+          </SearchList.Viewport>
+        </SearchList.Root>
         <Dialog.ActionBar>
           <Dialog.Close asChild>
             <Button classNames='w-full'>{t('close.label', { ns: osTranslations })}</Button>

package/src/containers/NavTreeContainer/NavTreeContainer.tsx

@@ -230,13 +230,6 @@ export const NavTreeContainer$ = forwardRef<HTMLDivElement, NavTreeContainerProp
       });
     }, [graph]);
 
-    const setAlternateTree = useCallback(
-      (path: string[], open: boolean) => {
-        setItem(path, 'alternateTree', open);
-      },
-      [setItem],
-    );
-
     const onItemHover = useCallback(({ item }: { item: Node.Node }) => Graph.expand(graph, item.id, 'child'), [graph]);
 
     const navTreeContextValue = useMemo(
@@ -247,7 +240,6 @@ export const NavTreeContainer$ = forwardRef<HTMLDivElement, NavTreeContainerProp
         blockInstruction,
         canDrop,
         canSelect,
-        setAlternateTree,
         onBack: handleBack,
         onOpenChange: handleOpenChange,
         onSelect: handleSelect,
@@ -260,7 +252,6 @@ export const NavTreeContainer$ = forwardRef<HTMLDivElement, NavTreeContainerProp
         blockInstruction,
         canDrop,
         canSelect,
-        setAlternateTree,
         handleBack,
         handleOpenChange,
         handleSelect,

package/src/hooks/useNavTreeState.ts

@@ -12,7 +12,7 @@ import { NavTreeCapabilities } from '#types';
 export type UseNavTreeStateResult = {
   getItem: (path: string[]) => NavTreeCapabilities.NavTreeItemState;
   getItemAtom: (path: string[]) => Atom.Atom<NavTreeCapabilities.NavTreeItemState>;
-  setItem: (path: string[], key: 'open' | 'current' | 'alternateTree', next: boolean) => void;
+  setItem: (path: string[], key: 'open' | 'current', next: boolean) => void;
 };
 
 /**
@@ -33,10 +33,3 @@ export const useNavTreeItemState = (path: string[]): NavTreeCapabilities.NavTree
   const atom = useMemo(() => getItemAtom(path), [getItemAtom, pathKey]);
   return useAtomValue(atom);
 };
-
-/**
- * Hook that subscribes to the alternateTree state for a tree item.
- */
-export const useIsAlternateTree = (path: string[], _item?: any): boolean => {
-  return useNavTreeItemState(path).alternateTree ?? false;
-};

package/src/index.ts

@@ -2,7 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-export { NavTreeCapabilities, NavTreeEvents } from './types';
-export * from './NavTreePlugin';
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const NavTreePlugin = Plugin.lazy(meta, () => import('./NavTreePlugin'));
+
 export * from './meta';
+
+export { NavTreeCapabilities, NavTreeEvents } from './types';
 export * from './util';

package/src/operations/expose.ts

@@ -7,8 +7,8 @@ import * as Option from 'effect/Option';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { log } from '@dxos/log';
-import { Operation } from '@dxos/operation';
 import { Graph } from '@dxos/plugin-graph';
 import { expandAttendableId } from '@dxos/react-ui-attention';
 

package/src/operations/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const NavTreeOperationHandlerSet = OperationHandlerSet.lazy(() => import('./expose'));

package/src/translations.ts

@@ -11,7 +11,6 @@ export const translations = [
     'en-US': {
       [meta.id]: {
         'app-menu.label': 'App menu',
-        'open-settings.label': 'Settings',
         'open-commands.label': 'Search commands',
         'commands-dialog.title': 'Commands',
         'command-list-input.placeholder': 'Search for commands…',

package/src/types/capabilities.ts

@@ -9,12 +9,12 @@ import { Capability } from '@dxos/app-framework';
 import { meta } from '#meta';
 
 export namespace NavTreeCapabilities {
-  export type NavTreeItemState = { open: boolean; current: boolean; alternateTree?: boolean };
+  export type NavTreeItemState = { open: boolean; current: boolean };
 
   export type NavTreeStateStore = {
     getItem: (path: string[]) => NavTreeItemState;
     getItemAtom: (path: string[]) => Atom.Atom<NavTreeItemState>;
-    setItem: (path: string[], key: 'open' | 'current' | 'alternateTree', next: boolean) => void;
+    setItem: (path: string[], key: 'open' | 'current', next: boolean) => void;
   };
 
   export const State = Capability.make<NavTreeStateStore>(`${meta.id}.capability.state`);

package/src/util.ts

@@ -93,7 +93,7 @@ export const getChildren = (
  * Determines whether a node should be visible based on its disposition.
  */
 export const filterItems = (node: Node.Node, disposition?: string) => {
-  if (!disposition && (node.properties.disposition === 'hidden' || node.properties.disposition === 'alternate-tree')) {
+  if (!disposition && node.properties.disposition === 'hidden') {
     return false;
   } else if (!disposition) {
     const action = Node.isAction(node);