@dxos/plugin-markdown 0.8.1 → 0.8.2-main.2f9c567

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 (181) hide show
  1. package/dist/lib/browser/{MarkdownContainer-T3HU27RE.mjs → MarkdownContainer-JKHGKEWX.mjs} +20 -16
  2. package/dist/lib/browser/MarkdownContainer-JKHGKEWX.mjs.map +7 -0
  3. package/dist/lib/browser/MarkdownPreview-AXRXM2VS.mjs +81 -0
  4. package/dist/lib/browser/MarkdownPreview-AXRXM2VS.mjs.map +7 -0
  5. package/dist/lib/browser/{app-graph-serializer-NOXI4IQ5.mjs → app-graph-serializer-6SMW5SL3.mjs} +3 -3
  6. package/dist/lib/browser/{artifact-definition-CE6J6NY4.mjs → artifact-definition-BEV7S3Q2.mjs} +9 -8
  7. package/dist/lib/browser/artifact-definition-BEV7S3Q2.mjs.map +7 -0
  8. package/dist/lib/browser/chunk-6D6EOKIT.mjs +20 -0
  9. package/dist/lib/browser/chunk-6D6EOKIT.mjs.map +7 -0
  10. package/dist/lib/browser/chunk-FJ5P5CGA.mjs +86 -0
  11. package/dist/lib/browser/chunk-FJ5P5CGA.mjs.map +7 -0
  12. package/dist/lib/browser/{chunk-3ULJ4FIJ.mjs → chunk-H2ACKZFL.mjs} +11 -24
  13. package/dist/lib/browser/chunk-H2ACKZFL.mjs.map +7 -0
  14. package/dist/lib/browser/{chunk-QXDKFACU.mjs → chunk-JD72ICHV.mjs} +5 -3
  15. package/dist/lib/browser/{chunk-QXDKFACU.mjs.map → chunk-JD72ICHV.mjs.map} +2 -2
  16. package/dist/lib/browser/index.mjs +10 -6
  17. package/dist/lib/browser/index.mjs.map +3 -3
  18. package/dist/lib/browser/intent-resolver-K7GY2J5W.mjs +86 -0
  19. package/dist/lib/browser/intent-resolver-K7GY2J5W.mjs.map +7 -0
  20. package/dist/lib/browser/meta.json +1 -1
  21. package/dist/lib/browser/{react-surface-RQX3CPFV.mjs → react-surface-G5QRPPGT.mjs} +16 -6
  22. package/dist/lib/browser/react-surface-G5QRPPGT.mjs.map +7 -0
  23. package/dist/lib/browser/{settings-GCSS3Y4Z.mjs → settings-QBFZJW2H.mjs} +4 -4
  24. package/dist/lib/browser/settings-QBFZJW2H.mjs.map +7 -0
  25. package/dist/lib/browser/{state-O7P5JDIH.mjs → state-AIN4J7N5.mjs} +1 -1
  26. package/dist/lib/browser/{state-O7P5JDIH.mjs.map → state-AIN4J7N5.mjs.map} +2 -2
  27. package/dist/lib/browser/{thread-3QGCFNVZ.mjs → thread-VUUBSXA5.mjs} +2 -2
  28. package/dist/lib/browser/types/index.mjs +3 -1
  29. package/dist/lib/node/{MarkdownContainer-6ZJIFAP6.cjs → MarkdownContainer-KLCUCM5O.cjs} +22 -18
  30. package/dist/lib/node/MarkdownContainer-KLCUCM5O.cjs.map +7 -0
  31. package/dist/lib/node/MarkdownPreview-YEFCEKYA.cjs +104 -0
  32. package/dist/lib/node/MarkdownPreview-YEFCEKYA.cjs.map +7 -0
  33. package/dist/lib/node/{app-graph-serializer-HKK3SEDN.cjs → app-graph-serializer-4VZJUDTL.cjs} +9 -9
  34. package/dist/lib/node/{artifact-definition-XGADFWCQ.cjs → artifact-definition-HNSTQ7SX.cjs} +15 -14
  35. package/dist/lib/node/artifact-definition-HNSTQ7SX.cjs.map +7 -0
  36. package/dist/lib/node/{chunk-UEXGNGSS.cjs → chunk-2HGBN655.cjs} +43 -31
  37. package/dist/lib/node/chunk-2HGBN655.cjs.map +7 -0
  38. package/dist/lib/node/{chunk-7QVONRSI.cjs → chunk-6KAGLDQY.cjs} +13 -57
  39. package/dist/lib/node/chunk-6KAGLDQY.cjs.map +7 -0
  40. package/dist/lib/node/chunk-AVTID2BC.cjs +75 -0
  41. package/dist/lib/node/chunk-AVTID2BC.cjs.map +7 -0
  42. package/dist/lib/node/{chunk-H5MYVP6F.cjs → chunk-ETVG2GKL.cjs} +9 -7
  43. package/dist/lib/node/{chunk-H5MYVP6F.cjs.map → chunk-ETVG2GKL.cjs.map} +2 -2
  44. package/dist/lib/node/index.cjs +24 -21
  45. package/dist/lib/node/index.cjs.map +3 -3
  46. package/dist/lib/node/{intent-resolver-NW27BF3W.cjs → intent-resolver-FGBVXI7L.cjs} +45 -9
  47. package/dist/lib/node/intent-resolver-FGBVXI7L.cjs.map +7 -0
  48. package/dist/lib/node/meta.json +1 -1
  49. package/dist/lib/node/{react-surface-5X3SMHGI.cjs → react-surface-DJFEQ4EN.cjs} +19 -9
  50. package/dist/lib/node/react-surface-DJFEQ4EN.cjs.map +7 -0
  51. package/dist/lib/node/{settings-S2ISUVIH.cjs → settings-I3Z64YPE.cjs} +7 -7
  52. package/dist/lib/node/settings-I3Z64YPE.cjs.map +7 -0
  53. package/dist/lib/node/{state-L44SG3ZM.cjs → state-PC7IVXFP.cjs} +4 -4
  54. package/dist/lib/node/{state-L44SG3ZM.cjs.map → state-PC7IVXFP.cjs.map} +2 -2
  55. package/dist/lib/node/{thread-42R57L4K.cjs → thread-NHTJKFC4.cjs} +6 -6
  56. package/dist/lib/node/types/index.cjs +8 -6
  57. package/dist/lib/node/types/index.cjs.map +2 -2
  58. package/dist/lib/node-esm/{MarkdownContainer-URAPTO37.mjs → MarkdownContainer-IRHSOSGC.mjs} +20 -16
  59. package/dist/lib/node-esm/MarkdownContainer-IRHSOSGC.mjs.map +7 -0
  60. package/dist/lib/node-esm/MarkdownPreview-JWPTJG2V.mjs +82 -0
  61. package/dist/lib/node-esm/MarkdownPreview-JWPTJG2V.mjs.map +7 -0
  62. package/dist/lib/node-esm/{app-graph-serializer-QQ2CTHOQ.mjs → app-graph-serializer-QH2FE7FH.mjs} +3 -3
  63. package/dist/lib/node-esm/{artifact-definition-WRG5ZRN5.mjs → artifact-definition-GA7NQ3X5.mjs} +9 -8
  64. package/dist/lib/node-esm/artifact-definition-GA7NQ3X5.mjs.map +7 -0
  65. package/dist/lib/node-esm/{chunk-F6UHVLH7.mjs → chunk-64TMVBTT.mjs} +11 -24
  66. package/dist/lib/node-esm/chunk-64TMVBTT.mjs.map +7 -0
  67. package/dist/lib/node-esm/{chunk-JAVD67QP.mjs → chunk-6TXN2UXT.mjs} +5 -3
  68. package/dist/lib/node-esm/{chunk-JAVD67QP.mjs.map → chunk-6TXN2UXT.mjs.map} +2 -2
  69. package/dist/lib/node-esm/chunk-I6RIVFIP.mjs +87 -0
  70. package/dist/lib/node-esm/chunk-I6RIVFIP.mjs.map +7 -0
  71. package/dist/lib/node-esm/chunk-VBEBX5EB.mjs +22 -0
  72. package/dist/lib/node-esm/chunk-VBEBX5EB.mjs.map +7 -0
  73. package/dist/lib/node-esm/index.mjs +10 -6
  74. package/dist/lib/node-esm/index.mjs.map +3 -3
  75. package/dist/lib/node-esm/intent-resolver-3STR3645.mjs +87 -0
  76. package/dist/lib/node-esm/intent-resolver-3STR3645.mjs.map +7 -0
  77. package/dist/lib/node-esm/meta.json +1 -1
  78. package/dist/lib/node-esm/{react-surface-6IKC3G46.mjs → react-surface-75OU2AJX.mjs} +16 -6
  79. package/dist/lib/node-esm/react-surface-75OU2AJX.mjs.map +7 -0
  80. package/dist/lib/node-esm/{settings-ZDIFTK4N.mjs → settings-G7QIMIEK.mjs} +4 -4
  81. package/dist/lib/node-esm/settings-G7QIMIEK.mjs.map +7 -0
  82. package/dist/lib/node-esm/{state-DWPOKLEY.mjs → state-PNOPM4TS.mjs} +1 -1
  83. package/dist/lib/node-esm/{state-DWPOKLEY.mjs.map → state-PNOPM4TS.mjs.map} +2 -2
  84. package/dist/lib/node-esm/{thread-R2KHZD6V.mjs → thread-72RI26KD.mjs} +2 -2
  85. package/dist/lib/node-esm/types/index.mjs +3 -1
  86. package/dist/types/src/capabilities/artifact-definition.d.ts.map +1 -1
  87. package/dist/types/src/capabilities/intent-resolver.d.ts.map +1 -1
  88. package/dist/types/src/capabilities/react-surface.d.ts.map +1 -1
  89. package/dist/types/src/components/MarkdownContainer.d.ts +2 -2
  90. package/dist/types/src/components/MarkdownContainer.d.ts.map +1 -1
  91. package/dist/types/src/components/{MarkdownEditor.d.ts → MarkdownEditor/MarkdownEditor.d.ts} +1 -1
  92. package/dist/types/src/components/MarkdownEditor/MarkdownEditor.d.ts.map +1 -0
  93. package/dist/types/src/components/{MarkdownEditor.stories.d.ts → MarkdownEditor/MarkdownEditor.stories.d.ts} +3 -3
  94. package/dist/types/src/components/MarkdownEditor/MarkdownEditor.stories.d.ts.map +1 -0
  95. package/dist/types/src/components/MarkdownEditor/index.d.ts +2 -0
  96. package/dist/types/src/components/MarkdownEditor/index.d.ts.map +1 -0
  97. package/dist/types/src/components/MarkdownPreview/MarkdownPreview.d.ts +6 -0
  98. package/dist/types/src/components/MarkdownPreview/MarkdownPreview.d.ts.map +1 -0
  99. package/dist/types/src/components/MarkdownPreview/MarkdownPreview.stories.d.ts +189 -0
  100. package/dist/types/src/components/MarkdownPreview/MarkdownPreview.stories.d.ts.map +1 -0
  101. package/dist/types/src/components/MarkdownPreview/index.d.ts +4 -0
  102. package/dist/types/src/components/MarkdownPreview/index.d.ts.map +1 -0
  103. package/dist/types/src/components/{MarkdownSettings.d.ts → MarkdownSettings/MarkdownSettings.d.ts} +1 -1
  104. package/dist/types/src/components/MarkdownSettings/MarkdownSettings.d.ts.map +1 -0
  105. package/dist/types/src/components/MarkdownSettings/index.d.ts +2 -0
  106. package/dist/types/src/components/MarkdownSettings/index.d.ts.map +1 -0
  107. package/dist/types/src/components/Suggestions.stories.d.ts +12 -0
  108. package/dist/types/src/components/Suggestions.stories.d.ts.map +1 -0
  109. package/dist/types/src/components/Toolbar.stories.d.ts +2 -2
  110. package/dist/types/src/components/Toolbar.stories.d.ts.map +1 -1
  111. package/dist/types/src/components/index.d.ts +1 -0
  112. package/dist/types/src/components/index.d.ts.map +1 -1
  113. package/dist/types/src/extensions.d.ts +2 -2
  114. package/dist/types/src/extensions.d.ts.map +1 -1
  115. package/dist/types/src/translations.d.ts +6 -0
  116. package/dist/types/src/translations.d.ts.map +1 -1
  117. package/dist/types/src/types/schema.d.ts +522 -123
  118. package/dist/types/src/types/schema.d.ts.map +1 -1
  119. package/dist/types/src/types/types.d.ts +195 -85
  120. package/dist/types/src/types/types.d.ts.map +1 -1
  121. package/dist/types/src/util.d.ts +1 -0
  122. package/dist/types/src/util.d.ts.map +1 -1
  123. package/package.json +40 -33
  124. package/src/MarkdownPlugin.tsx +5 -5
  125. package/src/capabilities/artifact-definition.ts +5 -3
  126. package/src/capabilities/intent-resolver.ts +39 -6
  127. package/src/capabilities/react-surface.tsx +11 -4
  128. package/src/capabilities/settings.ts +2 -2
  129. package/src/capabilities/state.ts +1 -1
  130. package/src/components/MarkdownContainer.tsx +4 -3
  131. package/src/components/{MarkdownEditor.stories.tsx → MarkdownEditor/MarkdownEditor.stories.tsx} +22 -35
  132. package/src/components/{MarkdownEditor.tsx → MarkdownEditor/MarkdownEditor.tsx} +5 -4
  133. package/src/components/MarkdownEditor/index.ts +5 -0
  134. package/src/components/MarkdownPreview/MarkdownPreview.stories.tsx +68 -0
  135. package/src/components/MarkdownPreview/MarkdownPreview.tsx +85 -0
  136. package/src/components/MarkdownPreview/index.ts +9 -0
  137. package/src/components/{MarkdownSettings.tsx → MarkdownSettings/MarkdownSettings.tsx} +2 -2
  138. package/src/components/MarkdownSettings/index.ts +5 -0
  139. package/src/components/Suggestions.stories.tsx +191 -0
  140. package/src/components/Toolbar.stories.tsx +16 -16
  141. package/src/components/index.ts +1 -0
  142. package/src/extensions.tsx +39 -34
  143. package/src/hooks/useSelectCurrentThread.tsx +2 -2
  144. package/src/translations.ts +2 -0
  145. package/src/types/schema.ts +24 -11
  146. package/src/types/types.ts +22 -21
  147. package/src/util.tsx +7 -3
  148. package/dist/lib/browser/MarkdownContainer-T3HU27RE.mjs.map +0 -7
  149. package/dist/lib/browser/artifact-definition-CE6J6NY4.mjs.map +0 -7
  150. package/dist/lib/browser/chunk-3ULJ4FIJ.mjs.map +0 -7
  151. package/dist/lib/browser/chunk-YCJNW2RU.mjs +0 -75
  152. package/dist/lib/browser/chunk-YCJNW2RU.mjs.map +0 -7
  153. package/dist/lib/browser/intent-resolver-42GQ6HNZ.mjs +0 -50
  154. package/dist/lib/browser/intent-resolver-42GQ6HNZ.mjs.map +0 -7
  155. package/dist/lib/browser/react-surface-RQX3CPFV.mjs.map +0 -7
  156. package/dist/lib/browser/settings-GCSS3Y4Z.mjs.map +0 -7
  157. package/dist/lib/node/MarkdownContainer-6ZJIFAP6.cjs.map +0 -7
  158. package/dist/lib/node/artifact-definition-XGADFWCQ.cjs.map +0 -7
  159. package/dist/lib/node/chunk-7QVONRSI.cjs.map +0 -7
  160. package/dist/lib/node/chunk-UEXGNGSS.cjs.map +0 -7
  161. package/dist/lib/node/intent-resolver-NW27BF3W.cjs.map +0 -7
  162. package/dist/lib/node/react-surface-5X3SMHGI.cjs.map +0 -7
  163. package/dist/lib/node/settings-S2ISUVIH.cjs.map +0 -7
  164. package/dist/lib/node-esm/MarkdownContainer-URAPTO37.mjs.map +0 -7
  165. package/dist/lib/node-esm/artifact-definition-WRG5ZRN5.mjs.map +0 -7
  166. package/dist/lib/node-esm/chunk-4AM4VU3Y.mjs +0 -76
  167. package/dist/lib/node-esm/chunk-4AM4VU3Y.mjs.map +0 -7
  168. package/dist/lib/node-esm/chunk-F6UHVLH7.mjs.map +0 -7
  169. package/dist/lib/node-esm/intent-resolver-7HOMUVHR.mjs +0 -51
  170. package/dist/lib/node-esm/intent-resolver-7HOMUVHR.mjs.map +0 -7
  171. package/dist/lib/node-esm/react-surface-6IKC3G46.mjs.map +0 -7
  172. package/dist/lib/node-esm/settings-ZDIFTK4N.mjs.map +0 -7
  173. package/dist/types/src/components/MarkdownEditor.d.ts.map +0 -1
  174. package/dist/types/src/components/MarkdownEditor.stories.d.ts.map +0 -1
  175. package/dist/types/src/components/MarkdownSettings.d.ts.map +0 -1
  176. /package/dist/lib/browser/{app-graph-serializer-NOXI4IQ5.mjs.map → app-graph-serializer-6SMW5SL3.mjs.map} +0 -0
  177. /package/dist/lib/browser/{thread-3QGCFNVZ.mjs.map → thread-VUUBSXA5.mjs.map} +0 -0
  178. /package/dist/lib/node/{app-graph-serializer-HKK3SEDN.cjs.map → app-graph-serializer-4VZJUDTL.cjs.map} +0 -0
  179. /package/dist/lib/node/{thread-42R57L4K.cjs.map → thread-NHTJKFC4.cjs.map} +0 -0
  180. /package/dist/lib/node-esm/{app-graph-serializer-QQ2CTHOQ.mjs.map → app-graph-serializer-QH2FE7FH.mjs.map} +0 -0
  181. /package/dist/lib/node-esm/{thread-R2KHZD6V.mjs.map → thread-72RI26KD.mjs.map} +0 -0
