@dxos/plugin-search 0.7.4 → 0.7.5-labs.a279d8c

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { Capabilities, contributes, createSurface, firstIdInPart, useCapability } from '@dxos/app-framework';
+import { getActiveSpace } from '@dxos/plugin-space';
+
+import { SEARCH_DIALOG, SearchDialog, type SearchDialogProps, SearchMain } from '../components';
+
+export default () =>
+  contributes(Capabilities.ReactSurface, [
+    createSurface({
+      id: SEARCH_DIALOG,
+      role: 'dialog',
+      filter: (data): data is { subject: SearchDialogProps } => data.component === SEARCH_DIALOG,
+      component: ({ data }) => <SearchDialog {...data.subject} />,
+    }),
+    createSurface({
+      id: 'search-input',
+      role: 'search-input',
+      component: () => {
+        const location = useCapability(Capabilities.Location);
+        const { graph } = useCapability(Capabilities.AppGraph);
+        const space = graph && location ? getActiveSpace(graph, firstIdInPart(location.active, 'main')) : undefined;
+        return space ? <SearchMain space={space} /> : null;
+      },
+    }),
+  ]);

package/src/components/SearchDialog.tsx

@@ -5,14 +5,14 @@
 import React, { forwardRef, useCallback, useState } from 'react';
 
 import {
-  useResolvePlugin,
-  parseNavigationPlugin,
-  parseGraphPlugin,
   NavigationAction,
   LayoutAction,
   type LayoutCoordinate,
   isLayoutParts,
   useIntentDispatcher,
+  createIntent,
+  useCapability,
+  Capabilities,
 } from '@dxos/app-framework';
 import { type Node } from '@dxos/plugin-graph';
 import { useClient } from '@dxos/react-client';
@@ -24,6 +24,8 @@ import { descriptionText, mx } from '@dxos/react-ui-theme';
 import { SEARCH_PLUGIN } from '../meta';
 import { useSearchResults } from '../search';
 
+export const SEARCH_DIALOG = `${SEARCH_PLUGIN}/SearchDialog`;
+
 type SearchListResultProps = {
   node: Node;
 } & Pick<SearchListItemProps, 'onSelect'>;
@@ -45,55 +47,50 @@ const SearchListResult = forwardRef<HTMLDivElement, SearchListResultProps>(({ no
   );
 });
 
