@dxos/plugin-stack 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

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 (92) hide show
  1. package/dist/lib/browser/index.mjs +49 -39
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/browser/types/index.mjs +21 -4
  5. package/dist/lib/browser/types/index.mjs.map +4 -4
  6. package/dist/lib/node-esm/index.mjs +50 -39
  7. package/dist/lib/node-esm/index.mjs.map +4 -4
  8. package/dist/lib/node-esm/meta.json +1 -1
  9. package/dist/lib/node-esm/types/index.mjs +22 -4
  10. package/dist/lib/node-esm/types/index.mjs.map +4 -4
  11. package/dist/types/src/StackPlugin.d.ts.map +1 -1
  12. package/dist/types/src/capabilities/index.d.ts +2 -1
  13. package/dist/types/src/capabilities/index.d.ts.map +1 -1
  14. package/dist/types/src/capabilities/react-surface.d.ts +5 -0
  15. package/dist/types/src/capabilities/react-surface.d.ts.map +1 -0
  16. package/dist/types/src/components/{StackContext.d.ts → StackContext/StackContext.d.ts} +2 -1
  17. package/dist/types/src/components/StackContext/StackContext.d.ts.map +1 -0
  18. package/dist/types/src/components/StackContext/index.d.ts +2 -0
  19. package/dist/types/src/components/StackContext/index.d.ts.map +1 -0
  20. package/dist/types/src/components/StackSection/CaretDownUp.d.ts.map +1 -0
  21. package/dist/types/src/components/{StackSection.d.ts → StackSection/StackSection.d.ts} +1 -1
  22. package/dist/types/src/components/StackSection/StackSection.d.ts.map +1 -0
  23. package/dist/types/src/components/StackSection/index.d.ts +2 -0
  24. package/dist/types/src/components/StackSection/index.d.ts.map +1 -0
  25. package/dist/types/src/components/{StackSettings.d.ts → StackSettings/StackSettings.d.ts} +1 -1
  26. package/dist/types/src/components/StackSettings/StackSettings.d.ts.map +1 -0
  27. package/dist/types/src/components/StackSettings/index.d.ts +2 -0
  28. package/dist/types/src/components/StackSettings/index.d.ts.map +1 -0
  29. package/dist/types/src/components/index.d.ts +2 -9
  30. package/dist/types/src/components/index.d.ts.map +1 -1
  31. package/dist/types/src/containers/StackContainer/StackContainer.d.ts +7 -0
  32. package/dist/types/src/containers/StackContainer/StackContainer.d.ts.map +1 -0
  33. package/dist/types/src/containers/StackContainer/index.d.ts +2 -0
  34. package/dist/types/src/containers/StackContainer/index.d.ts.map +1 -0
  35. package/dist/types/src/containers/index.d.ts +3 -0
  36. package/dist/types/src/containers/index.d.ts.map +1 -0
  37. package/dist/types/src/meta.d.ts +1 -1
  38. package/dist/types/src/translations.d.ts +30 -29
  39. package/dist/types/src/translations.d.ts.map +1 -1
  40. package/dist/types/src/types/stack.d.ts +1 -1
  41. package/dist/types/src/types/types.d.ts +1 -1
  42. package/dist/types/src/types/types.d.ts.map +1 -1
  43. package/dist/types/tsconfig.tsbuildinfo +1 -1
  44. package/package.json +38 -27
  45. package/src/StackPlugin.ts +10 -8
  46. package/src/capabilities/index.ts +3 -1
  47. package/src/capabilities/react-surface.tsx +29 -0
  48. package/src/components/{StackContext.tsx → StackContext/StackContext.tsx} +3 -1
  49. package/src/components/StackContext/index.ts +5 -0
  50. package/src/components/{StackSection.tsx → StackSection/StackSection.tsx} +26 -24
  51. package/src/components/StackSection/index.ts +5 -0
  52. package/src/components/StackSettings/StackSettings.tsx +28 -0
  53. package/src/components/StackSettings/index.ts +5 -0
  54. package/src/components/index.ts +2 -4
  55. package/src/{components → containers/StackContainer}/StackContainer.tsx +67 -63
  56. package/src/containers/StackContainer/index.ts +5 -0
  57. package/src/containers/index.ts +7 -0
  58. package/src/meta.ts +2 -2
  59. package/src/translations.ts +22 -21
  60. package/src/types/stack.ts +2 -2
  61. package/src/types/types.ts +1 -1
  62. package/dist/lib/browser/StackContainer-FUGH3ZJH.mjs +0 -274
  63. package/dist/lib/browser/StackContainer-FUGH3ZJH.mjs.map +0 -7
  64. package/dist/lib/browser/chunk-4X7CK6FM.mjs +0 -21
  65. package/dist/lib/browser/chunk-4X7CK6FM.mjs.map +0 -7
  66. package/dist/lib/browser/chunk-MZUNZ6A3.mjs +0 -27
  67. package/dist/lib/browser/chunk-MZUNZ6A3.mjs.map +0 -7
  68. package/dist/lib/browser/react-surface-ZEFLABZS.mjs +0 -40
  69. package/dist/lib/browser/react-surface-ZEFLABZS.mjs.map +0 -7
  70. package/dist/lib/node-esm/StackContainer-PTZGEQFQ.mjs +0 -275
  71. package/dist/lib/node-esm/StackContainer-PTZGEQFQ.mjs.map +0 -7
  72. package/dist/lib/node-esm/chunk-BHDJHEFJ.mjs +0 -29
  73. package/dist/lib/node-esm/chunk-BHDJHEFJ.mjs.map +0 -7
  74. package/dist/lib/node-esm/chunk-HEEGXPSW.mjs +0 -23
  75. package/dist/lib/node-esm/chunk-HEEGXPSW.mjs.map +0 -7
  76. package/dist/lib/node-esm/react-surface-JQOFHBYS.mjs +0 -41
  77. package/dist/lib/node-esm/react-surface-JQOFHBYS.mjs.map +0 -7
  78. package/dist/types/src/capabilities/react-surface/index.d.ts +0 -3
  79. package/dist/types/src/capabilities/react-surface/index.d.ts.map +0 -1
  80. package/dist/types/src/capabilities/react-surface/react-surface.d.ts +0 -5
  81. package/dist/types/src/capabilities/react-surface/react-surface.d.ts.map +0 -1
  82. package/dist/types/src/components/CaretDownUp.d.ts.map +0 -1
  83. package/dist/types/src/components/StackContainer.d.ts +0 -9
  84. package/dist/types/src/components/StackContainer.d.ts.map +0 -1
  85. package/dist/types/src/components/StackContext.d.ts.map +0 -1
  86. package/dist/types/src/components/StackSection.d.ts.map +0 -1
  87. package/dist/types/src/components/StackSettings.d.ts.map +0 -1
  88. package/src/capabilities/react-surface/index.ts +0 -7
  89. package/src/capabilities/react-surface/react-surface.tsx +0 -33
  90. package/src/components/StackSettings.tsx +0 -30
  91. /package/dist/types/src/components/{CaretDownUp.d.ts → StackSection/CaretDownUp.d.ts} +0 -0
  92. /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.937b3ca",
