Merge branch 'master' into info-ui-observable

1 files changed, 6 insertions, 3 deletions

diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts
index f2a327445..36b926053 100644
--- a/src/client/util/SelectionManager.ts
+++ b/src/client/util/SelectionManager.ts
@@ -38,6 +38,7 @@ export class SelectionManager {
             this.Instance.SelectedViews.push(docView);
             docView.IsSelected = true;
             docView._props.whenChildContentsActiveChanged(true);
+            docView.ComponentView?.select?.(false, false);
         }
     });
 
@@ -51,9 +52,11 @@ export class SelectionManager {
 
     public static DeselectAll = (except?: Doc): void => {
         const found = this.Instance.SelectedViews.find(dv => dv.Document === except);
-        LinkManager.currentLink = undefined;
-        LinkManager.currentLinkAnchor = undefined;
-        runInAction(() => (this.Instance.SelectedSchemaDocument = undefined));
+        runInAction(() => {
+            LinkManager.Instance.currentLink = undefined;
+            LinkManager.Instance.currentLinkAnchor = undefined;
+            this.Instance.SelectedSchemaDocument = undefined;
+        });
         this.Instance.SelectedViews.forEach(dv => {
             dv.IsSelected = false;
             dv._props.whenChildContentsActiveChanged(false);