@milkdown/preset-commonmark 7.2.2 → 7.2.4

package/src/node/paragraph.ts

@@ -51,7 +51,7 @@ withMeta(paragraphSchema.ctx, {
 })
 
 /// This command can turn the selected block into paragraph.
-export const turnIntoTextCommand = $command('TurnIntoText', () => () => setBlockType(paragraphSchema.type()))
+export const turnIntoTextCommand = $command('TurnIntoText', ctx => () => setBlockType(paragraphSchema.type(ctx)))
 
 withMeta(turnIntoTextCommand, {
   displayName: 'Command<turnIntoTextCommand>',

package/src/plugin/hardbreak-clear-mark-plugin.ts

@@ -6,7 +6,7 @@ import { hardbreakSchema } from '../node'
 import { withMeta } from '../__internal__'
 
 /// This plugin is used to clear the marks around the hardbreak node.
-export const hardbreakClearMarkPlugin = $prose(() => {
+export const hardbreakClearMarkPlugin = $prose((ctx) => {
   return new Plugin({
     key: new PluginKey('MILKDOWN_HARDBREAK_MARKS'),
     appendTransaction: (trs, _oldState, newState) => {
@@ -25,7 +25,7 @@ export const hardbreakClearMarkPlugin = $prose(() => {
           return
 
         const { from } = step as unknown as { from: number }
-        return newState.tr.setNodeMarkup(from, hardbreakSchema.type(), undefined, [])
+        return newState.tr.setNodeMarkup(from, hardbreakSchema.type(ctx), undefined, [])
       }
 
       const isAddMarkStep = step instanceof AddMarkStep
@@ -33,8 +33,8 @@ export const hardbreakClearMarkPlugin = $prose(() => {
         let _tr = newState.tr
         const { from, to } = step as unknown as { from: number; to: number }
         newState.doc.nodesBetween(from, to, (node, pos) => {
-          if (node.type === hardbreakSchema.type())
-            _tr = _tr.setNodeMarkup(pos, hardbreakSchema.type(), undefined, [])
+          if (node.type === hardbreakSchema.type(ctx))
+            _tr = _tr.setNodeMarkup(pos, hardbreakSchema.type(ctx), undefined, [])
         })
 
         return _tr

package/src/plugin/index.ts

@@ -6,6 +6,7 @@ export * from './remark-add-order-in-list-plugin'
 export * from './remark-line-break'
 export * from './remark-inline-link-plugin'
 export * from './remark-html-transformer'
+export * from './remark-marker-plugin'
 
 export * from './inline-nodes-cursor-plugin'
 

package/src/plugin/inline-sync-plugin/inline-sync-plugin.ts

@@ -60,8 +60,6 @@ export const inlineSyncPlugin = $prose((ctx: Ctx) => {
           runReplacer(ctx, inlineSyncPluginKey, state, dispatch, prevNode.attrs)
         })
 
-        tr.setMeta('addToHistory', false)
-
         return null
       },
     },

package/src/plugin/inline-sync-plugin/regexp.ts

@@ -1,6 +1,8 @@
 /* Copyright 2021, Milkdown by Mirone. */
 
-export const linkRegexp = /\[(?<span>((www|https:\/\/|http:\/\/)[^\s\]]+))]\((?<url>[^\s\]]+)\)/
+export const linkRegexp = /\[([^\]]+)]\([^\s\]]+\)/
+
+export const keepLinkRegexp = /\[(?<span>((www|https:\/\/|http:\/\/)[^\s\]]+))]\((?<url>[^\s\]]+)\)/
 
 export const punctuationRegexp = (holePlaceholder: string) =>
   new RegExp(`\\\\(?=[^\\w\\s${holePlaceholder}\\\\]|_)`, 'g')

package/src/plugin/inline-sync-plugin/replacer.ts

@@ -7,6 +7,7 @@ import { TextSelection } from '@milkdown/prose/state'
 import { inlineSyncConfig } from './config'
 import { getContextByState } from './context'
 import { calcOffset } from './utils'
+import { linkRegexp } from './regexp'
 
 export const runReplacer = (
   ctx: Ctx,
@@ -26,6 +27,8 @@ export const runReplacer = (
   if (!context)
     return
 
+  const lastUserInput = context.text.slice(0, context.text.indexOf(context.placeholder))
+
   const { $from } = nextState.selection
   const from = $from.before()
   const to = $from.after()
@@ -41,5 +44,13 @@ export const runReplacer = (
   // restore the selection
   tr = tr.setSelection(TextSelection.near(tr.doc.resolve(offset + 1)))
 
+  const needsRestoreMark = linkRegexp.test(lastUserInput) || ['*', '_', '~'].includes(lastUserInput.at(-1) || '')
+  if (needsRestoreMark && tr.selection instanceof TextSelection) {
+    const marks = tr.selection.$cursor?.marks() ?? []
+    marks.forEach((mark) => {
+      tr = tr.removeStoredMark(mark.type)
+    })
+  }
+
   dispatch(tr)
 }

package/src/plugin/inline-sync-plugin/utils.ts

@@ -3,16 +3,16 @@
 import type { Node } from '@milkdown/prose/model'
 
 import type { SyncNodePlaceholder } from './config'
-import { linkRegexp, punctuationRegexp } from './regexp'
+import { keepLinkRegexp, punctuationRegexp } from './regexp'
 
 export const keepLink = (str: string) => {
   let text = str
-  let match = text.match(linkRegexp)
+  let match = text.match(keepLinkRegexp)
   while (match && match.groups) {
     const { span } = match.groups
-    text = text.replace(linkRegexp, span as string)
+    text = text.replace(keepLinkRegexp, span as string)
 
-    match = text.match(linkRegexp)
+    match = text.match(keepLinkRegexp)
   }
   return text
 }

package/src/plugin/remark-marker-plugin.ts

@@ -0,0 +1,20 @@
+/* Copyright 2021, Milkdown by Mirone. */
+import { $remark } from '@milkdown/utils'
+import type { Node } from 'unist'
+import { visit } from 'unist-util-visit'
+import { withMeta } from '../__internal__'
+
+/// This plugin is used to keep the marker (`_` and `*`) of emphasis and strong nodes.
+export const remarkMarker = $remark(() => () => (tree, file) => {
+  const getMarker = (node: Node) => {
+    return (file.value as string).charAt(node.position!.start.offset!)
+  }
+  visit(tree, node => ['strong', 'emphasis'].includes(node.type), (node: Node) => {
+    (node as Node & { marker: string }).marker = getMarker(node)
+  })
+})
+
+withMeta(remarkMarker, {
+  displayName: 'Remark<remarkMarker>',
+  group: 'Remark',
+})

package/src/plugin/sync-heading-id-plugin.ts

@@ -20,7 +20,7 @@ export const syncHeadingIdPlugin = $prose((ctx) => {
     let found = false
 
     view.state.doc.descendants((node, pos) => {
-      if (node.type === headingSchema.type()) {
+      if (node.type === headingSchema.type(ctx)) {
         if (node.textContent.trim().length === 0)
           return
 

package/src/plugin/sync-list-order-plugin.ts

@@ -9,14 +9,14 @@ import { bulletListSchema } from '../node'
 import { withMeta } from '../__internal__'
 
 /// This plugin is used to keep the label of list item up to date in ordered list.
-export const syncListOrderPlugin = $prose(() => {
+export const syncListOrderPlugin = $prose((ctx) => {
   const syncOrderLabel = (view: EditorView) => {
     if (view.composing || !view.editable)
       return
 
-    const orderedListType = orderedListSchema.type()
-    const bulletListType = bulletListSchema.type()
-    const listItemType = listItemSchema.type()
+    const orderedListType = orderedListSchema.type(ctx)
+    const bulletListType = bulletListSchema.type(ctx)
+    const listItemType = listItemSchema.type(ctx)
     const state = view.state
     const handleNodeItem = (attrs: Record<string, any>, index: number): boolean => {
       let changed = false