Merge pull request spcl#46 from spcl/event_bubbling

Allow click event bubbling to regain window focus for renderer clicks
N2D4 · Aug 6, 2021 · c573aa8 · c573aa8
2 parents df3133c + 0a32049
commit c573aa8
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 21 deletions.
diff --git a/dist/main.js b/dist/main.js
diff --git a/dist/main.js.map b/dist/main.js.map
diff --git a/dist/sdfv.js b/dist/sdfv.js
diff --git a/dist/sdfv.js.map b/dist/sdfv.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@spcl/sdfv",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "description": "A standalone viewer for SDFGs",
     "homepage": "https://github.com/spcl/dace-webclient",
     "keywords": [

diff --git a/src/renderer/renderer.js b/src/renderer/renderer.js
@@ -113,6 +113,13 @@ export class SDFGRenderer {
             this.overlay_manager = null;
         }
 
+        this.in_vscode = false;
+        try {
+            vscode;
+            if (vscode)
+                this.in_vscode = true;
+        } catch (ex) { }
+
         // Draw debug aids.
         this.debug_draw = debug_draw;
 
@@ -269,13 +276,6 @@ export class SDFGRenderer {
         this.toolbar.style = 'position:absolute; top:10px; left: 10px;';
         let d;
 
-        let in_vscode = false;
-        try {
-            vscode;
-            if (vscode)
-                in_vscode = true;
-        } catch (ex) { }
-
         // Menu bar
         try {
             ContextMenu;
@@ -298,7 +298,7 @@ export class SDFGRenderer {
                 }
                 cmenu.addCheckableOption("Inclusive ranges", that.inclusive_ranges, (x, checked) => { that.inclusive_ranges = checked; });
                 cmenu.addCheckableOption("Adaptive content hiding", that.ctx.lod, (x, checked) => { that.ctx.lod = checked; });
-                if (!in_vscode)
+                if (!this.in_vscode)
                     cmenu.addOption(
                         'Overlays',
                         () => {
@@ -323,7 +323,7 @@ export class SDFGRenderer {
                                             MemoryVolumeOverlay
                                         );
                                     that.draw_async();
-                                    if (in_vscode)
+                                    if (this.in_vscode)
                                         refresh_analysis_pane();
                                 }
                             );
@@ -479,7 +479,7 @@ export class SDFGRenderer {
         document.addEventListener('keyup', (e) => this.on_key_event(e));
 
         // Exit previewing mode
-        if (in_vscode) {
+        if (this.in_vscode) {
             let exit_preview_btn = document.createElement('button');
             exit_preview_btn.id = 'exit-preview-button';
             exit_preview_btn.className = 'button hidden';
@@ -706,8 +706,10 @@ export class SDFGRenderer {
                 let cancelled = this.on_mouse_event(x, comp_x, comp_y, evtype);
                 if (cancelled)
                     return;
-                x.stopPropagation();
-                x.preventDefault();
+                if (!this.in_vscode) {
+                    x.stopPropagation();
+                    x.preventDefault();
+                }
             });
         }
     }

diff --git a/src/sdfv_ui_handlers.js b/src/sdfv_ui_handlers.js
@@ -3,6 +3,7 @@
 import { sdfg_property_to_string } from "./utils/sdfg/display";
 import { traverse_sdfg_scopes } from "./utils/sdfg/traversal";
 import { htmlSanitize } from "./utils/sanitization";
+import { globals } from "./sdfv";
 
 export const SDFVUIHandlers = {
     on_init_menu,
@@ -44,8 +45,9 @@ function on_fill_info(elem) {
             attr[0] == "position")
             continue;
         html += "<b>" + attr[0] + "</b>:&nbsp;&nbsp;";
-        html += sdfg_property_to_string(attr[1], renderer.view_settings()) +
-            "</p>";
+        html += sdfg_property_to_string(
+            attr[1], globals.daceRenderer.view_settings()
+        ) + "</p>";
     }
 
     // If access node, add array information too
@@ -57,8 +59,9 @@ function on_fill_info(elem) {
                 attr[0].startsWith("_meta_"))
                 continue;
             html += "<b>" + attr[0] + "</b>:&nbsp;&nbsp;";
-            html += sdfg_property_to_string(attr[1], renderer.view_settings()) +
-                "</p>";
+            html += sdfg_property_to_string(
+                attr[1], globals.daceRenderer.view_settings()
+            ) + "</p>";
         }
     }