@dxos/plugin-search 0.7.5-main.9d26e3a → 0.7.5-main.e9bb01b

package/src/components/SearchDialog.tsx

@@ -4,17 +4,7 @@
 
 import React, { forwardRef, useCallback, useState } from 'react';
 
-import {
-  useResolvePlugin,
-  parseNavigationPlugin,
-  parseGraphPlugin,
-  NavigationAction,
-  LayoutAction,
-  type LayoutCoordinate,
-  isLayoutParts,
-  useIntentDispatcher,
-  createIntent,
-} from '@dxos/app-framework';
+import { LayoutAction, createIntent, useAppGraph, useIntentDispatcher, useLayout } from '@dxos/app-framework';
 import { type Node } from '@dxos/plugin-graph';
 import { useClient } from '@dxos/react-client';
 import { Filter, fullyQualifiedId, useQuery } from '@dxos/react-client/echo';
@@ -49,19 +39,16 @@ const SearchListResult = forwardRef<HTMLDivElement, SearchListResultProps>(({ no
 });
 
 export type SearchDialogProps = {
-  layoutCoordinate: LayoutCoordinate;
+  pivotId: string;
 };
 
-export const SearchDialog = ({ layoutCoordinate }: SearchDialogProps) => {
+export const SearchDialog = ({ pivotId }: 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 closed = (Array.isArray(providedClosed) ? providedClosed : [providedClosed])
+  const layout = useLayout();
+  const { graph } = useAppGraph();
+  const closed = (Array.isArray(layout.inactive) ? layout.inactive : [layout.inactive])
     .map((id) => graph?.findNode(id))
     .filter(Boolean);
-  const active = navigationPlugin?.provides.location.active;
   const [queryString, setQueryString] = useState('');
   const client = useClient();
   const dangerouslyLoadAllObjects = useQuery(client.spaces, Filter.all());
@@ -71,28 +58,26 @@ export const SearchDialog = ({ layoutCoordinate }: SearchDialogProps) => {
 
   const handleSelect = useCallback(
     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) {
-          await dispatch(createIntent(LayoutAction.SetLayout, { element: 'dialog', state: false }));
-          await dispatch(createIntent(LayoutAction.ScrollIntoView, { id: nodeId }));
-          return;
-        }
+      await dispatch(createIntent(LayoutAction.UpdateDialog, { part: 'dialog', options: { state: false } }));
 
+      // If node is already present in the active parts, scroll to it and close the dialog.
+      const index = layout.active.findIndex((id) => id === nodeId);
+      if (index !== -1) {
+        await dispatch(createIntent(LayoutAction.ScrollIntoView, { part: 'current', subject: nodeId }));
+      } else {
         await dispatch(
-          createIntent(NavigationAction.AddToActive, {
-            part: layoutCoordinate.part,
-            id: nodeId,
-            pivotId: layoutCoordinate.entryId,
-            positioning: 'end',
+          createIntent(LayoutAction.Open, {
+            part: 'main',
+            subject: [nodeId],
+            options: {
+              pivotId,
+              positioning: 'end',
+            },
           }),
         );
-        await dispatch(createIntent(LayoutAction.SetLayout, { element: 'dialog', state: false }));
-        await dispatch(createIntent(LayoutAction.ScrollIntoView, { id: nodeId }));
       }
     },
-    [layoutCoordinate, dispatch, active],
+    [pivotId, dispatch, layout],
   );
 
   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,13 +2,6 @@
 // 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';
@@ -21,9 +14,3 @@ export namespace SearchAction {
     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": []
-}