@dxos/react-ui-editor 0.7.5-staging.e6154f3 → 0.8.1-main.303c73a

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 (23) hide show
  1. package/dist/lib/browser/index.mjs +8 -4
  2. package/dist/lib/browser/index.mjs.map +3 -3
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node/index.cjs +8 -4
  5. package/dist/lib/node/index.cjs.map +3 -3
  6. package/dist/lib/node/meta.json +1 -1
  7. package/dist/lib/node-esm/index.mjs +8 -4
  8. package/dist/lib/node-esm/index.mjs.map +3 -3
  9. package/dist/lib/node-esm/meta.json +1 -1
  10. package/dist/types/src/InputMode.stories.d.ts +3 -2
  11. package/dist/types/src/InputMode.stories.d.ts.map +1 -1
  12. package/dist/types/src/TextEditor.stories.d.ts +34 -33
  13. package/dist/types/src/TextEditor.stories.d.ts.map +1 -1
  14. package/dist/types/src/components/EditorToolbar/EditorToolbar.d.ts +2 -1
  15. package/dist/types/src/components/EditorToolbar/EditorToolbar.d.ts.map +1 -1
  16. package/dist/types/src/defaults.d.ts +2 -1
  17. package/dist/types/src/defaults.d.ts.map +1 -1
  18. package/dist/types/src/extensions/automerge/automerge.stories.d.ts +4 -3
  19. package/dist/types/src/extensions/automerge/automerge.stories.d.ts.map +1 -1
  20. package/dist/types/src/extensions/markdown/decorate.d.ts.map +1 -1
  21. package/package.json +27 -27
  22. package/src/defaults.ts +8 -5
  23. package/src/extensions/markdown/decorate.ts +5 -1
package/dist/types/src/extensions/automerge/automerge.stories.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import '@dxos-theme';
2
2
  import '@preact/signals-react';
3
+ import React from 'react';
3
4
  import { DocAccessor, type Space } from '@dxos/react-client/echo';
4
5
  import { type Identity } from '@dxos/react-client/halo';
