@progress/kendo-editor-common 1.12.3-develop.1 → 1.12.3-develop.10

package/dist/es/find-replace.js

@@ -4,16 +4,12 @@ export const findAt = (doc, searchOptions, start, end, exit) => {
     let exec, text, from, to, childText, nextSibling;
     const nodes = [];
     const { matchCase, matchWord, useRegExp } = searchOptions;
-    let searchText = searchOptions.text;
-    if (useRegExp && (/^\\$/.test(searchText) || /[^\\]\\$/.test(searchText))) {
-        // lookbehind doesn't work in Edge -> /((?<!\\)\\)$/.test(searchText)
-        searchText = searchText.substring(0, searchText.length - 1);
-    }
+    const searchText = searchOptions.text;
     if (!searchText) {
         return result;
     }
     const flags = matchCase ? 'g' : 'gi';
-    const regExp = useRegExp ? new RegExp(searchText, flags) : createRegExp(searchText, flags);
+    const regExp = useRegExp ? new RegExp(searchText, flags) : new RegExp(escapeRegExp(searchText), flags);
     doc.nodesBetween(start, end, (node, pos) => {
         if (exit(result)) {
             return false;
@@ -37,13 +33,18 @@ export const findAt = (doc, searchOptions, start, end, exit) => {
                     text = nodes.map(t => t.text).join('');
                     exec = regExp.exec(text);
                     while (exec !== null) {
-                        from = nodes[0].start + exec.index;
-                        to = from + exec[0].length;
-                        if (start <= from && end >= to && shouldMatchWord(exec, matchWord)) {
-                            result.push(TextSelection.create(doc, from, to));
+                        if (exec[0].length > 0) {
+                            from = nodes[0].start + exec.index;
+                            to = from + exec[0].length;
+                            if (start <= from && end >= to && shouldMatchWord(exec, matchWord)) {
+                                result.push(TextSelection.create(doc, from, to));
+                            }
+                            if (exit(result)) {
+                                break;
+                            }
                         }
-                        if (exit(result)) {
-                            break;
+                        else {
+                            regExp.lastIndex++;
                         }
                         exec = regExp.exec(text);
                     }
@@ -110,10 +111,6 @@ const shouldMatchWord = (exec, matchWord) => {
         return matchWord(exec);
     }
 };
-const createRegExp = (inputString, flags) => {
-    const escaped = inputString
-        .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
-        .replace(/-/g, '\\x2d')
-        .replace(/\s/g, '\\s');
-    return new RegExp(escaped, flags);
+const escapeRegExp = (text) => {
+    return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 };

package/dist/es/plugins/table-resize/column-resize.js

@@ -4,7 +4,7 @@ import { Decoration, DecorationSet } from 'prosemirror-view';
 import { colgroupAttr } from '../../config/constants';
 import { TableView, TableWrapperView } from './table-view';
 import { parseStyle, setNodeStyle } from './../../utils';
-import { cellIndexes, domCellAround, otherResizeHandle, otherResizing, edgeCell, tableColumnResizeKey as key } from './utils';
+import { cellIndexes, domCellAround, otherResizeHandle, otherResizing, edgeCell, tableColumnResizeKey as key, splitCols } from './utils';
 export function columnResizing() {
     const handleWidth = 5, cellMinWidth = 25;
     const plugin = new Plugin({
@@ -130,6 +130,12 @@ function handleMouseDown(view, event, cellMinWidth) {
     let col, tableAttrs;
     if (tableNode.attrs[colgroupAttr]) {
         const colgroup = tableDom.firstChild;
+        if (splitCols(colgroup)) {
+            tableAttrs = {
+                ...tableNode.attrs,
+                [colgroupAttr]: colgroup.outerHTML
+            };
+        }
         col = colgroup.children[colSpan - 1];
         if (!col.style.width) {
             col.style.width = col.offsetWidth + 'px';

package/dist/es/plugins/table-resize/table-resize.js

@@ -1,6 +1,6 @@
 import { NodeSelection, Plugin } from 'prosemirror-state';
 import { colgroupAttr, dataResizeDirTable, resizableAttr } from '../../config/constants';
-import { getTable, tableResizeKey as key } from './utils';
+import { getTable, tableResizeKey as key, splitCols } from './utils';
 import { parseStyle, setNodeStyle, parentNode } from './../../utils';
 import { directions } from './../resize-utils';
 const commonDir = {
@@ -70,14 +70,14 @@ const handleMouseMove = (view, event) => {
 const toPercents = (view, tr, tablePos) => {
     const tableNode = view.state.doc.nodeAt(tablePos);
     const tableDom = getTable(view.nodeDOM(tablePos));
-    const { width, height, colsWidth, rowsHeight, offsetWidth, offsetHeight } = tableSize(tableDom);
     const colgroup = tableDom.firstChild;
+    let colsChanged = splitCols(colgroup);
+    const { width, height, colsWidth, rowsHeight, offsetWidth, offsetHeight } = tableSize(tableDom);
     const cols = Array.from((colgroup && colgroup.children) || []);
-    let widthChanged = false;
     cols.forEach((col, i) => {
         if (col.style.width && !/%$/.test(col.style.width)) {
             col.style.width = ((colsWidth[i]) * 100 / width) + '%';
-            widthChanged = true;
+            colsChanged = true;
         }
     });
     let heightChange = false;
@@ -92,13 +92,13 @@ const toPercents = (view, tr, tablePos) => {
     if (parseStyle(tableAttrs.style).width !== offsetWidth + 'px') {
         tableAttrs = setNodeStyle(tableAttrs, 'width', offsetWidth + 'px');
     }
-    if (widthChanged) {
+    if (colsChanged) {
         tableAttrs[colgroupAttr] = colgroup.outerHTML;
     }
     if (heightChange) {
         tableAttrs = setNodeStyle(tableAttrs, 'height', offsetHeight + 'px');
     }
-    if (widthChanged || heightChange) {
+    if (colsChanged || heightChange) {
         tr.setNodeMarkup(tablePos, null, tableAttrs);
     }
 };

package/dist/es/plugins/table-resize/utils.js

@@ -88,3 +88,17 @@ export function edgeCell(view, event, indexes) {
     const cell = tablePos + map.map[(map.width * indexes.rowIndex) + indexes.cellIndex];
     return cell;
 }
+export function splitCols(colgroup) {
+    const cols = Array.from((colgroup && colgroup.children || []));
+    let splitted = false;
+    cols.forEach((col) => {
+        while (col.span > 1) {
+            const newCol = col.cloneNode();
+            newCol.span = 1;
+            colgroup.insertBefore(newCol, col);
+            col.span -= 1;
+            splitted = true;
+        }
+    });
+    return splitted;
+}

package/dist/npm/find-replace.js

@@ -7,16 +7,12 @@ const findAt = (doc, searchOptions, start, end, exit) => {
     let exec, text, from, to, childText, nextSibling;
     const nodes = [];
     const { matchCase, matchWord, useRegExp } = searchOptions;
-    let searchText = searchOptions.text;
-    if (useRegExp && (/^\\$/.test(searchText) || /[^\\]\\$/.test(searchText))) {
-        // lookbehind doesn't work in Edge -> /((?<!\\)\\)$/.test(searchText)
-        searchText = searchText.substring(0, searchText.length - 1);
-    }
+    const searchText = searchOptions.text;
     if (!searchText) {
         return result;
     }
     const flags = matchCase ? 'g' : 'gi';
-    const regExp = useRegExp ? new RegExp(searchText, flags) : createRegExp(searchText, flags);
+    const regExp = useRegExp ? new RegExp(searchText, flags) : new RegExp(escapeRegExp(searchText), flags);
     doc.nodesBetween(start, end, (node, pos) => {
         if (exit(result)) {
             return false;
@@ -40,13 +36,18 @@ const findAt = (doc, searchOptions, start, end, exit) => {
                     text = nodes.map(t => t.text).join('');
                     exec = regExp.exec(text);
                     while (exec !== null) {
-                        from = nodes[0].start + exec.index;
-                        to = from + exec[0].length;
-                        if (start <= from && end >= to && shouldMatchWord(exec, matchWord)) {
-                            result.push(prosemirror_state_1.TextSelection.create(doc, from, to));
+                        if (exec[0].length > 0) {
+                            from = nodes[0].start + exec.index;
+                            to = from + exec[0].length;
+                            if (start <= from && end >= to && shouldMatchWord(exec, matchWord)) {
+                                result.push(prosemirror_state_1.TextSelection.create(doc, from, to));
+                            }
+                            if (exit(result)) {
+                                break;
+                            }
                         }
-                        if (exit(result)) {
-                            break;
+                        else {
+                            regExp.lastIndex++;
                         }
                         exec = regExp.exec(text);
                     }
@@ -118,10 +119,6 @@ const shouldMatchWord = (exec, matchWord) => {
         return matchWord(exec);
     }
 };
-const createRegExp = (inputString, flags) => {
-    const escaped = inputString
-        .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
-        .replace(/-/g, '\\x2d')
-        .replace(/\s/g, '\\s');
-    return new RegExp(escaped, flags);
+const escapeRegExp = (text) => {
+    return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 };

package/dist/npm/plugins/table-resize/column-resize.js

@@ -133,6 +133,12 @@ function handleMouseDown(view, event, cellMinWidth) {
     let col, tableAttrs;
     if (tableNode.attrs[constants_1.colgroupAttr]) {
         const colgroup = tableDom.firstChild;
+        if ((0, utils_2.splitCols)(colgroup)) {
+            tableAttrs = {
+                ...tableNode.attrs,
+                [constants_1.colgroupAttr]: colgroup.outerHTML
+            };
+        }
         col = colgroup.children[colSpan - 1];
         if (!col.style.width) {
             col.style.width = col.offsetWidth + 'px';

package/dist/npm/plugins/table-resize/table-resize.js

@@ -73,14 +73,14 @@ const handleMouseMove = (view, event) => {
 const toPercents = (view, tr, tablePos) => {
     const tableNode = view.state.doc.nodeAt(tablePos);
     const tableDom = (0, utils_1.getTable)(view.nodeDOM(tablePos));
-    const { width, height, colsWidth, rowsHeight, offsetWidth, offsetHeight } = tableSize(tableDom);
     const colgroup = tableDom.firstChild;
+    let colsChanged = (0, utils_1.splitCols)(colgroup);
+    const { width, height, colsWidth, rowsHeight, offsetWidth, offsetHeight } = tableSize(tableDom);
     const cols = Array.from((colgroup && colgroup.children) || []);
-    let widthChanged = false;
     cols.forEach((col, i) => {
         if (col.style.width && !/%$/.test(col.style.width)) {
             col.style.width = ((colsWidth[i]) * 100 / width) + '%';
-            widthChanged = true;
+            colsChanged = true;
         }
     });
     let heightChange = false;
@@ -95,13 +95,13 @@ const toPercents = (view, tr, tablePos) => {
     if ((0, utils_2.parseStyle)(tableAttrs.style).width !== offsetWidth + 'px') {
         tableAttrs = (0, utils_2.setNodeStyle)(tableAttrs, 'width', offsetWidth + 'px');
     }
-    if (widthChanged) {
+    if (colsChanged) {
         tableAttrs[constants_1.colgroupAttr] = colgroup.outerHTML;
     }
     if (heightChange) {
         tableAttrs = (0, utils_2.setNodeStyle)(tableAttrs, 'height', offsetHeight + 'px');
     }
-    if (widthChanged || heightChange) {
+    if (colsChanged || heightChange) {
         tr.setNodeMarkup(tablePos, null, tableAttrs);
     }
 };

package/dist/npm/plugins/table-resize/utils.d.ts

@@ -15,3 +15,4 @@ export declare function edgeCell(view: EditorView, event: MouseEvent, indexes: {
     cellIndex: number;
     rowIndex: number;
 }): number;
+export declare function splitCols(colgroup?: HTMLTableColElement): boolean;

package/dist/npm/plugins/table-resize/utils.js

@@ -7,6 +7,7 @@ exports.getTable = getTable;
 exports.domCellAround = domCellAround;
 exports.cellIndexes = cellIndexes;
 exports.edgeCell = edgeCell;
+exports.splitCols = splitCols;
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_tables_1 = require("prosemirror-tables");
 const utils_1 = require("../../utils");
@@ -97,3 +98,17 @@ function edgeCell(view, event, indexes) {
     const cell = tablePos + map.map[(map.width * indexes.rowIndex) + indexes.cellIndex];
     return cell;
 }
+function splitCols(colgroup) {
+    const cols = Array.from((colgroup && colgroup.children || []));
+    let splitted = false;
+    cols.forEach((col) => {
+        while (col.span > 1) {
+            const newCol = col.cloneNode();
+            newCol.span = 1;
+            colgroup.insertBefore(newCol, col);
+            col.span -= 1;
+            splitted = true;
+        }
+    });
+    return splitted;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-editor-common",
   "description": "Kendo UI TypeScript package exporting functions for Editor component",
-  "version": "1.12.3-develop.1",
+  "version": "1.12.3-develop.10",
   "keywords": [
     "Kendo UI"
   ],
@@ -15,17 +15,17 @@
   "dependencies": {
     "@progress/kendo-common": "^1.0.2",
     "prosemirror-commands": "1.7.1",
-    "prosemirror-dropcursor": "1.8.1",
+    "prosemirror-dropcursor": "1.8.2",
     "prosemirror-gapcursor": "1.3.2",
     "prosemirror-history": "1.4.1",
     "prosemirror-inputrules": "1.5.0",
-    "prosemirror-keymap": "1.2.2",
-    "prosemirror-model": "1.25.0",
+    "prosemirror-keymap": "1.2.3",
+    "prosemirror-model": "1.25.1",
     "prosemirror-schema-list": "1.5.1",
     "prosemirror-state": "1.4.3",
     "prosemirror-tables": "1.7.1",
-    "prosemirror-transform": "1.10.3",
-    "prosemirror-view": "1.39.1",
+    "prosemirror-transform": "1.10.4",
+    "prosemirror-view": "1.39.3",
     "tslib": "^2.8.1"
   },
   "repository": {