selection

1 files changed, 11 insertions, 9 deletions

diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index 96d7627a3..f59d562dd 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -232,14 +232,14 @@ export class CollectionSchemaView extends CollectionSubView() {
                     break;
                 case 'ArrowRight':
                     if (this._selectedCells) {
-                        ++this._selectedCol;
+                        this._selectedCol = Math.min(this._colEles.length - 1, this._selectedCol + 1);
                     } else if (this._selectedDocs.length > 0) {
                         this.selectCell(this._selectedDocs[0], 0, false, false);
                     }
                     break;
                 case 'ArrowLeft':
                     if (this._selectedCells) {
-                        --this._selectedCol;
+                        this._selectedCol = Math.max(0, this._selectedCol - 1);
                     } else if (this._selectedDocs.length > 0) {
                         this.selectCell(this._selectedDocs[0], 0, false, false);
                     }
@@ -436,7 +436,6 @@ export class CollectionSchemaView extends CollectionSubView() {
         this.deselectAllCells();
     };
 
-    //This method is called in SchemaRowBox.select, which is never called anywhere
     selectRows = (doc: Doc, lastSelected: Doc) => {
         const index = this.rowIndex(doc);
         const lastSelectedRow = this.rowIndex(lastSelected);
@@ -451,24 +450,27 @@ export class CollectionSchemaView extends CollectionSubView() {
 
     @action
     selectCell = (doc: Doc, index: number, shiftKey: boolean, ctrlKey: boolean) => {
-        console.log(ctrlKey);
         (!shiftKey && !ctrlKey) && this.clearSelection();
         !this._selectedCells && (this._selectedCells = []);
         this._selectedCells.push(doc);
-        this._selectedCol = index;
 
         if (!this) return;
         const lastSelected = Array.from(this._selectedDocs).lastElement();
-        if (shiftKey && lastSelected) this.selectRows(doc, lastSelected);
+        if (shiftKey && lastSelected && !this._selectedDocs.includes(doc)) this.selectRows(doc, lastSelected);
+        else if (ctrlKey && lastSelected && this._selectedDocs.includes(doc)) {
+            console.log("removed");
+            SelectionManager.DeselectView(DocumentManager.Instance.getFirstDocumentView(doc))
+            this.deselectCell(doc);
+        }
         else if (ctrlKey) {this.addDocToSelection(doc, true, this.rowIndex(doc)); console.log("2")}
         else this.addDocToSelection(doc, false, this.rowIndex(doc));
-        
+
+        this._selectedCol = index;
     };
 
     @action
     deselectCell = (doc: Doc) => {
-        if (this._selectedCells)
-        this._selectedCells = this._selectedCells.filter(d => d !== doc);
+        this._selectedCells && (this._selectedCells = this._selectedCells.filter(d => d !== doc));
     };
 
     @action