prosemirror-transform - npm Package Compare versions

Comparing version 1.8.0 to 1.9.0

CHANGELOG.md

@@ -0,1 +1,11 @@
+## 1.9.0 (2024-05-06)
+
+### Bug fixes
+
+Fix an issue in `ReplaceAroundStep.map` that broke mapping steps that wrapped content over steps that inserted content at the start of the step.
+
+### New features
+
+`setBlockMarkup` now uses the linebreak equivalent node defined in the schema.
+
 ## 1.8.0 (2023-10-01)
@@ -2,0 +12,0 @@

dist/index.d.ts

@@ -839,2 +839,2 @@ import { Node, Schema, Slice, Fragment, NodeRange, NodeType, Attrs, Mark, MarkType, ContentMatch } from 'prosemirror-model';
 
-export { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, MapResult, Mappable, Mapping, RemoveMarkStep, RemoveNodeMarkStep, ReplaceAroundStep, ReplaceStep, Step, StepMap, StepResult, Transform, canJoin, canSplit, dropPoint, findWrapping, insertPoint, joinPoint, liftTarget, replaceStep };
+export { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, MapResult, type Mappable, Mapping, RemoveMarkStep, RemoveNodeMarkStep, ReplaceAroundStep, ReplaceStep, Step, StepMap, StepResult, Transform, canJoin, canSplit, dropPoint, findWrapping, insertPoint, joinPoint, liftTarget, replaceStep };

package.json

 {
   "name": "prosemirror-transform",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "ProseMirror document transformations",
@@ -27,3 +27,3 @@ "type": "module",
   "dependencies": {
-    "prosemirror-model": "^1.0.0"
+    "prosemirror-model": "^1.21.0"
   },
@@ -30,0 +30,0 @@ "devDependencies": {

src/mark.ts

@@ -75,3 +75,5 @@ import {Mark, MarkType, Slice, Fragment, NodeType} from "prosemirror-model"
 
-export function clearIncompatible(tr: Transform, pos: number, parentType: NodeType, match = parentType.contentMatch) {
+export function clearIncompatible(tr: Transform, pos: number, parentType: NodeType,
+                                  match = parentType.contentMatch,
+                                  clearNewlines = true) {
   let node = tr.doc.nodeAt(pos)!
@@ -89,3 +91,3 @@ let replSteps: Step[] = [], cur = pos + 1
 
-      if (child.isText && !parentType.spec.code) {
+      if (clearNewlines && child.isText && parentType.whitespace != "pre") {
         let m, newline = /\r?\n|\r/g, slice
@@ -92,0 +94,0 @@ while (m = newline.exec(child.text!)) {

src/replace_step.ts

@@ -137,3 +137,4 @@ import {Slice, Node, Schema} from "prosemirror-model"
     let from = mapping.mapResult(this.from, 1), to = mapping.mapResult(this.to, -1)
-    let gapFrom = mapping.map(this.gapFrom, -1), gapTo = mapping.map(this.gapTo, 1)
+    let gapFrom = this.from == this.gapFrom ? from.pos : mapping.map(this.gapFrom, -1)
+    let gapTo = this.to == this.gapTo ? to.pos : mapping.map(this.gapTo, 1)
     if ((from.deletedAcross && to.deletedAcross) || gapFrom < from.pos || gapTo > to.pos) return null
@@ -140,0 +141,0 @@ return new ReplaceAroundStep(from.pos, to.pos, gapFrom, gapTo, this.slice, this.insert, this.structure)

src/structure.ts

@@ -5,2 +5,3 @@ import {Slice, Fragment, NodeRange, NodeType, Node, Mark, Attrs, ContentMatch} from "prosemirror-model"
 import {ReplaceStep, ReplaceAroundStep} from "./replace_step"
+import {clearIncompatible} from "./mark"
 
@@ -120,4 +121,11 @@ function canCut(node: Node, start: number, end: number) {
     if (node.isTextblock && !node.hasMarkup(type, attrs) && canChangeType(tr.doc, tr.mapping.slice(mapFrom).map(pos), type)) {
+      let convertNewlines = null
+      if (type.schema.linebreakReplacement) {
+        let pre = type.whitespace == "pre", supportLinebreak = !!type.contentMatch.matchType(type.schema.linebreakReplacement)
+        if (pre && !supportLinebreak) convertNewlines = false
+        else if (!pre && supportLinebreak) convertNewlines = true
+      }
       // Ensure all markup that isn't allowed in the new node type is cleared
-      tr.clearIncompatible(tr.mapping.slice(mapFrom).map(pos, 1), type)
+      if (convertNewlines === false) replaceLinebreaks(tr, node, pos, mapFrom)
+      clearIncompatible(tr, tr.mapping.slice(mapFrom).map(pos, 1), type, undefined, convertNewlines === null)
       let mapping = tr.mapping.slice(mapFrom)
@@ -127,2 +135,3 @@ let startM = mapping.map(pos, 1), endM = mapping.map(pos + node.nodeSize, 1)
                                       new Slice(Fragment.from(type.create(attrs, null, node.marks)), 0, 0), 1, true))
+      if (convertNewlines === true) replaceNewlines(tr, node, pos, mapFrom)
       return false
@@ -133,2 +142,23 @@ }
 
+function replaceNewlines(tr: Transform, node: Node, pos: number, mapFrom: number) {
+  node.forEach((child, offset) => {
+    if (child.isText) {
+      let m, newline = /\r?\n|\r/g
+      while (m = newline.exec(child.text!)) {
+        let start = tr.mapping.slice(mapFrom).map(pos + 1 + offset + m.index)
+        tr.replaceWith(start, start + 1, node.type.schema.linebreakReplacement!.create())
+      }
+    }
+  })
+}
+
+function replaceLinebreaks(tr: Transform, node: Node, pos: number, mapFrom: number) {
+  node.forEach((child, offset) => {
+    if (child.type == child.type.schema.linebreakReplacement) {
+      let start = tr.mapping.slice(mapFrom).map(pos + 1 + offset)
+      tr.replaceWith(start, start + 1, node.type.schema.text("\n"))
+    }
+  })
+}
+
 function canChangeType(doc: Node, pos: number, type: NodeType) {
@@ -135,0 +165,0 @@ let $pos = doc.resolve(pos), index = $pos.index()

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

309025

increased by1.51%

Lines of code

6522

increased by0.85%

Dependency changes

• Updatedprosemirror-model@^1.21.0