several fixes to drag/drop so that dropAction's set on target work for tree views, notetaking, formattedText, etc. make bringToFront an optional prop.

1 files changed, 8 insertions, 9 deletions

diff --git a/src/client/views/collections/collectionLinear/CollectionLinearView.tsx b/src/client/views/collections/collectionLinear/CollectionLinearView.tsx
index 72bdb9b6b..228af78aa 100644
--- a/src/client/views/collections/collectionLinear/CollectionLinearView.tsx
+++ b/src/client/views/collections/collectionLinear/CollectionLinearView.tsx
@@ -79,16 +79,16 @@ export class CollectionLinearView extends CollectionSubView() {
 
     @action
     changeDescriptionSetting = () => {
-        if (LinkDescriptionPopup.showDescriptions) {
-            if (LinkDescriptionPopup.showDescriptions === 'ON') {
-                LinkDescriptionPopup.showDescriptions = 'OFF';
-                LinkDescriptionPopup.descriptionPopup = false;
+        if (LinkDescriptionPopup.Instance.showDescriptions) {
+            if (LinkDescriptionPopup.Instance.showDescriptions === 'ON') {
+                LinkDescriptionPopup.Instance.showDescriptions = 'OFF';
+                LinkDescriptionPopup.Instance.display = false;
             } else {
-                LinkDescriptionPopup.showDescriptions = 'ON';
+                LinkDescriptionPopup.Instance.showDescriptions = 'ON';
             }
         } else {
-            LinkDescriptionPopup.showDescriptions = 'OFF';
-            LinkDescriptionPopup.descriptionPopup = false;
+            LinkDescriptionPopup.Instance.showDescriptions = 'OFF';
+            LinkDescriptionPopup.Instance.display = false;
         }
     };
 
@@ -110,7 +110,7 @@ export class CollectionLinearView extends CollectionSubView() {
 
                 <Tooltip title={<div className="dash-tooltip">{'Toggle description pop-up'} </div>} placement="top">
                     <span className="bottomPopup-descriptions" onClick={this.changeDescriptionSetting}>
-                        Labels: {LinkDescriptionPopup.showDescriptions ? LinkDescriptionPopup.showDescriptions : 'ON'}
+                        Labels: {LinkDescriptionPopup.Instance.showDescriptions ? LinkDescriptionPopup.Instance.showDescriptions : 'ON'}
                     </span>
                 </Tooltip>
 
@@ -191,7 +191,6 @@ export class CollectionLinearView extends CollectionSubView() {
                     styleProvider={this._props.styleProvider}
                     containerViewPath={this.childContainerViewPath}
                     whenChildContentsActiveChanged={emptyFunction}
-                    bringToFront={emptyFunction}
                     childFilters={this._props.childFilters}
                     childFiltersByRanges={this._props.childFiltersByRanges}
                     searchFilterDocs={this._props.searchFilterDocs}