@worktile/theia 1.2.15 → 1.2.16

package/bundles/worktile-theia.umd.js

@@ -828,7 +828,11 @@
     };
 
     var isEmptyParagraph = function (editor, at) {
-        var _a = __read(getAnchorBlockEntry(editor, at), 1), block = _a[0];
+        var entry = getAnchorBlockEntry(editor, at);
+        if (!entry) {
+            return false;
+        }
+        var _a = __read(entry, 1), block = _a[0];
         return slate.Editor.isEmpty(editor, block) && block.type === exports.ElementKinds.paragraph;
     };
 
@@ -4727,20 +4731,66 @@
             // block card cursor
             if (anchorNode && i1.hasBlockCard(domSelection)) {
                 var isCardLeftCursor = i1.isCardLeft(anchorNode);
-                // ↓ + left-block-card 或者 → + right-block-card
-                if ((isMoveDown && isCardLeftCursor) || (isMoveForward && !isCardLeftCursor)) {
-                    nativeEvent.preventDefault();
+                if (isMoveUp) {
                     var _a = __read(i1.AngularEditor.toSlateCardEntry(editor, anchorNode), 2), path = _a[1];
+                    var previousPath = slate.Path.hasPrevious(path) && slate.Path.previous(path);
+                    var previousNode = previousPath && getNode(editor, previousPath);
+                    if (previousNode && editor.isBlockCard(previousNode)) {
+                        i1.AngularEditor.moveBlockCard(editor, previousNode, { direction: isCardLeftCursor ? 'left' : 'right' });
+                    }
+                    else {
+                        var before = slate.Editor.before(editor, path);
+                        if (before) {
+                            slate.Transforms.select(editor, before);
+                        }
+                    }
+                    nativeEvent.preventDefault();
+                    return;
+                }
+                if (isMoveDown) {
+                    var _b = __read(i1.AngularEditor.toSlateCardEntry(editor, anchorNode), 2), path = _b[1];
+                    var nextPath = slate.Path.next(path);
+                    var nextNode = getNode(editor, nextPath);
+                    if (nextNode && editor.isBlockCard(nextNode)) {
+                        i1.AngularEditor.moveBlockCard(editor, nextNode, { direction: isCardLeftCursor ? 'left' : 'right' });
+                    }
+                    else {
+                        var after = slate.Editor.after(editor, path);
+                        if (after) {
+                            slate.Transforms.select(editor, slate.Editor.after(editor, path));
+                        }
+                    }
+                    nativeEvent.preventDefault();
+                    return;
+                }
+                // → + right-block-card
+                if ((isMoveForward && !isCardLeftCursor)) {
+                    nativeEvent.preventDefault();
+                    var _c = __read(i1.AngularEditor.toSlateCardEntry(editor, anchorNode), 2), path = _c[1];
+                    var nextPath = slate.Path.next(path);
+                    var nextNode = getNode(editor, nextPath);
+                    if (nextNode && editor.isBlockCard(nextNode)) {
+                        event.preventDefault();
+                        i1.AngularEditor.moveBlockCard(editor, nextNode, { direction: 'left' });
+                        return;
+                    }
                     var after = slate.Editor.after(editor, path);
                     if (after) {
                         slate.Transforms.select(editor, slate.Editor.after(editor, path));
                     }
                     return;
                 }
-                // ↑ + right-block-card 或者 ← + left-block-card
-                if ((isMoveUp && !isCardLeftCursor) || (isMoveBackward && isCardLeftCursor)) {
+                // ← + left-block-card
+                if (isMoveBackward && isCardLeftCursor) {
                     nativeEvent.preventDefault();
-                    var _b = __read(i1.AngularEditor.toSlateCardEntry(editor, anchorNode), 2), path = _b[1];
+                    var _d = __read(i1.AngularEditor.toSlateCardEntry(editor, anchorNode), 2), path = _d[1];
+                    var previousPath = slate.Path.hasPrevious(path) && slate.Path.previous(path);
+                    var previousNode = previousPath && getNode(editor, previousPath);
+                    if (previousNode && editor.isBlockCard(previousNode)) {
+                        event.preventDefault();
+                        i1.AngularEditor.moveBlockCard(editor, previousNode, { direction: 'right' });
+                        return;
+                    }
                     var before = slate.Editor.before(editor, path);
                     if (before) {
                         slate.Transforms.select(editor, before);
@@ -4750,14 +4800,14 @@
                 // move to card center
                 if ((isCardLeftCursor && isMoveForward) || (!isCardLeftCursor && isMoveBackward)) {
                     nativeEvent.preventDefault();
-                    var _c = __read(i1.AngularEditor.toSlateCardEntry(editor, anchorNode), 2), path = _c[1];
+                    var _e = __read(i1.AngularEditor.toSlateCardEntry(editor, anchorNode), 2), path = _e[1];
                     slate.Transforms.select(editor, isCardLeftCursor ? slate.Editor.start(editor, path) : slate.Editor.end(editor, path));
                     return;
                 }
             }
             // block card center
             if (isCollapsed && (isMoveUp || isMoveDown) && anchorEntry) {
-                var _d = __read(anchorEntry, 2), block = _d[0], path = _d[1];
+                var _f = __read(anchorEntry, 2), block = _f[0], path = _f[1];
                 if (editor.isBlockCard(block)) {
                     event.preventDefault();
                     slate.Transforms.select(editor, isMoveUp ? slate.Editor.before(editor, path) : slate.Editor.after(editor, path));
@@ -4765,7 +4815,7 @@
                 }
             }
             if (isCollapsed && (isMoveBackward || isMoveForward) && anchorEntry) {
-                var _e = __read(anchorEntry, 1), block = _e[0];
+                var _g = __read(anchorEntry, 1), block = _g[0];
                 if (editor.isBlockCard(block)) {
                     event.preventDefault();
                     i1.AngularEditor.moveBlockCard(editor, block, { direction: isMoveBackward ? 'left' : 'right' });
@@ -5151,11 +5201,14 @@
                     columnIndex++;
                     nextCell = this.table.children[rowIndex].children[columnIndex];
                 }
-                else {
+                else if (rowIndex + 1 < this.getHeight()) {
                     columnIndex = 0;
                     rowIndex++;
                     nextCell = this.table.children[rowIndex].children[columnIndex];
                 }
+                else {
+                    nextCell = null;
+                }
             }
             return nextCell;
         };
@@ -5307,7 +5360,7 @@
             return rowspans.some(function (rowspan) { return isInside(rowspan, rowIndx, targetIndex); });
         });
     }
-    function calcOriginSpan(table, targetRowIndex, targetColumnIndex) {
+    function getOriginCell(table, targetRowIndex, targetColumnIndex) {
         var _loop_1 = function (rowIndex) {
             var row = table.children[rowIndex];
             var originCell = row.children
@@ -5830,6 +5883,13 @@
         isActiveHeader: function (editor) {
             var _a = __read(slate.Editor.nodes(editor, { match: function (n) { return n.type === exports.ElementKinds.tableRow; } }), 1), tableRowEntry = _a[0];
             return tableRowEntry && tableRowEntry[0] && tableRowEntry[0].header;
+        },
+        selectOriginCell: function (editor, table, rowIndex, columnIndex, isStart) {
+            var origin = getOriginCell(table, rowIndex, columnIndex);
+            if (origin) {
+                var path = i1.AngularEditor.findPath(editor, origin);
+                slate.Transforms.select(editor, isStart ? slate.Editor.start(editor, path) : slate.Editor.end(editor, path));
+            }
         }
     };
 
@@ -6862,6 +6922,9 @@
                 if (this.options.mode !== this.element.language) {
                     this.useMode();
                 }
+                if (!this.readonly && this.isCollapsed) {
+                    this.initializeCodemirrorFocus();
+                }
             }
         };
         TheCodeComponent.prototype.ngOnInit = function () {
@@ -10641,7 +10704,7 @@
                 }
                 // case 2
                 if (cell.hidden && !normalizedNodes.includes(cell)) {
-                    var origin = calcOriginSpan(table, rowIndex, columnIndex);
+                    var origin = getOriginCell(table, rowIndex, columnIndex);
                     if (!origin) {
                         delete table.children[rowIndex].children[columnIndex].hidden;
                     }
@@ -10652,7 +10715,7 @@
     };
 
     var withTable = function (editor) {
-        var deleteBackward = editor.deleteBackward, deleteForward = editor.deleteForward, onKeydown = editor.onKeydown, setFragmentData = editor.setFragmentData, insertData = editor.insertData, normalizeNode = editor.normalizeNode, isBlockCard = editor.isBlockCard, renderElement = editor.renderElement, deleteCutData = editor.deleteCutData, isContainer = editor.isContainer;
+        var deleteBackward = editor.deleteBackward, deleteForward = editor.deleteForward, onKeydown = editor.onKeydown, setFragmentData = editor.setFragmentData, insertData = editor.insertData, normalizeNode = editor.normalizeNode, isBlockCard = editor.isBlockCard, renderElement = editor.renderElement, deleteCutData = editor.deleteCutData, isContainer = editor.isContainer, onChange = editor.onChange;
         editor.deleteBackward = function (unit) {
             var opts = new TableOptions$1();
             if (!isSelectionInTable(opts, editor)) {
@@ -10723,13 +10786,11 @@
                         var aboveCell = aboveRow && aboveRow.children[startPosition.getColumnIndex()];
                         if (aboveCell) {
                             if (aboveCell.hidden) {
-                                var originSpan = calcOriginSpan(endPosition.table, startPosition.getRowIndex() - 1, startPosition.getColumnIndex());
-                                if (originSpan) {
-                                    at = slate.Editor.start(editor, TheEditor.findPath(editor, originSpan));
-                                }
+                                TableEditor.selectOriginCell(editor, startPosition.table, startPosition.getRowIndex() - 1, startPosition.getColumnIndex(), false);
+                                return;
                             }
                             else {
-                                at = slate.Editor.start(editor, TheEditor.findPath(editor, aboveCell));
+                                at = slate.Editor.end(editor, TheEditor.findPath(editor, aboveCell));
                             }
                         }
                         else {
@@ -10758,10 +10819,8 @@
                         var belowCell = belowRow && belowRow.children[startPosition.getColumnIndex()];
                         if (belowCell) {
                             if (belowCell.hidden) {
-                                var originSpan = calcOriginSpan(endPosition.table, belowRowIndex, startPosition.getColumnIndex());
-                                if (originSpan) {
-                                    at = slate.Editor.start(editor, TheEditor.findPath(editor, originSpan));
-                                }
+                                TableEditor.selectOriginCell(editor, startPosition.table, startPosition.getRowIndex() + 1, startPosition.getColumnIndex(), true);
+                                return;
                             }
                             else {
                                 at = slate.Editor.start(editor, TheEditor.findPath(editor, belowCell));
@@ -10780,18 +10839,27 @@
                     var beforePoint = slate.Editor.before(editor, editor.selection);
                     var beforePosition = beforePoint && TablePosition.create(opts, editor, beforePoint.path);
                     if (beforePosition && beforePosition.cell && beforePosition.cell.hidden) {
+                        event.preventDefault();
                         var at = slate.Editor.end(editor, TheEditor.findPath(editor, beforePosition.findPrevious()));
                         slate.Transforms.select(editor, at);
-                        event.preventDefault();
                     }
                 }
                 if (isMoveForward) {
                     var afterPoint = slate.Editor.after(editor, editor.selection);
                     var afterPosition = afterPoint && TablePosition.create(opts, editor, afterPoint.path);
                     if (afterPosition.cell && afterPosition.cell.hidden) {
-                        var at = slate.Editor.start(editor, TheEditor.findPath(editor, afterPosition.findNext()));
-                        slate.Transforms.select(editor, at);
                         event.preventDefault();
+                        var nextCell = afterPosition.findNext();
+                        if (nextCell) {
+                            var at = slate.Editor.start(editor, TheEditor.findPath(editor, afterPosition.findNext()));
+                            slate.Transforms.select(editor, at);
+                            event.preventDefault();
+                        }
+                        else {
+                            i1.AngularEditor.moveBlockCard(editor, startPosition.tableEntry[0], { direction: 'right' });
+                            event.preventDefault();
+                        }
+                        return;
                     }
                 }
                 // Prevent deleting cells in the table
@@ -10872,12 +10940,12 @@
             }
             if (tableFragment) {
                 tableFragment = normalizeTable(_.cloneDeep(tableFragment));
+                var plainText = slate.Node.string(tableFragment);
                 tableFragment = [tableFragment];
                 var stringObj = JSON.stringify(tableFragment);
                 var encoded = window.btoa(encodeURIComponent(stringObj));
                 unit.setData("application/" + CLIPBOARD_FORMAT_KEY, encoded);
-                // unit.setData('text/html', div.innerHTML);
-                unit.setData('text/plain', slate.Node.string(tableFragment));
+                unit.setData('text/plain', plainText);
                 return;
             }
             setFragmentData(unit);
@@ -10902,7 +10970,7 @@
                         for (var j = selectColIndex_1; j <= lastColIndex_1; j++) {
                             var row = tablePosition_1.table.children[i];
                             if (row && row.children[j]) {
-                                var originCell = calcOriginSpan(tablePosition_1.table, i, j);
+                                var originCell = getOriginCell(tablePosition_1.table, i, j);
                                 if (originCell && (originCell.colspan || originCell.rowspan)) {
                                     var path = TheEditor.findPath(editor, originCell).slice(-2);
                                     resetTableCell(editor, tablePosition_1.table, originCell, path[0], path[1]);
@@ -10960,6 +11028,21 @@
                     slate.Transforms.setNodes(editor, { columns: columns }, { at: entry[1] });
                 }
             }
+            // adjust selection when selection is in hidden cell
+            if (slate.Element.isElement(entry[0]) && entry[0].type === exports.ElementKinds.tableCell && entry[0].hidden) {
+                if (editor.selection && slate.Range.isCollapsed(editor.selection) && slate.Path.isAncestor(entry[1], editor.selection.anchor.path)) {
+                    setTimeout(function () {
+                        var opts = new TableOptions$1();
+                        var tablePosition = TablePosition.create(opts, editor, editor.selection.anchor.path);
+                        var origin = getOriginCell(tablePosition.table, tablePosition.getRowIndex(), tablePosition.getColumnIndex());
+                        if (origin) {
+                            var path = i1.AngularEditor.findPath(editor, origin);
+                            slate.Transforms.select(editor, slate.Editor.end(editor, path));
+                        }
+                    }, 0);
+                    return;
+                }
+            }
             normalizeNode(entry);
         };
         editor.isBlockCard = function (element) {
@@ -11007,6 +11090,20 @@
         editor.isContainer = function (element) {
             return element.type === exports.ElementKinds.tableCell ? true : isContainer(element);
         };
+        editor.onChange = function () {
+            onChange();
+            // adujst selection when selection is in hidden cell
+            // just hook set_selection
+            var isCollapsed = editor.selection && slate.Range.isCollapsed(editor.selection);
+            var isSelectionOperation = editor.operations.every(function (op) { return slate.Operation.isSelectionOperation(op); });
+            if (isCollapsed && isSelectionOperation) {
+                var opts = new TableOptions$1();
+                var tablePosition = TablePosition.create(opts, editor, editor.selection.anchor.path);
+                if (tablePosition.isInTable() && tablePosition.cell.hidden) {
+                    TableEditor.selectOriginCell(editor, tablePosition.table, tablePosition.getRowIndex(), tablePosition.getColumnIndex(), false);
+                }
+            }
+        };
         return editor;
     };
 
@@ -12290,12 +12387,13 @@
         };
         ThePlaceholderComponent.prototype.checkStatus = function () {
             var _this = this;
-            var _a, _b;
+            var _a, _b, _c;
             var editor = this.editor;
             var isEmptyShow = typeof ((_a = this.options) === null || _a === void 0 ? void 0 : _a.isEmptyShowPlaceholder) === 'undefined' ? true : this.options.isEmptyShowPlaceholder;
             var isMustShow = (_b = this.options) === null || _b === void 0 ? void 0 : _b.isMustShowPlaceholder;
+            var isReadonly = (_c = this.options) === null || _c === void 0 ? void 0 : _c.readonly;
             // empty content and no selection processing
-            if (isEmptyShow && isEmptyContent(editor.children)) {
+            if (!isReadonly && isEmptyShow && isEmptyContent(editor.children)) {
                 var firstElementChild = this.contextService.getFirstElementChild();
                 var offsetTop = firstElementChild.offsetTop;
                 var offsetLeft = firstElementChild.offsetLeft;