From 6b87703bff0e26489ae5e7757b7a622a7143a51d Mon Sep 17 00:00:00 2001 From: Nathan-SR <144961007+Nathan-SR@users.noreply.github.com> Date: Sun, 17 Mar 2024 13:51:01 -0400 Subject: DocView 1330 problem statement --- src/client/util/SelectionManager.ts | 4 +--- .../views/collections/collectionSchema/CollectionSchemaView.tsx | 1 - src/client/views/nodes/DocumentView.tsx | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/client') diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts index 0862cf20e..f3b2acb5e 100644 --- a/src/client/util/SelectionManager.ts +++ b/src/client/util/SelectionManager.ts @@ -34,9 +34,7 @@ export class SelectionManager { public static SelectView = action((docView: DocumentView | undefined, extendSelection: boolean): void => { if (!docView) this.DeselectAll(); else if (!docView.IsSelected) { - if (!extendSelection) { - this.DeselectAll(); - }; + if (!extendSelection) this.DeselectAll(); this.Instance.SelectedViews.push(docView); docView.IsSelected = true; docView._props.whenChildContentsActiveChanged(true); diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx index 4e90f5006..e6c13d11e 100644 --- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx +++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx @@ -420,7 +420,6 @@ export class CollectionSchemaView extends CollectionSubView() { @action clearSelection = () => { SelectionManager.DeselectAll() - console.log(2); }; selectRows = (doc: Doc, lastSelected: Doc) => { diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index abb1aa59f..38e60721f 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -1325,8 +1325,8 @@ export class DocumentView extends DocComponent() { screenToLocalScale = () => this._props.ScreenToLocalTransform().Scale; isSelected = () => this.IsSelected; select = (extendSelection: boolean, focusSelection?: boolean) => { - if (this.IsSelected && SelectionManager.Views.length > 1) SelectionManager.DeselectView(this); - else { + /*if (this.IsSelected && SelectionManager.Views.length > 1) SelectionManager.DeselectView(this); + else {*/ SelectionManager.SelectView(this, extendSelection); if (focusSelection) { DocumentManager.Instance.showDocument(this.Document, { @@ -1335,7 +1335,7 @@ export class DocumentView extends DocComponent() { zoomTime: 500, }); } - } + /*}*/ }; DataTransition = () => this._props.DataTransition?.() || StrCast(this.Document.dataTransition); ShouldNotScale = () => this.shouldNotScale; -- cgit v1.2.3-70-g09d2