@dxos/plugin-search 0.8.4-main.b97322e → 0.8.4-main.c4373fc
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/{app-graph-builder-FLW7KDC5.mjs → app-graph-builder-YME7SN7O.mjs} +15 -14
- package/dist/lib/browser/app-graph-builder-YME7SN7O.mjs.map +7 -0
- package/dist/lib/browser/{chunk-KNS62YL2.mjs → chunk-5N6LDSFF.mjs} +5 -7
- package/dist/lib/browser/chunk-5N6LDSFF.mjs.map +7 -0
- package/dist/lib/browser/{chunk-BXSF7IAU.mjs → chunk-WN3TVQLV.mjs} +4 -4
- package/dist/lib/browser/chunk-WN3TVQLV.mjs.map +7 -0
- package/dist/lib/browser/{chunk-JVMYGOKS.mjs → chunk-YJGHPWUO.mjs} +5 -5
- package/dist/lib/browser/chunk-YJGHPWUO.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +8 -10
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/intent-resolver-XNVR4XRX.mjs +22 -0
- package/dist/lib/browser/{intent-resolver-JPBGEKFT.mjs.map → intent-resolver-XNVR4XRX.mjs.map} +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/{react-surface-MPPIWDBF.mjs → react-surface-YOGLADC4.mjs} +102 -283
- package/dist/lib/browser/react-surface-YOGLADC4.mjs.map +7 -0
- package/dist/types/src/SearchPlugin.d.ts +1 -1
- package/dist/types/src/SearchPlugin.d.ts.map +1 -1
- package/dist/types/src/capabilities/app-graph-builder.d.ts +1 -1
- package/dist/types/src/capabilities/app-graph-builder.d.ts.map +1 -1
- package/dist/types/src/capabilities/index.d.ts +3 -3
- package/dist/types/src/capabilities/index.d.ts.map +1 -1
- package/dist/types/src/capabilities/intent-resolver.d.ts +1 -1
- package/dist/types/src/capabilities/intent-resolver.d.ts.map +1 -1
- package/dist/types/src/capabilities/react-surface.d.ts +1 -1
- package/dist/types/src/components/Search.stories.d.ts +15 -11
- package/dist/types/src/components/Search.stories.d.ts.map +1 -1
- package/dist/types/src/components/SearchDialog.d.ts +1 -1
- package/dist/types/src/components/SearchDialog.d.ts.map +1 -1
- package/dist/types/src/components/SearchMain.d.ts.map +1 -1
- package/dist/types/src/components/SearchResults/SearchResults.stories.d.ts +12 -8
- package/dist/types/src/components/SearchResults/SearchResults.stories.d.ts.map +1 -1
- package/dist/types/src/components/Searchbar/Searchbar.d.ts.map +1 -1
- package/dist/types/src/components/Searchbar/Searchbar.stories.d.ts +10 -8
- package/dist/types/src/components/Searchbar/Searchbar.stories.d.ts.map +1 -1
- package/dist/types/src/hooks/sync.d.ts.map +1 -1
- package/dist/types/src/hooks/useGlobalSearch.d.ts.map +1 -1
- package/dist/types/src/hooks/useWebSearch.d.ts.map +1 -1
- package/dist/types/src/meta.d.ts +1 -2
- package/dist/types/src/meta.d.ts.map +1 -1
- package/dist/types/src/search/exa.d.ts +1 -3
- package/dist/types/src/search/exa.d.ts.map +1 -1
- package/dist/types/src/types/action.d.ts +3 -3
- package/dist/types/src/types/action.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +38 -38
- package/src/SearchPlugin.tsx +43 -44
- package/src/capabilities/app-graph-builder.ts +11 -10
- package/src/capabilities/intent-resolver.ts +1 -1
- package/src/capabilities/react-surface.tsx +1 -1
- package/src/components/Search.stories.tsx +14 -13
- package/src/components/SearchDialog.tsx +5 -5
- package/src/components/SearchMain.tsx +6 -5
- package/src/components/SearchResults/SearchResults.stories.tsx +18 -17
- package/src/components/Searchbar/Searchbar.stories.tsx +8 -8
- package/src/components/Searchbar/Searchbar.tsx +1 -1
- package/src/hooks/sync.test.ts +1 -1
- package/src/hooks/sync.ts +2 -1
- package/src/hooks/useGlobalSearch.tsx +3 -2
- package/src/hooks/useSearchResults.ts +2 -2
- package/src/hooks/useWebSearch.ts +3 -8
- package/src/meta.ts +3 -4
- package/src/search/exa.test.ts +2 -11
- package/src/search/exa.ts +131 -151
- package/src/types/action.tsx +3 -3
- package/dist/lib/browser/app-graph-builder-FLW7KDC5.mjs.map +0 -7
- package/dist/lib/browser/chunk-BXSF7IAU.mjs.map +0 -7
- package/dist/lib/browser/chunk-JVMYGOKS.mjs.map +0 -7
- package/dist/lib/browser/chunk-KNS62YL2.mjs.map +0 -7
- package/dist/lib/browser/intent-resolver-JPBGEKFT.mjs +0 -22
- package/dist/lib/browser/react-surface-MPPIWDBF.mjs.map +0 -7
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/plugin-search",
|
|
3
|
-
"version": "0.8.4-main.
|
|
3
|
+
"version": "0.8.4-main.c4373fc",
|
|
4
4
|
"description": "Braneframe sketch plugin",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
"type": "module",
|
|
11
11
|
"exports": {
|
|
12
12
|
".": {
|
|
13
|
+
"source": "./src/index.ts",
|
|
13
14
|
"types": "./dist/types/src/index.d.ts",
|
|
14
15
|
"browser": "./dist/lib/browser/index.mjs"
|
|
15
16
|
}
|
|
@@ -26,50 +27,49 @@
|
|
|
26
27
|
"@preact-signals/safe-react": "^0.9.0",
|
|
27
28
|
"exa-js": "^1.5.12",
|
|
28
29
|
"main-thread-scheduling": "^14.1.1",
|
|
29
|
-
"@dxos/ai": "0.8.4-main.
|
|
30
|
-
"@dxos/app-framework": "0.8.4-main.
|
|
31
|
-
"@dxos/assistant": "0.8.4-main.
|
|
32
|
-
"@dxos/
|
|
33
|
-
"@dxos/echo": "0.8.4-main.
|
|
34
|
-
"@dxos/
|
|
35
|
-
"@dxos/
|
|
36
|
-
"@dxos/
|
|
37
|
-
"@dxos/
|
|
38
|
-
"@dxos/
|
|
39
|
-
"@dxos/
|
|
40
|
-
"@dxos/plugin-
|
|
41
|
-
"@dxos/plugin-graph": "0.8.4-main.
|
|
42
|
-
"@dxos/
|
|
43
|
-
"@dxos/plugin-
|
|
44
|
-
"@dxos/react-client": "0.8.4-main.
|
|
45
|
-
"@dxos/
|
|
46
|
-
"@dxos/
|
|
47
|
-
"@dxos/
|
|
48
|
-
"@dxos/react-ui-
|
|
49
|
-
"@dxos/util": "0.8.4-main.b97322e"
|
|
30
|
+
"@dxos/ai": "0.8.4-main.c4373fc",
|
|
31
|
+
"@dxos/app-framework": "0.8.4-main.c4373fc",
|
|
32
|
+
"@dxos/assistant": "0.8.4-main.c4373fc",
|
|
33
|
+
"@dxos/echo": "0.8.4-main.c4373fc",
|
|
34
|
+
"@dxos/echo-protocol": "0.8.4-main.c4373fc",
|
|
35
|
+
"@dxos/effect": "0.8.4-main.c4373fc",
|
|
36
|
+
"@dxos/invariant": "0.8.4-main.c4373fc",
|
|
37
|
+
"@dxos/live-object": "0.8.4-main.c4373fc",
|
|
38
|
+
"@dxos/debug": "0.8.4-main.c4373fc",
|
|
39
|
+
"@dxos/log": "0.8.4-main.c4373fc",
|
|
40
|
+
"@dxos/plugin-client": "0.8.4-main.c4373fc",
|
|
41
|
+
"@dxos/plugin-deck": "0.8.4-main.c4373fc",
|
|
42
|
+
"@dxos/plugin-graph": "0.8.4-main.c4373fc",
|
|
43
|
+
"@dxos/blueprints": "0.8.4-main.c4373fc",
|
|
44
|
+
"@dxos/plugin-space": "0.8.4-main.c4373fc",
|
|
45
|
+
"@dxos/react-client": "0.8.4-main.c4373fc",
|
|
46
|
+
"@dxos/react-ui-searchlist": "0.8.4-main.c4373fc",
|
|
47
|
+
"@dxos/schema": "0.8.4-main.c4373fc",
|
|
48
|
+
"@dxos/util": "0.8.4-main.c4373fc",
|
|
49
|
+
"@dxos/react-ui-stack": "0.8.4-main.c4373fc"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@effect-rx/rx-react": "0.
|
|
53
|
-
"@effect/platform": "0.
|
|
54
|
-
"@types/react": "~
|
|
55
|
-
"@types/react-dom": "~
|
|
56
|
-
"effect": "3.
|
|
57
|
-
"react": "~
|
|
58
|
-
"react-dom": "~
|
|
59
|
-
"vite": "
|
|
60
|
-
"@dxos/random": "0.8.4-main.
|
|
61
|
-
"@dxos/react-ui": "0.8.4-main.
|
|
62
|
-
"@dxos/react-ui
|
|
63
|
-
"@dxos/storybook-utils": "0.8.4-main.
|
|
52
|
+
"@effect-rx/rx-react": "0.42.4",
|
|
53
|
+
"@effect/platform": "0.92.1",
|
|
54
|
+
"@types/react": "~19.2.2",
|
|
55
|
+
"@types/react-dom": "~19.2.1",
|
|
56
|
+
"effect": "3.18.3",
|
|
57
|
+
"react": "~19.2.0",
|
|
58
|
+
"react-dom": "~19.2.0",
|
|
59
|
+
"vite": "7.1.9",
|
|
60
|
+
"@dxos/random": "0.8.4-main.c4373fc",
|
|
61
|
+
"@dxos/react-ui-theme": "0.8.4-main.c4373fc",
|
|
62
|
+
"@dxos/react-ui": "0.8.4-main.c4373fc",
|
|
63
|
+
"@dxos/storybook-utils": "0.8.4-main.c4373fc"
|
|
64
64
|
},
|
|
65
65
|
"peerDependencies": {
|
|
66
66
|
"@effect-rx/rx-react": "^0.34.1",
|
|
67
67
|
"@effect/platform": "^0.80.12",
|
|
68
68
|
"effect": "^3.13.3",
|
|
69
|
-
"react": "
|
|
70
|
-
"react-dom": "
|
|
71
|
-
"@dxos/react-ui": "0.8.4-main.
|
|
72
|
-
"@dxos/react-ui-theme": "0.8.4-main.
|
|
69
|
+
"react": "^19.0.0",
|
|
70
|
+
"react-dom": "^19.0.0",
|
|
71
|
+
"@dxos/react-ui": "0.8.4-main.c4373fc",
|
|
72
|
+
"@dxos/react-ui-theme": "0.8.4-main.c4373fc"
|
|
73
73
|
},
|
|
74
74
|
"publishConfig": {
|
|
75
75
|
"access": "public"
|
package/src/SearchPlugin.tsx
CHANGED
|
@@ -2,53 +2,52 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
|
|
6
6
|
|
|
7
7
|
import { AppGraphBuilder, IntentResolver, ReactSurface } from './capabilities';
|
|
8
|
-
import {
|
|
8
|
+
import { SEARCH_RESULT, meta } from './meta';
|
|
9
9
|
import { translations } from './translations';
|
|
10
10
|
import { type SearchResult } from './types';
|
|
11
11
|
|
|
12
|
-
export const SearchPlugin = () =>
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
}
|
|
35
|
-
},
|
|
12
|
+
export const SearchPlugin = definePlugin(meta, () => [
|
|
13
|
+
defineModule({
|
|
14
|
+
id: `${meta.id}/module/translations`,
|
|
15
|
+
activatesOn: Events.SetupTranslations,
|
|
16
|
+
activate: () => contributes(Capabilities.Translations, translations),
|
|
17
|
+
}),
|
|
18
|
+
defineModule({
|
|
19
|
+
id: `${meta.id}/module/metadata`,
|
|
20
|
+
activatesOn: Events.SetupMetadata,
|
|
21
|
+
activate: () =>
|
|
22
|
+
contributes(Capabilities.Metadata, {
|
|
23
|
+
id: SEARCH_RESULT,
|
|
24
|
+
metadata: {
|
|
25
|
+
parse: (item: SearchResult, type: string) => {
|
|
26
|
+
switch (type) {
|
|
27
|
+
case 'node':
|
|
28
|
+
return { id: item.id, label: item.label, data: item.object };
|
|
29
|
+
case 'object':
|
|
30
|
+
return item.object;
|
|
31
|
+
case 'view-object':
|
|
32
|
+
return item;
|
|
33
|
+
}
|
|
36
34
|
},
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
35
|
+
},
|
|
36
|
+
}),
|
|
37
|
+
}),
|
|
38
|
+
defineModule({
|
|
39
|
+
id: `${meta.id}/module/app-graph-builder`,
|
|
40
|
+
activatesOn: Events.SetupAppGraph,
|
|
41
|
+
activate: AppGraphBuilder,
|
|
42
|
+
}),
|
|
43
|
+
defineModule({
|
|
44
|
+
id: `${meta.id}/module/intent-resolver`,
|
|
45
|
+
activatesOn: Events.SetupIntentResolver,
|
|
46
|
+
activate: IntentResolver,
|
|
47
|
+
}),
|
|
48
|
+
defineModule({
|
|
49
|
+
id: `${meta.id}/module/react-surface`,
|
|
50
|
+
activatesOn: Events.SetupReactSurface,
|
|
51
|
+
activate: ReactSurface,
|
|
52
|
+
}),
|
|
53
|
+
]);
|
|
@@ -3,24 +3,25 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { Rx } from '@effect-rx/rx-react';
|
|
6
|
-
import
|
|
6
|
+
import * as Function from 'effect/Function';
|
|
7
|
+
import * as Option from 'effect/Option';
|
|
7
8
|
|
|
8
|
-
import { Capabilities, contributes, createIntent
|
|
9
|
+
import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
|
|
9
10
|
import { ClientCapabilities } from '@dxos/plugin-client';
|
|
10
11
|
import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
|
|
11
|
-
import {
|
|
12
|
+
import { ROOT_ID, createExtension, rxFromSignal } from '@dxos/plugin-graph';
|
|
12
13
|
import { parseId } from '@dxos/react-client/echo';
|
|
13
14
|
|
|
14
|
-
import {
|
|
15
|
+
import { meta } from '../meta';
|
|
15
16
|
import { SearchAction } from '../types';
|
|
16
17
|
|
|
17
18
|
export default (context: PluginContext) =>
|
|
18
19
|
contributes(Capabilities.AppGraphBuilder, [
|
|
19
20
|
createExtension({
|
|
20
|
-
id: `${
|
|
21
|
+
id: `${meta.id}/space-search`,
|
|
21
22
|
connector: (node) =>
|
|
22
23
|
Rx.make((get) =>
|
|
23
|
-
pipe(
|
|
24
|
+
Function.pipe(
|
|
24
25
|
get(node),
|
|
25
26
|
Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
|
|
26
27
|
Option.map((node) => {
|
|
@@ -35,7 +36,7 @@ export default (context: PluginContext) =>
|
|
|
35
36
|
type: DECK_COMPANION_TYPE,
|
|
36
37
|
data: space,
|
|
37
38
|
properties: {
|
|
38
|
-
label: ['search label', { ns:
|
|
39
|
+
label: ['search label', { ns: meta.id }],
|
|
39
40
|
icon: 'ph--magnifying-glass--regular',
|
|
40
41
|
disposition: 'hidden',
|
|
41
42
|
},
|
|
@@ -47,10 +48,10 @@ export default (context: PluginContext) =>
|
|
|
47
48
|
),
|
|
48
49
|
}),
|
|
49
50
|
createExtension({
|
|
50
|
-
id:
|
|
51
|
+
id: meta.id,
|
|
51
52
|
actions: (node) =>
|
|
52
53
|
Rx.make((get) =>
|
|
53
|
-
pipe(
|
|
54
|
+
Function.pipe(
|
|
54
55
|
get(node),
|
|
55
56
|
Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
|
|
56
57
|
Option.map(() => {
|
|
@@ -62,7 +63,7 @@ export default (context: PluginContext) =>
|
|
|
62
63
|
await dispatch(createIntent(SearchAction.OpenSearch));
|
|
63
64
|
},
|
|
64
65
|
properties: {
|
|
65
|
-
label: ['search action label', { ns:
|
|
66
|
+
label: ['search action label', { ns: meta.id }],
|
|
66
67
|
icon: 'ph--magnifying-glass--regular',
|
|
67
68
|
keyBinding: {
|
|
68
69
|
macos: 'shift+meta+f',
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { Capabilities, LayoutAction, contributes, createIntent, createResolver } from '@dxos/app-framework';
|
|
6
6
|
|
|
7
7
|
import { SearchAction } from '../types';
|
|
8
8
|
|
|
@@ -6,7 +6,7 @@ import React from 'react';
|
|
|
6
6
|
|
|
7
7
|
import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
|
|
8
8
|
import { useActiveSpace } from '@dxos/plugin-space';
|
|
9
|
-
import {
|
|
9
|
+
import { type Space, isSpace } from '@dxos/react-client/echo';
|
|
10
10
|
|
|
11
11
|
import { SEARCH_DIALOG, SearchDialog, type SearchDialogProps, SearchMain } from '../components';
|
|
12
12
|
import { SearchContextProvider } from '../hooks';
|
|
@@ -2,18 +2,17 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import '@
|
|
6
|
-
|
|
7
|
-
import { type Meta, type Decorator, type StoryFn } from '@storybook/react-vite';
|
|
5
|
+
import { type Decorator, type Meta, type StoryObj } from '@storybook/react-vite';
|
|
8
6
|
import React, { useState } from 'react';
|
|
9
7
|
|
|
10
8
|
import { faker } from '@dxos/random';
|
|
11
|
-
import {
|
|
9
|
+
import { withTheme } from '@dxos/react-ui/testing';
|
|
12
10
|
|
|
13
|
-
import { SearchResults } from './SearchResults';
|
|
14
|
-
import { Searchbar, type SearchbarProps } from './Searchbar';
|
|
15
11
|
import { SearchContextProvider, useGlobalSearch, useGlobalSearchResults } from '../hooks';
|
|
16
12
|
|
|
13
|
+
import { Searchbar, type SearchbarProps } from './Searchbar';
|
|
14
|
+
import { SearchResults } from './SearchResults';
|
|
15
|
+
|
|
17
16
|
faker.seed(1);
|
|
18
17
|
|
|
19
18
|
type StoryProps = SearchbarProps & {
|
|
@@ -35,15 +34,15 @@ const DefaultStory = ({ objects, ...props }: StoryProps) => {
|
|
|
35
34
|
);
|
|
36
35
|
};
|
|
37
36
|
|
|
38
|
-
const
|
|
39
|
-
return (Story
|
|
37
|
+
const withSearchContext = (): Decorator => {
|
|
38
|
+
return (Story) => (
|
|
40
39
|
<SearchContextProvider>
|
|
41
40
|
<Story />
|
|
42
41
|
</SearchContextProvider>
|
|
43
42
|
);
|
|
44
43
|
};
|
|
45
44
|
|
|
46
|
-
export const Default = {
|
|
45
|
+
export const Default: Story = {
|
|
47
46
|
args: {
|
|
48
47
|
objects: Array.from({ length: 8 }).map(() => ({
|
|
49
48
|
id: faker.string.uuid(),
|
|
@@ -53,14 +52,16 @@ export const Default = {
|
|
|
53
52
|
},
|
|
54
53
|
};
|
|
55
54
|
|
|
56
|
-
const meta
|
|
55
|
+
const meta = {
|
|
57
56
|
title: 'plugins/plugin-search/Search',
|
|
58
57
|
component: Searchbar,
|
|
59
58
|
render: DefaultStory,
|
|
60
|
-
decorators: [withTheme,
|
|
59
|
+
decorators: [withTheme, withSearchContext()],
|
|
61
60
|
parameters: {
|
|
62
|
-
layout: '
|
|
61
|
+
layout: 'column',
|
|
63
62
|
},
|
|
64
|
-
}
|
|
63
|
+
} satisfies Meta<typeof Searchbar>;
|
|
65
64
|
|
|
66
65
|
export default meta;
|
|
66
|
+
|
|
67
|
+
type Story = StoryObj<typeof meta>;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import * as Option from 'effect/Option';
|
|
6
6
|
import React, { forwardRef, useCallback, useState } from 'react';
|
|
7
7
|
|
|
8
8
|
import { LayoutAction, createIntent, useAppGraph, useIntentDispatcher, useLayout } from '@dxos/app-framework';
|
|
@@ -14,16 +14,16 @@ import { SearchList, type SearchListItemProps } from '@dxos/react-ui-searchlist'
|
|
|
14
14
|
import { descriptionText, mx } from '@dxos/react-ui-theme';
|
|
15
15
|
|
|
16
16
|
import { useSearchResults } from '../hooks';
|
|
17
|
-
import {
|
|
17
|
+
import { meta } from '../meta';
|
|
18
18
|
|
|
19
|
-
export const SEARCH_DIALOG = `${
|
|
19
|
+
export const SEARCH_DIALOG = `${meta.id}/SearchDialog`;
|
|
20
20
|
|
|
21
21
|
type SearchListResultProps = {
|
|
22
22
|
node: Node;
|
|
23
23
|
} & Pick<SearchListItemProps, 'onSelect'>;
|
|
24
24
|
|
|
25
25
|
const SearchListResult = forwardRef<HTMLDivElement, SearchListResultProps>(({ node, onSelect }, forwardedRef) => {
|
|
26
|
-
const { t } = useTranslation(
|
|
26
|
+
const { t } = useTranslation(meta.id);
|
|
27
27
|
const label = toLocalizedString(node?.properties.label ?? 'never', t);
|
|
28
28
|
return (
|
|
29
29
|
<SearchList.Item
|
|
@@ -44,7 +44,7 @@ export type SearchDialogProps = {
|
|
|
44
44
|
};
|
|
45
45
|
|
|
46
46
|
export const SearchDialog = ({ pivotId }: SearchDialogProps) => {
|
|
47
|
-
const { t } = useTranslation(
|
|
47
|
+
const { t } = useTranslation(meta.id);
|
|
48
48
|
const { graph } = useAppGraph();
|
|
49
49
|
const layout = useLayout();
|
|
50
50
|
const closed = (Array.isArray(layout.inactive) ? layout.inactive : [layout.inactive])
|
|
@@ -6,18 +6,19 @@ import React, { type FC, useState } from 'react';
|
|
|
6
6
|
|
|
7
7
|
import { log } from '@dxos/log';
|
|
8
8
|
import { useClient } from '@dxos/react-client';
|
|
9
|
-
import { Filter,
|
|
9
|
+
import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
|
|
10
10
|
import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
|
|
11
11
|
import { activeSurface, mx } from '@dxos/react-ui-theme';
|
|
12
12
|
|
|
13
|
-
import { SearchResults } from './SearchResults';
|
|
14
|
-
import { Searchbar } from './Searchbar';
|
|
15
13
|
import { useGlobalSearch, useGlobalSearchResults } from '../hooks';
|
|
16
14
|
import { useWebSearch } from '../hooks/useWebSearch';
|
|
17
|
-
import {
|
|
15
|
+
import { meta } from '../meta';
|
|
16
|
+
|
|
17
|
+
import { Searchbar } from './Searchbar';
|
|
18
|
+
import { SearchResults } from './SearchResults';
|
|
18
19
|
|
|
19
20
|
export const SearchMain: FC<ThemedClassName<{ space: Space }>> = ({ classNames, space }) => {
|
|
20
|
-
const { t } = useTranslation(
|
|
21
|
+
const { t } = useTranslation(meta.id);
|
|
21
22
|
const client = useClient();
|
|
22
23
|
const { setMatch } = useGlobalSearch();
|
|
23
24
|
const [query, setQuery] = useState<string>();
|
|
@@ -2,26 +2,25 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import '@
|
|
6
|
-
|
|
7
|
-
import { type Meta } from '@storybook/react-vite';
|
|
5
|
+
import { type Meta, type StoryObj } from '@storybook/react-vite';
|
|
8
6
|
import React, { useState } from 'react';
|
|
9
7
|
|
|
10
8
|
import { faker } from '@dxos/random';
|
|
11
|
-
import {
|
|
9
|
+
import { withTheme } from '@dxos/react-ui/testing';
|
|
12
10
|
|
|
13
|
-
import { SearchResults, type SearchResultsProps } from './SearchResults';
|
|
14
11
|
import { filterObjectsSync } from '../../hooks';
|
|
15
12
|
|
|
13
|
+
import { SearchResults, type SearchResultsProps } from './SearchResults';
|
|
14
|
+
|
|
16
15
|
faker.seed(1);
|
|
17
16
|
|
|
18
|
-
const DefaultStory = (
|
|
17
|
+
const DefaultStory = (props: SearchResultsProps) => {
|
|
19
18
|
const [selected, setSelected] = useState<string>();
|
|
20
19
|
|
|
21
20
|
return (
|
|
22
21
|
<div className='flex grow justify-center overflow-hidden'>
|
|
23
22
|
<div className='flex w-[300px] m-4 overflow-hidden'>
|
|
24
|
-
<SearchResults {...
|
|
23
|
+
<SearchResults {...props} selected={selected} onSelect={setSelected} />
|
|
25
24
|
</div>
|
|
26
25
|
</div>
|
|
27
26
|
);
|
|
@@ -37,21 +36,23 @@ const objects = Array.from({ length: 100 }).map((_, i) => ({
|
|
|
37
36
|
|
|
38
37
|
const match = new RegExp(word, 'i');
|
|
39
38
|
|
|
40
|
-
|
|
41
|
-
args: {
|
|
42
|
-
items: filterObjectsSync(objects, match),
|
|
43
|
-
match,
|
|
44
|
-
},
|
|
45
|
-
};
|
|
46
|
-
|
|
47
|
-
const meta: Meta<typeof SearchResults> = {
|
|
39
|
+
const meta = {
|
|
48
40
|
title: 'plugins/plugin-search/SearchResults',
|
|
49
41
|
component: SearchResults,
|
|
50
42
|
render: DefaultStory,
|
|
51
|
-
decorators: [withTheme
|
|
43
|
+
decorators: [withTheme],
|
|
52
44
|
parameters: {
|
|
53
45
|
layout: 'fullscreen',
|
|
54
46
|
},
|
|
55
|
-
}
|
|
47
|
+
} satisfies Meta<typeof SearchResults>;
|
|
56
48
|
|
|
57
49
|
export default meta;
|
|
50
|
+
|
|
51
|
+
type Story = StoryObj<typeof meta>;
|
|
52
|
+
|
|
53
|
+
export const Default: Story = {
|
|
54
|
+
args: {
|
|
55
|
+
items: filterObjectsSync(objects, match),
|
|
56
|
+
match,
|
|
57
|
+
},
|
|
58
|
+
};
|
|
@@ -2,26 +2,26 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import '@
|
|
5
|
+
import { type Meta, type StoryObj } from '@storybook/react-vite';
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { withTheme } from '@dxos/react-ui/testing';
|
|
8
8
|
|
|
9
|
-
import {
|
|
9
|
+
import { Searchbar } from './Searchbar';
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const meta: Meta<SearchbarProps> = {
|
|
11
|
+
const meta = {
|
|
14
12
|
title: 'plugins/plugin-search/Searchbar',
|
|
15
13
|
component: Searchbar,
|
|
16
14
|
decorators: [withTheme],
|
|
17
15
|
parameters: {
|
|
18
16
|
layout: 'centered',
|
|
19
17
|
},
|
|
20
|
-
}
|
|
18
|
+
} satisfies Meta<typeof Searchbar>;
|
|
21
19
|
|
|
22
20
|
export default meta;
|
|
23
21
|
|
|
24
|
-
|
|
22
|
+
type Story = StoryObj<typeof meta>;
|
|
23
|
+
|
|
24
|
+
export const Default: Story = {
|
|
25
25
|
args: {
|
|
26
26
|
placeholder: 'Search...',
|
|
27
27
|
},
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
import React, { type KeyboardEvent, useEffect, useRef, useState } from 'react';
|
|
6
6
|
|
|
7
|
-
import { Input, type TextInputProps
|
|
7
|
+
import { Icon, Input, type TextInputProps } from '@dxos/react-ui';
|
|
8
8
|
|
|
9
9
|
export type SearchbarProps = Pick<TextInputProps, 'variant' | 'placeholder'> & {
|
|
10
10
|
classes?: {
|
package/src/hooks/sync.test.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { describe, expect, test } from 'vitest';
|
|
6
6
|
|
|
7
7
|
import { Client } from '@dxos/client';
|
|
8
|
-
import {
|
|
8
|
+
import { Filter, Obj, Type } from '@dxos/echo';
|
|
9
9
|
import { faker } from '@dxos/random';
|
|
10
10
|
|
|
11
11
|
import { filterObjectsSync } from './sync';
|
package/src/hooks/sync.ts
CHANGED
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import React, {
|
|
5
|
+
import React, { type PropsWithChildren, createContext, useContext, useMemo, useState } from 'react';
|
|
6
6
|
|
|
7
7
|
import { raise } from '@dxos/debug';
|
|
8
8
|
|
|
9
|
-
import { filterObjectsSync, queryStringToMatch } from './sync';
|
|
10
9
|
import { type SearchResult } from '../types';
|
|
11
10
|
|
|
11
|
+
import { filterObjectsSync, queryStringToMatch } from './sync';
|
|
12
|
+
|
|
12
13
|
type SearchContextType = {
|
|
13
14
|
match?: RegExp;
|
|
14
15
|
setMatch?: (text?: string) => void;
|
|
@@ -47,14 +47,14 @@ export const useSearchResults = <T extends Record<string, any>>(
|
|
|
47
47
|
|
|
48
48
|
useEffect(() => {
|
|
49
49
|
setPending(!!(objects && queryString));
|
|
50
|
-
const
|
|
50
|
+
const timeout = setTimeout(async () => {
|
|
51
51
|
const nextResults =
|
|
52
52
|
objects && queryString ? await filterObjects(objects, queryStringToMatch(queryString)) : new Map();
|
|
53
53
|
setResults(nextResults);
|
|
54
54
|
setPending(false);
|
|
55
55
|
}, delay);
|
|
56
56
|
|
|
57
|
-
return () => clearTimeout(
|
|
57
|
+
return () => clearTimeout(timeout);
|
|
58
58
|
}, [queryString, objects]);
|
|
59
59
|
|
|
60
60
|
return [pending, results];
|
|
@@ -4,23 +4,19 @@
|
|
|
4
4
|
|
|
5
5
|
import { useState } from 'react';
|
|
6
6
|
|
|
7
|
-
import {
|
|
8
|
-
import { AI_SERVICE_ENDPOINT, EXA_API_KEY } from '@dxos/ai/testing';
|
|
7
|
+
import { EXA_API_KEY } from '@dxos/ai/testing';
|
|
9
8
|
import { Obj } from '@dxos/echo';
|
|
10
9
|
import { type DXN } from '@dxos/keys';
|
|
11
10
|
import { log } from '@dxos/log';
|
|
12
11
|
import { getIconAnnotation } from '@dxos/schema';
|
|
13
12
|
import { Testing } from '@dxos/schema/testing';
|
|
14
13
|
|
|
15
|
-
import { getStringProperty } from './sync';
|
|
16
14
|
import { search } from '../search';
|
|
17
15
|
import { type SearchResult } from '../types';
|
|
18
16
|
|
|
19
|
-
|
|
20
|
-
const AiService = new EdgeAiServiceClient({
|
|
21
|
-
endpoint: AI_SERVICE_ENDPOINT.REMOTE,
|
|
22
|
-
});
|
|
17
|
+
import { getStringProperty } from './sync';
|
|
23
18
|
|
|
19
|
+
export const useWebSearch = ({ query, context }: { query?: string; context?: string }) => {
|
|
24
20
|
const [results, setResults] = useState<SearchResult[]>([]);
|
|
25
21
|
const [isLoading, setIsLoading] = useState(false);
|
|
26
22
|
|
|
@@ -32,7 +28,6 @@ export const useWebSearch = ({ query, context }: { query?: string; context?: str
|
|
|
32
28
|
query,
|
|
33
29
|
context,
|
|
34
30
|
schema: [Testing.Project, Testing.Organization, Testing.Contact],
|
|
35
|
-
AiService,
|
|
36
31
|
exaApiKey: EXA_API_KEY,
|
|
37
32
|
});
|
|
38
33
|
|
package/src/meta.ts
CHANGED
|
@@ -4,14 +4,13 @@
|
|
|
4
4
|
|
|
5
5
|
import { type PluginMeta } from '@dxos/app-framework';
|
|
6
6
|
|
|
7
|
-
export const SEARCH_PLUGIN = 'dxos.org/plugin/search';
|
|
8
|
-
export const SEARCH_RESULT = `${SEARCH_PLUGIN}/result`;
|
|
9
|
-
|
|
10
7
|
export const meta: PluginMeta = {
|
|
11
|
-
id:
|
|
8
|
+
id: 'dxos.org/plugin/search',
|
|
12
9
|
name: 'Search',
|
|
13
10
|
description: 'Search ECHO spaces for content.',
|
|
14
11
|
icon: 'ph--magnifying-glass--regular',
|
|
15
12
|
source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-search',
|
|
16
13
|
tags: ['labs'],
|
|
17
14
|
};
|
|
15
|
+
|
|
16
|
+
export const SEARCH_RESULT = `${meta.id}/result`;
|