@@ -8,10 +8,10 @@ import { createSurface, contributes, Capabilities, useCapability } from '@dxos/a
8
8
  import { isInstanceOf } from '@dxos/echo-schema';
9
9
  import { SettingsStore } from '@dxos/local-storage';
10
10
  import { fullyQualifiedId } from '@dxos/react-client/echo';
11
- import { TextType } from '@dxos/schema';
11
+ import { DataType } from '@dxos/schema';
12
12
 
13
13
  import { MarkdownCapabilities } from './capabilities';
14
- import { MarkdownContainer, MarkdownSettings } from '../components';
14
+ import { MarkdownContainer, MarkdownSettings, MarkdownPreview } from '../components';
15
15
  import { MARKDOWN_PLUGIN } from '../meta';
16
16
  import { DocumentType, isEditorModel, type MarkdownSettingsProps } from '../types';
17
17
 
@@ -44,8 +44,8 @@ export default () =>
44
44
  createSurface({
45
45
  id: `${MARKDOWN_PLUGIN}/text`,
46
46
  role: ['article', 'section', 'tabpanel'],
47
- filter: (data): data is { id: string; subject: TextType } =>
48
- typeof data.id === 'string' && isInstanceOf(TextType, data.subject),
47
+ filter: (data): data is { id: string; subject: DataType.Text } =>
48
+ typeof data.id === 'string' && isInstanceOf(DataType.Text, data.subject),
49
49
  component: ({ data, role }) => {
50
50
  const settingsStore = useCapability(Capabilities.SettingsStore);
51
51
  const settings = settingsStore.getStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN)!.value;
@@ -95,4 +95,11 @@ export default () =>
95
95
  data.subject instanceof SettingsStore && data.subject.prefix === MARKDOWN_PLUGIN,
96
96
  component: ({ data: { subject } }) => <MarkdownSettings settings={subject.value} />,
97
97
  }),
