@milkdown/preset-commonmark 5.1.1 → 5.1.2

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.
@@ -1 +1 @@
1
- {"version":3,"file":"hardbreak.d.ts","sourceRoot":"","sources":["../../src/node/hardbreak.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,eAAe,4CAAiB,CAAC;AAE9C,eAAO,MAAM,SAAS;;;;EA+CpB,CAAC"}
1
+ {"version":3,"file":"hardbreak.d.ts","sourceRoot":"","sources":["../../src/node/hardbreak.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,eAAe,4CAAiB,CAAC;AAE9C,eAAO,MAAM,SAAS;;;;EAkEpB,CAAC"}
@@ -1,6 +1,6 @@
1
1
  /* Copyright 2021, Milkdown by Mirone. */
2
2
  import { createCmd, createCmdKey } from '@milkdown/core';
3
- import { Plugin, ReplaceStep } from '@milkdown/prose';
3
+ import { AddMarkStep, Plugin, ReplaceStep } from '@milkdown/prose';
4
4
  import { createNode, createShortcut } from '@milkdown/utils';
5
5
  import { SupportedKeys } from '../supported-keys';
6
6
  export const InsertHardbreak = createCmdKey();
@@ -41,14 +41,27 @@ export const hardbreak = createNode((utils) => {
41
41
  if (!trs.length)
42
42
  return;
43
43
  const [tr] = trs;
44
- if (!tr.getMeta('hardbreak'))
45
- return;
46
44
  const [step] = tr.steps;
47
- if (!(step instanceof ReplaceStep)) {
48
- return;
45
+ const isInsertHr = tr.getMeta('hardbreak');
46
+ if (isInsertHr) {
47
+ if (!(step instanceof ReplaceStep)) {
48
+ return;
49
+ }
50
+ const { from } = step;
51
+ return newState.tr.setNodeMarkup(from, type, undefined, []);
52
+ }
53
+ const isAddMarkStep = step instanceof AddMarkStep;
54
+ if (isAddMarkStep) {
55
+ let _tr = newState.tr;
56
+ const { from, to } = step;
57
+ newState.doc.nodesBetween(from, to, (node, pos) => {
58
+ if (node.type === type) {
59
+ _tr = _tr.setNodeMarkup(pos, type, undefined, []);
60
+ }
61
+ });
62
+ return _tr;
49
63
  }
50
- const { from } = step;
51
- return newState.tr.setNodeMarkup(from, type, undefined, []);
64
+ return;
52
65
  },
53
66
  }),
54
67
  ],
@@ -1 +1 @@
1
- {"version":3,"file":"hardbreak.js","sourceRoot":"","sources":["../../src/node/hardbreak.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAS,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIlD,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAO,CAAC,KAAK,EAAE,EAAE;IAChD,OAAO;QACH,EAAE,EAAE,WAAW;QACf,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YACX,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,QAAQ;YACf,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;YACzB,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC;YAC/E,aAAa,EAAE;gBACX,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO;gBACrC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;oBACvB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACxB,CAAC;aACJ;YACD,UAAU,EAAE;gBACR,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW;gBAC/C,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;oBACd,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC3B,CAAC;aACJ;SACJ,CAAC;QACF,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YAChB,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACjD,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC;gBACrG,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC;SACL;QACD,SAAS,EAAE;YACP,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,eAAe,EAAE,aAAa,CAAC;SAC5E;QACD,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YACpB,IAAI,MAAM,CAAC;gBACP,iBAAiB,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;oBAC5C,IAAI,CAAC,GAAG,CAAC,MAAM;wBAAE,OAAO;oBACxB,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;oBACjB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC;wBAAE,OAAO;oBACrC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;oBACxB,IAAI,CAAC,CAAC,IAAI,YAAY,WAAW,CAAC,EAAE;wBAChC,OAAO;qBACV;oBACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAA6D,CAAC;oBAC/E,OAAO,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;gBAChE,CAAC;aACJ,CAAC;SACL;KACJ,CAAC;AACN,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"hardbreak.js","sourceRoot":"","sources":["../../src/node/hardbreak.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@milkdown/preset-commonmark",
3
- "version": "5.1.1",
3
+ "version": "5.1.2",
4
4
  "main": "lib/index.js",
5
5
  "module": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -21,7 +21,7 @@
21
21
  },
22
22
  "dependencies": {
23
23
  "@emotion/css": "^11.1.3",
24
- "@milkdown/utils": "5.1.1",
24
+ "@milkdown/utils": "5.1.2",
25
25
  "@types/prosemirror-schema-list": "^1.0.3",
26
26
  "prosemirror-schema-list": "^1.1.4",
27
27
  "remark-inline-links": "^5.0.0",
@@ -1,6 +1,6 @@
1
1
  /* Copyright 2021, Milkdown by Mirone. */
2
2
  import { createCmd, createCmdKey } from '@milkdown/core';
3
- import { Plugin, ReplaceStep, Slice } from '@milkdown/prose';
3
+ import { AddMarkStep, Plugin, ReplaceStep } from '@milkdown/prose';
4
4
  import { createNode, createShortcut } from '@milkdown/utils';
5
5
 
6
6
  import { SupportedKeys } from '../supported-keys';
@@ -45,13 +45,32 @@ export const hardbreak = createNode<Keys>((utils) => {
45
45
  appendTransaction: (trs, _oldState, newState) => {
46
46
  if (!trs.length) return;
47
47
  const [tr] = trs;
48
- if (!tr.getMeta('hardbreak')) return;
48
+
49
49
  const [step] = tr.steps;
50
- if (!(step instanceof ReplaceStep)) {
51
- return;
50
+
51
+ const isInsertHr = tr.getMeta('hardbreak');
52
+ if (isInsertHr) {
53
+ if (!(step instanceof ReplaceStep)) {
54
+ return;
55
+ }
56
+ const { from } = step as unknown as { from: number };
57
+ return newState.tr.setNodeMarkup(from, type, undefined, []);
58
+ }
59
+
60
+ const isAddMarkStep = step instanceof AddMarkStep;
61
+ if (isAddMarkStep) {
62
+ let _tr = newState.tr;
63
+ const { from, to } = step as unknown as { from: number; to: number };
64
+ newState.doc.nodesBetween(from, to, (node, pos) => {
65
+ if (node.type === type) {
66
+ _tr = _tr.setNodeMarkup(pos, type, undefined, []);
67
+ }
68
+ });
69
+
70
+ return _tr;
52
71
  }
53
- const { from } = step as unknown as { slice: Slice; from: number; to: number };
54
- return newState.tr.setNodeMarkup(from, type, undefined, []);
72
+
73
+ return;
55
74
  },
56
75
  }),
57
76
  ],