@node-red/editor-client 4.0.2 → 4.0.3

package/public/red/red.js

@@ -2386,16 +2386,36 @@ RED.comms = (function() {
                 break
             }
         }
+        if (isInWorkspace) {
+            const chart = $('#red-ui-workspace-chart')
+            const chartOffset = chart.offset()
+            const scaleFactor = RED.view.scale()
+            location.cursor = {
+                x: (lastPosition[0] - chartOffset.left + chart.scrollLeft()) / scaleFactor,
+                y: (lastPosition[1] - chartOffset.top + chart.scrollTop()) / scaleFactor
+            }
+        }
         return location
     }
+
+    let publishLocationTimeout
+    let lastPosition = [0,0]
+    let isInWorkspace = false
+
     function publishLocation () {
-        const location = getLocation()
-        if (location.workspace !== 0) {
-            log('send', 'multiplayer/location', location)
-            RED.comms.send('multiplayer/location', location)
+        if (!publishLocationTimeout) {
+            publishLocationTimeout = setTimeout(() => {
+                const location = getLocation()
+                if (location.workspace !== 0) {
+                    log('send', 'multiplayer/location', location)
+                    RED.comms.send('multiplayer/location', location)
+                }
+                publishLocationTimeout = null
+            }, 100)
         }
     }
 
+
     function revealUser(location, skipWorkspace) {
         if (location.node) {
             // Need to check if this is a known node, so we can fall back to revealing
@@ -2557,7 +2577,16 @@ RED.comms = (function() {
 
     function removeUserLocation (sessionId) {
         updateUserLocation(sessionId, {})
+        removeUserCursor(sessionId)
     }
+    function removeUserCursor (sessionId) {
+        // return
+        if (sessions[sessionId]?.cursor) {
+            sessions[sessionId].cursor.parentNode.removeChild(sessions[sessionId].cursor)
+            delete sessions[sessionId].cursor
+        }
+    }
+
     function updateUserLocation (sessionId, location) {
         let viewTouched = false
         const oldLocation = sessions[sessionId].location
@@ -2577,6 +2606,28 @@ RED.comms = (function() {
         // console.log(`updateUserLocation sessionId:${sessionId} oldWS:${oldLocation?.workspace} newWS:${location.workspace}`)
         if (location.workspace) {
             getWorkspaceTray(location.workspace).addUser(sessionId)
+            if (location.cursor && location.workspace === RED.workspaces.active()) {
+                if (!sessions[sessionId].cursor) {
+                    const user = sessions[sessionId].user
+                    const cursorIcon = document.createElementNS("http://www.w3.org/2000/svg","g");
+                    cursorIcon.setAttribute("class", "red-ui-multiplayer-annotation")
+                    cursorIcon.appendChild(createAnnotationUser(user, true))
+                    $(cursorIcon).css({
+                        transform: `translate( ${location.cursor.x}px, ${location.cursor.y}px)`,
+                        transition: 'transform 0.1s linear'
+                    })
+                    $("#red-ui-workspace-chart svg").append(cursorIcon)
+                    sessions[sessionId].cursor = cursorIcon
+                } else {
+                    const cursorIcon = sessions[sessionId].cursor
+                    $(cursorIcon).css({
+                        transform: `translate( ${location.cursor.x}px, ${location.cursor.y}px)`
+                    })
+    
+                }
+            } else if (sessions[sessionId].cursor) {
+                removeUserCursor(sessionId)
+            }
         }
         if (location.node) {
             addUserToNode(sessionId, location.node)
@@ -2595,67 +2646,69 @@ RED.comms = (function() {
     //     }
     // }
 
-    return {
-        init: function () {
 
-            function createAnnotationUser(user) {
-
-                const group = document.createElementNS("http://www.w3.org/2000/svg","g");
-                const badge = document.createElementNS("http://www.w3.org/2000/svg","circle");
-                const radius = 20
-                badge.setAttribute("cx",radius/2);
-                badge.setAttribute("cy",radius/2);
-                badge.setAttribute("r",radius/2);
-                badge.setAttribute("class", "red-ui-multiplayer-annotation-background")
-                group.appendChild(badge)
-                if (user && user.profileColor !== undefined) {
-                    badge.setAttribute("class", "red-ui-multiplayer-annotation-background red-ui-user-profile-color-" + user.profileColor)
-                }
-                if (user && user.image) {
-                    const image = document.createElementNS("http://www.w3.org/2000/svg","image");
-                    image.setAttribute("width", radius)
-                    image.setAttribute("height", radius)
-                    image.setAttribute("href", user.image)
-                    image.setAttribute("clip-path", "circle("+Math.floor(radius/2)+")")
-                    group.appendChild(image)
-                } else if (user && user.anonymous) {
-                    const anonIconHead = document.createElementNS("http://www.w3.org/2000/svg","circle");
-                    anonIconHead.setAttribute("cx", radius/2)
-                    anonIconHead.setAttribute("cy", radius/2 - 2)
-                    anonIconHead.setAttribute("r", 2.4)
-                    anonIconHead.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
-                    group.appendChild(anonIconHead)
-                    const anonIconBody = document.createElementNS("http://www.w3.org/2000/svg","path");
-                    anonIconBody.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
-                    // anonIconBody.setAttribute("d",`M ${radius/2 - 4} ${radius/2 + 1} h 8 v4 h -8 z`);
-                    anonIconBody.setAttribute("d",`M ${radius/2} ${radius/2 + 5} h -2.5 c -2 1 -2 -5 0.5 -4.5 c 2 1 2 1 4 0 c 2.5 -0.5  2.5 5.5  0 4.5  z`);
-                    group.appendChild(anonIconBody)
-                } else {
-                    const labelText = user.username ? user.username.substring(0,2) : user
-                    const label = document.createElementNS("http://www.w3.org/2000/svg","text");
-                    if (user.username) {
-                        label.setAttribute("class","red-ui-multiplayer-annotation-label");
-                        label.textContent = user.username.substring(0,2)
-                    } else {
-                        label.setAttribute("class","red-ui-multiplayer-annotation-label red-ui-multiplayer-user-count")
-                        label.textContent = user
-                    }
-                    label.setAttribute("text-anchor", "middle")
-                    label.setAttribute("x",radius/2);
-                    label.setAttribute("y",radius/2 + 3);
-                    group.appendChild(label)
-                }
-                const border = document.createElementNS("http://www.w3.org/2000/svg","circle");
-                border.setAttribute("cx",radius/2);
-                border.setAttribute("cy",radius/2);
-                border.setAttribute("r",radius/2);
-                border.setAttribute("class", "red-ui-multiplayer-annotation-border")
-                group.appendChild(border)
-          
+    function createAnnotationUser(user, pointer = false) {
+        const radius = 20
+        const halfRadius = radius/2
+        const group = document.createElementNS("http://www.w3.org/2000/svg","g");
+        const badge = document.createElementNS("http://www.w3.org/2000/svg","path");
+        let shapePath
+        if (!pointer) {
+            shapePath = `M 0 ${halfRadius} a ${halfRadius} ${halfRadius} 0 1 1 ${radius} 0 a ${halfRadius} ${halfRadius} 0 1 1 -${radius} 0 z`
+        } else {
+            shapePath = `M 0 0 h ${halfRadius} a ${halfRadius} ${halfRadius} 0 1 1 -${halfRadius} ${halfRadius} z`
+        }
+        badge.setAttribute('d', shapePath)
+        badge.setAttribute("class", "red-ui-multiplayer-annotation-background")
+        group.appendChild(badge)
+        if (user && user.profileColor !== undefined) {
+            badge.setAttribute("class", "red-ui-multiplayer-annotation-background red-ui-user-profile-color-" + user.profileColor)
+        }
+        if (user && user.image) {
+            const image = document.createElementNS("http://www.w3.org/2000/svg","image");
+            image.setAttribute("width", radius)
+            image.setAttribute("height", radius)
+            image.setAttribute("href", user.image)
+            image.setAttribute("clip-path", "circle("+Math.floor(radius/2)+")")
+            group.appendChild(image)
+        } else if (user && user.anonymous) {
+            const anonIconHead = document.createElementNS("http://www.w3.org/2000/svg","circle");
+            anonIconHead.setAttribute("cx", radius/2)
+            anonIconHead.setAttribute("cy", radius/2 - 2)
+            anonIconHead.setAttribute("r", 2.4)
+            anonIconHead.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
+            group.appendChild(anonIconHead)
+            const anonIconBody = document.createElementNS("http://www.w3.org/2000/svg","path");
+            anonIconBody.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
+            // anonIconBody.setAttribute("d",`M ${radius/2 - 4} ${radius/2 + 1} h 8 v4 h -8 z`);
+            anonIconBody.setAttribute("d",`M ${radius/2} ${radius/2 + 5} h -2.5 c -2 1 -2 -5 0.5 -4.5 c 2 1 2 1 4 0 c 2.5 -0.5  2.5 5.5  0 4.5  z`);
+            group.appendChild(anonIconBody)
+        } else {
+            const labelText = user.username ? user.username.substring(0,2) : user
+            const label = document.createElementNS("http://www.w3.org/2000/svg","text");
+            if (user.username) {
+                label.setAttribute("class","red-ui-multiplayer-annotation-label");
+                label.textContent = user.username.substring(0,2)
+            } else {
+                label.setAttribute("class","red-ui-multiplayer-annotation-label red-ui-multiplayer-user-count")
+                label.textContent = user
+            }
+            label.setAttribute("text-anchor", "middle")
+            label.setAttribute("x",radius/2);
+            label.setAttribute("y",radius/2 + 3);
+            group.appendChild(label)
+        }
+        const border = document.createElementNS("http://www.w3.org/2000/svg","path");
+        border.setAttribute('d', shapePath)
+        border.setAttribute("class", "red-ui-multiplayer-annotation-border")
+        group.appendChild(border)
+        return group
+    }
 
+    return {
+        init: function () {
 
-                return group
-            }
+            
             
             RED.view.annotations.register("red-ui-multiplayer",{
                 type: 'badge',
@@ -2765,6 +2818,24 @@ RED.comms = (function() {
                 RED.comms.send('multiplayer/disconnect', disconnectInfo)
                 RED.settings.removeLocal('multiplayer:sessionId')
             })
+            
+            const chart = $('#red-ui-workspace-chart')
+            chart.on('mousemove', function (evt) {
+                lastPosition[0] = evt.clientX
+                lastPosition[1] = evt.clientY
+                publishLocation()
+            })
+            chart.on('scroll', function (evt) {
+                publishLocation()
+            })
+            chart.on('mouseenter', function () {
+                isInWorkspace = true
+                publishLocation()
+            })
+            chart.on('mouseleave', function () {
+                isInWorkspace = false
+                publishLocation()
+            })
         }
     }
 
@@ -6757,11 +6828,24 @@ RED.nodes = (function() {
             } else {
                 delete n.g
             }
-            // If importing into a subflow, ensure an outbound-link doesn't get added
-            if (activeSubflow && /^link /.test(n.type) && n.links) {
+            // If importing a link node, ensure both ends of each link are either:
+            // - not in a subflow
+            // - both in the same subflow
+            if (/^link /.test(n.type) && n.links) {
                 n.links = n.links.filter(function(id) {
                     const otherNode = node_map[id] || RED.nodes.node(id);
-                    return (otherNode && otherNode.z === activeWorkspace);
+                    if (!otherNode) {
+                        // Cannot find other end - remove the link
+                        return false
+                    }
+                    if (otherNode.z === n.z) {
+                        // Both ends in the same flow/subflow
+                        return true
+                    } else if (!!getSubflow(n.z) || !!getSubflow(otherNode.z)) {
+                        // One end is in a subflow - remove the link
+                        return false                        
+                    }
+                    return true
                 });
             }
             for (var d3 in n._def.defaults) {
@@ -18099,7 +18183,7 @@ RED.diagnostics = (function () {
             }
         })
         if (c === 0) {
-            result.text("none");
+            result.text(RED._("diff.type.none"));
         } else {
             list.appendTo(result);
         }
@@ -18423,7 +18507,7 @@ RED.diagnostics = (function () {
                 conflict = true;
             }
             row = $("<tr>").appendTo(nodePropertiesTableBody);
-            $("<td>",{class:"red-ui-diff-list-cell-label"}).text("position").appendTo(row);
+            $("<td>",{class:"red-ui-diff-list-cell-label"}).text(RED._("diff.type.position")).appendTo(row);
             localCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row);
             if (localNode) {
                 localCell.addClass("red-ui-diff-status-"+(localChanged?"moved":"unchanged"));
@@ -18501,7 +18585,7 @@ RED.diagnostics = (function () {
                 conflict = true;
             }
             row = $("<tr>").appendTo(nodePropertiesTableBody);
-            $("<td>",{class:"red-ui-diff-list-cell-label"}).text("wires").appendTo(row);
+            $("<td>",{class:"red-ui-diff-list-cell-label"}).text(RED._("diff.type.wires")).appendTo(row);
             localCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row);
             if (localNode) {
                 if (!conflict) {
@@ -19631,15 +19715,14 @@ RED.diagnostics = (function () {
                             if (!isSeparator) {
                                 var isOurs = /^..<<<<<<</.test(lineText);
                                 if (isOurs) {
-                                    $('<span>').text("<<<<<<< Local Changes").appendTo(line);
+                                    $('<span>').text("<<<<<<< " + RED._("diff.localChanges")).appendTo(line);
                                     hunk.localChangeStart = actualLineNumber;
                                 } else {
                                     hunk.remoteChangeEnd = actualLineNumber;
-                                    $('<span>').text(">>>>>>> Remote Changes").appendTo(line);
-
+                                    $('<span>').text(">>>>>>> " + RED._("diff.remoteChanges")).appendTo(line);
                                 }
                                 diffRow.addClass("mergeHeader-"+(isOurs?"ours":"theirs"));
-                                $('<button class="red-ui-button red-ui-button-small" style="float: right; margin-right: 20px;"><i class="fa fa-angle-double-'+(isOurs?"down":"up")+'"></i> use '+(isOurs?"local":"remote")+' changes</button>')
+                                $('<button class="red-ui-button red-ui-button-small" style="float: right; margin-right: 20px;"><i class="fa fa-angle-double-'+(isOurs?"down":"up")+'"></i> '+RED._(isOurs?"diff.useLocalChanges":"diff.useRemoteChanges")+'</button>')
                                     .appendTo(line)
                                     .on("click", function(evt) {
                                         evt.preventDefault();
@@ -19721,7 +19804,7 @@ RED.diagnostics = (function () {
                 $("<h3>").text(commit.title).appendTo(content);
                 $('<div class="commit-body"></div>').text(commit.comment).appendTo(content);
                 var summary = $('<div class="commit-summary"></div>').appendTo(content);
-                $('<div style="float: right">').text("Commit "+commit.sha).appendTo(summary);
+                $('<div style="float: right">').text(RED._('diff.commit')+" "+commit.sha).appendTo(summary);
                 $('<div>').text((commit.authorName||commit.author)+" - "+options.date).appendTo(summary);
 
                 if (commit.files) {
@@ -21013,25 +21096,29 @@ RED.workspaces = (function() {
             },
             null)
         }
-        menuItems.push(
-            {
-                id:"red-ui-tabs-menu-option-add-flow",
-                label: RED._("workspace.addFlow"),
-                onselect: "core:add-flow"
-            }
-        )
-        if (isMenuButton || !!tab) {
+        if (RED.settings.theme("menu.menu-item-workspace-add", true)) {
             menuItems.push(
                 {
-                    id:"red-ui-tabs-menu-option-add-flow-right",
-                    label: RED._("workspace.addFlowToRight"),
-                    shortcut: RED.keyboard.getShortcut("core:add-flow-to-right"),
-                    onselect: function() {
-                        RED.actions.invoke("core:add-flow-to-right", tab)
-                    }
-                },
-                null
+                    id:"red-ui-tabs-menu-option-add-flow",
+                    label: RED._("workspace.addFlow"),
+                    onselect: "core:add-flow"
+                }
             )
+        }
+        if (isMenuButton || !!tab) {
+            if (RED.settings.theme("menu.menu-item-workspace-add", true)) {
+                menuItems.push(
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow-right",
+                        label: RED._("workspace.addFlowToRight"),
+                        shortcut: RED.keyboard.getShortcut("core:add-flow-to-right"),
+                        onselect: function() {
+                            RED.actions.invoke("core:add-flow-to-right", tab)
+                        }
+                    },
+                    null
+                )
+            }
             if (activeWorkspace && activeWorkspace.type === 'tab') {
                 menuItems.push(
                     isFlowDisabled ? {
@@ -21085,7 +21172,9 @@ RED.workspaces = (function() {
                 }
             )
         }
-        menuItems.push(null)
+        if (menuItems.length > 0) {
+            menuItems.push(null)
+        }
         if (isMenuButton || !!tab) {
             menuItems.push(
                 {
@@ -21129,19 +21218,24 @@ RED.workspaces = (function() {
             }
         )
         if (tab) {
+            menuItems.push(null)
+
+            if (RED.settings.theme("menu.menu-item-workspace-delete", true)) {
+                menuItems.push(
+                    {
+                        label: RED._("common.label.delete"),
+                        onselect: function() {
+                            if (tab.type === 'tab') {
+                                RED.workspaces.delete(tab)
+                            } else if (tab.type === 'subflow') {
+                                RED.subflow.delete(tab.id)
+                            }
+                        },
+                        disabled: isCurrentLocked || (workspaceTabCount === 1)
+                    }
+                )
+            }
             menuItems.push(
-                null,
-                {
-                    label: RED._("common.label.delete"),
-                    onselect: function() {
-                        if (tab.type === 'tab') {
-                            RED.workspaces.delete(tab)
-                        } else if (tab.type === 'subflow') {
-                            RED.subflow.delete(tab.id)
-                        }
-                    },
-                    disabled: isCurrentLocked || (workspaceTabCount === 1)
-                },
                 {
                     label: RED._("menu.label.export"),
                     shortcut: RED.keyboard.getShortcut("core:show-export-dialog"),
@@ -21298,7 +21392,7 @@ RED.workspaces = (function() {
             },
             minimumActiveTabWidth: 150,
             scrollable: true,
-            addButton: "core:add-flow",
+            addButton: RED.settings.theme("menu.menu-item-workspace-add", true) ? "core:add-flow" : undefined,
             addButtonCaption: RED._("workspace.addFlow"),
             menu: function() { return getMenuItems(true) },
             contextmenu: function(tab) { return getMenuItems(false, tab) }
@@ -21355,19 +21449,24 @@ RED.workspaces = (function() {
         $(window).on("resize", function() {
             workspace_tabs.resize();
         });
-
-        RED.actions.add("core:add-flow",function(opts) { addWorkspace(undefined,undefined,opts?opts.index:undefined)});
-        RED.actions.add("core:add-flow-to-right",function(workspace) {
-            let index
-            if (workspace) {
-                index = workspace_tabs.getTabIndex(workspace.id)+1
-            } else {
-                index = workspace_tabs.activeIndex()+1
-            }
-            addWorkspace(undefined,undefined,index)
-        });
-        RED.actions.add("core:edit-flow",editWorkspace);
-        RED.actions.add("core:remove-flow",removeWorkspace);
+        if (RED.settings.theme("menu.menu-item-workspace-add", true)) {
+            RED.actions.add("core:add-flow",function(opts) { addWorkspace(undefined,undefined,opts?opts.index:undefined)});
+            RED.actions.add("core:add-flow-to-right",function(workspace) {
+                let index
+                if (workspace) {
+                    index = workspace_tabs.getTabIndex(workspace.id)+1
+                } else {
+                    index = workspace_tabs.activeIndex()+1
+                }
+                addWorkspace(undefined,undefined,index)
+            });
+        }
+        if (RED.settings.theme("menu.menu-item-workspace-edit", true)) {
+            RED.actions.add("core:edit-flow",editWorkspace);
+        }
+        if (RED.settings.theme("menu.menu-item-workspace-delete", true)) {
+            RED.actions.add("core:remove-flow",removeWorkspace);
+        }
         RED.actions.add("core:enable-flow",enableWorkspace);
         RED.actions.add("core:disable-flow",disableWorkspace);
         RED.actions.add("core:lock-flow",lockWorkspace);
@@ -21734,6 +21833,17 @@ RED.workspaces = (function() {
             }
         },
         refresh: function() {
+            var workspace = RED.nodes.workspace(RED.workspaces.active());
+            if (workspace) {
+                document.title = `${documentTitle} : ${workspace.label}`;
+            } else {
+                var subflow = RED.nodes.subflow(RED.workspaces.active());
+                if (subflow) {
+                    document.title = `${documentTitle} : ${subflow.name}`;
+                } else {
+                    document.title = documentTitle
+                }
+            }
             RED.nodes.eachWorkspace(function(ws) {
                 workspace_tabs.renameTab(ws.id,ws.label);
                 $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
@@ -23016,7 +23126,10 @@ RED.view = (function() {
             lasso = null;
         }
         if (d3.event.touches || d3.event.button === 0) {
-            if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) {
+            if (
+                (mouse_mode === 0 && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) ||
+                mouse_mode === RED.state.QUICK_JOINING
+            ) {
                 // Trigger quick add dialog
                 d3.event.stopPropagation();
                 clearSelection();
@@ -23092,7 +23205,6 @@ RED.view = (function() {
         }
 
         var mainPos = $("#red-ui-main-container").position();
-
         if (mouse_mode !== RED.state.QUICK_JOINING) {
             mouse_mode = RED.state.QUICK_JOINING;
             $(window).on('keyup',disableQuickJoinEventHandler);
@@ -24864,8 +24976,8 @@ RED.view = (function() {
     }
 
     function disableQuickJoinEventHandler(evt) {
-        // Check for ctrl (all browsers), "Meta" (Chrome/FF), keyCode 91 (Safari)
-        if (evt.keyCode === 17 || evt.key === "Meta" || evt.keyCode === 91) {
+        // Check for ctrl (all browsers), "Meta" (Chrome/FF), keyCode 91 (Safari), or Escape
+        if (evt.keyCode === 17 || evt.key === "Meta" || evt.keyCode === 91 || evt.keyCode === 27) {
             resetMouseVars();
             hideDragLines();
             redraw();
@@ -24996,27 +25108,59 @@ RED.view = (function() {
 
             for (i=0;i<drag_lines.length;i++) {
                 if (portType != drag_lines[i].portType && mouseup_node !== drag_lines[i].node) {
-                    var drag_line = drag_lines[i];
-                    var src,dst,src_port;
+                    let drag_line = drag_lines[i];
+                    let src,dst,src_port;
+                    let oldDst;
+                    let oldSrc;
                     if (drag_line.portType === PORT_TYPE_OUTPUT) {
                         src = drag_line.node;
                         src_port = drag_line.port;
                         dst = mouseup_node;
+                        oldSrc = src;
+                        if (drag_line.link) {
+                            oldDst = drag_line.link.target;
+                        }
                     } else if (drag_line.portType === PORT_TYPE_INPUT) {
                         src = mouseup_node;
                         dst = drag_line.node;
                         src_port = portIndex || 0;
+                        oldSrc = dst;
+                        if (drag_line.link) {
+                            oldDst = drag_line.link.source
+                        }
                     }
                     var link = {source: src, sourcePort:src_port, target: dst};
                     if (drag_line.virtualLink) {
                         if (/^link (in|out)$/.test(src.type) && /^link (in|out)$/.test(dst.type) && src.type !== dst.type) {
                             if (src.links.indexOf(dst.id) === -1 && dst.links.indexOf(src.id) === -1) {
-                                var oldSrcLinks = $.extend(true,{},{v:src.links}).v
-                                var oldDstLinks = $.extend(true,{},{v:dst.links}).v
+                                var oldSrcLinks = [...src.links]
+                                var oldDstLinks = [...dst.links]
+
                                 src.links.push(dst.id);
                                 dst.links.push(src.id);
+
+                                if (oldDst) {
+                                    src.links = src.links.filter(id => id !== oldDst.id)
+                                    dst.links = dst.links.filter(id => id !== oldDst.id)
+                                    var oldOldDstLinks = [...oldDst.links]
+                                    oldDst.links = oldDst.links.filter(id => id !== oldSrc.id)
+                                    oldDst.dirty = true;
+                                    modifiedNodes.push(oldDst);
+                                    linkEditEvents.push({
+                                        t:'edit',
+                                        node: oldDst,
+                                        dirty: RED.nodes.dirty(),
+                                        changed: oldDst.changed,
+                                        changes: {
+                                            links:oldOldDstLinks
+                                        }
+                                    });
+                                    oldDst.changed = true;
+                                }
+
                                 src.dirty = true;
                                 dst.dirty = true;
+
                                 modifiedNodes.push(src);
                                 modifiedNodes.push(dst);
 
@@ -25044,6 +25188,7 @@ RED.view = (function() {
                                         links:oldDstLinks
                                     }
                                 });
+                               
                                 src.changed = true;
                                 dst.changed = true;
                             }
@@ -31318,7 +31463,7 @@ RED.sidebar.info = (function() {
 
             propertiesPanelHeaderIcon.empty();
             RED.utils.createNodeIcon({type:"_selection_"}).appendTo(propertiesPanelHeaderIcon);
-            propertiesPanelHeaderLabel.text("Selection");
+            propertiesPanelHeaderLabel.text(RED._("sidebar.info.selection"));
             propertiesPanelHeaderReveal.hide();
             propertiesPanelHeaderHelp.hide();
             propertiesPanelHeaderCopyLink.hide();
@@ -36089,7 +36234,7 @@ RED.editor = (function() {
                             const labelText = RED.editor.envVarList.lookupLabel(labels, labels["en-US"] || tenv.name, locale)
                             const config = {
                                 env: tenv,
-                                id: '${' + parentEnv[0].name + '}',
+                                id: '${' + tenv.name + '}',
                                 type: type,
                                 label: labelText,
                                 __label__: `[env] ${labelText}`
@@ -45814,10 +45959,10 @@ RED.library = (function() {
                     if (file && file.label && !file.children) {
                         $.get("library/"+file.library+"/"+file.type+"/"+file.path, function(data) {
                             //TODO: nls + sanitize
-                            var propRow = $('<tr class="red-ui-help-info-row"><td>Type</td><td></td></tr>').appendTo(table);
+                            var propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("library.type")+'</td><td></td></tr>').appendTo(table);
                             $(propRow.children()[1]).text(activeLibrary.type);
                             if (file.props.hasOwnProperty('name')) {
-                                propRow = $('<tr class="red-ui-help-info-row"><td>Name</td><td>'+file.props.name+'</td></tr>').appendTo(table);
+                                propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("library.name")+'</td><td>'+file.props.name+'</td></tr>').appendTo(table);
                                 $(propRow.children()[1]).text(file.props.name);
                             }
                             for (var p in file.props) {
@@ -46901,24 +47046,28 @@ RED.search = (function() {
             const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
             let hasGroup, isAllGroups = true, hasDisabledNode, hasEnabledNode, hasLabeledNode, hasUnlabeledNode;
             if (hasSelection) {
-                selection.nodes.forEach(n => {
+                const nodes = selection.nodes.slice();
+                while (nodes.length) {
+                    const n = nodes.shift();
                     if (n.type === 'group') {
                         hasGroup = true;
+                        nodes.push(...n.nodes);
                     } else {
                         isAllGroups = false;
-                    }
-                    if (n.d) {
-                        hasDisabledNode = true;
-                    } else {
-                        hasEnabledNode = true;
+                        if (n.d) {
+                            hasDisabledNode = true;
+                        } else {
+                            hasEnabledNode = true;
+                        }
                     }
                     if (n.l === undefined || n.l) {
                         hasLabeledNode = true;
                     } else {
                         hasUnlabeledNode = true;
                     }
-                });
+                }
             }
+
             const offset = $("#red-ui-workspace-chart").offset()
 
             let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
@@ -46930,10 +47079,11 @@ RED.search = (function() {
                 addY = gridSize * Math.floor(addY / gridSize)
             }
 
-            menuItems.push(
-                { onselect: 'core:show-action-list', label: RED._("contextMenu.showActionList"), onpostselect: function () { } }
-            )
-
+            if (RED.settings.theme("menu.menu-item-action-list", true)) {
+                menuItems.push(
+                    { onselect: 'core:show-action-list', label: RED._("contextMenu.showActionList"), onpostselect: function () { } }
+                )
+            }
             const insertOptions = []
             menuItems.push({ label: RED._("contextMenu.insert"), options: insertOptions })
             insertOptions.push(
@@ -47350,7 +47500,9 @@ RED.actionList = (function() {
     }
 
     function init() {
-        RED.actions.add("core:show-action-list",show);
+        if (RED.settings.theme("menu.menu-item-action-list", true)) {
+            RED.actions.add("core:show-action-list",show);
+        }
 
         RED.events.on("editor:open",function() { disabled = true; });
         RED.events.on("editor:close",function() { disabled = false; });
@@ -47656,6 +47808,11 @@ RED.actionList = (function() {
         if ($("#red-ui-main-container").height() - opts.y - 195 < 0) {
             opts.y = opts.y - 275;
         }
+        const dialogWidth = dialog.width() || 300 // default is 300 (defined in class .red-ui-search)
+        const workspaceWidth = $('#red-ui-workspace').width()
+        if (workspaceWidth > dialogWidth && workspaceWidth - opts.x - dialogWidth < 0) {
+            opts.x = opts.x - (dialogWidth - RED.view.node_width)
+        }
         dialog.css({left:opts.x+"px",top:opts.y+"px"}).show();
         searchResultsDiv.slideDown(300);
         setTimeout(function() {
@@ -47707,13 +47864,25 @@ RED.actionList = (function() {
         }
     }
     function applyFilter(filter,type,def) {
-        return !def || !filter ||
-            (
-                (!filter.spliceMultiple) &&
-                (!filter.type || type === filter.type) &&
-                (!filter.input || type === 'junction' || def.inputs > 0) &&
-                (!filter.output || type === 'junction' || def.outputs > 0)
-            )
+        if (!filter) {
+            // No filter; allow everything
+            return true
+        }
+        if (type === 'junction') {
+            // Only allow Junction is there's no specific type filter
+            return !filter.type
+        }
+        if (filter.type) {
+            // Handle explicit type filter
+            return filter.type === type
+        }
+        if (!def) {
+            // No node definition available - allow it
+            return true
+        }
+        // Check if the filter is for input/outputs and apply
+        return (!filter.input || def.inputs > 0) &&
+                (!filter.output || def.outputs > 0)
     }
     function refreshTypeList(opts) {
         var i;
@@ -53044,7 +53213,7 @@ RED.projects.settings = (function() {
         if (activeProject.dependencies) {
             for (var m in activeProject.dependencies) {
                 if (activeProject.dependencies.hasOwnProperty(m)) {
-                    var installed = !!RED.nodes.registry.getModule(m) && activeProject.dependencies[m] === modulesInUse[m].version;
+                    var installed = !!RED.nodes.registry.getModule(m) && activeProject.dependencies[m] === modulesInUse[m]?.version;
                     depsList.editableList('addItem',{
                         id: m,
                         version: activeProject.dependencies[m], //RED.nodes.registry.getModule(module).version,
@@ -53992,7 +54161,7 @@ RED.projects.settings = (function() {
                                             notification.close();
                                         }
                                     },{
-                                        text: 'Delete branch',
+                                        text: RED._("sidebar.project.projectSettings.deleteBranch"),
                                         click: function() {
                                             notification.close();
                                             var url = "projects/"+activeProject.name+"/branches/"+entry.name;