@dxos/plugin-stack 0.8.4-main.1068cf700f → 0.8.4-main.1c7ec43d41
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/StackPlugin-XXRZ2OJA.mjs +22 -0
- package/dist/lib/browser/StackPlugin-XXRZ2OJA.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +18 -75
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/translations.mjs +37 -0
- package/dist/lib/browser/translations.mjs.map +7 -0
- package/dist/lib/browser/types/index.mjs +21 -4
- package/dist/lib/browser/types/index.mjs.map +4 -4
- package/dist/lib/node-esm/StackPlugin-YCPQMVBH.mjs +24 -0
- package/dist/lib/node-esm/StackPlugin-YCPQMVBH.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +18 -74
- package/dist/lib/node-esm/index.mjs.map +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/translations.mjs +39 -0
- package/dist/lib/node-esm/translations.mjs.map +7 -0
- package/dist/lib/node-esm/types/index.mjs +22 -4
- package/dist/lib/node-esm/types/index.mjs.map +4 -4
- package/dist/types/src/StackPlugin.d.ts +1 -0
- package/dist/types/src/StackPlugin.d.ts.map +1 -1
- package/dist/types/src/capabilities/index.d.ts +2 -1
- package/dist/types/src/capabilities/index.d.ts.map +1 -1
- package/dist/types/src/capabilities/react-surface.d.ts +5 -0
- package/dist/types/src/capabilities/react-surface.d.ts.map +1 -0
- package/dist/types/src/components/{StackContext.d.ts → StackContext/StackContext.d.ts} +2 -1
- package/dist/types/src/components/StackContext/StackContext.d.ts.map +1 -0
- package/dist/types/src/components/StackContext/index.d.ts +2 -0
- package/dist/types/src/components/StackContext/index.d.ts.map +1 -0
- package/dist/types/src/components/{CaretDownUp.d.ts → StackSection/CaretDownUp.d.ts} +1 -1
- package/dist/types/src/components/StackSection/CaretDownUp.d.ts.map +1 -0
- package/dist/types/src/components/{StackSection.d.ts → StackSection/StackSection.d.ts} +1 -1
- package/dist/types/src/components/StackSection/StackSection.d.ts.map +1 -0
- package/dist/types/src/components/StackSection/index.d.ts +2 -0
- package/dist/types/src/components/StackSection/index.d.ts.map +1 -0
- package/dist/types/src/components/{StackSettings.d.ts → StackSettings/StackSettings.d.ts} +1 -1
- package/dist/types/src/components/StackSettings/StackSettings.d.ts.map +1 -0
- package/dist/types/src/components/StackSettings/index.d.ts +2 -0
- package/dist/types/src/components/StackSettings/index.d.ts.map +1 -0
- package/dist/types/src/components/index.d.ts +2 -9
- package/dist/types/src/components/index.d.ts.map +1 -1
- package/dist/types/src/containers/StackContainer/StackContainer.d.ts +7 -0
- package/dist/types/src/containers/StackContainer/StackContainer.d.ts.map +1 -0
- package/dist/types/src/containers/StackContainer/index.d.ts +2 -0
- package/dist/types/src/containers/StackContainer/index.d.ts.map +1 -0
- package/dist/types/src/containers/index.d.ts +3 -0
- package/dist/types/src/containers/index.d.ts.map +1 -0
- package/dist/types/src/index.d.ts +2 -1
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/meta.d.ts +1 -1
- package/dist/types/src/translations.d.ts +30 -30
- package/dist/types/src/translations.d.ts.map +1 -1
- package/dist/types/src/types/types.d.ts +1 -1
- package/dist/types/src/types/types.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +46 -35
- package/src/StackPlugin.ts +6 -22
- package/src/capabilities/index.ts +3 -1
- package/src/capabilities/react-surface.tsx +28 -0
- package/src/components/{StackContext.tsx → StackContext/StackContext.tsx} +3 -1
- package/src/components/StackContext/index.ts +5 -0
- package/src/components/{StackSection.tsx → StackSection/StackSection.tsx} +26 -23
- package/src/components/StackSection/index.ts +5 -0
- package/src/components/StackSettings/StackSettings.tsx +28 -0
- package/src/components/StackSettings/index.ts +5 -0
- package/src/components/index.ts +2 -4
- package/src/{components → containers/StackContainer}/StackContainer.tsx +65 -62
- package/src/containers/StackContainer/index.ts +5 -0
- package/src/containers/index.ts +7 -0
- package/src/index.ts +6 -1
- package/src/meta.ts +2 -2
- package/src/translations.ts +23 -22
- package/src/types/stack.ts +1 -1
- package/src/types/types.ts +1 -1
- package/dist/lib/browser/StackContainer-TFG62M42.mjs +0 -275
- package/dist/lib/browser/StackContainer-TFG62M42.mjs.map +0 -7
- package/dist/lib/browser/chunk-4X7CK6FM.mjs +0 -21
- package/dist/lib/browser/chunk-4X7CK6FM.mjs.map +0 -7
- package/dist/lib/browser/chunk-CD32XYEB.mjs +0 -27
- package/dist/lib/browser/chunk-CD32XYEB.mjs.map +0 -7
- package/dist/lib/browser/react-surface-RMMCIEXY.mjs +0 -41
- package/dist/lib/browser/react-surface-RMMCIEXY.mjs.map +0 -7
- package/dist/lib/node-esm/StackContainer-G4QUICWO.mjs +0 -276
- package/dist/lib/node-esm/StackContainer-G4QUICWO.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-26XWE7UY.mjs +0 -29
- package/dist/lib/node-esm/chunk-26XWE7UY.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-HEEGXPSW.mjs +0 -23
- package/dist/lib/node-esm/chunk-HEEGXPSW.mjs.map +0 -7
- package/dist/lib/node-esm/react-surface-R5QS3JT6.mjs +0 -42
- package/dist/lib/node-esm/react-surface-R5QS3JT6.mjs.map +0 -7
- package/dist/types/src/capabilities/react-surface/index.d.ts +0 -3
- package/dist/types/src/capabilities/react-surface/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/react-surface/react-surface.d.ts +0 -5
- package/dist/types/src/capabilities/react-surface/react-surface.d.ts.map +0 -1
- package/dist/types/src/components/CaretDownUp.d.ts.map +0 -1
- package/dist/types/src/components/StackContainer.d.ts +0 -9
- package/dist/types/src/components/StackContainer.d.ts.map +0 -1
- package/dist/types/src/components/StackContext.d.ts.map +0 -1
- package/dist/types/src/components/StackSection.d.ts.map +0 -1
- package/dist/types/src/components/StackSettings.d.ts.map +0 -1
- package/src/capabilities/react-surface/index.ts +0 -7
- package/src/capabilities/react-surface/react-surface.tsx +0 -34
- package/src/components/StackSettings.tsx +0 -30
- /package/src/components/{CaretDownUp.tsx → StackSection/CaretDownUp.tsx} +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/plugin-stack",
|
|
3
|
-
"version": "0.8.4-main.
|
|
3
|
+
"version": "0.8.4-main.1c7ec43d41",
|
|
4
4
|
"description": "DXOS Surface plugin for Stack entities",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -12,6 +12,14 @@
|
|
|
12
12
|
"author": "DXOS.org",
|
|
13
13
|
"sideEffects": true,
|
|
14
14
|
"type": "module",
|
|
15
|
+
"imports": {
|
|
16
|
+
"#capabilities": "./src/capabilities/index.ts",
|
|
17
|
+
"#components": "./src/components/index.ts",
|
|
18
|
+
"#containers": "./src/containers/index.ts",
|
|
19
|
+
"#meta": "./src/meta.ts",
|
|
20
|
+
"#translations": "./src/translations.ts",
|
|
21
|
+
"#types": "./src/types/index.ts"
|
|
22
|
+
},
|
|
15
23
|
"exports": {
|
|
16
24
|
".": {
|
|
17
25
|
"source": "./src/index.ts",
|
|
@@ -19,6 +27,12 @@
|
|
|
19
27
|
"browser": "./dist/lib/browser/index.mjs",
|
|
20
28
|
"node": "./dist/lib/node-esm/index.mjs"
|
|
21
29
|
},
|
|
30
|
+
"./translations": {
|
|
31
|
+
"source": "./src/translations.ts",
|
|
32
|
+
"types": "./dist/types/src/translations.d.ts",
|
|
33
|
+
"browser": "./dist/lib/browser/translations.mjs",
|
|
34
|
+
"node": "./dist/lib/node-esm/translations.mjs"
|
|
35
|
+
},
|
|
22
36
|
"./types": {
|
|
23
37
|
"source": "./src/types/index.ts",
|
|
24
38
|
"types": "./dist/types/src/types/index.d.ts",
|
|
@@ -27,42 +41,37 @@
|
|
|
27
41
|
}
|
|
28
42
|
},
|
|
29
43
|
"types": "dist/types/src/index.d.ts",
|
|
30
|
-
"typesVersions": {
|
|
31
|
-
"*": {
|
|
32
|
-
"types": [
|
|
33
|
-
"dist/types/src/types/index.d.ts"
|
|
34
|
-
]
|
|
35
|
-
}
|
|
36
|
-
},
|
|
37
44
|
"files": [
|
|
38
45
|
"dist",
|
|
39
46
|
"src"
|
|
40
47
|
],
|
|
41
48
|
"dependencies": {
|
|
49
|
+
"@effect-atom/atom-react": "^0.5.0",
|
|
42
50
|
"@fluentui/react-tabster": "9.26.11",
|
|
43
51
|
"@radix-ui/react-collapsible": "1.1.3",
|
|
44
|
-
"effect": "3.
|
|
52
|
+
"effect": "3.20.0",
|
|
45
53
|
"node-fetch": "^2.6.0",
|
|
46
54
|
"react-is": "~19.2.0",
|
|
47
|
-
"@dxos/app-framework": "0.8.4-main.
|
|
48
|
-
"@dxos/app-toolkit": "0.8.4-main.
|
|
49
|
-
"@dxos/async": "0.8.4-main.
|
|
50
|
-
"@dxos/client": "0.8.4-main.
|
|
51
|
-
"@dxos/echo": "0.8.4-main.
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/plugin-client": "0.8.4-main.
|
|
55
|
-
"@dxos/plugin-deck": "0.8.4-main.
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/plugin-graph": "0.8.4-main.
|
|
59
|
-
"@dxos/react-ui-attention": "0.8.4-main.
|
|
60
|
-
"@dxos/react-ui-form": "0.8.4-main.
|
|
61
|
-
"@dxos/react-ui-
|
|
62
|
-
"@dxos/react-ui-stack": "0.8.4-main.
|
|
63
|
-
"@dxos/
|
|
64
|
-
"@dxos/
|
|
65
|
-
"@dxos/
|
|
55
|
+
"@dxos/app-framework": "0.8.4-main.1c7ec43d41",
|
|
56
|
+
"@dxos/app-toolkit": "0.8.4-main.1c7ec43d41",
|
|
57
|
+
"@dxos/async": "0.8.4-main.1c7ec43d41",
|
|
58
|
+
"@dxos/client": "0.8.4-main.1c7ec43d41",
|
|
59
|
+
"@dxos/echo": "0.8.4-main.1c7ec43d41",
|
|
60
|
+
"@dxos/echo-atom": "0.8.4-main.1c7ec43d41",
|
|
61
|
+
"@dxos/invariant": "0.8.4-main.1c7ec43d41",
|
|
62
|
+
"@dxos/plugin-client": "0.8.4-main.1c7ec43d41",
|
|
63
|
+
"@dxos/plugin-deck": "0.8.4-main.1c7ec43d41",
|
|
64
|
+
"@dxos/react-client": "0.8.4-main.1c7ec43d41",
|
|
65
|
+
"@dxos/operation": "0.8.4-main.1c7ec43d41",
|
|
66
|
+
"@dxos/plugin-graph": "0.8.4-main.1c7ec43d41",
|
|
67
|
+
"@dxos/react-ui-attention": "0.8.4-main.1c7ec43d41",
|
|
68
|
+
"@dxos/react-ui-form": "0.8.4-main.1c7ec43d41",
|
|
69
|
+
"@dxos/react-ui-list": "0.8.4-main.1c7ec43d41",
|
|
70
|
+
"@dxos/react-ui-stack": "0.8.4-main.1c7ec43d41",
|
|
71
|
+
"@dxos/schema": "0.8.4-main.1c7ec43d41",
|
|
72
|
+
"@dxos/plugin-space": "0.8.4-main.1c7ec43d41",
|
|
73
|
+
"@dxos/util": "0.8.4-main.1c7ec43d41",
|
|
74
|
+
"@dxos/types": "0.8.4-main.1c7ec43d41"
|
|
66
75
|
},
|
|
67
76
|
"devDependencies": {
|
|
68
77
|
"@babel/core": "^7.18.13",
|
|
@@ -70,17 +79,19 @@
|
|
|
70
79
|
"@types/react-dom": "~19.2.3",
|
|
71
80
|
"react": "~19.2.3",
|
|
72
81
|
"react-dom": "~19.2.3",
|
|
73
|
-
"vite": "
|
|
74
|
-
"@dxos/
|
|
75
|
-
"@dxos/
|
|
76
|
-
"@dxos/
|
|
82
|
+
"vite": "^8.0.10",
|
|
83
|
+
"@dxos/plugin-testing": "0.8.4-main.1c7ec43d41",
|
|
84
|
+
"@dxos/react-ui": "0.8.4-main.1c7ec43d41",
|
|
85
|
+
"@dxos/storybook-utils": "0.8.4-main.1c7ec43d41",
|
|
86
|
+
"@dxos/ui-theme": "0.8.4-main.1c7ec43d41"
|
|
77
87
|
},
|
|
78
88
|
"peerDependencies": {
|
|
79
|
-
"effect": "
|
|
89
|
+
"@effect-atom/atom-react": "^0.5.0",
|
|
90
|
+
"effect": "3.20.0",
|
|
80
91
|
"react": "~19.2.3",
|
|
81
92
|
"react-dom": "~19.2.3",
|
|
82
|
-
"@dxos/react-ui": "0.8.4-main.
|
|
83
|
-
"@dxos/ui-theme": "0.8.4-main.
|
|
93
|
+
"@dxos/react-ui": "0.8.4-main.1c7ec43d41",
|
|
94
|
+
"@dxos/ui-theme": "0.8.4-main.1c7ec43d41"
|
|
84
95
|
},
|
|
85
96
|
"publishConfig": {
|
|
86
97
|
"access": "public"
|
package/src/StackPlugin.ts
CHANGED
|
@@ -4,33 +4,17 @@
|
|
|
4
4
|
|
|
5
5
|
import { Plugin } from '@dxos/app-framework';
|
|
6
6
|
import { AppPlugin } from '@dxos/app-toolkit';
|
|
7
|
-
import { type Obj } from '@dxos/echo';
|
|
8
7
|
|
|
9
|
-
import { ReactSurface } from '
|
|
10
|
-
import {
|
|
11
|
-
import { translations } from '
|
|
12
|
-
import { StackViewType } from '
|
|
8
|
+
import { ReactSurface } from '#capabilities';
|
|
9
|
+
import { meta } from '#meta';
|
|
10
|
+
import { translations } from '#translations';
|
|
11
|
+
import { StackViewType } from '#types';
|
|
13
12
|
|
|
14
13
|
export const StackPlugin = Plugin.define(meta).pipe(
|
|
15
|
-
AppPlugin.addMetadataModule({
|
|
16
|
-
metadata: {
|
|
17
|
-
id: SECTION_IDENTIFIER,
|
|
18
|
-
metadata: {
|
|
19
|
-
parse: (section: { object: Obj.Unknown }, type: string) => {
|
|
20
|
-
switch (type) {
|
|
21
|
-
case 'node':
|
|
22
|
-
return { id: section.object.id, label: (section.object as any).title, data: section.object };
|
|
23
|
-
case 'object':
|
|
24
|
-
return section.object;
|
|
25
|
-
case 'view-object':
|
|
26
|
-
return section;
|
|
27
|
-
}
|
|
28
|
-
},
|
|
29
|
-
},
|
|
30
|
-
},
|
|
31
|
-
}),
|
|
32
14
|
AppPlugin.addSchemaModule({ schema: [StackViewType] }),
|
|
33
15
|
AppPlugin.addSurfaceModule({ activate: ReactSurface }),
|
|
34
16
|
AppPlugin.addTranslationsModule({ translations }),
|
|
35
17
|
Plugin.make,
|
|
36
18
|
);
|
|
19
|
+
|
|
20
|
+
export default StackPlugin;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import * as Effect from 'effect/Effect';
|
|
6
|
+
import React from 'react';
|
|
7
|
+
|
|
8
|
+
import { Capabilities, Capability } from '@dxos/app-framework';
|
|
9
|
+
import { Surface } from '@dxos/app-framework/ui';
|
|
10
|
+
import { AppSurface } from '@dxos/app-toolkit/ui';
|
|
11
|
+
import { Collection } from '@dxos/echo';
|
|
12
|
+
|
|
13
|
+
import { StackContainer } from '#containers';
|
|
14
|
+
|
|
15
|
+
export default Capability.makeModule(() =>
|
|
16
|
+
Effect.succeed(
|
|
17
|
+
Capability.contributes(
|
|
18
|
+
Capabilities.ReactSurface,
|
|
19
|
+
Surface.create({
|
|
20
|
+
id: 'article',
|
|
21
|
+
filter: AppSurface.object(AppSurface.Article, Collection.Collection),
|
|
22
|
+
component: ({ role, data }) => {
|
|
23
|
+
return <StackContainer attendableId={data.attendableId} role={role} subject={data.subject} />;
|
|
24
|
+
},
|
|
25
|
+
}),
|
|
26
|
+
),
|
|
27
|
+
),
|
|
28
|
+
);
|
|
@@ -4,9 +4,10 @@
|
|
|
4
4
|
|
|
5
5
|
import { createContext, useContext } from 'react';
|
|
6
6
|
|
|
7
|
-
import { type AddSectionPosition } from '
|
|
7
|
+
import { type AddSectionPosition } from '#types';
|
|
8
8
|
|
|
9
9
|
export type StackContextValue = {
|
|
10
|
+
attendableId: string;
|
|
10
11
|
onCollapse: (id: string, collapsed: boolean) => void;
|
|
11
12
|
onNavigate: (id: string) => Promise<void>;
|
|
12
13
|
onDelete: (id: string) => Promise<void>;
|
|
@@ -14,6 +15,7 @@ export type StackContextValue = {
|
|
|
14
15
|
};
|
|
15
16
|
|
|
16
17
|
export const StackContext = createContext<StackContextValue>({
|
|
18
|
+
attendableId: '',
|
|
17
19
|
onCollapse: () => {},
|
|
18
20
|
onNavigate: async () => {},
|
|
19
21
|
onDelete: async () => {},
|
|
@@ -6,18 +6,19 @@ import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
|
|
|
6
6
|
import React, { useMemo, useState } from 'react';
|
|
7
7
|
|
|
8
8
|
import { Surface } from '@dxos/app-framework/ui';
|
|
9
|
+
import { AppSurface } from '@dxos/app-toolkit/ui';
|
|
9
10
|
import { DropdownMenu, Icon, IconButton, useTranslation } from '@dxos/react-ui';
|
|
10
11
|
import { useAttentionAttributes } from '@dxos/react-ui-attention';
|
|
11
12
|
import { StackItem } from '@dxos/react-ui-stack';
|
|
12
|
-
import { getSize, mx
|
|
13
|
+
import { getSize, mx } from '@dxos/ui-theme';
|
|
13
14
|
|
|
14
|
-
import { meta } from '
|
|
15
|
-
import { type StackSectionItem } from '
|
|
15
|
+
import { meta } from '#meta';
|
|
16
|
+
import { type StackSectionItem } from '#types';
|
|
16
17
|
|
|
18
|
+
import { useStack } from '../StackContext';
|
|
17
19
|
import { CaretDownUp } from './CaretDownUp';
|
|
18
|
-
import { useStack } from './StackContext';
|
|
19
20
|
|
|
20
|
-
const sectionActionDimensions = 'p-1
|
|
21
|
+
const sectionActionDimensions = 'p-1 my-1 shrink-0 min-h-0 w-(--dx-rail-action) h-min';
|
|
21
22
|
|
|
22
23
|
export type StackSectionProps = StackSectionItem;
|
|
23
24
|
|
|
@@ -28,15 +29,17 @@ export const StackSection = ({
|
|
|
28
29
|
metadata: { icon = 'ph--placeholder--regular' },
|
|
29
30
|
}: StackSectionProps) => {
|
|
30
31
|
const { t } = useTranslation(meta.id);
|
|
31
|
-
const { onNavigate, onAdd, onCollapse, onDelete } = useStack();
|
|
32
|
+
const { attendableId: parentAttendableId, onNavigate, onAdd, onCollapse, onDelete } = useStack();
|
|
32
33
|
const [optionsMenuOpen, setOptionsMenuOpen] = useState(false);
|
|
33
|
-
const
|
|
34
|
+
const attendableId = `${parentAttendableId}/${object.id}`;
|
|
35
|
+
const attentionAttrs = useAttentionAttributes(attendableId);
|
|
34
36
|
const stackItem = useMemo(() => ({ id }), [id]);
|
|
37
|
+
const data = useMemo(() => ({ attendableId, subject: object }), [object, attendableId]);
|
|
35
38
|
|
|
36
39
|
return (
|
|
37
40
|
<CollapsiblePrimitive.Root asChild open={!view.collapsed} onOpenChange={(nextOpen) => onCollapse?.(id, !nextOpen)}>
|
|
38
41
|
<StackItem.Root item={stackItem} role='section' {...attentionAttrs}>
|
|
39
|
-
<StackItem.Heading classNames='attention-surface'>
|
|
42
|
+
<StackItem.Heading classNames='dx-attention-surface'>
|
|
40
43
|
<span className='sr-only'>{view.title}</span>
|
|
41
44
|
<StackItem.HeadingStickyContent>
|
|
42
45
|
<DropdownMenu.Root
|
|
@@ -47,7 +50,7 @@ export const StackSection = ({
|
|
|
47
50
|
>
|
|
48
51
|
<DropdownMenu.Trigger asChild>
|
|
49
52
|
<StackItem.SigilButton>
|
|
50
|
-
<Icon icon={icon}
|
|
53
|
+
<Icon icon={icon} classNames='transition-opacity' />
|
|
51
54
|
</StackItem.SigilButton>
|
|
52
55
|
</DropdownMenu.Trigger>
|
|
53
56
|
<DropdownMenu.Portal>
|
|
@@ -55,28 +58,28 @@ export const StackSection = ({
|
|
|
55
58
|
<DropdownMenu.Viewport>
|
|
56
59
|
{view.collapsed ? (
|
|
57
60
|
<DropdownMenu.Item onClick={() => onNavigate(id)} data-testid='section.navigate-to'>
|
|
58
|
-
<Icon icon='ph--arrow-right--regular'
|
|
59
|
-
<span className='
|
|
61
|
+
<Icon icon='ph--arrow-right--regular' />
|
|
62
|
+
<span className='ms-2 grow'>{t('navigate-to-section.label')}</span>
|
|
60
63
|
</DropdownMenu.Item>
|
|
61
64
|
) : (
|
|
62
65
|
<CollapsiblePrimitive.Trigger asChild>
|
|
63
66
|
<DropdownMenu.Item>
|
|
64
67
|
<CaretDownUp className={getSize(5)} />
|
|
65
|
-
<span className='
|
|
68
|
+
<span className='ms-2 grow'>{t('collapse.label')}</span>
|
|
66
69
|
</DropdownMenu.Item>
|
|
67
70
|
</CollapsiblePrimitive.Trigger>
|
|
68
71
|
)}
|
|
69
72
|
<DropdownMenu.Item onClick={() => onAdd(id, 'before')} data-testid='section.add-before'>
|
|
70
|
-
<Icon icon='ph--arrow-line-up--regular'
|
|
71
|
-
<span className='
|
|
73
|
+
<Icon icon='ph--arrow-line-up--regular' />
|
|
74
|
+
<span className='ms-2 grow'>{t('add-section-before.label')}</span>
|
|
72
75
|
</DropdownMenu.Item>
|
|
73
76
|
<DropdownMenu.Item onClick={() => onAdd(id, 'after')} data-testid='section.add-after'>
|
|
74
|
-
<Icon icon='ph--arrow-line-down--regular'
|
|
75
|
-
<span className='
|
|
77
|
+
<Icon icon='ph--arrow-line-down--regular' />
|
|
78
|
+
<span className='ms-2 grow'>{t('add-section-after.label')}</span>
|
|
76
79
|
</DropdownMenu.Item>
|
|
77
80
|
<DropdownMenu.Item onClick={() => onDelete(id)} data-testid='section.remove'>
|
|
78
|
-
<Icon icon='ph--trash--regular'
|
|
79
|
-
<span className='
|
|
81
|
+
<Icon icon='ph--trash--regular' />
|
|
82
|
+
<span className='ms-2 grow'>{t('remove-section.label')}</span>
|
|
80
83
|
</DropdownMenu.Item>
|
|
81
84
|
</DropdownMenu.Viewport>
|
|
82
85
|
<DropdownMenu.Arrow />
|
|
@@ -88,7 +91,7 @@ export const StackSection = ({
|
|
|
88
91
|
<IconButton
|
|
89
92
|
iconOnly
|
|
90
93
|
variant='ghost'
|
|
91
|
-
label={t('expand
|
|
94
|
+
label={t('expand.label')}
|
|
92
95
|
icon='ph--caret-up-down--regular'
|
|
93
96
|
classNames={sectionActionDimensions}
|
|
94
97
|
/>
|
|
@@ -98,7 +101,7 @@ export const StackSection = ({
|
|
|
98
101
|
iconOnly
|
|
99
102
|
variant='ghost'
|
|
100
103
|
onClick={() => onNavigate(id)}
|
|
101
|
-
label={t('navigate
|
|
104
|
+
label={t('navigate-to-section.label')}
|
|
102
105
|
icon='ph--arrow-right--regular'
|
|
103
106
|
data-testid='section.navigate-to'
|
|
104
107
|
classNames={sectionActionDimensions}
|
|
@@ -107,11 +110,11 @@ export const StackSection = ({
|
|
|
107
110
|
</StackItem.HeadingStickyContent>
|
|
108
111
|
</StackItem.Heading>
|
|
109
112
|
<CollapsiblePrimitive.Content>
|
|
110
|
-
<Surface.Surface
|
|
113
|
+
<Surface.Surface type={AppSurface.Section} data={data} limit={1} placeholder={<></>} />
|
|
111
114
|
</CollapsiblePrimitive.Content>
|
|
112
115
|
{view.collapsed && (
|
|
113
|
-
<StackItem.Content classNames='attention-surface'>
|
|
114
|
-
<h2 className={mx('flex items-center p-4 font-medium'
|
|
116
|
+
<StackItem.Content classNames='dx-attention-surface'>
|
|
117
|
+
<h2 className={mx('flex items-center p-4 font-medium')}>{view.title}</h2>
|
|
115
118
|
</StackItem.Content>
|
|
116
119
|
)}
|
|
117
120
|
</StackItem.Root>
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2023 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import React from 'react';
|
|
6
|
+
|
|
7
|
+
import { Input, useTranslation } from '@dxos/react-ui';
|
|
8
|
+
import { Settings as SettingsForm } from '@dxos/react-ui-form';
|
|
9
|
+
|
|
10
|
+
import { meta } from '#meta';
|
|
11
|
+
import { type StackSettingsProps } from '#types';
|
|
12
|
+
|
|
13
|
+
export const StackSettings = ({ settings }: { settings: StackSettingsProps }) => {
|
|
14
|
+
const { t } = useTranslation(meta.id);
|
|
15
|
+
|
|
16
|
+
return (
|
|
17
|
+
<SettingsForm.Viewport>
|
|
18
|
+
<SettingsForm.Section title={t('settings.title', { ns: meta.id })}>
|
|
19
|
+
<SettingsForm.Item title={t('settings.separation.label')} description={t('settings.separation.description')}>
|
|
20
|
+
<Input.Switch
|
|
21
|
+
checked={settings.separation}
|
|
22
|
+
onCheckedChange={(checked) => (settings.separation = !!checked)}
|
|
23
|
+
/>
|
|
24
|
+
</SettingsForm.Item>
|
|
25
|
+
</SettingsForm.Section>
|
|
26
|
+
</SettingsForm.Viewport>
|
|
27
|
+
);
|
|
28
|
+
};
|
package/src/components/index.ts
CHANGED
|
@@ -2,43 +2,50 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
+
import { Atom, useAtomValue } from '@effect-atom/atom-react';
|
|
5
6
|
import * as Option from 'effect/Option';
|
|
6
7
|
import React, { useCallback, useState } from 'react';
|
|
7
8
|
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import { type
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
9
|
+
import { useOperationInvoker } from '@dxos/app-framework/ui';
|
|
10
|
+
import { LayoutOperation } from '@dxos/app-toolkit';
|
|
11
|
+
import { useAppGraph, type AppSurface } from '@dxos/app-toolkit/ui';
|
|
12
|
+
import { Annotation, Obj, type Ref } from '@dxos/echo';
|
|
13
|
+
import { type Collection } from '@dxos/echo';
|
|
14
|
+
import { AtomObj } from '@dxos/echo-atom';
|
|
13
15
|
import { Graph } from '@dxos/plugin-graph';
|
|
14
|
-
import { SpaceOperation } from '@dxos/plugin-space/
|
|
16
|
+
import { SpaceOperation } from '@dxos/plugin-space/operations';
|
|
15
17
|
import { Toolbar, toLocalizedString, useTranslation } from '@dxos/react-ui';
|
|
16
|
-
import { AttentionProvider } from '@dxos/react-ui-attention';
|
|
17
18
|
import { Stack, StackItem } from '@dxos/react-ui-stack';
|
|
18
|
-
import { type Collection } from '@dxos/schema';
|
|
19
19
|
import { isNonNullable } from '@dxos/util';
|
|
20
20
|
|
|
21
|
-
import {
|
|
21
|
+
import { StackContext, StackSection } from '#components';
|
|
22
|
+
import { meta } from '#meta';
|
|
22
23
|
import {
|
|
23
24
|
type AddSectionPosition,
|
|
24
25
|
type CollapsedSections,
|
|
25
26
|
type StackSectionItem,
|
|
26
27
|
type StackSectionMetadata,
|
|
27
28
|
type StackSectionView,
|
|
28
|
-
} from '
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
} from '#types';
|
|
30
|
+
|
|
31
|
+
const collectionObjectsFamily = Atom.family((collection: Collection.Collection) =>
|
|
32
|
+
Atom.make((get) => {
|
|
33
|
+
const snapshot = get(AtomObj.make(collection));
|
|
34
|
+
return (
|
|
35
|
+
snapshot.objects
|
|
36
|
+
// TODO(wittjosiah): Why isn't this type inferred correctly?
|
|
37
|
+
.map((ref: Ref.Ref<Obj.Unknown>) => get(AtomObj.makeWithReactive(ref)))
|
|
38
|
+
.filter(isNonNullable)
|
|
39
|
+
);
|
|
40
|
+
}),
|
|
41
|
+
);
|
|
32
42
|
|
|
33
|
-
type StackContainerProps =
|
|
34
|
-
id: string;
|
|
35
|
-
};
|
|
43
|
+
type StackContainerProps = AppSurface.ObjectArticleProps<Collection.Collection>;
|
|
36
44
|
|
|
37
|
-
const StackContainer = ({
|
|
45
|
+
export const StackContainer = ({ attendableId, subject: collection }: StackContainerProps) => {
|
|
38
46
|
const { invokePromise } = useOperationInvoker();
|
|
39
47
|
const { graph } = useAppGraph();
|
|
40
48
|
const { t } = useTranslation(meta.id);
|
|
41
|
-
const allMetadata = useCapabilities(AppCapabilities.Metadata);
|
|
42
49
|
const [collapsedSections, setCollapsedSections] = useState<CollapsedSections>({});
|
|
43
50
|
|
|
44
51
|
// TODO(wittjosiah): Re-implement stack views with relations.
|
|
@@ -50,28 +57,24 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
|
|
|
50
57
|
// }
|
|
51
58
|
// }, [collection, stack]);
|
|
52
59
|
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
.
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
),
|
|
72
|
-
} as StackSectionView;
|
|
73
|
-
return { id: Obj.getDXN(object).toString(), object, metadata, view } satisfies StackSectionItem;
|
|
74
|
-
}) ?? [];
|
|
60
|
+
const collectionObjects = useAtomValue(collectionObjectsFamily(collection));
|
|
61
|
+
const items = collectionObjects.map((object: Obj.Unknown) => {
|
|
62
|
+
const schema = Obj.getSchema(object);
|
|
63
|
+
const iconAnnotation = schema ? Option.getOrUndefined(Annotation.IconAnnotation.get(schema)) : undefined;
|
|
64
|
+
const metadata: StackSectionMetadata = { icon: iconAnnotation?.icon };
|
|
65
|
+
const view = {
|
|
66
|
+
// ...stack.sections[object.id],
|
|
67
|
+
collapsed: collapsedSections[Obj.getDXN(object).toString()],
|
|
68
|
+
title:
|
|
69
|
+
(object as any)?.title ??
|
|
70
|
+
// TODO(wittjosiah): `getNode` is not reactive.
|
|
71
|
+
toLocalizedString(
|
|
72
|
+
Graph.getNode(graph, Obj.getDXN(object).toString()).pipe(Option.getOrNull)?.properties.label,
|
|
73
|
+
t,
|
|
74
|
+
),
|
|
75
|
+
} as StackSectionView;
|
|
76
|
+
return { id: Obj.getDXN(object).toString(), object, metadata, view } satisfies StackSectionItem;
|
|
77
|
+
});
|
|
75
78
|
|
|
76
79
|
const handleDelete = useCallback(
|
|
77
80
|
async (id: string) => {
|
|
@@ -97,7 +100,7 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
|
|
|
97
100
|
async (id: string, position: AddSectionPosition) => {
|
|
98
101
|
// TODO(wittjosiah): Use object creation dialog.
|
|
99
102
|
await invokePromise(LayoutOperation.UpdateDialog, {
|
|
100
|
-
subject: `${meta.id}
|
|
103
|
+
subject: `${meta.id}.AddSectionDialog`,
|
|
101
104
|
blockAlign: 'start',
|
|
102
105
|
props: {
|
|
103
106
|
path: id,
|
|
@@ -131,10 +134,7 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
|
|
|
131
134
|
);
|
|
132
135
|
|
|
133
136
|
return (
|
|
134
|
-
<StackItem.Content
|
|
135
|
-
toolbar
|
|
136
|
-
classNames='container-max-width overflow-hidden border-l border-r border-subduedSeparator'
|
|
137
|
-
>
|
|
137
|
+
<StackItem.Content toolbar classNames='dx-document'>
|
|
138
138
|
<Toolbar.Root>
|
|
139
139
|
<Toolbar.IconButton
|
|
140
140
|
icon='ph--plus--regular'
|
|
@@ -144,24 +144,27 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
|
|
|
144
144
|
onClick={handleAddSection}
|
|
145
145
|
/>
|
|
146
146
|
</Toolbar.Root>
|
|
147
|
-
<
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
147
|
+
<StackContext.Provider
|
|
148
|
+
value={{
|
|
149
|
+
attendableId,
|
|
150
|
+
onCollapse: handleCollapse,
|
|
151
|
+
onNavigate: handleNavigate,
|
|
152
|
+
onDelete: handleDelete,
|
|
153
|
+
onAdd: handleAdd,
|
|
154
|
+
}}
|
|
155
|
+
>
|
|
156
|
+
<Stack
|
|
157
|
+
orientation='vertical'
|
|
158
|
+
size='intrinsic'
|
|
159
|
+
id={Obj.getDXN(collection).toString()}
|
|
160
|
+
data-testid='main.stack'
|
|
161
|
+
classNames='overflow-y-auto'
|
|
155
162
|
>
|
|
156
|
-
|
|
157
|
-
{
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
</StackContext.Provider>
|
|
162
|
-
</AttentionProvider>
|
|
163
|
+
{items.map((item) => (
|
|
164
|
+
<StackSection key={item.id} {...item} />
|
|
165
|
+
))}
|
|
166
|
+
</Stack>
|
|
167
|
+
</StackContext.Provider>
|
|
163
168
|
</StackItem.Content>
|
|
164
169
|
);
|
|
165
170
|
};
|
|
166
|
-
|
|
167
|
-
export default StackContainer;
|
package/src/index.ts
CHANGED
|
@@ -2,5 +2,10 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
+
import { Plugin } from '@dxos/app-framework';
|
|
6
|
+
|
|
7
|
+
import { meta } from './meta';
|
|
8
|
+
|
|
9
|
+
export const StackPlugin = Plugin.lazy(meta, () => import('./StackPlugin'));
|
|
10
|
+
|
|
5
11
|
export * from './meta';
|
|
6
|
-
export * from './StackPlugin';
|
package/src/meta.ts
CHANGED
|
@@ -5,10 +5,10 @@
|
|
|
5
5
|
import { type Plugin } from '@dxos/app-framework';
|
|
6
6
|
import { trim } from '@dxos/util';
|
|
7
7
|
|
|
8
|
-
export const SECTION_IDENTIFIER = 'dxos.
|
|
8
|
+
export const SECTION_IDENTIFIER = 'org.dxos.type.stackSection';
|
|
9
9
|
|
|
10
10
|
export const meta: Plugin.Meta = {
|
|
11
|
-
id: 'dxos.
|
|
11
|
+
id: 'org.dxos.plugin.stack',
|
|
12
12
|
// TODO(wittjosiah): Prevents "stacks" language from being exposed to users in settings panel.
|
|
13
13
|
// Conside renaming this to the collection plugin and trying to factor more collections logic from the space plugin.
|
|
14
14
|
name: 'Collections',
|