3
+ "version": "0.8.4-main.9be5663bfe",
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,13 @@
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
+ "#types": "./src/types/index.ts"
21
+ },
15
22
  "exports": {
16
23
  ".": {
17
24
  "source": "./src/index.ts",
@@ -39,29 +46,32 @@
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.19.11",
52
+ "effect": "3.20.0",
45
53
  "node-fetch": "^2.6.0",
46
54
  "react-is": "~19.2.0",
47
- "@dxos/client": "0.8.4-main.937b3ca",
48
- "@dxos/app-framework": "0.8.4-main.937b3ca",
49
- "@dxos/echo": "0.8.4-main.937b3ca",
50
- "@dxos/async": "0.8.4-main.937b3ca",
51
- "@dxos/operation": "0.8.4-main.937b3ca",
52
- "@dxos/invariant": "0.8.4-main.937b3ca",
53
- "@dxos/plugin-client": "0.8.4-main.937b3ca",
54
- "@dxos/plugin-graph": "0.8.4-main.937b3ca",
55
- "@dxos/plugin-space": "0.8.4-main.937b3ca",
56
- "@dxos/react-client": "0.8.4-main.937b3ca",
57
- "@dxos/react-ui-attention": "0.8.4-main.937b3ca",
58
- "@dxos/react-ui-form": "0.8.4-main.937b3ca",
59
- "@dxos/plugin-deck": "0.8.4-main.937b3ca",
60
- "@dxos/react-ui-stack": "0.8.4-main.937b3ca",
61
- "@dxos/react-ui-searchlist": "0.8.4-main.937b3ca",
62
- "@dxos/schema": "0.8.4-main.937b3ca",
63
- "@dxos/types": "0.8.4-main.937b3ca",
64
- "@dxos/util": "0.8.4-main.937b3ca"
55
+ "@dxos/app-framework": "0.8.4-main.9be5663bfe",
56
+ "@dxos/app-toolkit": "0.8.4-main.9be5663bfe",
57
+ "@dxos/echo": "0.8.4-main.9be5663bfe",
58
+ "@dxos/client": "0.8.4-main.9be5663bfe",
59
+ "@dxos/echo-atom": "0.8.4-main.9be5663bfe",
60
+ "@dxos/operation": "0.8.4-main.9be5663bfe",
61
+ "@dxos/invariant": "0.8.4-main.9be5663bfe",
62
+ "@dxos/plugin-client": "0.8.4-main.9be5663bfe",
63
+ "@dxos/plugin-deck": "0.8.4-main.9be5663bfe",
64
+ "@dxos/plugin-space": "0.8.4-main.9be5663bfe",
65
+ "@dxos/react-ui-attention": "0.8.4-main.9be5663bfe",
66
+ "@dxos/async": "0.8.4-main.9be5663bfe",
67
+ "@dxos/plugin-graph": "0.8.4-main.9be5663bfe",
68
+ "@dxos/react-client": "0.8.4-main.9be5663bfe",
69
+ "@dxos/react-ui-stack": "0.8.4-main.9be5663bfe",
70
+ "@dxos/schema": "0.8.4-main.9be5663bfe",
71
+ "@dxos/types": "0.8.4-main.9be5663bfe",
72
+ "@dxos/react-ui-search": "0.8.4-main.9be5663bfe",
73
+ "@dxos/react-ui-form": "0.8.4-main.9be5663bfe",
74
+ "@dxos/util": "0.8.4-main.9be5663bfe"
65
75
  },
66
76
  "devDependencies": {
67
77
  "@babel/core": "^7.18.13",
@@ -69,17 +79,18 @@
69
79
  "@types/react-dom": "~19.2.3",
70
80
  "react": "~19.2.3",
71
81
  "react-dom": "~19.2.3",
72
- "vite": "7.1.9",
73
- "@dxos/react-ui": "0.8.4-main.937b3ca",
74
- "@dxos/ui-theme": "0.8.4-main.937b3ca",
75
- "@dxos/storybook-utils": "0.8.4-main.937b3ca"
82
+ "vite": "^7.1.11",
83
+ "@dxos/storybook-utils": "0.8.4-main.9be5663bfe",
84
+ "@dxos/react-ui": "0.8.4-main.9be5663bfe",
85
+ "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
76
86
  },
77
87
  "peerDependencies": {
78
- "effect": "3.19.11",
88
+ "@effect-atom/atom-react": "^0.5.0",
89
+ "effect": "3.20.0",
79
90
  "react": "~19.2.3",
80
91
  "react-dom": "~19.2.3",
81
- "@dxos/react-ui": "0.8.4-main.937b3ca",
82
- "@dxos/ui-theme": "0.8.4-main.937b3ca"
92
+ "@dxos/react-ui": "0.8.4-main.9be5663bfe",
93
+ "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
83
94
  },
84
95
  "publishConfig": {
85
96
  "access": "public"
@@ -2,17 +2,18 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import { Common, Plugin } from '@dxos/app-framework';
5
+ import { Plugin } from '@dxos/app-framework';
6
+ import { AppPlugin } from '@dxos/app-toolkit';
6
7
  import { type Obj } from '@dxos/echo';
7
8
 
8
- import { ReactSurface } from './capabilities';
9
- import { SECTION_IDENTIFIER, meta } from './meta';
9
+ import { ReactSurface } from '#capabilities';
10
+ import { SECTION_IDENTIFIER, meta } from '#meta';
11
+ import { StackViewType } from '#types';
12
+
10
13
  import { translations } from './translations';
11
- import { StackViewType } from './types';
12
14
 
13
15
  export const StackPlugin = Plugin.define(meta).pipe(
14
- Common.Plugin.addTranslationsModule({ translations }),
15
- Common.Plugin.addMetadataModule({
16
+ AppPlugin.addMetadataModule({
16
17
  metadata: {
17
18
  id: SECTION_IDENTIFIER,
18
19
  metadata: {
@@ -29,7 +30,8 @@ export const StackPlugin = Plugin.define(meta).pipe(
29
30
  },
30
31
  },
31
32
  }),
32
- Common.Plugin.addSchemaModule({ schema: [StackViewType] }),
33
- Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
33
+ AppPlugin.addSchemaModule({ schema: [StackViewType] }),
34
+ AppPlugin.addSurfaceModule({ activate: ReactSurface }),
35
+ AppPlugin.addTranslationsModule({ translations }),
34
36
  Plugin.make,
35
37
  );
@@ -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,29 @@
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
+ role: 'article',
22
+ filter: AppSurface.objectArticle(Collection.Collection),
23
+ component: ({ role, data }) => {
24
+ return <StackContainer attendableId={data.attendableId} role={role} subject={data.subject} />;
25
+ },
26
+ }),
27
+ ),
28
+ ),
29
+ );
@@ -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';
@@ -5,19 +5,19 @@
5
5
  import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