98
+ createSurface({
99
+ id: `${MARKDOWN_PLUGIN}/preview`,
100
+ role: 'popover',
101
+ filter: (data): data is { subject: DocumentType | DataType.Text } =>
102
+ isInstanceOf(DocumentType, data.subject) || isInstanceOf(DataType.Text, data.subject),
103
+ component: ({ data, role }) => <MarkdownPreview {...data} role={role} />,
104
+ }),
98
105
  ]);
@@ -3,13 +3,13 @@
3
3
  //
4
4
 
5
5
  import { Capabilities, contributes } from '@dxos/app-framework';
6
- import { create } from '@dxos/live-object';
6
+ import { live } from '@dxos/live-object';
7
7
 
8
8
  import { MARKDOWN_PLUGIN } from '../meta';
9
9
  import { type MarkdownSettingsProps, MarkdownSettingsSchema } from '../types';
10
10
 
11
11
  export default () => {
12
- const settings = create<MarkdownSettingsProps>({
12
+ const settings = live<MarkdownSettingsProps>({
13
13
  defaultViewMode: 'preview',
14
14
  toolbar: true,
15
15
  numberedHeadings: true,
@@ -12,7 +12,6 @@ import { type MarkdownPluginState, type MarkdownSettingsProps } from '../types';
12
12
 
13
13
  export default (context: PluginsContext) => {
14
14
  const state = new LocalStorageStore<MarkdownPluginState>(MARKDOWN_PLUGIN, { extensionProviders: [], viewMode: {} });
15
-
16
15
  state.prop({ key: 'viewMode', type: LocalStorageStore.json<{ [key: string]: EditorViewMode }>() });
17
16
 
18
17
  // TODO(wittjosiah): Fold into state.
@@ -27,5 +26,6 @@ export default (context: PluginsContext) => {
27
26
 
28
27
  const setViewMode = (id: string, viewMode: EditorViewMode) => (state.values.viewMode[id] = viewMode);
29
28
 
29
+ // Return object with methods.
30
30
  return contributes(MarkdownCapabilities.State, { state: state.values, editorState, getViewMode, setViewMode });
31
31
  };
@@ -7,7 +7,7 @@ import React, { useEffect, useMemo } from 'react';
7
7
  import { Capabilities, useCapabilities } from '@dxos/app-framework';
8
8
  import { isInstanceOf } from '@dxos/echo-schema';
9
9
  import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
10
- import { TextType } from '@dxos/schema';
10
+ import { DataType } from '@dxos/schema';
11
11
 
12
12
  import { MarkdownEditor, type MarkdownEditorProps } from './MarkdownEditor';
13
13
  import { useExtensions } from '../extensions';
@@ -19,7 +19,7 @@ export type MarkdownContainerProps = Pick<
19
19
  'role' | 'extensionProviders' | 'viewMode' | 'editorStateStore' | 'onViewModeChange'
20
20
  > & {
21
21
  id: string;
22
- object: DocumentType | TextType | any;
22
+ object: DocumentType | DataType.Text | any;
23
23
  settings: MarkdownSettingsProps;
24
24
  };
25
25
 
@@ -36,7 +36,7 @@ const MarkdownContainer = ({
36
36
  }: MarkdownContainerProps) => {
37
37
  const scrollPastEnd = role === 'article';
38
38
  const doc = isInstanceOf(DocumentType, object) ? object : undefined;
39
- const text = isInstanceOf(TextType, object) ? object : undefined;
39
+ const text = isInstanceOf(DataType.Text, object) ? object : undefined;
40
40
  const extensions = useExtensions({ document: doc, text, id, settings, viewMode, editorStateStore });
41
41
 
42
42
  if (doc) {
@@ -68,6 +68,7 @@ const MarkdownContainer = ({
68
68
  />
69
69
  );
70
70
  } else {
71
+ // TODO(burdon): Normalize with above.
71
72
  return (
72
73
  <MarkdownEditor
73
74
  id={id}
@@ -10,19 +10,14 @@ import React, { useMemo } from 'react';
10
10
  import { IntentPlugin } from '@dxos/app-framework';
11
11
  import { withPluginManager } from '@dxos/app-framework/testing';
12
12
  import { createDocAccessor, createObject } from '@dxos/react-client/echo';
13
- import { Main } from '@dxos/react-ui';
14
- import { AttendableContainer } from '@dxos/react-ui-attention';
15
13
  import { withAttention } from '@dxos/react-ui-attention/testing';
16
- import { editorWithToolbarLayout, automerge, translations as editorTranslations } from '@dxos/react-ui-editor';
17
- import { topbarBlockPaddingStart } from '@dxos/react-ui-theme';
14
+ import { automerge, translations as editorTranslations } from '@dxos/react-ui-editor';
18
15
  import { withLayout, withTheme } from '@dxos/storybook-utils';
19
16
 
20
17
  import { MarkdownEditor, type MarkdownEditorProps } from './MarkdownEditor';
21
- import translations from '../translations';
18
+ import translations from '../../translations';
22
19
 
23
- const content = Array.from({ length: 100 })
24
- .map((_, i) => `Line ${i + 1}`)
25
- .join('\n');
20
+ const content = Array.from({ length: 100 }, (_, i) => `Line ${i + 1}`).join('\n');
26
21
 
27
22
  type StoryProps = MarkdownEditorProps & {
28
23
  content?: string;
@@ -32,43 +27,35 @@ type StoryProps = MarkdownEditorProps & {
32
27
  const DefaultStory = ({ content = '# Test', toolbar }: StoryProps) => {
33
28
  const doc = useMemo(() => createObject({ content }), [content]);
34
29
  const extensions = useMemo(() => [automerge(createDocAccessor(doc, ['content']))], [doc]);
35
- return (
36
- <Main.Content
37
- bounce
38
- data-toolbar={toolbar ? 'enabled' : 'disabled'}
39
- classNames={[topbarBlockPaddingStart, editorWithToolbarLayout]}
40
- >
41
- <AttendableContainer id='test'>
42
- <MarkdownEditor id='test' initialValue={doc.content} extensions={extensions} toolbar={toolbar} />
43
- </AttendableContainer>
44
- </Main.Content>
45
- );
46
- };
47
-
48
- export const Default = {
49
- args: {
50
- content,
51
- },
52
- };
53
-
54
- export const WithToolbar = {
55
- args: {
56
- content,
57
- toolbar: true,
58
- },
30
+ return <MarkdownEditor id='test' initialValue={doc.content} extensions={extensions} toolbar={toolbar} />;
59
31
  };
60
32
 
61
33
  const meta: Meta<typeof MarkdownEditor> = {
62
- title: 'plugins/plugin-markdown/EditorMain',
34
+ title: 'plugins/plugin-markdown/MarkdownEditor',
63
35
  component: MarkdownEditor,
64
36
  render: DefaultStory,
65
37
  decorators: [
66
38
  withTheme,
67
- withLayout({ tooltips: true }),
39
+ withLayout({ tooltips: true, fullscreen: true }),
68
40
  withAttention,
69
41
  withPluginManager({ plugins: [IntentPlugin()] }),
70
42
  ],
71
- parameters: { layout: 'fullscreen', translations: [...translations, ...editorTranslations] },
43
+ parameters: {
44
+ translations: [...translations, ...editorTranslations],
45
+ },
72
46
  };
73
47
 
74
48
  export default meta;
49
+
50
+ export const Default = {
51
+ args: {
52
+ content,
53
+ },
54
+ };
55
+
56
+ export const WithToolbar = {
57
+ args: {
58
+ toolbar: true,
59
+ content,
60
+ },
61
+ };
@@ -38,9 +38,9 @@ import {
38
38
  import { StackItem } from '@dxos/react-ui-stack';
39
39
  import { isNotFalsy, isNonNullable } from '@dxos/util';
40
40
 
41
- import { useSelectCurrentThread } from '../hooks';
42
- import { MARKDOWN_PLUGIN } from '../meta';
43
- import { type MarkdownPluginState } from '../types';
41
+ import { useSelectCurrentThread } from '../../hooks';
42
+ import { MARKDOWN_PLUGIN } from '../../meta';
43
+ import { type MarkdownPluginState } from '../../types';
44
44
 
45
45
  export type MarkdownEditorProps = {
46
46
  id: string;
@@ -211,7 +211,7 @@ export const MarkdownEditor = ({
211
211
  );
212
212
 
213
213
  return (
214
- <StackItem.Content toolbar={!!toolbar}>
214
+ <StackItem.Content toolbar={!!toolbar} classNames='is-full min-bs-0'>
215
215
  {toolbar && (
216
216
  <>
217
217
  <EditorToolbar
@@ -231,6 +231,7 @@ export const MarkdownEditor = ({
231
231
  data-testid='composer.markdownRoot'
232
232
  data-toolbar={toolbar ? 'enabled' : 'disabled'}
233
233
  className={stackItemContentEditorClassNames(role)}
234
+ data-popover-collision-boundary={true}
234
235
  {...focusAttributes}
235
236
  />
236
237
  </StackItem.Content>
@@ -0,0 +1,5 @@
1
+ //
2
+ // Copyright 2025 DXOS.org
3
+ //
4
+
5
+ export * from './MarkdownEditor';
@@ -0,0 +1,68 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ import '@dxos-theme';
6
+
7
+ import { type Meta } from '@storybook/react';
8
+ import React from 'react';
9
+
10
+ import { IntentPlugin } from '@dxos/app-framework';
11
+ import { withPluginManager } from '@dxos/app-framework/testing';
12
+ import { create } from '@dxos/echo-schema';
13
+ import { DocumentType } from '@dxos/plugin-markdown/types';
14
+ import { faker } from '@dxos/random';
15
+ import { makeRef } from '@dxos/react-client/echo';
16
+ import { Icon, Popover } from '@dxos/react-ui';
17
+ import { DataType } from '@dxos/schema';
18
+ import { withTheme, withLayout } from '@dxos/storybook-utils';
19
+
20
+ import { MarkdownPreview } from './MarkdownPreview';
21
+ import translations from '../../translations';
22
+
23
+ faker.seed(1234);
24
+
25
+ const meta: Meta<typeof MarkdownPreview> = {
26
+ title: 'plugins/plugin-markdown/MarkdownPreview',
27
+ component: MarkdownPreview,
28
+ render: ({ subject }) => {
29
+ return (
30
+ <Popover.Root open>
31
+ <Popover.Content>
32
+ <MarkdownPreview subject={subject} role='popover' />
33
+ <Popover.Arrow />
34
+ </Popover.Content>
35
+ <Popover.Trigger>
36
+ <Icon icon='ph--text-aa--regular' size={5} />
37
+ </Popover.Trigger>
38
+ </Popover.Root>
39
+ );
40
+ },
41
+ decorators: [withPluginManager({ plugins: [IntentPlugin()] }), withTheme, withLayout({ tooltips: true })],
42
+ parameters: {
43
+ layout: 'centered',
44
+ translations,
45
+ },
46
+ };
47
+
48
+ export default meta;
49
+
50
+ const data = (() => {
51
+ const document = create(DocumentType, {
52
+ name: faker.lorem.words(3),
53
+ content: makeRef(
54
+ create(DataType.Text, {
55
+ content: faker.lorem.paragraphs(3),
56
+ }),
57
+ ),
58
+ threads: [],
59
+ });
60
+
61
+ return { document };
62
+ })();
63
+
64
+ export const Default = {
65
+ args: {
66
+ subject: create(DocumentType, data.document),
67
+ },
68
+ };
@@ -0,0 +1,85 @@
1
+ //
2
+ // Copyright 2025 DXOS.org
3
+ //
4
+
5
+ import { pipe } from 'effect';
6
+ import React, { useCallback } from 'react';
7
+
8
+ import { chain, createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
9
+ import { isInstanceOf } from '@dxos/echo-schema';
10
+ import {
11
+ type PreviewProps,
12
+ defaultCard,
13
+ kanbanCardWithoutPoster,
14
+ popoverCard,
15
+ previewTitle,
16
+ previewProse,
17
+ previewChrome,
18
+ } from '@dxos/plugin-preview';
19
+ import { fullyQualifiedId } from '@dxos/react-client/echo';
20
+ import { Button, Icon, useTranslation } from '@dxos/react-ui';
21
+ import { mx } from '@dxos/react-ui-theme';
22
+ import { DataType } from '@dxos/schema';
23
+
24
+ import { MARKDOWN_PLUGIN } from '../../meta';
25
+ import { DocumentType } from '../../types';
26
+ import { getAbstract, getFallbackName } from '../../util';
27
+
28
+ // TODO(burdon): Factor out.
29
+ const getTitle = (subject: DocumentType | DataType.Text, fallback: string) => {
30
+ if (isInstanceOf(DocumentType, subject)) {
31
+ return subject.name ?? subject.fallbackName ?? getFallbackName(subject.content?.target?.content ?? fallback);
32
+ } else if (isInstanceOf(DataType.Text, subject)) {
33
+ return getFallbackName(subject.content);
34
+ }
35
+ };
36
+
37
+ // TODO(burdon): Factor out.
38
+ const getSnippet = (subject: DocumentType | DataType.Text, fallback: string) => {
39
+ if (isInstanceOf(DocumentType, subject)) {
40
+ return getAbstract(subject.content?.target?.content ?? fallback);
41
+ } else if (isInstanceOf(DataType.Text, subject)) {
42
+ return getAbstract(subject.content);
43
+ }
44
+ };
45
+
46
+ export const MarkdownPreview = ({ classNames, subject, role }: PreviewProps<DocumentType | DataType.Text>) => {
47
+ const { dispatchPromise: dispatch } = useIntentDispatcher();
48
+ const { t } = useTranslation(MARKDOWN_PLUGIN);
49
+ const snippet = getSnippet(subject, t('fallback abstract'));
50
+
51
+ // TODO(wittjosiah): Factor out so this component isn't dependent on the app framework.
52
+ const handleNavigate = useCallback(
53
+ () =>
54
+ dispatch(
55
+ pipe(
56
+ createIntent(LayoutAction.UpdatePopover, {
57
+ part: 'popover',
58
+ subject: null,
59
+ options: { state: false, anchorId: '' },
60
+ }),
61
+ chain(LayoutAction.Open, { part: 'main', subject: [fullyQualifiedId(subject)] }),
62
+ ),
63
+ ),
64
+ [dispatch, subject],
65
+ );
66
+
67
+ return (
68
+ <div
69
+ role='none'
70
+ className={mx(
71
+ role === 'popover' ? popoverCard : role === 'card--kanban' ? kanbanCardWithoutPoster : defaultCard,
72
+ classNames,
73
+ )}
74
+ >
75
+ <h2 className={mx(previewTitle, previewProse)}>{getTitle(subject, t('fallback title'))}</h2>
76
+ {snippet && <p className={mx(previewProse, 'line-clamp-3 break-words col-span-2')}>{snippet}</p>}
77
+ <div role='none' className={previewChrome}>
78
+ <Button onClick={handleNavigate}>
79
+ <span className='grow'>{t('navigate to document label')}</span>
80
+ <Icon icon='ph--arrow-right--regular' />
81
+ </Button>
82
+ </div>
83
+ </div>
84
+ );
85
+ };
@@ -0,0 +1,9 @@
1
+ //
2
+ // Copyright 2025 DXOS.org
3
+ //
4
+
5
+ import { MarkdownPreview } from './MarkdownPreview';
6
+
7
+ export * from './MarkdownPreview';
8
+
9
+ export default MarkdownPreview;
@@ -8,8 +8,8 @@ import { Input, Select, useTranslation } from '@dxos/react-ui';
8
8
  import { type EditorInputMode, EditorInputModes, type EditorViewMode, EditorViewModes } from '@dxos/react-ui-editor';
9
9
  import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
10
10
 
11
- import { MARKDOWN_PLUGIN } from '../meta';
12
- import { type MarkdownSettingsProps } from '../types';
11
+ import { MARKDOWN_PLUGIN } from '../../meta';
12
+ import { type MarkdownSettingsProps } from '../../types';
13
13
 
14
14
  export const MarkdownSettings = ({ settings }: { settings: MarkdownSettingsProps }) => {
15
15
  const { t } = useTranslation(MARKDOWN_PLUGIN);
@@ -0,0 +1,5 @@
1
+ //
2
+ // Copyright 2025 DXOS.org
3
+ //
4
+
5
+ export * from './MarkdownSettings';
@@ -0,0 +1,191 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ import '@dxos-theme';
6
+
7
+ import { type Meta } from '@storybook/react';
8
+ import { Schema, SchemaAST } from 'effect';
9
+ import React, { type FC, useEffect, useMemo, useState } from 'react';
10
+
11
+ import {
12
+ Capabilities,
13
+ CollaborationActions,
14
+ IntentPlugin,
15
+ SettingsPlugin,
16
+ contributes,
17
+ createIntent,
18
+ useCapability,
19
+ useIntentDispatcher,
20
+ } from '@dxos/app-framework';
21
+ import { withPluginManager } from '@dxos/app-framework/testing';
22
+ import { Message } from '@dxos/artifact';
23
+ import { Type } from '@dxos/echo';
24
+ import { create, type Expando } from '@dxos/echo-schema';
25
+ import { invariant } from '@dxos/invariant';
26
+ import { DXN } from '@dxos/keys';
27
+ import { live, makeRef, refFromDXN } from '@dxos/live-object';
28
+ import { ClientPlugin } from '@dxos/plugin-client';
29
+ import { PreviewPlugin } from '@dxos/plugin-preview';
30
+ import { SpacePlugin } from '@dxos/plugin-space';
31
+ import { StorybookLayoutPlugin } from '@dxos/plugin-storybook-layout';
32
+ import { ThemePlugin } from '@dxos/plugin-theme';
33
+ import { faker } from '@dxos/random';
34
+ import { createQueueDxn, useQueue, useSpace } from '@dxos/react-client/echo';
35
+ import { IconButton, Toolbar } from '@dxos/react-ui';
36
+ import { command, useTextEditor } from '@dxos/react-ui-editor';
37
+ import { StackItem } from '@dxos/react-ui-stack';
38
+ import { defaultTx } from '@dxos/react-ui-theme';
39
+ import { withLayout } from '@dxos/storybook-utils';
40
+
41
+ import MarkdownContainer from './MarkdownContainer';
42
+ import { MarkdownPlugin } from '../MarkdownPlugin';
43
+ import { MarkdownCapabilities } from '../capabilities';
44
+ import { MARKDOWN_PLUGIN } from '../meta';
45
+ import translations from '../translations';
46
+ import { createDocument, DocumentType, type MarkdownSettingsProps } from '../types';
47
+
48
+ faker.seed(1);
49
+
50
+ const TestItem = Schema.Struct({
51
+ title: Schema.String.annotations({
52
+ [SchemaAST.TitleAnnotationId]: 'Title',
53
+ [SchemaAST.DescriptionAnnotationId]: 'Product title',
54
+ }),
55
+ description: Schema.String.annotations({
56
+ [SchemaAST.TitleAnnotationId]: 'Description',
57
+ [SchemaAST.DescriptionAnnotationId]: 'Product description',
58
+ }),
59
+ }).pipe(
60
+ Type.def({
61
+ typename: 'dxos.org/type/Test',
62
+ version: '0.1.0',
63
+ }),
64
+ );
65
+
66
+ const TestChat: FC<{ doc: DocumentType; content: string }> = ({ doc, content }) => {
67
+ const { dispatchPromise: dispatch } = useIntentDispatcher();
68
+ const { parentRef } = useTextEditor({ initialValue: content });
69
+
70
+ const space = useSpace();
71
+ const queueDxn = useMemo(() => space && createQueueDxn(space.id), [space]);
72
+ const queue = useQueue<Message>(queueDxn);
73
+
74
+ const handleInsert = () => {
75
+ invariant(space);
76
+ invariant(queue);
77
+ queue.append([create(Message, { role: 'assistant', content: [{ type: 'text', text: 'Hello' }] })]);
78
+ const message = queue.items[queue.items.length - 1];
79
+
80
+ // {
81
+ // const ref = refFromDXN(new DXN(DXN.kind.QUEUE, [...queue.dxn.parts, message.id]));
82
+
83
+ // const message = deref(ref);
84
+ // }
85
+
86
+ void dispatch(
87
+ createIntent(CollaborationActions.InsertContent, {
88
+ spaceId: space.id,
89
+ target: makeRef(doc as any as Expando), // TODO(burdon): Comomon base type.
90
+ object: refFromDXN(new DXN(DXN.kind.QUEUE, [...queue.dxn.parts, message.id])),
91
+ label: 'Proposal',
92
+ }),
93
+ );
94
+ };
95
+
96
+ return (
97
+ <StackItem.Content toolbar classNames='w-full'>
98
+ <Toolbar.Root classNames='border-be border-separator'>
99
+ <IconButton icon='ph--plus--regular' disabled={!queue} label='Insert' onClick={handleInsert} />
100
+ </Toolbar.Root>
101
+ <div ref={parentRef} className='p-4' />
102
+ </StackItem.Content>
103
+ );
104
+ };
105
+
106
+ const DefaultStory = ({ document, chat }: { document: string; chat: string }) => {
107
+ const space = useSpace();
108
+ const [doc, setDoc] = useState<DocumentType>();
109
+ const settings = useCapability(Capabilities.SettingsStore).getStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN)!.value;
110
+
111
+ useEffect(() => {
112
+ if (!space) {
113
+ return undefined;
114
+ }
115
+
116
+ const doc = space.db.add(
117
+ createDocument({
118
+ name: 'Test',
119
+
120
+ // Create links.
121
+ content: document.replaceAll(/\[(\w+)\]/g, (_, label) => {
122
+ const obj = space.db.add(live(TestItem, { title: label, description: faker.lorem.paragraph() }));
123
+ const dxn = makeRef(obj).dxn.toString();
124
+ return `[${label}][${dxn}]`;
125
+ }),
126
+ }),
127
+ );
128
+
129
+ setDoc(doc);
130
+ }, [space]);
131
+
132
+ if (!space || !doc) {
133
+ return <></>;
134
+ }
135
+
136
+ return (
137
+ <>
138
+ <MarkdownContainer id={doc.id} object={doc} settings={settings} />
139
+ <TestChat doc={doc} content={chat} />
140
+ </>
141
+ );
142
+ };
143
+
144
+ const meta: Meta<typeof DefaultStory> = {
145
+ title: 'plugins/plugin-markdown/Suggestions',
146
+ render: DefaultStory,
147
+ decorators: [
148
+ withPluginManager({
149
+ plugins: [
150
+ ThemePlugin({ tx: defaultTx }),
151
+ StorybookLayoutPlugin(),
152
+ ClientPlugin({
153
+ types: [DocumentType, TestItem],
154
+ onClientInitialized: async (_, client) => {
155
+ await client.halo.createIdentity();
156
+ },
157
+ }),
158
+ SpacePlugin(),
159
+ SettingsPlugin(),
160
+ IntentPlugin(),
161
+ MarkdownPlugin(),
162
+ PreviewPlugin(),
163
+ ],
164
+ capabilities: [contributes(MarkdownCapabilities.Extensions, [() => command()])],
165
+ }),
166
+ withLayout({ tooltips: true, fullscreen: true, classNames: 'grid grid-cols-2' }),
167
+ ],
168
+ parameters: {
169
+ translations,
170
+ },
171
+ };
172
+
173
+ export default meta;
174
+
175
+ type Story = Meta<typeof DefaultStory>;
176
+
177
+ export const Default: Story = {
178
+ args: {
179
+ chat: 'Hello\n',
180
+ document: [
181
+ '# Test',
182
+ '',
183
+ faker.lorem.paragraph(1),
184
+ '',
185
+ 'This is a [DXOS] story that tests [ECHO] references inside the Markdown plugin.',
186
+ '',
187
+ faker.lorem.paragraph(3),
188
+ '',
189
+ ].join('\n'),
190
+ },
191
+ };
@@ -8,11 +8,12 @@ import { type Meta } from '@storybook/react';
8
8
  import React, { type FC, useState } from 'react';
9
9
 
10
10
  import { PublicKey } from '@dxos/keys';
11
- import { create } from '@dxos/live-object';
11
+ import { live } from '@dxos/live-object';
12
12
  import { faker } from '@dxos/random';
13
13
  import { createDocAccessor, createObject } from '@dxos/react-client/echo';
14
14
  import { useThemeContext } from '@dxos/react-ui';
15
15
  import {
16
+ EditorToolbar,
16
17
  type EditorAction,
17
18
  type Comment,
18
19
  comments,
@@ -23,7 +24,6 @@ import {
23
24
  decorateMarkdown,
24
25
  editorContent,
25
26
  formattingKeymap,
26
- EditorToolbar,
27
27
  translations,
28
28
  useActionHandler,
29
29
  useComments,
@@ -31,16 +31,14 @@ import {
31
31
  useTextEditor,
32
32
  useEditorToolbarState,
33
33
  } from '@dxos/react-ui-editor';
34
- import { TextType } from '@dxos/schema';
34
+ import { DataType } from '@dxos/schema';
35
35
  import { withLayout, withTheme } from '@dxos/storybook-utils';
36
36
 
37
37
  faker.seed(101);
38
38
 
39
- const _onUpload = async (file: File) => ({ url: file.name });
40
-
41
39
  const DefaultStory: FC<{ content?: string }> = ({ content = '' }) => {
42
40
  const { themeMode } = useThemeContext();
43
- const [text] = useState(createObject(create(TextType, { content })));
41
+ const [text] = useState(createObject(live(DataType.Text, { content })));
44
42
  const toolbarState = useEditorToolbarState({ viewMode: 'preview' });
45
43
  const formattingObserver = useFormattingState(toolbarState);
46
44
  const { parentRef, view } = useTextEditor(() => {
@@ -79,9 +77,9 @@ const DefaultStory: FC<{ content?: string }> = ({ content = '' }) => {
79
77
  useComments(view, text.id, _comments);
80
78
 
81
79
  return (
82
- <div role='none' className='fixed inset-0 flex flex-col'>
80
+ <div role='none' className='flex flex-col'>
83
81
  <EditorToolbar onAction={handleAction} state={toolbarState ?? {}} />
84
- <div ref={parentRef} />
82
+ <div className='flex grow overflow-hidden' ref={parentRef} />
85
83
  </div>
86
84
  );
87
85
  };
@@ -96,18 +94,20 @@ const content = [
96
94
  '',
97
95
  ].join('\n');
98
96
 
99
- export const Default = {
100
- args: {
101
- content,
102
- },
103
- };
104
-
105
97
  const meta: Meta<typeof EditorToolbar> = {
106
98
  title: 'plugins/plugin-markdown/Toolbar',
107
99
  component: EditorToolbar,
108
100
  render: DefaultStory as any,
109
- decorators: [withTheme, withLayout({ tooltips: true })],
110
- parameters: { translations, layout: 'fullscreen' },
101
+ decorators: [withTheme, withLayout({ tooltips: true, fullscreen: true })],
102
+ parameters: {
103
+ translations,
104
+ },
111
105
  };
112
106
 
113
107
  export default meta;
108
+
109
+ export const Default = {
110
+ args: {
111
+ content,
112
+ },
113
+ };