@milkdown/preset-commonmark 7.2.0 → 7.2.2

package/lib/node/list-item.d.ts

@@ -3,5 +3,6 @@ export declare const listItemSchema: import("@milkdown/utils").$NodeSchema<"list
 export declare const sinkListItemCommand: import("@milkdown/utils").$Command<unknown>;
 export declare const liftListItemCommand: import("@milkdown/utils").$Command<unknown>;
 export declare const splitListItemCommand: import("@milkdown/utils").$Command<unknown>;
-export declare const listItemKeymap: import("@milkdown/utils").$UserKeymap<"listItemKeymap", "SinkListItem" | "NextListItem" | "LiftListItem">;
+export declare const liftFirstListItemCommand: import("@milkdown/utils").$Command<unknown>;
+export declare const listItemKeymap: import("@milkdown/utils").$UserKeymap<"listItemKeymap", "SinkListItem" | "LiftFirstListItem" | "NextListItem" | "LiftListItem">;
 //# sourceMappingURL=list-item.d.ts.map

package/lib/node/list-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-item.d.ts","sourceRoot":"","sources":["../../src/node/list-item.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,YAAY,qCAAwB,CAAA;AAQjD,eAAO,MAAM,cAAc,oDA2DxB,CAAA;AAwBH,eAAO,MAAM,mBAAmB,6CAA4E,CAAA;AAmB5G,eAAO,MAAM,mBAAmB,6CAA6E,CAAA;AAoB7G,eAAO,MAAM,oBAAoB,6CAA8E,CAAA;AAW/G,eAAO,MAAM,cAAc,2GAsBzB,CAAA"}
+{"version":3,"file":"list-item.d.ts","sourceRoot":"","sources":["../../src/node/list-item.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,YAAY,qCAAwB,CAAA;AAQjD,eAAO,MAAM,cAAc,oDA2DxB,CAAA;AAwBH,eAAO,MAAM,mBAAmB,6CAA4E,CAAA;AAmB5G,eAAO,MAAM,mBAAmB,6CAA6E,CAAA;AAoB7G,eAAO,MAAM,oBAAoB,6CAA8E,CAAA;AAqC/G,eAAO,MAAM,wBAAwB,6CAA+D,CAAA;AAWpG,eAAO,MAAM,cAAc,iIA6BzB,CAAA"}

package/lib/plugin/inline-sync-plugin/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/plugin/inline-sync-plugin/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAGnD,eAAO,MAAM,QAAQ,QAAS,MAAM,WAUnC,CAAA;AAED,eAAO,MAAM,IAAI,SAAU,MAAM,SAAS,MAAM,QAAQ,MAAM,WAQ7D,CAAA;AAED,eAAO,MAAM,kBAAkB,oBAAqB,MAAM,YAAY,MAAM,WACtB,CAAA;AAEtD,eAAO,MAAM,oBAAoB,gBAAiB,mBAAmB,YAAY,MAAM,WAkBtF,CAAA;AAED,eAAO,MAAM,UAAU,SAAU,IAAI,QAAQ,MAAM,eAAe,MAAM,WAkBvE,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/plugin/inline-sync-plugin/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAGnD,eAAO,MAAM,QAAQ,QAAS,MAAM,WAUnC,CAAA;AAED,eAAO,MAAM,IAAI,SAAU,MAAM,SAAS,MAAM,QAAQ,MAAM,WAQ7D,CAAA;AAED,eAAO,MAAM,kBAAkB,oBAAqB,MAAM,YAAY,MAAM,WACtB,CAAA;AAEtD,eAAO,MAAM,oBAAoB,gBAAiB,mBAAmB,YAAY,MAAM,WAkBtF,CAAA;AAED,eAAO,MAAM,UAAU,SAAU,IAAI,QAAQ,MAAM,eAAe,MAAM,WAwBvE,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@milkdown/preset-commonmark",
   "type": "module",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -32,15 +32,15 @@
     "remark-inline-links": "^6.0.0",
     "tslib": "^2.5.0",
     "unist-util-visit": "^4.0.0",
-    "@milkdown/exception": "7.2.0",
-    "@milkdown/utils": "7.2.0"
+    "@milkdown/exception": "7.2.2",
+    "@milkdown/utils": "7.2.2"
   },
   "devDependencies": {
     "@types/unist": "^2.0.6",
-    "@milkdown/core": "7.2.0",
-    "@milkdown/ctx": "7.2.0",
-    "@milkdown/prose": "7.2.0",
-    "@milkdown/transformer": "7.2.0"
+    "@milkdown/core": "7.2.2",
+    "@milkdown/ctx": "7.2.2",
+    "@milkdown/prose": "7.2.2",
+    "@milkdown/transformer": "7.2.2"
   },
   "nx": {
     "targets": {

package/src/composed/commands.ts

@@ -1,7 +1,23 @@
 /* Copyright 2021, Milkdown by Mirone. */
 import type { MilkdownPlugin } from '@milkdown/ctx'
 import { toggleEmphasisCommand, toggleInlineCodeCommand, toggleLinkCommand, toggleStrongCommand, updateLinkCommand } from '../mark'
-import { createCodeBlockCommand, downgradeHeadingCommand, insertHardbreakCommand, insertHrCommand, insertImageCommand, liftListItemCommand, sinkListItemCommand, splitListItemCommand, turnIntoTextCommand, updateImageCommand, wrapInBlockquoteCommand, wrapInBulletListCommand, wrapInHeadingCommand, wrapInOrderedListCommand } from '../node'
+import {
+  createCodeBlockCommand,
+  downgradeHeadingCommand,
+  insertHardbreakCommand,
+  insertHrCommand,
+  insertImageCommand,
+  liftFirstListItemCommand,
+  liftListItemCommand,
+  sinkListItemCommand,
+  splitListItemCommand,
+  turnIntoTextCommand,
+  updateImageCommand,
+  wrapInBlockquoteCommand,
+  wrapInBulletListCommand,
+  wrapInHeadingCommand,
+  wrapInOrderedListCommand,
+} from '../node'
 
 /// @internal
 export const commands: MilkdownPlugin[] = [
@@ -21,6 +37,7 @@ export const commands: MilkdownPlugin[] = [
   sinkListItemCommand,
   splitListItemCommand,
   liftListItemCommand,
+  liftFirstListItemCommand,
 
   toggleEmphasisCommand,
   toggleInlineCodeCommand,

package/src/node/list-item.ts

@@ -3,6 +3,7 @@ import { commandsCtx } from '@milkdown/core'
 import { expectDomTypeError } from '@milkdown/exception'
 import { liftListItem, sinkListItem, splitListItem } from '@milkdown/prose/schema-list'
 import { $command, $nodeAttr, $nodeSchema, $useKeymap } from '@milkdown/utils'
+import { type Command, TextSelection } from '@milkdown/prose/state'
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for list item node.
@@ -143,6 +144,43 @@ withMeta(splitListItemCommand, {
   group: 'ListItem',
 })
 
+const liftFirstListItem: Command = (state, dispatch, view) => {
+  const { selection } = state
+  if (!(selection instanceof TextSelection))
+    return false
+
+  const { empty, $from } = selection
+
+  // selection should be empty and at the start of the node
+  if (!empty || $from.parentOffset !== 0)
+    return false
+
+  const parentItem = $from.node(-1)
+  // selection should be in list item and list item should be the first child of the list
+  if (parentItem.type !== listItemSchema.type() || parentItem.firstChild !== $from.node())
+    return false
+
+  const list = $from.node(-2)
+  // list should have only one list item
+  if (list.childCount > 1)
+    return false
+
+  return liftListItem(listItemSchema.type())(state, dispatch, view)
+}
+
+/// The command to remove list item **only if**:
+///
+/// - Selection is at the start of the list item.
+/// - List item is the only child of the list.
+///
+/// Most of the time, you shouldn't use this command directly.
+export const liftFirstListItemCommand = $command('LiftFirstListItem', () => () => liftFirstListItem)
+
+withMeta(liftFirstListItemCommand, {
+  displayName: 'Command<liftFirstListItemCommand>',
+  group: 'ListItem',
+})
+
 /// Keymap for list item node.
 /// - `<Enter>`: Split the current list item.
 /// - `<Tab>/<Mod-]>`: Sink the current list item.
@@ -169,6 +207,13 @@ export const listItemKeymap = $useKeymap('listItemKeymap', {
       return () => commands.call(liftListItemCommand.key)
     },
   },
+  LiftFirstListItem: {
+    shortcuts: ['Backspace', 'Delete'],
+    command: (ctx) => {
+      const commands = ctx.get(commandsCtx)
+      return () => commands.call(liftFirstListItemCommand.key)
+    },
+  },
 })
 
 withMeta(listItemKeymap.ctx, {

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

@@ -56,6 +56,10 @@ export const calcOffset = (node: Node, from: number, placeholder: string) => {
   node.descendants((n) => {
     if (find)
       return false
+    if (!n.textContent.includes(placeholder)) {
+      offset += n.nodeSize
+      return false
+    }
     if (n.isText) {
       const i = n.text?.indexOf(placeholder)
       if (i != null && i >= 0) {
@@ -64,8 +68,10 @@ export const calcOffset = (node: Node, from: number, placeholder: string) => {
         return false
       }
     }
-    offset += n.nodeSize
-    return undefined
+
+    // enter the node
+    offset += 1
+    return true
   })
   return offset
 }