6
6
  import React, { useMemo, useState } from 'react';
7
7
 
8
- import { Surface } from '@dxos/app-framework/react';
8
+ import { Surface } from '@dxos/app-framework/ui';
9
9
  import { DropdownMenu, Icon, IconButton, useTranslation } from '@dxos/react-ui';
10
10
  import { useAttentionAttributes } from '@dxos/react-ui-attention';
11
11
  import { StackItem } from '@dxos/react-ui-stack';
12
- import { getSize, mx, textBlockWidth } from '@dxos/ui-theme';
12
+ import { getSize, mx } from '@dxos/ui-theme';
13
13
 
14
- import { meta } from '../meta';
15
- import { type StackSectionItem } from '../types';
14
+ import { meta } from '#meta';
15
+ import { type StackSectionItem } from '#types';
16
16
 
17
+ import { useStack } from '../StackContext';
17
18
  import { CaretDownUp } from './CaretDownUp';
18
- import { useStack } from './StackContext';
19
19
 
20
- const sectionActionDimensions = 'p-1 mlb-1 shrink-0 min-bs-0 is-[--rail-action] bs-min';
20
+ const sectionActionDimensions = 'p-1 my-1 shrink-0 min-h-0 w-(--dx-rail-action) h-min';
21
21
 
22
22
  export type StackSectionProps = StackSectionItem;
