Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into richTextEditor

1 files changed, 14 insertions, 7 deletions

diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts
index 79d4ceb25..2fa45a086 100644
--- a/src/client/util/SelectionManager.ts
+++ b/src/client/util/SelectionManager.ts
@@ -12,13 +12,21 @@ 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 = [];
+            Main.Instance.SetTextDoc();
+        }
     }
 
     const manager = new Manager();
@@ -34,14 +42,13 @@ export namespace SelectionManager {
     export function DeselectAll(except?: Document): void {
         let found: DocumentView | undefined = undefined;
         if (except) {
-            for (let i = 0; i < manager.SelectedDocuments.length; i++) {
-                let view = manager.SelectedDocuments[i];
-                if (view.props.Document == except) found = view;
+            for (const view of manager.SelectedDocuments) {
+                if (view.props.Document === except) found = view;
             }
         }
-        manager.SelectedDocuments.length = 0;
-        if (found) manager.SelectedDocuments.push(found);
-        Main.Instance.SetTextDoc(undefined, undefined);
+
+        manager.DeselectAll();
+        if (found) manager.SelectDoc(found, false);
     }
 
     export function SelectedDocuments(): Array<DocumentView> {