Merge branch 'main' into update-spectrum-deps

Thinkmill · Sep 2, 2024 · 6eb8bcc · 6eb8bcc
2 parents 55e9765 + 09ef3b3
commit 6eb8bcc
Show file tree

Hide file tree

Showing 14 changed files with 169 additions and 33 deletions.
diff --git a/.changeset/honest-seahorses-whisper.md b/.changeset/honest-seahorses-whisper.md
@@ -0,0 +1,5 @@
+---
+'@keystatic/core': patch
+---
+
+Support ordered lists that don't start at 1 in `fields.markdoc` and `fields.mdx`
diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml
@@ -22,7 +22,7 @@ jobs:
       - name: version packages
         run: pnpm changeset version --snapshot ${{ inputs.tag }}
         env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: git commit
         run: |

diff --git a/.github/workflows/version_packages.yml b/.github/workflows/version_packages.yml
@@ -22,5 +22,4 @@ jobs:
         with:
           version: pnpm run version-packages
         env:
-          # use a different GitHub account to have the CI run on push
-          GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/packages/keystatic/src/form/fields/markdoc/editor/inputrules/rules.ts b/packages/keystatic/src/form/fields/markdoc/editor/inputrules/rules.ts
@@ -28,8 +28,10 @@ export function inputRulesForSchema({ nodes, marks, config }: EditorSchema) {
   }
   if (nodes.ordered_list) {
     rules.push({
-      pattern: /^\s*\d+(?:\.|\))\s$/,
-      handler: wrappingInputRuleHandler(nodes.ordered_list),
+      pattern: /^\s*(\d+)(?:\.|\))\s$/,
+      handler: wrappingInputRuleHandler(nodes.ordered_list, match => ({
+        start: parseInt(match[1], 10),
+      })),
     });
   }
   if (nodes.unordered_list) {

diff --git a/packages/keystatic/src/form/fields/markdoc/editor/markdoc/parse.ts b/packages/keystatic/src/form/fields/markdoc/editor/markdoc/parse.ts
@@ -297,7 +297,13 @@ function markdocNodeToProseMirrorNode(
       ? schema.nodes.ordered_list
       : schema.nodes.unordered_list;
     if (!listType) return notAllowed(node, parentType);
-    return createAndFill(node, listType, {});
+    return createAndFill(
+      node,
+      listType,
+      node.attributes.ordered && node.attributes.start !== undefined
+        ? { start: node.attributes.start }
+        : {}
+    );
   }
   if (node.type === 'table') {
     if (!schema.nodes.table) return notAllowed(node, parentType);

diff --git a/packages/keystatic/src/form/fields/markdoc/editor/markdoc/serialize.ts b/packages/keystatic/src/form/fields/markdoc/editor/markdoc/serialize.ts
@@ -244,7 +244,11 @@ export function proseMirrorToMarkdoc(
     return new Ast.Node('item', {}, listItemContent);
   }
   if (node.type === schema.nodes.ordered_list) {
-    return new Ast.Node('list', { ordered: true }, blocks(node.content));
+    return new Ast.Node(
+      'list',
+      { ordered: true, start: node.attrs.start },
+      blocks(node.content)
+    );
   }
   if (node.type === schema.nodes.unordered_list) {
     return new Ast.Node('list', { ordered: false }, blocks(node.content));

diff --git a/packages/keystatic/src/form/fields/markdoc/editor/mdx/parse.ts b/packages/keystatic/src/form/fields/markdoc/editor/mdx/parse.ts
@@ -318,7 +318,11 @@ function markdocNodeToProseMirrorNode(
       ? schema.nodes.ordered_list
       : schema.nodes.unordered_list;
     if (!listType) return notAllowed(node, parentType);
-    return createAndFill(node, listType, {});
+    return createAndFill(
+      node,
+      listType,
+      node.ordered && node.start != null ? { start: node.start } : {}
+    );
   }
   if (node.type === 'table') {
     if (!schema.nodes.table) return notAllowed(node, parentType);

diff --git a/packages/keystatic/src/form/fields/markdoc/editor/mdx/serialize.ts b/packages/keystatic/src/form/fields/markdoc/editor/mdx/serialize.ts
@@ -249,6 +249,7 @@ function proseMirrorToMDX(
       type: 'list',
       ordered: true,
       spread: false,
+      start: node.attrs.start,
       children: mapContent(node, node => convertListItem(blocks(node.content))),
     };
   }

diff --git a/packages/keystatic/src/form/fields/markdoc/editor/schema.tsx b/packages/keystatic/src/form/fields/markdoc/editor/schema.tsx
@@ -221,9 +221,26 @@ const nodeSpecs = {
   ordered_list: {
     content: 'list_item+',
     group: 'block',
-    parseDOM: [{ tag: 'ol' }],
-    toDOM() {
-      return olDOM;
+    attrs: {
+      start: { default: 1 },
+    },
+    parseDOM: [
+      {
+        tag: 'ol',
+        getAttrs: node => {
+          if (typeof node === 'string') {
+            return false;
+          }
+          if (!(node instanceof HTMLOListElement) || node.start < 0) {
+            return { start: 1 };
+          }
+          return { start: node.start };
+        },
+      },
+    ],
+    toDOM(node) {
+      if (node.attrs.start === 1) return olDOM;
+      return ['ol', { start: node.attrs.start }, 0];
     },
     insertMenu: {
       label: 'Ordered list',

diff --git a/packages/keystatic/src/form/fields/markdoc/editor/tests/lists.test.tsx b/packages/keystatic/src/form/fields/markdoc/editor/tests/lists.test.tsx
@@ -19,7 +19,37 @@ test('ordered list shortcut', async () => {
   await user.keyboard(' ');
   expect(state()).toMatchInlineSnapshot(`
     <doc>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
+        <list_item>
+          <paragraph>
+            <cursor />
+          </paragraph>
+        </list_item>
+      </ordered_list>
+    </doc>
+  `);
+});
+
+test('ordered list shortcut with different start', async () => {
+  const { state, user } = renderEditor(
+    <doc>
+      <paragraph>
+        <text>
+          5.
+          <cursor />
+        </text>
+      </paragraph>
+    </doc>
+  );
+
+  await user.keyboard(' ');
+  expect(state()).toMatchInlineSnapshot(`
+    <doc>
+      <ordered_list
+        start={5}
+      >
         <list_item>
           <paragraph>
             <cursor />
@@ -190,7 +220,9 @@ test('toggle list on empty line', async () => {
 
   expect(state()).toMatchInlineSnapshot(`
     <doc>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <cursor />
@@ -219,7 +251,9 @@ test('toggle list on line with text', async () => {
 
   expect(state()).toMatchInlineSnapshot(`
     <doc>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -252,7 +286,9 @@ test('toggle list on line with text with marks', async () => {
 
   expect(state()).toMatchInlineSnapshot(`
     <doc>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -382,7 +418,9 @@ test('toggle ordered_list inside of multi-item ordered_list', async () => {
 
   expect(state()).toMatchInlineSnapshot(`
     <doc>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -397,7 +435,9 @@ test('toggle ordered_list inside of multi-item ordered_list', async () => {
           <cursor />
         </text>
       </paragraph>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -572,7 +612,9 @@ test('backspace at start of list only unwraps the first item', async () => {
           some text
         </text>
       </paragraph>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -788,7 +830,9 @@ test('changing the type of a nested list', async () => {
               some text
             </text>
           </paragraph>
-          <ordered_list>
+          <ordered_list
+            start={1}
+          >
             <list_item>
               <paragraph>
                 <text>
@@ -846,14 +890,18 @@ test('changing the type of a nested list to something which it is nested inside'
               top text
             </text>
           </paragraph>
-          <ordered_list>
+          <ordered_list
+            start={1}
+          >
             <list_item>
               <paragraph>
                 <text>
                   middle text
                 </text>
               </paragraph>
-              <ordered_list>
+              <ordered_list
+                start={1}
+              >
                 <list_item>
                   <paragraph>
                     <text>

diff --git a/packages/keystatic/src/form/fields/markdoc/editor/tests/markdoc.test.tsx b/packages/keystatic/src/form/fields/markdoc/editor/tests/markdoc.test.tsx
@@ -297,7 +297,9 @@ test('link in list', () => {
   const editor = fromMarkdoc(markdoc);
   expect(editor).toMatchInlineSnapshot(`
     <doc>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -690,3 +692,16 @@ test('undefined in conditional value', () => {
     "
   `);
 });
+
+test('ordered list with start', () => {
+  const markdoc = `5. a
+1. b
+1. c`;
+  const editor = fromMarkdoc(markdoc);
+  expect(toMarkdoc(editor)).toMatchInlineSnapshot(`
+    "5. a
+    1. b
+    1. c
+    "
+  `);
+});
diff --git a/packages/keystatic/src/form/fields/markdoc/editor/tests/mdx.test.tsx b/packages/keystatic/src/form/fields/markdoc/editor/tests/mdx.test.tsx
@@ -303,7 +303,9 @@ test('link in list', () => {
   const editor = fromMDX(mdx);
   expect(editor).toMatchInlineSnapshot(`
     <doc>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -1032,3 +1034,16 @@ test('loose list', () => {
     "
   `);
 });
+
+test('ordered list with start', () => {
+  const mdx = `5. a
+1. b
+1. c`;
+  const editor = fromMDX(mdx);
+  expect(toMDX(editor)).toMatchInlineSnapshot(`
+    "5. a
+    6. b
+    7. c
+    "
+  `);
+});
diff --git a/packages/keystatic/src/form/fields/markdoc/editor/tests/pasting/from-other-editors.test.tsx b/packages/keystatic/src/form/fields/markdoc/editor/tests/pasting/from-other-editors.test.tsx
@@ -187,7 +187,9 @@ test('confluence', async () => {
           </unordered_list>
         </list_item>
       </unordered_list>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -201,7 +203,9 @@ test('confluence', async () => {
               item
             </text>
           </paragraph>
-          <ordered_list>
+          <ordered_list
+            start={1}
+          >
             <list_item>
               <paragraph>
                 <text>
@@ -435,7 +439,9 @@ there is a break before this</p>
           </unordered_list>
         </list_item>
       </unordered_list>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -449,7 +455,9 @@ there is a break before this</p>
               item
             </text>
           </paragraph>
-          <ordered_list>
+          <ordered_list
+            start={1}
+          >
             <list_item>
               <paragraph>
                 <text>
@@ -604,7 +612,9 @@ test('dropbox paper', async () => {
           </unordered_list>
         </list_item>
       </unordered_list>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -618,7 +628,9 @@ test('dropbox paper', async () => {
               item
             </text>
           </paragraph>
-          <ordered_list>
+          <ordered_list
+            start={1}
+          >
             <list_item>
               <paragraph>
                 <text>
@@ -803,7 +815,9 @@ test('google docs', async () => {
           </unordered_list>
         </list_item>
       </unordered_list>
-      <ordered_list>
+      <ordered_list
+        start={1}
+      >
         <list_item>
           <paragraph>
             <text>
@@ -817,7 +831,9 @@ test('google docs', async () => {
               item
             </text>
           </paragraph>
-          <ordered_list>
+          <ordered_list
+            start={1}
+          >
             <list_item>
               <paragraph>
                 <text>