23
23
 
@@ -28,15 +28,17 @@ export const StackSection = ({
28
28
  metadata: { icon = 'ph--placeholder--regular' },
29
29
  }: StackSectionProps) => {
30
30
  const { t } = useTranslation(meta.id);
31
- const { onNavigate, onAdd, onCollapse, onDelete } = useStack();
31
+ const { attendableId: parentAttendableId, onNavigate, onAdd, onCollapse, onDelete } = useStack();
32
32
  const [optionsMenuOpen, setOptionsMenuOpen] = useState(false);
33
- const attentionAttrs = useAttentionAttributes(id);
33
+ const attendableId = `${parentAttendableId}/${object.id}`;
34
+ const attentionAttrs = useAttentionAttributes(attendableId);
34
35
  const stackItem = useMemo(() => ({ id }), [id]);
36
+ const data = useMemo(() => ({ attendableId, subject: object }), [object, attendableId]);
35
37
 
36
38
  return (
37
39
  <CollapsiblePrimitive.Root asChild open={!view.collapsed} onOpenChange={(nextOpen) => onCollapse?.(id, !nextOpen)}>
38
40
  <StackItem.Root item={stackItem} role='section' {...attentionAttrs}>
39
- <StackItem.Heading classNames='attention-surface'>
41
+ <StackItem.Heading classNames='dx-attention-surface'>
40
42
  <span className='sr-only'>{view.title}</span>
41
43
  <StackItem.HeadingStickyContent>
42
44
  <DropdownMenu.Root
@@ -47,7 +49,7 @@ export const StackSection = ({
47
49
  >
48
50
  <DropdownMenu.Trigger asChild>
49
51
  <StackItem.SigilButton>
50
- <Icon icon={icon} size={5} classNames='transition-opacity' />
52
+ <Icon icon={icon} classNames='transition-opacity' />
51
53
  </StackItem.SigilButton>
52
54
  </DropdownMenu.Trigger>
53
55
  <DropdownMenu.Portal>
@@ -55,28 +57,28 @@ export const StackSection = ({
55
57
  <DropdownMenu.Viewport>
56
58
  {view.collapsed ? (
57
59
  <DropdownMenu.Item onClick={() => onNavigate(id)} data-testid='section.navigate-to'>
58
- <Icon icon='ph--arrow-right--regular' size={5} />
59
- <span className='mis-2 grow'>{t('navigate to section label')}</span>
60
+ <Icon icon='ph--arrow-right--regular' />
61
+ <span className='ms-2 grow'>{t('navigate-to-section.label')}</span>
60
62
  </DropdownMenu.Item>
61
63
  ) : (
62
64
  <CollapsiblePrimitive.Trigger asChild>
63
65
  <DropdownMenu.Item>
64
66
  <CaretDownUp className={getSize(5)} />
65
- <span className='mis-2 grow'>{t('collapse label')}</span>
67
+ <span className='ms-2 grow'>{t('collapse.label')}</span>
66
68
  </DropdownMenu.Item>
67
69
  </CollapsiblePrimitive.Trigger>
68
70
  )}
69
71
  <DropdownMenu.Item onClick={() => onAdd(id, 'before')} data-testid='section.add-before'>
70
- <Icon icon='ph--arrow-line-up--regular' size={5} />
71
- <span className='mis-2 grow'>{t('add section before label')}</span>
72
+ <Icon icon='ph--arrow-line-up--regular' />
73
+ <span className='ms-2 grow'>{t('add-section-before.label')}</span>
72
74
  </DropdownMenu.Item>
73
75
  <DropdownMenu.Item onClick={() => onAdd(id, 'after')} data-testid='section.add-after'>
74
- <Icon icon='ph--arrow-line-down--regular' size={5} />
75
- <span className='mis-2 grow'>{t('add section after label')}</span>
76
+ <Icon icon='ph--arrow-line-down--regular' />
77
+ <span className='ms-2 grow'>{t('add-section-after.label')}</span>
76
78
  </DropdownMenu.Item>
77
79
  <DropdownMenu.Item onClick={() => onDelete(id)} data-testid='section.remove'>
78
- <Icon icon='ph--trash--regular' size={5} />
79
- <span className='mis-2 grow'>{t('remove section label')}</span>
80
+ <Icon icon='ph--trash--regular' />
81
+ <span className='ms-2 grow'>{t('remove-section.label')}</span>
80
82
  </DropdownMenu.Item>
81
83
  </DropdownMenu.Viewport>
82
84
  <DropdownMenu.Arrow />
@@ -88,7 +90,7 @@ export const StackSection = ({
88
90
  <IconButton
89
91
  iconOnly
90
92
  variant='ghost'
91
- label={t('expand label')}
93
+ label={t('expand.label')}
92
94
  icon='ph--caret-up-down--regular'
93
95
  classNames={sectionActionDimensions}
94
96
  />
@@ -98,7 +100,7 @@ export const StackSection = ({
98
100
  iconOnly
99
101
  variant='ghost'
100
102
  onClick={() => onNavigate(id)}
101
- label={t('navigate to section label')}
103
+ label={t('navigate-to-section.label')}
102
104
  icon='ph--arrow-right--regular'
103
105
  data-testid='section.navigate-to'
104
106
  classNames={sectionActionDimensions}
@@ -107,11 +109,11 @@ export const StackSection = ({
107
109
  </StackItem.HeadingStickyContent>
108
110
  </StackItem.Heading>
109
111
  <CollapsiblePrimitive.Content>
110
- <Surface role='section' data={{ subject: object }} limit={1} placeholder={<></>} />
112
+ <Surface.Surface role='section' data={data} limit={1} placeholder={<></>} />
111
113
  </CollapsiblePrimitive.Content>
112
114
  {view.collapsed && (
113
- <StackItem.Content classNames='attention-surface'>
114
- <h2 className={mx('flex items-center p-4 font-medium', textBlockWidth)}>{view.title}</h2>
115
+ <StackItem.Content classNames='dx-attention-surface'>
116
+ <h2 className={mx('flex items-center p-4 font-medium')}>{view.title}</h2>
115
117
  </StackItem.Content>
116
118
  )}
117
119
  </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';
@@ -2,8 +2,6 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import { lazy } from 'react';
6
-
7
- export const StackContainer = lazy(() => import('./StackContainer'));
8
-
5
+ export * from './StackContext';
6
+ export * from './StackSection';
9
7
  export * from './StackSettings';
@@ -2,42 +2,51 @@
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 { Common } from '@dxos/app-framework';
9
- import { useAppGraph, useCapabilities, useOperationInvoker } from '@dxos/app-framework/react';
10
- import { type SurfaceComponentProps } from '@dxos/app-framework/react';
11
- import { Obj } from '@dxos/echo';
9
+ import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
10
+ import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
11
+ import { useAppGraph, type AppSurface } from '@dxos/app-toolkit/ui';
12
+ import { Obj, type Ref } from '@dxos/echo';
13
+ import { type Collection } from '@dxos/echo';
14
+ import { AtomObj } from '@dxos/echo-atom';
12
15
  import { Graph } from '@dxos/plugin-graph';
13
- import { SpaceOperation } from '@dxos/plugin-space/types';
16
+ import { SpaceOperation } from '@dxos/plugin-space/operations';
14
17
  import { Toolbar, toLocalizedString, useTranslation } from '@dxos/react-ui';
15
- import { AttentionProvider } from '@dxos/react-ui-attention';
16
18
  import { Stack, StackItem } from '@dxos/react-ui-stack';
17
- import { type Collection } from '@dxos/schema';
18
19
  import { isNonNullable } from '@dxos/util';
19
20
 
20
- import { meta } from '../meta';
21
+ import { StackContext, StackSection } from '#components';
22
+ import { meta } from '#meta';
21
23
  import {
22
24
  type AddSectionPosition,
23
25
  type CollapsedSections,
24
26
  type StackSectionItem,
25
27
  type StackSectionMetadata,
26
28
  type StackSectionView,
27
- } from '../types';
28
-
29
- import { StackContext } from './StackContext';
30
- import { StackSection } from './StackSection';
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
+ );
31
42
 
32
- type StackContainerProps = SurfaceComponentProps<Collection.Collection> & {
33
- id: string;
34
- };
43
+ type StackContainerProps = AppSurface.ObjectArticleProps<Collection.Collection>;
35
44
 
36
- const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
45
+ export const StackContainer = ({ attendableId, subject: collection }: StackContainerProps) => {
37
46
  const { invokePromise } = useOperationInvoker();
38
47
  const { graph } = useAppGraph();
39
48
  const { t } = useTranslation(meta.id);
40
- const allMetadata = useCapabilities(Common.Capability.Metadata);
49
+ const allMetadata = useCapabilities(AppCapabilities.Metadata);
41
50
  const [collapsedSections, setCollapsedSections] = useState<CollapsedSections>({});
42
51
 
43
52
  // TODO(wittjosiah): Re-implement stack views with relations.
@@ -49,28 +58,23 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
49
58
  // }
50
59
  // }, [collection, stack]);
51
60
 
52
- const items =
53
- collection.objects
54
- // TODO(wittjosiah): Should the database handle this differently?
55
- // TODO(wittjosiah): Render placeholders for missing objects so they can be removed from the stack?
56
- .map((object) => object.target)
57
- .filter(isNonNullable)
58
- .map((object) => {
59
- const metadata = allMetadata.find((m) => m.id === (Obj.getTypename(object) ?? 'never'))
60
- ?.metadata as StackSectionMetadata;
61
- const view = {
62
- // ...stack.sections[object.id],
63
- collapsed: collapsedSections[Obj.getDXN(object).toString()],
64
- title:
65
- (object as any)?.title ??
66
- // TODO(wittjosiah): `getNode` is not reactive.
67
- toLocalizedString(
68
- Graph.getNode(graph, Obj.getDXN(object).toString()).pipe(Option.getOrNull)?.properties.label,
69
- t,
70
- ),
71
- } as StackSectionView;
72
- return { id: Obj.getDXN(object).toString(), object, metadata, view } satisfies StackSectionItem;
73
- }) ?? [];
61
+ const collectionObjects = useAtomValue(collectionObjectsFamily(collection));
62
+ const items = collectionObjects.map((object: Obj.Unknown) => {
63
+ const metadata = allMetadata.find((m) => m.id === (Obj.getTypename(object) ?? 'never'))
64
+ ?.metadata as StackSectionMetadata;
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
+ });
74
78
 
75
79
  const handleDelete = useCallback(
76
80
  async (id: string) => {
@@ -95,8 +99,8 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
95
99
  const handleAdd = useCallback(
96
100
  async (id: string, position: AddSectionPosition) => {
97
101
  // TODO(wittjosiah): Use object creation dialog.
98
- await invokePromise(Common.LayoutOperation.UpdateDialog, {
99
- subject: `${meta.id}/AddSectionDialog`,
102
+ await invokePromise(LayoutOperation.UpdateDialog, {
103
+ subject: `${meta.id}.AddSectionDialog`,
100
104
  blockAlign: 'start',
101
105
  props: {
102
106
  path: id,
@@ -110,7 +114,7 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
110
114
 
111
115
  const handleNavigate = useCallback(
112
116
  async (id: string) => {
113
- await invokePromise(Common.LayoutOperation.Open, { subject: [id] });
117
+ await invokePromise(LayoutOperation.Open, { subject: [id] });
114
118
  },
115
119
  [invokePromise],
116
120
  );
@@ -130,10 +134,7 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
130
134
  );
131
135
 
132
136
  return (
133
- <StackItem.Content
134
- toolbar
135
- classNames='container-max-width overflow-hidden border-l border-r border-subduedSeparator'
136
- >
137
+ <StackItem.Content toolbar classNames='dx-document'>
137
138
  <Toolbar.Root>
138
139
  <Toolbar.IconButton
139
140
  icon='ph--plus--regular'
@@ -143,24 +144,27 @@ const StackContainer = ({ id, subject: collection }: StackContainerProps) => {
143
144
  onClick={handleAddSection}
144
145
  />
145
146
  </Toolbar.Root>
146
- <AttentionProvider id={id}>
147
- <StackContext.Provider
148
- value={{
149
- onCollapse: handleCollapse,
150
- onNavigate: handleNavigate,
151
- onDelete: handleDelete,
152
- onAdd: handleAdd,
153
- }}
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'
154
162
  >
155
- <Stack orientation='vertical' size='intrinsic' id={id} data-testid='main.stack' classNames='overflow-y-auto'>
156
- {items.map((item) => (
157
- <StackSection key={item.id} {...item} />
158
- ))}
159
- </Stack>
160
- </StackContext.Provider>
161
- </AttentionProvider>
163
+ {items.map((item) => (
164
+ <StackSection key={item.id} {...item} />
165
+ ))}
166
+ </Stack>
167
+ </StackContext.Provider>
162
168
  </StackItem.Content>
163
169
  );
164
170
  };
165
-
166
- export default StackContainer;
@@ -0,0 +1,5 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ export { StackContainer as default } from './StackContainer';
@@ -0,0 +1,7 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ import { type ComponentType, lazy } from 'react';
6
+
7
+ export const StackContainer: ComponentType<any> = lazy(() => import('./StackContainer'));
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',