-export const SearchDialog = ({
-  subject,
-}: {
-  subject: { action: NavigationAction; layoutCoordinate: LayoutCoordinate; position: 'add-after' | 'add-before' };
-}) => {
+export type SearchDialogProps = {
+  layoutCoordinate: LayoutCoordinate;
+};
+
+export const SearchDialog = ({ layoutCoordinate }: SearchDialogProps) => {
   const { t } = useTranslation(SEARCH_PLUGIN);
-  const graphPlugin = useResolvePlugin(parseGraphPlugin);
-  const graph = graphPlugin?.provides.graph;
-  const navigationPlugin = useResolvePlugin(parseNavigationPlugin);
-  const providedClosed = navigationPlugin?.provides.location.closed ?? [];
+  const location = useCapability(Capabilities.Location);
+  const { graph } = useCapability(Capabilities.AppGraph);
+  const providedClosed = location.closed ?? [];
   const closed = (Array.isArray(providedClosed) ? providedClosed : [providedClosed])
     .map((id) => graph?.findNode(id))
     .filter(Boolean);
-  const active = navigationPlugin?.provides.location.active;
+  const active = location.active;
   const [queryString, setQueryString] = useState('');
   const client = useClient();
   const dangerouslyLoadAllObjects = useQuery(client.spaces, Filter.all());
   const [pending, results] = useSearchResults(queryString, dangerouslyLoadAllObjects);
   const resultObjects = Array.from(results.keys());
-  const dispatch = useIntentDispatcher();
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const handleSelect = useCallback(
-    (nodeId: string) => {
+    async (nodeId: string) => {
       if (active && isLayoutParts(active)) {
         // If node is already present in the active parts, scroll to it and close the dialog.
         const index = active?.main?.findIndex((entry) => entry.id === nodeId);
         if (index !== -1) {
-          return dispatch([
-            { action: LayoutAction.SET_LAYOUT, data: { element: 'dialog', state: false } },
-            { action: LayoutAction.SCROLL_INTO_VIEW, data: { id: nodeId } },
-          ]);
+          await dispatch(createIntent(LayoutAction.SetLayout, { element: 'dialog', state: false }));
+          await dispatch(createIntent(LayoutAction.ScrollIntoView, { id: nodeId }));
+          return;
         }
 
-        return dispatch([
-          {
-            action: NavigationAction.ADD_TO_ACTIVE,
-            data: {
-              part: subject.layoutCoordinate.part,
-              id: nodeId,
-              pivotId: subject.layoutCoordinate.entryId,
-              positioning: 'end',
-            },
-          },
-          { action: LayoutAction.SET_LAYOUT, data: { element: 'dialog', state: false } },
-          { action: LayoutAction.SCROLL_INTO_VIEW, data: { id: nodeId } },
-        ]);
+        await dispatch(
+          createIntent(NavigationAction.AddToActive, {
+            part: layoutCoordinate.part,
+            id: nodeId,
+            pivotId: layoutCoordinate.entryId,
+            positioning: 'end',
+          }),
+        );
+        await dispatch(createIntent(LayoutAction.SetLayout, { element: 'dialog', state: false }));
+        await dispatch(createIntent(LayoutAction.ScrollIntoView, { id: nodeId }));
       }
     },
-    [subject, dispatch, active],
+    [layoutCoordinate, dispatch, active],
   );
 
   return (

package/src/index.ts

@@ -2,11 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { SearchPlugin } from './SearchPlugin';
-
-export default SearchPlugin;
-
 export * from './context';
+export * from './meta';
 export * from './search-sync';
 
 export * from './SearchPlugin';

package/src/meta.ts

@@ -7,7 +7,7 @@ import { type PluginMeta } from '@dxos/app-framework';
 export const SEARCH_PLUGIN = 'dxos.org/plugin/search';
 export const SEARCH_RESULT = `${SEARCH_PLUGIN}/result`;
 
-export default {
+export const meta = {
   id: SEARCH_PLUGIN,
   name: 'Search',
   description: 'Search ECHO spaces for content.',

package/src/search-sync.ts

@@ -4,7 +4,7 @@
 
 import { AST, type S } from '@dxos/echo-schema';
 import { getSchema } from '@dxos/live-object';
-import { TextType } from '@dxos/plugin-markdown/types';
+import { TextType } from '@dxos/schema';
 
 export const queryStringToMatch = (queryString?: string): RegExp | undefined => {
   const trimmed = queryString?.trim();

package/src/search.ts

@@ -5,7 +5,7 @@
 import { yieldOrContinue } from 'main-thread-scheduling';
 import { useEffect, useState } from 'react';
 
-import { TextType } from '@dxos/plugin-markdown/types';
+import { TextType } from '@dxos/schema';
 
 // TODO(thure): Deprecate search-sync, move still-relevant utilities elsewhere (here, probably).
 import { mapObjectToTextFields, queryStringToMatch } from './search-sync';

package/src/types.tsx

@@ -2,24 +2,15 @@
 // Copyright 2023 DXOS.org
 //
 
-import type {
-  GraphBuilderProvides,
-  IntentResolverProvides,
-  MetadataRecordsProvides,
-  SurfaceProvides,
-  TranslationsProvides,
-} from '@dxos/app-framework';
+import { S } from '@dxos/echo-schema';
 
 import { SEARCH_PLUGIN } from './meta';
 
-const SEARCH_ACTION = `${SEARCH_PLUGIN}/action`;
+export namespace SearchAction {
+  const SEARCH_ACTION = `${SEARCH_PLUGIN}/action`;
 
-export enum SearchAction {
-  SEARCH = `${SEARCH_ACTION}/search`,
+  export class OpenSearch extends S.TaggedClass<OpenSearch>()(`${SEARCH_ACTION}/open-search`, {
+    input: S.Void,
+    output: S.Void,
+  }) {}
 }
-
-export type SearchPluginProvides = SurfaceProvides &
-  IntentResolverProvides &
-  GraphBuilderProvides &
-  MetadataRecordsProvides &
-  TranslationsProvides;

package/dist/lib/browser/chunk-4L4PWJYC.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type PluginMeta } from '@dxos/app-framework';\n\nexport const SEARCH_PLUGIN = 'dxos.org/plugin/search';\nexport const SEARCH_RESULT = `${SEARCH_PLUGIN}/result`;\n\nexport default {\n  id: SEARCH_PLUGIN,\n  name: 'Search',\n  description: 'Search ECHO spaces for content.',\n  icon: 'ph--magnifying-glass--regular',\n  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/experimental/plugin-search',\n  tags: ['experimental'],\n} satisfies PluginMeta;\n"],
-  "mappings": ";AAMO,IAAMA,gBAAgB;AACtB,IAAMC,gBAAgB,GAAGD,aAAAA;AAEhC,IAAA,eAAe;EACbE,IAAIF;EACJG,MAAM;EACNC,aAAa;EACbC,MAAM;EACNC,QAAQ;EACRC,MAAM;IAAC;;AACT;",
-  "names": ["SEARCH_PLUGIN", "SEARCH_RESULT", "id", "name", "description", "icon", "source", "tags"]
-}

package/dist/lib/browser/meta.mjs

@@ -1,11 +0,0 @@
-import {
-  SEARCH_PLUGIN,
-  SEARCH_RESULT,
-  meta_default
-} from "./chunk-4L4PWJYC.mjs";
-export {
-  SEARCH_PLUGIN,
-  SEARCH_RESULT,
-  meta_default as default
-};
-//# sourceMappingURL=meta.mjs.map

package/dist/lib/browser/meta.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}