Include scroll offset when positioning quick-add dialog

Fixes #3684

packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js

@@ -133,8 +133,6 @@ RED.menu = (function() {
             if (opt.options) {
                 item.addClass("red-ui-menu-dropdown-submenu"+(opt.direction!=='right'?" pull-left":""));
                 var submenu = $('<ul id="'+opt.id+'-submenu" class="red-ui-menu-dropdown"></ul>').appendTo(item);
-                var hasIcons = false
-                var hasSubmenus = false
 
                 for (var i=0;i<opt.options.length;i++) {
 
@@ -146,8 +144,6 @@ RED.menu = (function() {
                             opt.options[i].onpostselect = opt.onpostselect
                         }
                         opt.options[i].direction = opt.direction
-                        hasIcons = hasIcons || (opt.options[i].icon);
-                        hasSubmenus = hasSubmenus || (opt.options[i].options);
                     }
 
                     var li = createMenuItem(opt.options[i]);
@@ -155,14 +151,6 @@ RED.menu = (function() {
                         li.appendTo(submenu);
                     }
                 }
-                if (!hasIcons) {
-                    submenu.addClass("red-ui-menu-dropdown-noicons")
-                }
-                if (hasSubmenus) {
-                    submenu.addClass("red-ui-menu-dropdown-submenus")
-                }
-
-
             }
             if (opt.disabled) {
                 item.addClass("disabled");
@@ -203,8 +191,6 @@ RED.menu = (function() {
         }
 
         var lastAddedSeparator = false;
-        var hasSubmenus = false;
-        var hasIcons = false;
         for (var i=0;i<options.options.length;i++) {
             var opt = options.options[i];
             if (opt) {
@@ -217,8 +203,6 @@ RED.menu = (function() {
                 opt.direction = options.direction || 'left'
             }
             if (opt !== null || !lastAddedSeparator) {
-                hasIcons = hasIcons || (opt && opt.icon);
-                hasSubmenus = hasSubmenus || (opt && opt.options);
                 var li = createMenuItem(opt);
                 if (li) {
                     li.appendTo(topMenu);
@@ -226,12 +210,7 @@ RED.menu = (function() {
                 }
             }
         }
-        if (!hasIcons) {
-            topMenu.addClass("red-ui-menu-dropdown-noicons")
-        }
-        if (hasSubmenus) {
-            topMenu.addClass("red-ui-menu-dropdown-submenus")
-        }
+
         return topMenu;
     }
 

packages/node_modules/@node-red/editor-client/src/js/ui/view.js

@@ -1071,8 +1071,8 @@ RED.view = (function() {
         var oy = point[1];
 
         const offset = $("#red-ui-workspace-chart").offset()
-        var clientX = ox + offset.left
-        var clientY = oy + offset.top
+        var clientX = ox + offset.left - $("#red-ui-workspace-chart").scrollLeft()
+        var clientY = oy + offset.top - $("#red-ui-workspace-chart").scrollTop()
 
         if (RED.settings.get("editor").view['view-snap-grid']) {
             // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','red')

packages/node_modules/@node-red/editor-client/src/sass/dropdownMenu.scss

@@ -46,7 +46,7 @@
     & > li > a,
     & > li > a:focus {
         display: block;
-        padding: 4px 12px 4px 32px;
+        padding: 4px 20px 4px 12px;
         clear: both;
         font-weight: normal;
         line-height: 20px;
@@ -58,18 +58,6 @@
     & > li.pull-left > a:focus {
         padding: 4px 12px 4px 32px;
     }
-    &.red-ui-menu-dropdown-noicons > li > a,
-    &.red-ui-menu-dropdown-noicons > li > a:focus {
-        padding: 4px 12px 4px 12px;
-    }
-
-    &.red-ui-menu-dropdown-submenus > li > a,
-    &.red-ui-menu-dropdown-submenus > li > a:focus {
-        padding-right: 20px;
-    }
-
-
-
     & > .active > a,
     & > .active > a:hover,
     & > .active > a:focus {