Merge and it compiles

1 files changed, 12 insertions, 2 deletions

diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts
index 6d6ae26fc..05810b61c 100644
--- a/src/client/util/SelectionManager.ts
+++ b/src/client/util/SelectionManager.ts
@@ -11,13 +11,20 @@ export namespace SelectionManager {
         SelectDoc(doc: DocumentView, ctrlPressed: boolean): void {
             // if doc is not in SelectedDocuments, add it
             if (!ctrlPressed) {
-                manager.SelectedDocuments = [];
+                this.DeselectAll();
             }
 
             if (manager.SelectedDocuments.indexOf(doc) === -1) {
                 manager.SelectedDocuments.push(doc)
+                doc.props.onActiveChanged(true);
             }
         }
+
+        @action
+        DeselectAll(): void {
+            manager.SelectedDocuments.map(dv => dv.props.onActiveChanged(false))
+            manager.SelectedDocuments = [];
+        }
     }
 
     const manager = new Manager;
@@ -39,7 +46,10 @@ export namespace SelectionManager {
                     found = view;
             }
         }
-        manager.SelectedDocuments.length = 0;
+
+        manager.DeselectAll()
+        if (found)
+            manager.SelectDoc(found, false);
     }
 
     export function SelectedDocuments(): Array<DocumentView> {