@dxos/plugin-stack 0.8.4-main.4a85c3132b → 0.8.4-main.4f23b4e393

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.
Files changed (109) hide show
  1. package/dist/lib/neutral/StackContainer-DDERTIAF.mjs +126 -0
  2. package/dist/lib/neutral/StackContainer-DDERTIAF.mjs.map +7 -0
  3. package/dist/lib/neutral/StackPlugin.mjs +22 -0
  4. package/dist/lib/neutral/StackPlugin.mjs.map +7 -0
  5. package/dist/lib/neutral/capabilities/index.mjs +7 -0
  6. package/dist/lib/neutral/capabilities/index.mjs.map +7 -0
  7. package/dist/lib/{browser/chunk-4X7CK6FM.mjs → neutral/chunk-3ISQZKGO.mjs} +3 -3
  8. package/dist/lib/{browser/chunk-4X7CK6FM.mjs.map → neutral/chunk-3ISQZKGO.mjs.map} +3 -3
  9. package/dist/lib/{browser/chunk-CD32XYEB.mjs → neutral/chunk-IPU3C6TT.mjs} +2 -2
  10. package/dist/lib/{browser/chunk-CD32XYEB.mjs.map → neutral/chunk-IPU3C6TT.mjs.map} +3 -3
  11. package/dist/lib/neutral/components/index.mjs +182 -0
  12. package/dist/lib/neutral/components/index.mjs.map +7 -0
  13. package/dist/lib/neutral/containers/index.mjs +7 -0
  14. package/dist/lib/neutral/containers/index.mjs.map +7 -0
  15. package/dist/lib/neutral/index.mjs +15 -0
  16. package/dist/lib/neutral/meta.json +1 -0
  17. package/dist/lib/neutral/meta.mjs +9 -0
  18. package/dist/lib/neutral/plugin.mjs +11 -0
  19. package/dist/lib/neutral/plugin.mjs.map +7 -0
  20. package/dist/lib/neutral/react-surface-4ZA44TMR.mjs +23 -0
  21. package/dist/lib/neutral/react-surface-4ZA44TMR.mjs.map +7 -0
  22. package/dist/lib/neutral/translations.mjs +37 -0
  23. package/dist/lib/neutral/translations.mjs.map +7 -0
  24. package/dist/lib/{browser → neutral}/types/index.mjs +1 -1
  25. package/dist/lib/neutral/types/index.mjs.map +7 -0
  26. package/dist/types/src/StackPlugin.d.ts +1 -0
  27. package/dist/types/src/StackPlugin.d.ts.map +1 -1
  28. package/dist/types/src/capabilities/index.d.ts +2 -1
  29. package/dist/types/src/capabilities/index.d.ts.map +1 -1
  30. package/dist/types/src/capabilities/react-surface.d.ts.map +1 -0
  31. package/dist/types/src/components/{StackContext.d.ts → StackContext/StackContext.d.ts} +2 -1
  32. package/dist/types/src/components/StackContext/StackContext.d.ts.map +1 -0
  33. package/dist/types/src/components/StackContext/index.d.ts +2 -0
  34. package/dist/types/src/components/StackContext/index.d.ts.map +1 -0
  35. package/dist/types/src/components/{CaretDownUp.d.ts → StackSection/CaretDownUp.d.ts} +1 -1
  36. package/dist/types/src/components/StackSection/CaretDownUp.d.ts.map +1 -0
  37. package/dist/types/src/components/{StackSection.d.ts → StackSection/StackSection.d.ts} +1 -1
  38. package/dist/types/src/components/StackSection/StackSection.d.ts.map +1 -0
  39. package/dist/types/src/components/StackSection/index.d.ts +2 -0
  40. package/dist/types/src/components/StackSection/index.d.ts.map +1 -0
  41. package/dist/types/src/components/{StackSettings.d.ts → StackSettings/StackSettings.d.ts} +1 -1
  42. package/dist/types/src/components/StackSettings/StackSettings.d.ts.map +1 -0
  43. package/dist/types/src/components/StackSettings/index.d.ts +2 -0
  44. package/dist/types/src/components/StackSettings/index.d.ts.map +1 -0
  45. package/dist/types/src/containers/StackContainer/StackContainer.d.ts +3 -5
  46. package/dist/types/src/containers/StackContainer/StackContainer.d.ts.map +1 -1
  47. package/dist/types/src/containers/StackContainer/index.d.ts +1 -2
  48. package/dist/types/src/containers/StackContainer/index.d.ts.map +1 -1
  49. package/dist/types/src/index.d.ts +1 -1
  50. package/dist/types/src/index.d.ts.map +1 -1
  51. package/dist/types/src/meta.d.ts +1 -1
  52. package/dist/types/src/plugin.d.ts +3 -0
  53. package/dist/types/src/plugin.d.ts.map +1 -0
  54. package/dist/types/src/translations.d.ts +30 -30
  55. package/dist/types/src/translations.d.ts.map +1 -1
  56. package/dist/types/src/types/types.d.ts +1 -2
  57. package/dist/types/src/types/types.d.ts.map +1 -1
  58. package/dist/types/tsconfig.tsbuildinfo +1 -1
  59. package/package.json +77 -43
  60. package/src/StackPlugin.ts +6 -22
  61. package/src/capabilities/index.ts +3 -1
  62. package/src/capabilities/react-surface.tsx +28 -0
  63. package/src/components/{StackContext.tsx → StackContext/StackContext.tsx} +3 -1
  64. package/src/components/StackContext/index.ts +5 -0
  65. package/src/components/{StackSection.tsx → StackSection/StackSection.tsx} +23 -20
  66. package/src/components/StackSection/index.ts +5 -0
  67. package/src/components/StackSettings/StackSettings.tsx +28 -0
  68. package/src/components/StackSettings/index.ts +5 -0
  69. package/src/containers/StackContainer/StackContainer.tsx +35 -35
  70. package/src/containers/StackContainer/index.ts +1 -3
  71. package/src/index.ts +1 -1
  72. package/src/meta.ts +2 -2
  73. package/src/plugin.ts +9 -0
  74. package/src/translations.ts +23 -22
  75. package/src/types/stack.ts +1 -1
  76. package/src/types/types.ts +1 -2
  77. package/dist/lib/browser/StackContainer-BIFUBD3Y.mjs +0 -289
  78. package/dist/lib/browser/StackContainer-BIFUBD3Y.mjs.map +0 -7
  79. package/dist/lib/browser/index.mjs +0 -84
  80. package/dist/lib/browser/index.mjs.map +0 -7
  81. package/dist/lib/browser/meta.json +0 -1
  82. package/dist/lib/browser/react-surface-PVND4UCN.mjs +0 -34
  83. package/dist/lib/browser/react-surface-PVND4UCN.mjs.map +0 -7
  84. package/dist/lib/node-esm/StackContainer-7XVJHW4D.mjs +0 -290
  85. package/dist/lib/node-esm/StackContainer-7XVJHW4D.mjs.map +0 -7
  86. package/dist/lib/node-esm/chunk-26XWE7UY.mjs +0 -29
  87. package/dist/lib/node-esm/chunk-26XWE7UY.mjs.map +0 -7
  88. package/dist/lib/node-esm/chunk-HEEGXPSW.mjs +0 -23
  89. package/dist/lib/node-esm/chunk-HEEGXPSW.mjs.map +0 -7
  90. package/dist/lib/node-esm/index.mjs +0 -85
  91. package/dist/lib/node-esm/index.mjs.map +0 -7
  92. package/dist/lib/node-esm/meta.json +0 -1
  93. package/dist/lib/node-esm/react-surface-SZETVRAZ.mjs +0 -35
  94. package/dist/lib/node-esm/react-surface-SZETVRAZ.mjs.map +0 -7
  95. package/dist/lib/node-esm/types/index.mjs +0 -10
  96. package/dist/types/src/capabilities/react-surface/index.d.ts +0 -3
  97. package/dist/types/src/capabilities/react-surface/index.d.ts.map +0 -1
  98. package/dist/types/src/capabilities/react-surface/react-surface.d.ts.map +0 -1
  99. package/dist/types/src/components/CaretDownUp.d.ts.map +0 -1
  100. package/dist/types/src/components/StackContext.d.ts.map +0 -1
  101. package/dist/types/src/components/StackSection.d.ts.map +0 -1
  102. package/dist/types/src/components/StackSettings.d.ts.map +0 -1
  103. package/src/capabilities/react-surface/index.ts +0 -7
  104. package/src/capabilities/react-surface/react-surface.tsx +0 -34
  105. package/src/components/StackSettings.tsx +0 -30
  106. /package/dist/lib/{browser/types → neutral}/index.mjs.map +0 -0
  107. /package/dist/lib/{node-esm/types/index.mjs.map → neutral/meta.mjs.map} +0 -0
  108. /package/dist/types/src/capabilities/{react-surface/react-surface.d.ts → react-surface.d.ts} +0 -0
  109. /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.4a85c3132b",
