@progress/kendo-editor-common 1.9.6-dev.202305301645 → 1.9.6-dev.202305311245

package/dist/es/config/schema.js

@@ -64,7 +64,7 @@ var marks = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__ass
         inclusive: false,
         parseDOM: [{ tag: 'a', getAttrs: domAttributes }],
         toDOM: function (node) { return ['a', pmAttributes(node.attrs), hole]; }
-    } }, tagMark('strong')), tagMark('b')), tagMark('em')), tagMark('i')), tagMark('u')), tagMark('del')), tagMark('sub')), tagMark('sup')), tagMark('code')), { style: {
+    } }, tagMark('strong')), tagMark('b')), tagMark('em')), tagMark('i')), tagMark('del')), tagMark('sub')), tagMark('sup')), tagMark('code')), { style: {
         attrs: __assign({}, commonAttributes()),
         parseDOM: [{
                 tag: 'span',
@@ -72,7 +72,7 @@ var marks = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__ass
             }],
         toDOM: function (node) { return hasAttrs(node.attrs) ?
             ['span', pmAttributes(node.attrs), hole] : ['span', hole]; }
-    } });
+    } }), tagMark('u'));
 var cellAttribute = function (name) {
     var _a;
     return _a = {},

package/dist/es/source.js

@@ -99,7 +99,7 @@ export var htmlToFragment = function (html) {
  * @hidden
  */
 export var fragmentToHtml = function (fragment) {
-    return Array.from(fragment.children).reduce(function (acc, cur) { return acc + (cur.outerHTML || cur.textContent || ''); }, '');
+    return Array.from(fragment.childNodes).reduce(function (acc, cur) { return acc + (cur.outerHTML || cur.textContent || ''); }, '');
 };
 /**
  * Creates a DocumentFragment from the given ProseMirrorNode.

package/dist/es/utils.js

@@ -1,3 +1,4 @@
+import { __assign } from "tslib";
 import { Node, Fragment } from 'prosemirror-model';
 import { TextSelection, AllSelection, NodeSelection } from 'prosemirror-state';
 import { parseContent } from './source';
@@ -58,11 +59,29 @@ export var findNthParentNodeOfType = function (nodeType, depth) {
         return findNthParentNode(function (node) { return getTypeName(node) === getTypeName(nodeType); }, depth)(selection);
     };
 };
+var filterEmptyAttrs = function (attrs) {
+    var result = {};
+    for (var attr in attrs) {
+        if (attr && (attrs[attr] || attrs[attr] === 0)) {
+            result[attr] = attrs[attr];
+        }
+    }
+    return result;
+};
 /**
  * Inserts the given node at the place of current selection.
  */
 export var insertNode = function (node, scrollIntoView) { return function (state, dispatch) {
-    var tr = state.tr.replaceSelectionWith(node);
+    var selection = state.selection, tr = state.tr;
+    if (selection instanceof NodeSelection
+        && selection.node.type.name === node.type.name
+        && node.isLeaf && !node.isText && node.nodeSize === 1) {
+        tr.setNodeMarkup(selection.from, null, __assign(__assign({}, filterEmptyAttrs(selection.node.attrs)), filterEmptyAttrs(node.attrs)));
+        tr.setSelection(NodeSelection.create(tr.doc, selection.from));
+    }
+    else {
+        tr.replaceSelectionWith(node);
+    }
     if (scrollIntoView) {
         tr.scrollIntoView();
     }

package/dist/es2015/config/schema.js

@@ -58,7 +58,7 @@ const marks = Object.assign(Object.assign(Object.assign(Object.assign(Object.ass
         inclusive: false,
         parseDOM: [{ tag: 'a', getAttrs: domAttributes }],
         toDOM: (node) => ['a', pmAttributes(node.attrs), hole]
-    } }, tagMark('strong')), tagMark('b')), tagMark('em')), tagMark('i')), tagMark('u')), tagMark('del')), tagMark('sub')), tagMark('sup')), tagMark('code')), { style: {
+    } }, tagMark('strong')), tagMark('b')), tagMark('em')), tagMark('i')), tagMark('del')), tagMark('sub')), tagMark('sup')), tagMark('code')), { style: {
         attrs: Object.assign({}, commonAttributes()),
         parseDOM: [{
                 tag: 'span',
@@ -66,7 +66,7 @@ const marks = Object.assign(Object.assign(Object.assign(Object.assign(Object.ass
             }],
         toDOM: node => hasAttrs(node.attrs) ?
             ['span', pmAttributes(node.attrs), hole] : ['span', hole]
-    } });
+    } }), tagMark('u'));
 const cellAttribute = (name) => {
     return {
         [name]: {

package/dist/es2015/source.js

@@ -98,7 +98,7 @@ export const htmlToFragment = (html) => {
  * @hidden
  */
 export const fragmentToHtml = (fragment) => {
-    return Array.from(fragment.children).reduce((acc, cur) => acc + (cur.outerHTML || cur.textContent || ''), '');
+    return Array.from(fragment.childNodes).reduce((acc, cur) => acc + (cur.outerHTML || cur.textContent || ''), '');
 };
 /**
  * Creates a DocumentFragment from the given ProseMirrorNode.

package/dist/es2015/utils.js

@@ -56,11 +56,29 @@ export const findNthParentNodeOfType = (nodeType, depth = 1) => {
         return findNthParentNode((node) => getTypeName(node) === getTypeName(nodeType), depth)(selection);
     };
 };
+const filterEmptyAttrs = (attrs) => {
+    const result = {};
+    for (let attr in attrs) {
+        if (attr && (attrs[attr] || attrs[attr] === 0)) {
+            result[attr] = attrs[attr];
+        }
+    }
+    return result;
+};
 /**
  * Inserts the given node at the place of current selection.
  */
 export const insertNode = (node, scrollIntoView) => (state, dispatch) => {
-    const tr = state.tr.replaceSelectionWith(node);
+    const { selection, tr } = state;
+    if (selection instanceof NodeSelection
+        && selection.node.type.name === node.type.name
+        && node.isLeaf && !node.isText && node.nodeSize === 1) {
+        tr.setNodeMarkup(selection.from, null, Object.assign(Object.assign({}, filterEmptyAttrs(selection.node.attrs)), filterEmptyAttrs(node.attrs)));
+        tr.setSelection(NodeSelection.create(tr.doc, selection.from));
+    }
+    else {
+        tr.replaceSelectionWith(node);
+    }
     if (scrollIntoView) {
         tr.scrollIntoView();
     }

package/dist/npm/config/schema.js

@@ -67,7 +67,7 @@ var marks = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(
         inclusive: false,
         parseDOM: [{ tag: 'a', getAttrs: domAttributes }],
         toDOM: function (node) { return ['a', pmAttributes(node.attrs), hole]; }
-    } }, tagMark('strong')), tagMark('b')), tagMark('em')), tagMark('i')), tagMark('u')), tagMark('del')), tagMark('sub')), tagMark('sup')), tagMark('code')), { style: {
+    } }, tagMark('strong')), tagMark('b')), tagMark('em')), tagMark('i')), tagMark('del')), tagMark('sub')), tagMark('sup')), tagMark('code')), { style: {
         attrs: tslib_1.__assign({}, commonAttributes()),
         parseDOM: [{
                 tag: 'span',
@@ -75,7 +75,7 @@ var marks = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(
             }],
         toDOM: function (node) { return hasAttrs(node.attrs) ?
             ['span', pmAttributes(node.attrs), hole] : ['span', hole]; }
-    } });
+    } }), tagMark('u'));
 exports.marks = marks;
 var cellAttribute = function (name) {
     var _a;

package/dist/npm/source.js

@@ -104,7 +104,7 @@ exports.htmlToFragment = htmlToFragment;
  * @hidden
  */
 var fragmentToHtml = function (fragment) {
-    return Array.from(fragment.children).reduce(function (acc, cur) { return acc + (cur.outerHTML || cur.textContent || ''); }, '');
+    return Array.from(fragment.childNodes).reduce(function (acc, cur) { return acc + (cur.outerHTML || cur.textContent || ''); }, '');
 };
 exports.fragmentToHtml = fragmentToHtml;
 /**

package/dist/npm/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expandToWordWrap = exports.expandSelection = exports.shallowEqual = exports.indentHtml = exports.selectedLineTextOnly = exports.getNodeFromSelection = exports.getSelectionText = exports.hasSameMarkup = exports.insertNode = exports.findNthParentNodeOfType = exports.canInsert = exports.changeStylesString = void 0;
+var tslib_1 = require("tslib");
 var prosemirror_model_1 = require("prosemirror-model");
 var prosemirror_state_1 = require("prosemirror-state");
 var source_1 = require("./source");
@@ -64,11 +65,29 @@ var findNthParentNodeOfType = function (nodeType, depth) {
     };
 };
 exports.findNthParentNodeOfType = findNthParentNodeOfType;
+var filterEmptyAttrs = function (attrs) {
+    var result = {};
+    for (var attr in attrs) {
+        if (attr && (attrs[attr] || attrs[attr] === 0)) {
+            result[attr] = attrs[attr];
+        }
+    }
+    return result;
+};
 /**
  * Inserts the given node at the place of current selection.
  */
 var insertNode = function (node, scrollIntoView) { return function (state, dispatch) {
-    var tr = state.tr.replaceSelectionWith(node);
+    var selection = state.selection, tr = state.tr;
+    if (selection instanceof prosemirror_state_1.NodeSelection
+        && selection.node.type.name === node.type.name
+        && node.isLeaf && !node.isText && node.nodeSize === 1) {
+        tr.setNodeMarkup(selection.from, null, tslib_1.__assign(tslib_1.__assign({}, filterEmptyAttrs(selection.node.attrs)), filterEmptyAttrs(node.attrs)));
+        tr.setSelection(prosemirror_state_1.NodeSelection.create(tr.doc, selection.from));
+    }
+    else {
+        tr.replaceSelectionWith(node);
+    }
     if (scrollIntoView) {
         tr.scrollIntoView();
     }