@dxos/plugin-simple-layout 0.8.4-main.6fa680abb7 → 0.8.4-main.7996785055

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-simple-layout",
-  "version": "0.8.4-main.6fa680abb7",
+  "version": "0.8.4-main.7996785055",
   "description": "Simple layout plugin for minimal UI contexts like popover windows.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -31,45 +31,45 @@
     "@radix-ui/react-context": "1.1.1",
     "@tauri-apps/plugin-deep-link": "^2.2.0",
     "@tauri-apps/plugin-haptics": "^2.3.2",
-    "@dxos/app-framework": "0.8.4-main.6fa680abb7",
-    "@dxos/async": "0.8.4-main.6fa680abb7",
-    "@dxos/app-toolkit": "0.8.4-main.6fa680abb7",
-    "@dxos/log": "0.8.4-main.6fa680abb7",
-    "@dxos/echo": "0.8.4-main.6fa680abb7",
-    "@dxos/operation": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-graph": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui-menu": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui-mosaic": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui-attention": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui-searchlist": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui-stack": "0.8.4-main.6fa680abb7",
-    "@dxos/schema": "0.8.4-main.6fa680abb7",
-    "@dxos/util": "0.8.4-main.6fa680abb7"
+    "@dxos/app-framework": "0.8.4-main.7996785055",
+    "@dxos/echo": "0.8.4-main.7996785055",
+    "@dxos/async": "0.8.4-main.7996785055",
+    "@dxos/log": "0.8.4-main.7996785055",
+    "@dxos/plugin-graph": "0.8.4-main.7996785055",
+    "@dxos/react-ui-menu": "0.8.4-main.7996785055",
+    "@dxos/react-ui-mosaic": "0.8.4-main.7996785055",
+    "@dxos/react-ui-search": "0.8.4-main.7996785055",
+    "@dxos/react-ui-stack": "0.8.4-main.7996785055",
+    "@dxos/react-ui-attention": "0.8.4-main.7996785055",
+    "@dxos/schema": "0.8.4-main.7996785055",
+    "@dxos/util": "0.8.4-main.7996785055",
+    "@dxos/operation": "0.8.4-main.7996785055",
+    "@dxos/app-toolkit": "0.8.4-main.7996785055"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "^7.1.11",
-    "@dxos/app-graph": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-client": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-preview": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-search": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-testing": "0.8.4-main.6fa680abb7",
-    "@dxos/plugin-space": "0.8.4-main.6fa680abb7",
-    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
-    "@dxos/storybook-utils": "0.8.4-main.6fa680abb7",
-    "@dxos/schema": "0.8.4-main.6fa680abb7",
-    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
+    "@dxos/app-graph": "0.8.4-main.7996785055",
+    "@dxos/plugin-client": "0.8.4-main.7996785055",
+    "@dxos/plugin-preview": "0.8.4-main.7996785055",
+    "@dxos/plugin-search": "0.8.4-main.7996785055",
+    "@dxos/plugin-space": "0.8.4-main.7996785055",
+    "@dxos/plugin-testing": "0.8.4-main.7996785055",
+    "@dxos/schema": "0.8.4-main.7996785055",
+    "@dxos/ui-theme": "0.8.4-main.7996785055",
+    "@dxos/storybook-utils": "0.8.4-main.7996785055",
+    "@dxos/react-ui": "0.8.4-main.7996785055"
   },
   "peerDependencies": {
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
-    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
+    "@dxos/react-ui": "0.8.4-main.7996785055",
+    "@dxos/ui-theme": "0.8.4-main.7996785055"
   },
   "publishConfig": {
     "access": "public"

package/src/SimpleLayoutPlugin.ts

@@ -5,18 +5,18 @@
 import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 
-import { OperationResolver, ReactRoot, ReactSurface, SpotlightDismiss, State, UrlHandler } from './capabilities';
+import { OperationHandler, ReactRoot, ReactSurface, SpotlightDismiss, State, UrlHandler } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
 import { SimpleLayoutEvents } from './types';
 
 export type SimpleLayoutPluginOptions = {
-  /** Whether running in popover window context (hides mobile-specific UI). */
+  /** Determines if running in popover window context (hides mobile-specific UI). */
   isPopover?: boolean;
 };
 
 export const SimpleLayoutPlugin = Plugin.define<SimpleLayoutPluginOptions>(meta).pipe(
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule(({ isPopover = false }) => ({
     id: Capability.getModuleTag(State),

package/src/capabilities/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './operation-resolver';
+export * from './operation-handler';
 export * from './react-root';
 export * from './react-surface';
 export * from './spotlight-dismiss';

package/src/capabilities/operation-handler/index.ts

@@ -0,0 +1,9 @@
+// Copyright 2025 DXOS.org
+
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);

package/src/capabilities/operation-handler/operation-handler.ts

@@ -0,0 +1,14 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/operation';
+
+import { SimpleLayoutOperationHandlerSet } from '../../operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, SimpleLayoutOperationHandlerSet);
+  }),
+);

package/src/capabilities/url-handler/url-handler.ts

@@ -20,23 +20,28 @@ import { type SimpleLayoutState, SimpleLayoutState as SimpleLayoutStateCapabilit
  */
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    const { invokeSync } = yield* Capability.get(Capabilities.OperationInvoker);
+    const { invokePromise } = yield* Capability.get(Capabilities.OperationInvoker);
 
     /**
      * Handle navigation from a pathname.
      * Restores the qualified graph ID and dispatches layout operations.
      */
     const handlePathNavigation = (pathname: string) => {
+      if (isFilePath(pathname)) {
+        log.info('[UrlHandler] Skipping file path (not a graph node)', { pathname });
+        pathname = '/';
+      }
+
       log.info('[UrlHandler] Navigating to path', { pathname });
 
       const qualifiedId = fromUrlPath(pathname);
       const workspace = getWorkspaceFromPath(qualifiedId);
 
-      invokeSync(LayoutOperation.SwitchWorkspace, { subject: workspace });
+      void invokePromise(LayoutOperation.SwitchWorkspace, { subject: workspace });
 
       const activeId = qualifiedId !== workspace ? qualifiedId : undefined;
       if (activeId) {
-        invokeSync(LayoutOperation.Open, { subject: [activeId] });
+        void invokePromise(LayoutOperation.Open, { subject: [activeId] });
       }
     };
 
@@ -107,6 +112,13 @@ export default Capability.makeModule(
  */
 const isRedirectPath = (pathname: string): boolean => pathname.startsWith('/redirect/');
 
+/**
+ * Paths with file extensions (e.g., `/iframe.html`) are not graph node paths.
+ * This guards against embedded contexts like Storybook iframes interpreting
+ * the host pathname as a navigation target.
+ */
+const isFilePath = (pathname: string): boolean => /\.[a-z]+$/i.test(pathname);
+
 /**
  * Returns a handler for navigation events (initial load and popstate) that navigates to current pathname.
  */

package/src/components/DebugOverlay/DebugOverlay.tsx

@@ -0,0 +1,96 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { createContext } from '@radix-ui/react-context';
+import React, { type PropsWithChildren, useCallback, useRef } from 'react';
+
+const DEBUG_OVERLAY_NAME = 'DebugOverlay';
+
+//
+// Context
+//
+
+type DebugOverlayContextValue = {
+  /** Log a timestamped message to the on-screen debug overlay. */
+  dbg: (msg: string) => void;
+};
+
+// Default to a no-op so hooks can call useDebugLog() safely outside of a provider.
+const [DebugOverlayProvider, useDebugLog] = createContext<DebugOverlayContextValue>(DEBUG_OVERLAY_NAME, {
+  dbg: () => {},
+});
+
+//
+// Root
+//
+
+type DebugOverlayRootProps = PropsWithChildren<{
+  /**
+   * When true (default), renders the on-screen log panel.
+   * Set to false to suppress the overlay while keeping the context available.
+   */
+  enabled?: boolean;
+  maxLines?: number;
+}>;
+
+/**
+ * Establishes a debug overlay context.
+ *
+ * When enabled, renders an on-screen monospaced log panel anchored just above
+ * the keyboard (via --kb-height CSS variable). Descendants can call
+ * useDebugLog() to obtain the dbg() function for logging.
+ *
+ * Intended for transient mobile debugging in the iOS Simulator where DevTools
+ * console output may not be accessible.
+ */
+const DebugOverlayRoot = ({ children, enabled = true, maxLines = 10 }: DebugOverlayRootProps) => {
+  const overlayRef = useRef<HTMLDivElement>(null);
+
+  const dbg = useCallback((msg: string) => {
+    if (!overlayRef.current) {
+      return;
+    }
+    const line = document.createElement('pre');
+    line.textContent = `${(performance.now() / 1000).toFixed(2).padStart(8, ' ')} ${msg}`;
+    overlayRef.current.prepend(line);
+    while (overlayRef.current.children.length > maxLines) {
+      overlayRef.current.lastChild?.remove();
+    }
+  }, []);
+
+  return (
+    <DebugOverlayProvider dbg={dbg}>
+      {children}
+      {enabled && (
+        <div
+          ref={overlayRef}
+          style={{
+            position: 'fixed',
+            bottom: 'calc(var(--kb-height, 0px) + 8px)',
+            left: 8,
+            right: 8,
+            background: 'rgba(0,0,0,0.8)',
+            color: '#0f0',
+            fontSize: 10,
+            fontFamily: 'monospace',
+            padding: 6,
+            borderRadius: 4,
+            zIndex: 9999,
+            pointerEvents: 'none',
+          }}
+        />
+      )}
+    </DebugOverlayProvider>
+  );
+};
+
+//
+// Exports
+//
+
+export const DebugOverlay = {
+  Root: DebugOverlayRoot,
+};
+
+export { useDebugLog };

package/src/components/DebugOverlay/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { DebugOverlay, useDebugLog } from './DebugOverlay';

package/src/components/Home/Home.tsx

@@ -8,12 +8,12 @@ import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { LayoutOperation } from '@dxos/app-toolkit';
 import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { Node, useConnections } from '@dxos/plugin-graph';
-import { Avatar, Icon, Panel, ScrollArea, Toolbar, toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { Avatar, Icon, ScrollArea, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { Card } from '@dxos/react-ui';
 import { Mosaic, type MosaicStackTileComponent } from '@dxos/react-ui-mosaic';
-import { SearchList, useSearchListItem, useSearchListResults } from '@dxos/react-ui-searchlist';
+import { SearchPanel, useSearchListItem, useSearchListResults } from '@dxos/react-ui-search';
 import { mx } from '@dxos/ui-theme';
-import { byPosition } from '@dxos/util';
+import { byPosition, getHostPlatform, isTauri } from '@dxos/util';
 
 import { meta } from '../../meta';
 import { useExpandPath } from '../hooks';
@@ -40,27 +40,24 @@ export const Home = (_: HomeProps) => {
     extract: (node) => toLocalizedString(node.properties.label, t),
   });
 
+  const autoFocus = !isTauri() || getHostPlatform() !== 'ios';
+
   return (
-    <SearchList.Root onSearch={handleSearch}>
-      <Panel.Root>
-        <Panel.Toolbar asChild>
-          <Toolbar.Root>
-            <SearchList.Input placeholder={t('search placeholder')} autoFocus />
-          </Toolbar.Root>
-        </Panel.Toolbar>
-        <Panel.Content asChild>
-          <SearchList.Content>
-            <Mosaic.Container asChild>
-              <ScrollArea.Root orientation='vertical'>
-                <ScrollArea.Viewport classNames='p-2'>
-                  <Mosaic.Stack items={results} getId={(node) => node.id} Tile={WorkspaceTile} />
-                </ScrollArea.Viewport>
-              </ScrollArea.Root>
-            </Mosaic.Container>
-          </SearchList.Content>
-        </Panel.Content>
-      </Panel.Root>
-    </SearchList.Root>
+    <SearchPanel onSearch={handleSearch}>
+      <Mosaic.Container asChild>
+        <ScrollArea.Root centered padding thin>
+          <ScrollArea.Viewport>
+            <Mosaic.Stack
+              classNames='gap-1'
+              draggable={false}
+              items={results}
+              getId={(item) => item.id}
+              Tile={WorkspaceTile}
+            />
+          </ScrollArea.Viewport>
+        </ScrollArea.Root>
+      </Mosaic.Container>
+    </SearchPanel>
   );
 };
 
@@ -106,17 +103,17 @@ const WorkspaceTile: MosaicStackTileComponent<Node.Node> = (props) => {
       onClick={handleSelect}
       ref={cardRef}
     >
-      <Card.Toolbar density='coarse'>
+      <Card.Toolbar density='fine'>
         <Avatar.Root>
           <Avatar.Content
             icon={data.properties.icon}
             hue={data.properties.hue}
             hueVariant='transparent'
             variant='square'
-            size={12}
+            size={8}
             fallback={name}
           />
-          <Avatar.Label>{name}</Avatar.Label>
+          <Avatar.Label classNames='cursor-pointer'>{name}</Avatar.Label>
           <Icon icon='ph--caret-right--regular' />
         </Avatar.Root>
       </Card.Toolbar>
@@ -133,6 +130,8 @@ const filterItems = (node: Node.Node, disposition: string) => {
 const useItemsByDisposition = (disposition: string, sort = false) => {
   const { graph } = useAppGraph();
   const connections = useConnections(graph, Node.RootId, 'child');
-  const filtered = connections.filter((node) => filterItems(node, disposition));
-  return sort ? filtered.toSorted((a, b) => byPosition(a.properties, b.properties)) : filtered;
+  return useMemo(() => {
+    const filtered = connections.filter((node) => filterItems(node, disposition));
+    return sort ? filtered.toSorted((a, b) => byPosition(a.properties, b.properties)) : filtered;
+  }, [connections, disposition, sort]);
 };

package/src/components/{ContentLoading/ContentLoading.stories.tsx → Loading/Loading.stories.tsx}

@@ -6,16 +6,16 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withTheme } from '@dxos/react-ui/testing';
 
-import { ContentLoading } from './ContentLoading';
+import { Loading } from './Loading';
 
 const meta = {
-  title: 'plugins/plugin-simple-layout/components/ContentLoading',
-  component: ContentLoading,
+  title: 'plugins/plugin-simple-layout/components/Loading',
+  component: Loading,
   decorators: [withTheme()],
   parameters: {
     layout: 'centered',
   },
-} satisfies Meta<typeof ContentLoading>;
+} satisfies Meta<typeof Loading>;
 
 export default meta;
 

package/src/components/{ContentLoading/ContentLoading.tsx → Loading/Loading.tsx}

@@ -5,6 +5,6 @@
 import React from 'react';
 
 // TODO(burdon): Show skeleton: https://github.com/dxos/dxos/issues/8259
-export const ContentLoading = () => {
+export const Loading = () => {
   return <div role='none' className='grid place-items-center dx-attention-surface' />;
 };

package/src/components/{ContentLoading → Loading}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './ContentLoading';
+export * from './Loading';

package/src/components/MobileLayout/MobileLayout.stories.tsx

@@ -6,7 +6,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { type PropsWithChildren, useEffect, useState } from 'react';
 
 import { addEventListener, combine } from '@dxos/async';
-import { Flex, Input, Panel, Splitter, type SplitterMode, Toolbar } from '@dxos/react-ui';
+import { Column, Flex, Input, Panel, Splitter, type SplitterMode, Toolbar } from '@dxos/react-ui';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { MobileLayout, type MobileLayoutRootProps } from './MobileLayout';
@@ -65,11 +65,15 @@ const StoryPanel = ({ children, label }: PropsWithChildren<{ label: string }>) =
         </Toolbar.Root>
       </Panel.Toolbar>
       <Panel.Content asChild>
-        <Flex column classNames='p-1'>
-          <Input.Root>
-            <Input.TextInput />
-          </Input.Root>
-        </Flex>
+        <Column.Root gutter='xs' classNames='py-form-chrome'>
+          <Column.Content>
+            <Flex column>
+              <Input.Root>
+                <Input.TextInput placeholder={label} />
+              </Input.Root>
+            </Flex>
+          </Column.Content>
+        </Column.Root>
       </Panel.Content>
     </Panel.Root>
   );