rme 0.3.0-beta.31 → 0.3.0-beta.33

package/dist/index.d.ts

@@ -382,6 +382,7 @@ declare class MarkdownParseState {
     private marks;
     private tokenHandlers;
     private contextStack;
+    private contextTokenStack;
     stack: StackItem[];
     constructor(schema: Schema, tokenHandlers: TokenHandlers);
     top(): StackItem;
@@ -394,9 +395,11 @@ declare class MarkdownParseState {
     addNode(type: NodeType, attrs?: Record<string, any>, content?: Node[]): Node;
     openNode(type: NodeType, attrs?: Record<string, any>): void;
     closeNode(): Node;
-    openContext(context: ParserRuleContext): void;
+    openContext(context: ParserRuleContext, token: Token$1): void;
     closeContext(): void;
+    closeContextToken(): Token$1 | undefined;
     topContext(): ParserRuleContext | undefined;
+    topContextToken(): Token$1 | undefined;
 }
 declare class MarkdownParser {
     private schema;
@@ -676,7 +679,7 @@ declare class LineListExtension extends NodeExtension {
     fromMarkdown(): readonly [{
         readonly type: ParserRuleType.free;
         readonly token: "list_item_open";
-        readonly handler: (state: MarkdownParseState) => void;
+        readonly handler: (state: MarkdownParseState, token: Token) => void;
     }, {
         readonly type: ParserRuleType.free;
         readonly token: "list_checkbox";

package/dist/index.mjs

@@ -564,28 +564,32 @@ var FlatListStyles = css`
         content: counter(prosemirror-flat-list-counter, decimal) '. ';
         font-variant-numeric: tabular-nums;
       }
-      counter-increment: prosemirror-flat-list-counter;
 
       /*
-      Reset the counter for the first list node in the sequence.
+      If the node has a custom order number, set the counter to that value.
+      Otherwise, increment the counter normally.
       */
-      &:first-child,
-      :not(&) + & {
-        counter-reset: prosemirror-flat-list-counter;
-
-        /*
-        If the first list node has a custom order number, set the counter to that value.
-        */
-        &[data-list-order] {
-          @supports (counter-set: prosemirror-flat-list-counter 1) {
-            counter-set: prosemirror-flat-list-counter var(--prosemirror-flat-list-order);
-          }
+      &[data-list-order] {
+        @supports (counter-set: prosemirror-flat-list-counter 1) {
+          counter-set: prosemirror-flat-list-counter var(--prosemirror-flat-list-order);
+        }
 
-          @supports not (counter-set: prosemirror-flat-list-counter 1) {
-            counter-increment: prosemirror-flat-list-counter var(--prosemirror-flat-list-order);
-          }
+        @supports not (counter-set: prosemirror-flat-list-counter 1) {
+          counter-reset: prosemirror-flat-list-counter var(--prosemirror-flat-list-order);
         }
       }
+
+      &:not([data-list-order]) {
+        counter-increment: prosemirror-flat-list-counter;
+      }
+
+      /*
+      Reset the counter for the first list node in the sequence or when
+      the previous sibling is not a list (paragraph break).
+      */
+      &:first-child {
+        counter-reset: prosemirror-flat-list-counter;
+      }
     }
 
     &[data-list-kind='task'] {
@@ -620,6 +624,24 @@ var FlatListStyles = css`
       }
     }
   }
+
+  /*
+  Reset counter when an ordered list follows a non-list element.
+  This handles the case where there's a paragraph break (e.g., h3) between lists.
+  */
+  :not(.prosemirror-flat-list[data-list-kind='ordered']) + .prosemirror-flat-list[data-list-kind='ordered'] {
+    counter-reset: prosemirror-flat-list-counter;
+
+    &[data-list-order] {
+      @supports (counter-set: prosemirror-flat-list-counter 1) {
+        counter-set: prosemirror-flat-list-counter var(--prosemirror-flat-list-order);
+      }
+
+      @supports not (counter-set: prosemirror-flat-list-counter 1) {
+        counter-increment: prosemirror-flat-list-counter var(--prosemirror-flat-list-order);
+      }
+    }
+  }
 `;
 
 // src/editor/theme/WysiwygThemeWrapper.tsx
@@ -2477,7 +2499,20 @@ var rule = (state) => {
   const tokens = state.tokens;
   const tokensLength = tokens.length;
   for (let i = tokensLength - 3; i >= 0; i--) {
-    if (isBulletListItemToken(tokens[i]) && isParagraphOpenToken(tokens[i + 1]) && isInlineToken(tokens[i + 2])) {
+    const curToken = tokens[i];
+    if (curToken.type === "ordered_list_open") {
+      curToken.attrs?.some(([name, value]) => {
+        if (name === "start") {
+          const startNum = parseInt(value, 10);
+          if (!isNaN(startNum) && startNum >= 1) {
+            curToken.attrPush(["order", value]);
+          }
+          return true;
+        }
+        return false;
+      });
+    }
+    if (isBulletListItemToken(curToken) && isParagraphOpenToken(tokens[i + 1]) && isInlineToken(tokens[i + 2])) {
       const inlineToken = tokens[i + 2];
       const match = /^\[([ |x])\]\s?/.exec(inlineToken.content);
       if (match) {
@@ -3157,6 +3192,7 @@ var MarkdownParseState = class {
     this.schema = schema;
     this.stack = [{ type: schema.topNodeType, content: [] }];
     this.contextStack = [];
+    this.contextTokenStack = [];
     this.marks = Mark.none;
     this.tokenHandlers = tokenHandlers;
   }
@@ -3226,15 +3262,23 @@ var MarkdownParseState = class {
     }
     return this.addNode(info.type, info.attrs, info.content);
   }
-  openContext(context) {
+  openContext(context, token) {
     this.contextStack.push(context);
+    this.contextTokenStack.push(token);
   }
   closeContext() {
     this.contextStack.pop();
+    this.contextTokenStack.pop();
+  }
+  closeContextToken() {
+    return this.contextTokenStack.pop();
   }
   topContext() {
     return this.contextStack[this.contextStack.length - 1];
   }
+  topContextToken() {
+    return this.contextTokenStack[this.contextTokenStack.length - 1];
+  }
 };
 function withoutTrailingNewline(str) {
   return str.endsWith("\n") ? str.slice(0, str.length - 1) : str;
@@ -3262,8 +3306,8 @@ function buildBlockTokenHandler(parserRule, handlers, schema) {
   }
 }
 function buildContextTokenHandler(parserRule, handlers) {
-  handlers[parserRule.token + "_open"] = (state) => {
-    state.openContext(parserRule.context);
+  handlers[parserRule.token + "_open"] = (state, tok) => {
+    state.openContext(parserRule.context, tok);
   };
   handlers[parserRule.token + "_close"] = (state) => {
     state.closeContext();
@@ -9620,10 +9664,26 @@ var LineListExtension = class extends NodeExtension8 {
       {
         type: 4 /* free */,
         token: "list_item_open",
-        handler: (state) => {
+        handler: (state, token) => {
           switch (state.topContext()) {
             case "ordered_list":
-              state.openNode(this.type, { kind: "ordered" });
+              const token2 = state.topContextToken();
+              state.closeContext;
+              let startOrder;
+              if (token2?.type === "ordered_list_open") {
+                token2?.attrs?.some(([name, value]) => {
+                  if (name === "order") {
+                    startOrder = parseInt(value, 10);
+                    state.closeContextToken();
+                    return true;
+                  }
+                  return false;
+                });
+              }
+              state.openNode(this.type, {
+                kind: "ordered",
+                order: startOrder
+              });
               break;
             case "bullet_list":
               state.openNode(this.type, { kind: "bullet" });
@@ -9670,7 +9730,8 @@ var LineListExtension = class extends NodeExtension8 {
     const attrs = node.attrs;
     let firstDelim = "";
     if (attrs.kind === "ordered") {
-      firstDelim = `${counter}. `;
+      const order = attrs.order != null ? attrs.order : counter;
+      firstDelim = `${order}. `;
     } else if (attrs.kind === "task") {
       firstDelim = attrs.checked ? "- [x] " : "- [ ] ";
     } else if (attrs.kind === "bullet") {
@@ -11003,7 +11064,6 @@ var ReferenceDefinitionExtension = class extends NodeExtension12 {
         token: "reference_def",
         hasOpenClose: true,
         getAttrs: (token) => {
-          console.log("token11", token);
           return {
             label: token.attrs?.[0]?.[1] || "",
             href: token.attrs?.[1]?.[1] || "",
@@ -11618,7 +11678,16 @@ var MarkdownSerializerState = class {
     if (parent.forEach) {
       parent.forEach((node, offset, index) => {
         if (isOrderedListNode(node)) {
-          counter += 1;
+          const prevSibling = index > 0 ? parent.child(index - 1) : null;
+          if (prevSibling && !isOrderedListNode(prevSibling)) {
+            counter = 0;
+          }
+          const attrs = node.attrs;
+          if (attrs.order != null) {
+            counter = attrs.order;
+          } else {
+            counter += 1;
+          }
         } else {
           counter = 0;
         }
@@ -11626,7 +11695,12 @@ var MarkdownSerializerState = class {
       });
     } else {
       if (isOrderedListNode(parent)) {
-        counter += 1;
+        const attrs = parent.attrs;
+        if (attrs.order != null) {
+          counter = attrs.order;
+        } else {
+          counter += 1;
+        }
       } else {
         counter = 0;
       }