3
+ "version": "0.8.4-main.4f23b4e393",
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,28 +12,61 @@
12
12
  "author": "DXOS.org",
13
13
  "sideEffects": true,
14
14
  "type": "module",
15
+ "imports": {
16
+ "#capabilities": {
17
+ "source": "./src/capabilities/index.ts",
18
+ "types": "./dist/types/src/capabilities/index.d.ts",
19
+ "default": "./dist/lib/neutral/capabilities/index.mjs"
20
+ },
21
+ "#components": {
22
+ "source": "./src/components/index.ts",
23
+ "types": "./dist/types/src/components/index.d.ts",
24
+ "default": "./dist/lib/neutral/components/index.mjs"
25
+ },
26
+ "#containers": {
27
+ "source": "./src/containers/index.ts",
28
+ "types": "./dist/types/src/containers/index.d.ts",
29
+ "default": "./dist/lib/neutral/containers/index.mjs"
30
+ },
31
+ "#meta": {
32
+ "source": "./src/meta.ts",
33
+ "types": "./dist/types/src/meta.d.ts",
34
+ "default": "./dist/lib/neutral/meta.mjs"
35
+ },
36
+ "#plugin": {
37
+ "source": "./src/StackPlugin.ts",
38
+ "types": "./dist/types/src/StackPlugin.d.ts",
39
+ "default": "./dist/lib/neutral/StackPlugin.mjs"
40
+ },
41
+ "#translations": {
42
+ "source": "./src/translations.ts",
43
+ "types": "./dist/types/src/translations.d.ts",
44
+ "default": "./dist/lib/neutral/translations.mjs"
45
+ },
46
+ "#types": {
47
+ "source": "./src/types/index.ts",
48
+ "types": "./dist/types/src/types/index.d.ts",
49
+ "default": "./dist/lib/neutral/types/index.mjs"
50
+ }
51
+ },
15
52
  "exports": {
16
53
  ".": {
17
54
  "source": "./src/index.ts",
18
55
  "types": "./dist/types/src/index.d.ts",
19
- "browser": "./dist/lib/browser/index.mjs",
20
- "node": "./dist/lib/node-esm/index.mjs"
56
+ "default": "./dist/lib/neutral/index.mjs"
21
57
  },
22
- "./types": {
23
- "source": "./src/types/index.ts",
24
- "types": "./dist/types/src/types/index.d.ts",
25
- "browser": "./dist/lib/browser/types/index.mjs",
26
- "node": "./dist/lib/node-esm/types/index.mjs"
58
+ "./plugin": {
59
+ "source": "./src/plugin.ts",
60
+ "types": "./dist/types/src/plugin.d.ts",
61
+ "default": "./dist/lib/neutral/plugin.mjs"
62
+ },
63
+ "./translations": {
64
+ "source": "./src/translations.ts",
65
+ "types": "./dist/types/src/translations.d.ts",
66
+ "default": "./dist/lib/neutral/translations.mjs"
27
67
  }
28
68
  },
29
69
  "types": "dist/types/src/index.d.ts",
30
- "typesVersions": {
31
- "*": {
32
- "types": [
33
- "dist/types/src/types/index.d.ts"
34
- ]
35
- }
36
- },
37
70
  "files": [
38
71
  "dist",
39
72
  "src"
@@ -42,29 +75,29 @@
42
75
  "@effect-atom/atom-react": "^0.5.0",
43
76
  "@fluentui/react-tabster": "9.26.11",
44
77
  "@radix-ui/react-collapsible": "1.1.3",
45
- "effect": "3.19.16",
78
+ "effect": "3.20.0",
46
79
  "node-fetch": "^2.6.0",
47
80
  "react-is": "~19.2.0",
48
- "@dxos/app-framework": "0.8.4-main.4a85c3132b",
49
- "@dxos/app-toolkit": "0.8.4-main.4a85c3132b",
50
- "@dxos/client": "0.8.4-main.4a85c3132b",
51
- "@dxos/echo": "0.8.4-main.4a85c3132b",
52
- "@dxos/async": "0.8.4-main.4a85c3132b",
53
- "@dxos/invariant": "0.8.4-main.4a85c3132b",
54
- "@dxos/echo-atom": "0.8.4-main.4a85c3132b",
55
- "@dxos/operation": "0.8.4-main.4a85c3132b",
56
- "@dxos/plugin-deck": "0.8.4-main.4a85c3132b",
57
- "@dxos/plugin-client": "0.8.4-main.4a85c3132b",
58
- "@dxos/plugin-space": "0.8.4-main.4a85c3132b",
59
- "@dxos/plugin-graph": "0.8.4-main.4a85c3132b",
60
- "@dxos/react-ui-attention": "0.8.4-main.4a85c3132b",
61
- "@dxos/react-ui-form": "0.8.4-main.4a85c3132b",
62
- "@dxos/react-ui-stack": "0.8.4-main.4a85c3132b",
63
- "@dxos/react-ui-searchlist": "0.8.4-main.4a85c3132b",
64
- "@dxos/schema": "0.8.4-main.4a85c3132b",
65
- "@dxos/util": "0.8.4-main.4a85c3132b",
66
- "@dxos/react-client": "0.8.4-main.4a85c3132b",
67
- "@dxos/types": "0.8.4-main.4a85c3132b"
81
+ "@dxos/app-framework": "0.8.4-main.4f23b4e393",
82
+ "@dxos/app-toolkit": "0.8.4-main.4f23b4e393",
83
+ "@dxos/async": "0.8.4-main.4f23b4e393",
84
+ "@dxos/echo-atom": "0.8.4-main.4f23b4e393",
85
+ "@dxos/invariant": "0.8.4-main.4f23b4e393",
86
+ "@dxos/client": "0.8.4-main.4f23b4e393",
87
+ "@dxos/echo": "0.8.4-main.4f23b4e393",
88
+ "@dxos/operation": "0.8.4-main.4f23b4e393",
89
+ "@dxos/plugin-deck": "0.8.4-main.4f23b4e393",
90
+ "@dxos/plugin-client": "0.8.4-main.4f23b4e393",
91
+ "@dxos/plugin-graph": "0.8.4-main.4f23b4e393",
92
+ "@dxos/plugin-space": "0.8.4-main.4f23b4e393",
93
+ "@dxos/react-client": "0.8.4-main.4f23b4e393",
94
+ "@dxos/react-ui-form": "0.8.4-main.4f23b4e393",
95
+ "@dxos/react-ui-list": "0.8.4-main.4f23b4e393",
96
+ "@dxos/react-ui-attention": "0.8.4-main.4f23b4e393",
97
+ "@dxos/react-ui-stack": "0.8.4-main.4f23b4e393",
98
+ "@dxos/schema": "0.8.4-main.4f23b4e393",
99
+ "@dxos/types": "0.8.4-main.4f23b4e393",
100
+ "@dxos/util": "0.8.4-main.4f23b4e393"
68
101
  },
69
102
  "devDependencies": {
70
103
  "@babel/core": "^7.18.13",
@@ -72,18 +105,19 @@
72
105
  "@types/react-dom": "~19.2.3",
73
106
  "react": "~19.2.3",
74
107
  "react-dom": "~19.2.3",
75
- "vite": "^7.1.11",
76
- "@dxos/react-ui": "0.8.4-main.4a85c3132b",
77
- "@dxos/storybook-utils": "0.8.4-main.4a85c3132b",
78
- "@dxos/ui-theme": "0.8.4-main.4a85c3132b"
108
+ "vite": "^8.0.10",
109
+ "@dxos/plugin-testing": "0.8.4-main.4f23b4e393",
110
+ "@dxos/react-ui": "0.8.4-main.4f23b4e393",
111
+ "@dxos/storybook-utils": "0.8.4-main.4f23b4e393",
112
+ "@dxos/ui-theme": "0.8.4-main.4f23b4e393"
79
113
  },
80
114
  "peerDependencies": {
81
115
  "@effect-atom/atom-react": "^0.5.0",
82
- "effect": "3.19.16",
116
+ "effect": "3.20.0",
83
117
  "react": "~19.2.3",
84
118
  "react-dom": "~19.2.3",
85
- "@dxos/react-ui": "0.8.4-main.4a85c3132b",
86
- "@dxos/ui-theme": "0.8.4-main.4a85c3132b"
119
+ "@dxos/react-ui": "0.8.4-main.4f23b4e393",
120
+ "@dxos/ui-theme": "0.8.4-main.4f23b4e393"
87
121
  },
88
122
  "publishConfig": {
89
123
  "access": "public"
@@ -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 './capabilities';
10
- import { SECTION_IDENTIFIER, meta } from './meta';
11
- import { translations } from './translations';
12
- import { StackViewType } from './types';
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;
@@ -2,4 +2,6 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- export * from './react-surface';
5
+ import { Capability } from '@dxos/app-framework';
6
+
7
+ export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
@@ -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 '../types';
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 () => {},
@@ -0,0 +1,5 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ export * from './StackContext';
@@ -6,16 +6,17 @@ 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, textBlockWidth } from '@dxos/ui-theme';
13
+ import { getSize, mx } from '@dxos/ui-theme';
13
14
 
14
- import { meta } from '../meta';
15
- import { type StackSectionItem } from '../types';
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
21
  const sectionActionDimensions = 'p-1 my-1 shrink-0 min-h-0 w-(--dx-rail-action) h-min';
21
22
 
@@ -28,10 +29,12 @@ 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 attentionAttrs = useAttentionAttributes(id);
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)}>
@@ -47,7 +50,7 @@ export const StackSection = ({
47
50
  >
48
51
  <DropdownMenu.Trigger asChild>
49
52
  <StackItem.SigilButton>
50
- <Icon icon={icon} size={5} classNames='transition-opacity' />
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' size={5} />
59
- <span className='ms-2 grow'>{t('navigate to section label')}</span>
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='ms-2 grow'>{t('collapse label')}</span>
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' size={5} />
71
- <span className='ms-2 grow'>{t('add section before label')}</span>
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' size={5} />
75
- <span className='ms-2 grow'>{t('add section after label')}</span>
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' size={5} />
79
- <span className='ms-2 grow'>{t('remove section label')}</span>
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 label')}
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 to section label')}
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 role='section' data={{ subject: object }} limit={1} placeholder={<></>} />
113
+ <Surface.Surface type={AppSurface.Section} data={data} limit={1} placeholder={<></>} />
111
114
  </CollapsiblePrimitive.Content>
112
115
  {view.collapsed && (
113
116
  <StackItem.Content classNames='dx-attention-surface'>
114
- <h2 className={mx('flex items-center p-4 font-medium', textBlockWidth)}>{view.title}</h2>
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,5 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ export * from './StackSection';
@@ -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
+ };
@@ -0,0 +1,5 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ export * from './StackSettings';
@@ -6,29 +6,26 @@ import { Atom, useAtomValue } from '@effect-atom/atom-react';
6
6
  import * as Option from 'effect/Option';
7
7
  import React, { useCallback, useState } from 'react';
8
8
 
9
- import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
10
- import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
11
- import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
12
- import { useAppGraph } from '@dxos/app-toolkit/ui';
13
- import { Obj, type Ref } from '@dxos/echo';
14
- import { type Collection } from '@dxos/echo';
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, type Collection, Obj, type Ref } from '@dxos/echo';
15
13
  import { AtomObj } from '@dxos/echo-atom';
16
14
  import { Graph } from '@dxos/plugin-graph';
17
- import { SpaceOperation } from '@dxos/plugin-space/types';
15
+ import { SpaceOperation } from '@dxos/plugin-space';
18
16
  import { Toolbar, toLocalizedString, useTranslation } from '@dxos/react-ui';
19
- import { AttentionProvider } from '@dxos/react-ui-attention';
20
17
  import { Stack, StackItem } from '@dxos/react-ui-stack';
21
18
  import { isNonNullable } from '@dxos/util';
22
19
 
23
- import { StackContext, StackSection } from '../../components';
24
- import { meta } from '../../meta';
20
+ import { StackContext, StackSection } from '#components';
21
+ import { meta } from '#meta';
25
22
  import {
26
23
  type AddSectionPosition,
27
24
  type CollapsedSections,
28
25
  type StackSectionItem,
29
26
  type StackSectionMetadata,
30
27
  type StackSectionView,
31
- } from '../../types';
28
+ } from '#types';
32
29
 
33
30
  const collectionObjectsFamily = Atom.family((collection: Collection.Collection) =>
34
31
  Atom.make((get) => {
@@ -42,15 +39,12 @@ const collectionObjectsFamily = Atom.family((collection: Collection.Collection)
42
39
  }),
43
40
  );
44
41
 
45
- type StackContainerProps = SurfaceComponentProps<Collection.Collection> & {
46
- id: string;
47
- };
42
+ type StackContainerProps = AppSurface.ObjectArticleProps<Collection.Collection>;
48
43
 
49
- export const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
44
+ export const StackContainer = ({ attendableId, subject: collection }: StackContainerProps) => {
50
45
  const { invokePromise } = useOperationInvoker();
51
46
  const { graph } = useAppGraph();
52
47
  const { t } = useTranslation(meta.id);
53
- const allMetadata = useCapabilities(AppCapabilities.Metadata);
54
48
  const [collapsedSections, setCollapsedSections] = useState<CollapsedSections>({});
55
49
 
56
50
  // TODO(wittjosiah): Re-implement stack views with relations.
@@ -64,8 +58,9 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
64
58
 
65
59
  const collectionObjects = useAtomValue(collectionObjectsFamily(collection));
66
60
  const items = collectionObjects.map((object: Obj.Unknown) => {
67
- const metadata = allMetadata.find((m) => m.id === (Obj.getTypename(object) ?? 'never'))
68
- ?.metadata as StackSectionMetadata;
61
+ const schema = Obj.getSchema(object);
62
+ const iconAnnotation = schema ? Option.getOrUndefined(Annotation.IconAnnotation.get(schema)) : undefined;
63
+ const metadata: StackSectionMetadata = { icon: iconAnnotation?.icon };
69
64
  const view = {
70
65
  // ...stack.sections[object.id],
71
66
  collapsed: collapsedSections[Obj.getDXN(object).toString()],
@@ -104,7 +99,7 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
104
99
  async (id: string, position: AddSectionPosition) => {
105
100
  // TODO(wittjosiah): Use object creation dialog.
106
101
  await invokePromise(LayoutOperation.UpdateDialog, {
107
- subject: `${meta.id}/AddSectionDialog`,
102
+ subject: `${meta.id}.AddSectionDialog`,
108
103
  blockAlign: 'start',
109
104
  props: {
110
105
  path: id,
@@ -138,7 +133,7 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
138
133
  );
139
134
 
140
135
  return (
141
- <StackItem.Content toolbar classNames='dx-article overflow-hidden border-l border-r border-subdued-separator'>
136
+ <StackItem.Content toolbar classNames='dx-document'>
142
137
  <Toolbar.Root>
143
138
  <Toolbar.IconButton
144
139
  icon='ph--plus--regular'
@@ -148,22 +143,27 @@ export const StackContainer = ({ id, subject: collection }: StackContainerProps)
148
143
  onClick={handleAddSection}
149
144
  />
150
145
  </Toolbar.Root>
151
- <AttentionProvider id={id}>
152
- <StackContext.Provider
153
- value={{
154
- onCollapse: handleCollapse,
155
- onNavigate: handleNavigate,
156
- onDelete: handleDelete,
157
- onAdd: handleAdd,
158
- }}
146
+ <StackContext.Provider
147
+ value={{
148
+ attendableId,
149
+ onCollapse: handleCollapse,
150
+ onNavigate: handleNavigate,
151
+ onDelete: handleDelete,
152
+ onAdd: handleAdd,
153
+ }}
154
+ >
155
+ <Stack
156
+ orientation='vertical'
157
+ size='intrinsic'
158
+ id={Obj.getDXN(collection).toString()}
159
+ data-testid='main.stack'
160
+ classNames='overflow-y-auto'
159
161
  >
160
- <Stack orientation='vertical' size='intrinsic' id={id} data-testid='main.stack' classNames='overflow-y-auto'>
161
- {items.map((item) => (
162
- <StackSection key={item.id} {...item} />
163
- ))}
164
- </Stack>
165
- </StackContext.Provider>
166
- </AttentionProvider>
162
+ {items.map((item) => (
163
+ <StackSection key={item.id} {...item} />
164
+ ))}
165
+ </Stack>
166
+ </StackContext.Provider>
167
167
  </StackItem.Content>
168
168
  );
169
169
  };
@@ -2,6 +2,4 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import { StackContainer } from './StackContainer';
6
-
7
- export default StackContainer;
5
+ export { StackContainer as default } from './StackContainer';
package/src/index.ts CHANGED
@@ -3,4 +3,4 @@
3
3
  //
4
4
 
5
5
  export * from './meta';
6
- export * from './StackPlugin';
6
+ export * from './types';
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.org/type/StackSection';
8
+ export const SECTION_IDENTIFIER = 'org.dxos.type.stackSection';
9
9
 
10
10
  export const meta: Plugin.Meta = {
11
- id: 'dxos.org/plugin/stack',
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',
package/src/plugin.ts ADDED
@@ -0,0 +1,9 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ import { Plugin } from '@dxos/app-framework';
6
+
7
+ import { meta } from './meta';
8
+
9
+ export const StackPlugin = Plugin.lazy(meta, () => import('#plugin'));