@worktile/theia 21.0.0-next.1 → 21.0.0

package/fesm2022/worktile-theia.mjs

@@ -7147,22 +7147,18 @@ class TheCode extends TheBaseElement {
     onContextChange() {
         super.onContextChange();
         if (this.initialized) {
-            if (this.isCollapsedAndNonReadonly && !isMobileMode(this.editor)) {
-                this.openToolbar();
-            }
-            else {
-                this.closeToolbar();
-            }
+            this.useToolbar();
             if (this.options().readonly !== this.readonly) {
                 this.useReadonly();
             }
             if (this.options().mode !== this.element.language) {
                 this.useMode();
             }
-            if (this.options().lineWrapping !== this.element.autoWrap) {
+            const lineWrapping = this.element.autoWrap || false;
+            if (this.options().lineWrapping !== lineWrapping) {
                 this.useAutoWrap();
             }
-            if (this.resizeHeight !== this.element.height) {
+            if (this.element.height && this.resizeHeight && this.resizeHeight !== this.element.height) {
                 this.useHeight();
             }
         }
@@ -7196,6 +7192,10 @@ class TheCode extends TheBaseElement {
                 }
             });
         });
+        setTimeout(() => {
+            this.useAutofocus();
+            this.useToolbar();
+        }, 0);
     }
     initMaxHeight() {
         this.maxHeight = isPrintMode(this.editor) ? 0 : CODEMIRROR_DEFAULT_MAX_HEIGHT - CODEMIRROR_PADDING_TOP * 2;
@@ -7229,7 +7229,6 @@ class TheCode extends TheBaseElement {
         this.useMode();
         this.useAutoWrap();
         this.useHeight();
-        this.useAutofocus();
     }
     codeChange($event) {
         this.isHightLight = false;
@@ -7270,10 +7269,18 @@ class TheCode extends TheBaseElement {
         this.options.set({ ...this.options(), readonly: this.readonly, cursorBlinkRate: this.readonly ? -1 : 500 });
     }
     useAutofocus() {
-        if (this.isCollapsedAndNonReadonly && Range.isCollapsed(this.editor.selection)) {
+        if (this.isCollapsedAndNonReadonly) {
             this.options.set({ ...this.options(), autofocus: this.readonly ? false : true });
         }
     }
+    useToolbar() {
+        if (this.isCollapsedAndNonReadonly && !isMobileMode(this.editor)) {
+            this.openToolbar();
+        }
+        else {
+            this.closeToolbar();
+        }
+    }
     onResize({ height }) {
         this.resizeHeight = height;
         this.maxHeight = height;
@@ -13542,9 +13549,9 @@ const withMoveSelection = (editor) => {
     editor.onClick = (event) => {
         const domSelection = window.getSelection();
         if (domSelection && !domSelection.isCollapsed && event.detail >= 2 && editor.selection) {
-            const slateSelection = AngularEditor.toSlateRange(editor, domSelection, { exactMatch: false, suppressThrow: false });
-            const isNextStart = slateSelection.focus.offset === 0;
-            if (Range.isExpanded(slateSelection) && Range.isForward(slateSelection) && isNextStart) {
+            const slateSelection = AngularEditor.toSlateRange(editor, domSelection, { exactMatch: false, suppressThrow: true });
+            const isNextStart = slateSelection && slateSelection.focus.offset === 0;
+            if (slateSelection && Range.isExpanded(slateSelection) && Range.isForward(slateSelection) && isNextStart) {
                 const beforePoint = Editor.before(editor, slateSelection.focus);
                 const changedRange = Editor.range(editor, slateSelection.anchor, beforePoint);
                 // slate-angular throttle 80ms, so wait selectionchange complete
@@ -17527,15 +17534,17 @@ const withTable = (editor) => {
         if (event.detail === 3) {
             const isMergedCell = isSelectedCellMerged(editor);
             const domSelection = window.getSelection();
-            if (domSelection && !domSelection.isCollapsed && editor.selection) {
-                const slateSelection = AngularEditor.toSlateRange(editor, domSelection, { exactMatch: false, suppressThrow: false });
-                const opts = new TableOptions();
-                const startPosition = TablePosition.create(opts, editor, slateSelection.anchor.path);
-                const endPosition = TablePosition.create(opts, editor, slateSelection.focus.path);
-                if (isMergedCell && startPosition.cell !== endPosition.cell) {
-                    timer(81).subscribe(() => {
-                        Transforms.select(editor, slateSelection.anchor.path);
-                    });
+            if (domSelection && isMergedCell && !domSelection.isCollapsed && editor.selection) {
+                const slateSelection = AngularEditor.toSlateRange(editor, domSelection, { exactMatch: false, suppressThrow: true });
+                if (slateSelection) {
+                    const opts = new TableOptions();
+                    const startPosition = TablePosition.create(opts, editor, slateSelection.anchor.path);
+                    const endPosition = TablePosition.create(opts, editor, slateSelection.focus.path);
+                    if (startPosition.cell !== endPosition.cell) {
+                        timer(81).subscribe(() => {
+                            Transforms.select(editor, slateSelection.anchor.path);
+                        });
+                    }
                 }
             }
         }