5
6
  type EditorProps = {
@@ -10,9 +11,9 @@ type EditorProps = {
10
11
  };
11
12
  declare const _default: {
12
13
  title: string;
13
- component: ({ source, autoFocus, space, identity }: EditorProps) => import("react/jsx-runtime").JSX.Element;
14
+ component: ({ source, autoFocus, space, identity }: EditorProps) => React.JSX.Element;
14
15
  decorators: import("@storybook/react").Decorator[];
15
- render: () => import("react/jsx-runtime").JSX.Element;
16
+ render: () => React.JSX.Element;
16
17
  parameters: {
17
18
  translations: {
18
19
  'en-US': {
@@ -50,6 +51,6 @@ export default _default;
50
51
  export declare const Default: {};
51
52
  export declare const WithEcho: {
52
53
  decorators: import("@storybook/react").Decorator[];
53
- render: () => import("react/jsx-runtime").JSX.Element;
54
+ render: () => React.JSX.Element;
54
55
  };
55
56
  //# sourceMappingURL=automerge.stories.d.ts.map
package/dist/types/src/extensions/automerge/automerge.stories.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"automerge.stories.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/automerge/automerge.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,uBAAuB,CAAC;AAM/B,OAAO,EACL,WAAW,EAMX,KAAK,KAAK,EACX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAgBrE,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;;;wDAEsD,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDnE,wBAME;AAsBF,eAAO,MAAM,OAAO,IAAK,CAAC;AAE1B,eAAO,MAAM,QAAQ;;;CAmBpB,CAAC"}
1
+ {"version":3,"file":"automerge.stories.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/automerge/automerge.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,uBAAuB,CAAC;AAC/B,OAAO,KAA8B,MAAM,OAAO,CAAC;AAKnD,OAAO,EACL,WAAW,EAMX,KAAK,KAAK,EACX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAgBrE,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;;;wDAEsD,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDnE,wBAME;AAsBF,eAAO,MAAM,OAAO,IAAK,CAAC;AAE1B,eAAO,MAAM,QAAQ;;;CAmBpB,CAAC"}
package/dist/types/src/extensions/markdown/decorate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"decorate.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/decorate.ts"],"names":[],"mappings":"AA+fA,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACvD;AAED,eAAO,MAAM,gBAAgB,aAAa,eAAe,4CAgExD,CAAC"}
1
+ {"version":3,"file":"decorate.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/markdown/decorate.ts"],"names":[],"mappings":"AAmgBA,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACvD;AAED,eAAO,MAAM,gBAAgB,aAAa,eAAe,4CAgExD,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/react-ui-editor",
3
- "version": "0.7.5-staging.e6154f3",
3
+ "version": "0.8.1-main.303c73a",
4
4
  "description": "Document editing experience within a DXOS shell.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -51,20 +51,20 @@
51
51
  "lodash.merge": "^4.6.2",
52
52
  "lodash.sortby": "^4.7.0",
53
53
  "style-mod": "^4.1.0",
54
- "@dxos/app-graph": "0.7.5-staging.e6154f3",
55
- "@dxos/async": "0.7.5-staging.e6154f3",
56
- "@dxos/automerge": "0.7.5-staging.e6154f3",
57
- "@dxos/context": "0.7.5-staging.e6154f3",
58
- "@dxos/debug": "0.7.5-staging.e6154f3",
59
- "@dxos/echo-schema": "0.7.5-staging.e6154f3",
60
- "@dxos/invariant": "0.7.5-staging.e6154f3",
61
- "@dxos/display-name": "0.7.5-staging.e6154f3",
62
- "@dxos/live-object": "0.7.5-staging.e6154f3",
63
- "@dxos/log": "0.7.5-staging.e6154f3",
64
- "@dxos/react-hooks": "0.7.5-staging.e6154f3",
65
- "@dxos/protocols": "0.7.5-staging.e6154f3",
66
- "@dxos/react-ui-menu": "0.7.5-staging.e6154f3",
67
- "@dxos/util": "0.7.5-staging.e6154f3"
54
+ "@dxos/app-graph": "0.8.1-main.303c73a",
55
+ "@dxos/async": "0.8.1-main.303c73a",
56
+ "@dxos/automerge": "0.8.1-main.303c73a",
57
+ "@dxos/display-name": "0.8.1-main.303c73a",
58
+ "@dxos/context": "0.8.1-main.303c73a",
59
+ "@dxos/echo-schema": "0.8.1-main.303c73a",
60
+ "@dxos/invariant": "0.8.1-main.303c73a",
61
+ "@dxos/debug": "0.8.1-main.303c73a",
62
+ "@dxos/live-object": "0.8.1-main.303c73a",
63
+ "@dxos/log": "0.8.1-main.303c73a",
64
+ "@dxos/protocols": "0.8.1-main.303c73a",
65
+ "@dxos/react-ui-menu": "0.8.1-main.303c73a",
66
+ "@dxos/util": "0.8.1-main.303c73a",
67
+ "@dxos/react-hooks": "0.8.1-main.303c73a"
68
68
  },
69
69
  "devDependencies": {
70
70
  "@phosphor-icons/react": "^2.1.5",
@@ -88,23 +88,23 @@
88
88
  "vite": "5.4.7",
89
89
  "vite-plugin-top-level-await": "^1.4.1",
90
90
  "vite-plugin-wasm": "^3.3.0",
91
- "@dxos/automerge": "0.7.5-staging.e6154f3",
92
- "@dxos/config": "0.7.5-staging.e6154f3",
93
- "@dxos/echo-signals": "0.7.5-staging.e6154f3",
94
- "@dxos/random": "0.7.5-staging.e6154f3",
95
- "@dxos/react-client": "0.7.5-staging.e6154f3",
96
- "@dxos/keyboard": "0.7.5-staging.e6154f3",
97
- "@dxos/react-ui": "0.7.5-staging.e6154f3",
98
- "@dxos/react-ui-theme": "0.7.5-staging.e6154f3",
99
- "@dxos/storybook-utils": "0.7.5-staging.e6154f3"
91
+ "@dxos/automerge": "0.8.1-main.303c73a",
92
+ "@dxos/echo-signals": "0.8.1-main.303c73a",
93
+ "@dxos/config": "0.8.1-main.303c73a",
94
+ "@dxos/keyboard": "0.8.1-main.303c73a",
95
+ "@dxos/random": "0.8.1-main.303c73a",
96
+ "@dxos/react-ui": "0.8.1-main.303c73a",
97
+ "@dxos/react-ui-theme": "0.8.1-main.303c73a",
98
+ "@dxos/storybook-utils": "0.8.1-main.303c73a",
99
+ "@dxos/react-client": "0.8.1-main.303c73a"
100
100
  },
101
101
  "peerDependencies": {
102
102
  "@phosphor-icons/react": "^2.1.5",
103
103
  "react": "~18.2.0",
104
104
  "react-dom": "~18.2.0",
105
- "@dxos/react-client": "0.7.5-staging.e6154f3",
106
- "@dxos/react-ui": "0.7.5-staging.e6154f3",
107
- "@dxos/react-ui-theme": "0.7.5-staging.e6154f3"
105
+ "@dxos/react-client": "0.8.1-main.303c73a",
106
+ "@dxos/react-ui-theme": "0.8.1-main.303c73a",
107
+ "@dxos/react-ui": "0.8.1-main.303c73a"
108
108
  },
109
109
  "publishConfig": {
110
110
  "access": "public"
package/src/defaults.ts CHANGED
@@ -14,21 +14,21 @@ const margin = '!mt-[1rem]';
14
14
  * CodeMirror content width.
15
15
  * 40rem = 640px. Corresponds to initial plank width (Google docs, Stashpad, etc.)
16
16
  * 50rem = 800px. Maximum content width for solo mode.
17
+ * NOTE: Max width - 4rem = 2rem left/right margin (or 2rem gutter plus 1rem left/right margin).
17
18
  */
18
- export const editorContent = mx(margin, '!mli-auto w-full max-w-[min(50rem,100%-2rem)]');
19
+ // TOOD(burdon): Adjust depending on
20
+ export const editorContent = mx(margin, '!mli-auto w-full max-w-[min(50rem,100%-4rem)]');
19
21
 
20
22
  /**
21
23
  * Margin for numbers.
22
24
  */
23
25
  export const editorFullWidth = mx(margin);
24
26
 
25
- export const editorWithToolbarLayout =
26
- 'grid grid-cols-1 grid-rows-[min-content_1fr] data-[toolbar=disabled]:grid-rows-[1fr] justify-center content-start overflow-hidden';
27
-
28
27
  export const editorGutter = EditorView.theme({
29
28
  // Match margin from content.
29
+ // Gutter = 2rem + 1rem margin.
30
30
  '.cm-gutters': {
31
- marginTop: '16px',
31
+ marginTop: '1rem',
32
32
  paddingRight: '1rem',
33
33
  },
34
34
  });
@@ -38,3 +38,6 @@ export const editorMonospace = EditorView.theme({
38
38
  fontFamily: fontMono,
39
39
  },
40
40
  });
41
+
42
+ export const editorWithToolbarLayout =
43
+ 'grid grid-cols-1 grid-rows-[min-content_1fr] data-[toolbar=disabled]:grid-rows-[1fr] justify-center content-start overflow-hidden';
package/src/extensions/markdown/decorate.ts CHANGED
@@ -217,7 +217,11 @@ const buildDecorations = (view: EditorView, options: DecorateOptions, focus: boo
217
217
  const level = parseInt(node.name['ATXHeading'.length]) as HeadingLevel;
218
218
  const headers = getHeaderLevels(node, level);
219
219
  if (options.numberedHeadings?.from !== undefined) {
220
- headers[level - 1]!.number++;
220
+ const header = headers[level - 1];
221
+ // TODO(burdon): Header will be missing if headers are out of order (e.g., ## header then # header).
222
+ if (header) {
223
+ header.number++;
224
+ }
221
225
  }
222
226
 
223
227
  const editing = editingRange(state, node, focus);