@atlaskit/editor-plugin-show-diff 0.0.0 → 0.0.2

package/CHANGELOG.md

@@ -0,0 +1,15 @@
+# @atlaskit/editor-plugin-show-diff
+
+## 0.0.2
+
+### Patch Changes
+
+- [`9464a4f29a876`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9464a4f29a876) -
+  [EDITOR-1194] Bugfix show diff new line if deleted half way
+- Updated dependencies
+
+## 0.0.1
+
+### Patch Changes
+
+- Updated dependencies

package/afm-dev-agents/tsconfig.json

@@ -0,0 +1,27 @@
+{
+	"extends": "../../../../tsconfig.entry-points.dev-agents.json",
+	"compilerOptions": {
+		"target": "es5",
+		"outDir": "../../../../../dev-agents/tsDist/@atlaskit__editor-plugin-show-diff/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*",
+		"../src/**/examples.*"
+	],
+	"references": [
+		{
+			"path": "../../../design-system/tokens/afm-dev-agents/tsconfig.json"
+		},
+		{
+			"path": "../../editor-common/afm-dev-agents/tsconfig.json"
+		}
+	]
+}

package/dist/cjs/pm-plugins/decorations.js

@@ -45,11 +45,33 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
     tr = _ref.tr;
   var dom = document.createElement('span');
   dom.setAttribute('style', deletedContentStyle);
-  dom.appendChild(_model.DOMSerializer.fromSchema(tr.doc.type.schema).serializeFragment(doc.slice(change.fromA, change.toA).content));
+
+  /*
+      * The thinking is we separate out the fragment we got from doc.slice
+   * and if it's the first or last content, we go in however many the sliced Open
+   * or sliced End depth is and match only the content and not with the entire node.
+   */
+  var slice = doc.slice(change.fromA, change.toA);
+  slice.content.forEach(function (node) {
+    var serializer = _model.DOMSerializer.fromSchema(tr.doc.type.schema);
+    var isFirst = slice.content.firstChild === node;
+    var isLast = slice.content.lastChild === node;
+    if (isFirst || isLast && slice.content.childCount > 2) {
+      if (node.content.childCount > 0 && node.type.inlineContent === true) {
+        dom.append(serializer.serializeFragment(node.content));
+      } else {
+        dom.append(serializer.serializeNode(node));
+      }
+    } else if (isLast && slice.content.childCount === 2) {
+      var lineBreak = document.createElement('br');
+      dom.append(lineBreak);
+      dom.append(serializer.serializeFragment(node.content));
+    } else {
+      dom.append(serializer.serializeNode(node));
+    }
+  });
 
   // Widget decoration used for deletions as the content is not in the document
   // and we want to display the deleted content with a style.
-  return _view.Decoration.widget(change.fromB, dom, {
-    marks: []
-  });
+  return _view.Decoration.widget(change.fromB, dom, {});
 };

package/dist/es2019/pm-plugins/decorations.js

@@ -38,11 +38,33 @@ export const createDeletedContentDecoration = ({
 }) => {
   const dom = document.createElement('span');
   dom.setAttribute('style', deletedContentStyle);
-  dom.appendChild(DOMSerializer.fromSchema(tr.doc.type.schema).serializeFragment(doc.slice(change.fromA, change.toA).content));
+
+  /*
+      * The thinking is we separate out the fragment we got from doc.slice
+   * and if it's the first or last content, we go in however many the sliced Open
+   * or sliced End depth is and match only the content and not with the entire node.
+   */
+  const slice = doc.slice(change.fromA, change.toA);
+  slice.content.forEach(node => {
+    const serializer = DOMSerializer.fromSchema(tr.doc.type.schema);
+    const isFirst = slice.content.firstChild === node;
+    const isLast = slice.content.lastChild === node;
+    if (isFirst || isLast && slice.content.childCount > 2) {
+      if (node.content.childCount > 0 && node.type.inlineContent === true) {
+        dom.append(serializer.serializeFragment(node.content));
+      } else {
+        dom.append(serializer.serializeNode(node));
+      }
+    } else if (isLast && slice.content.childCount === 2) {
+      const lineBreak = document.createElement('br');
+      dom.append(lineBreak);
+      dom.append(serializer.serializeFragment(node.content));
+    } else {
+      dom.append(serializer.serializeNode(node));
+    }
+  });
 
   // Widget decoration used for deletions as the content is not in the document
   // and we want to display the deleted content with a style.
-  return Decoration.widget(change.fromB, dom, {
-    marks: []
-  });
+  return Decoration.widget(change.fromB, dom, {});
 };

package/dist/esm/pm-plugins/decorations.js

@@ -39,11 +39,33 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
     tr = _ref.tr;
   var dom = document.createElement('span');
   dom.setAttribute('style', deletedContentStyle);
-  dom.appendChild(DOMSerializer.fromSchema(tr.doc.type.schema).serializeFragment(doc.slice(change.fromA, change.toA).content));
+
+  /*
+      * The thinking is we separate out the fragment we got from doc.slice
+   * and if it's the first or last content, we go in however many the sliced Open
+   * or sliced End depth is and match only the content and not with the entire node.
+   */
+  var slice = doc.slice(change.fromA, change.toA);
+  slice.content.forEach(function (node) {
+    var serializer = DOMSerializer.fromSchema(tr.doc.type.schema);
+    var isFirst = slice.content.firstChild === node;
+    var isLast = slice.content.lastChild === node;
+    if (isFirst || isLast && slice.content.childCount > 2) {
+      if (node.content.childCount > 0 && node.type.inlineContent === true) {
+        dom.append(serializer.serializeFragment(node.content));
+      } else {
+        dom.append(serializer.serializeNode(node));
+      }
+    } else if (isLast && slice.content.childCount === 2) {
+      var lineBreak = document.createElement('br');
+      dom.append(lineBreak);
+      dom.append(serializer.serializeFragment(node.content));
+    } else {
+      dom.append(serializer.serializeNode(node));
+    }
+  });
 
   // Widget decoration used for deletions as the content is not in the document
   // and we want to display the deleted content with a style.
-  return Decoration.widget(change.fromB, dom, {
-    marks: []
-  });
+  return Decoration.widget(change.fromB, dom, {});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "0.0.0",
+	"version": "0.0.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,17 +32,14 @@
 	},
 	"dependencies": {
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/tokens": "^5.6.0",
+		"@atlaskit/tokens": "^6.0.0",
 		"@babel/runtime": "^7.0.0",
 		"prosemirror-changeset": "^2.2.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.12.0",
+		"@atlaskit/editor-common": "^107.18.0",
 		"react": "^18.2.0"
 	},
-	"devDependencies": {
-		"typescript": "~5.4.2"
-	},
 	"techstack": {
 		"@atlassian/frontend": {
 			"code-structure": [

package/tsconfig.json

@@ -1,14 +1,18 @@
 {
-	"extends": "../../../tsconfig.json",
-	"include": [
+  "extends": "../../../tsconfig.json",
+  "include": [
     "__tests__/**/*.ts",
     "__tests__/**/*.tsx",
-    "docs/**/*.ts",
-    "docs/**/*.tsx",
     "examples/**/*.ts",
     "examples/**/*.tsx",
     "src/**/*.ts",
-    "src/**/*.tsx"
-	],
-	"compilerOptions": {}
+    "src/**/*.tsx",
+    "**/stories.ts",
+    "**/stories.tsx",
+    "**/stories/*.ts",
+    "**/stories/*.tsx",
+    "**/stories/**/*.ts",
+    "**/stories/**/*.tsx"
+  ],
+  "compilerOptions": {}
 }