From 8d360a8899c55da0fbafe74c75006ed2185d755b Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Tue, 12 Jul 2022 00:19:08 +0300
Subject: [PATCH] feat(core-app): CB-2282 make nav tree settings button always
 visible

---
 .../ElementsTreeTools/ElementsTreeTools.tsx            |  9 +--------
 .../NavigationNode/NavigationNodeControl.tsx           | 10 +++++++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/webapp/packages/core-app/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx b/webapp/packages/core-app/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx
index 1547aa8e71..6bc3f6da62 100644
--- a/webapp/packages/core-app/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx
+++ b/webapp/packages/core-app/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx
@@ -33,13 +33,6 @@ const toolsStyles = css`
       position: sticky;
       top: 0;
       z-index: 1;
-
-      &:hover [|settings] {
-        display: block;
-      }
-      & [|settings] {
-        display: none;
-      }
     }
     actions {
       display: flex;
@@ -111,7 +104,7 @@ export const ElementsTreeTools = observer<React.PropsWithChildren<Props>>(functi
             style={toolsStyles}
             img
             onClick={() => setOpen(!opened)}
-            {...use({ opened, primary: true, settings: true })}
+            {...use({ opened, primary: true })}
           />
         )}
         <fill />
diff --git a/webapp/packages/core-app/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx b/webapp/packages/core-app/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
index 65bed0f260..f5d7d30675 100644
--- a/webapp/packages/core-app/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
+++ b/webapp/packages/core-app/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
@@ -61,6 +61,10 @@ const styles = css`
     margin-right: 16px !important;
     visibility: hidden;
   }
+  name-box {
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 `;
 
 export const NavigationNodeControl: NavTreeControlComponent = observer<NavTreeControlProps, HTMLDivElement>(function NavigationNodeControl({
@@ -110,7 +114,11 @@ export const NavigationNodeControl: NavTreeControlComponent = observer<NavTreeCo
         <ConnectionMark connected={connected} />
       </TreeNodeIcon>
       <TreeNodeName title={node.name}>
-        {editing ? <NavigationNodeEditor node={node} onClose={() => setEditing(false)} /> : node.name}
+        {editing ? (
+          <NavigationNodeEditor node={node} onClose={() => setEditing(false)} />
+        ) : (
+          <name-box>{node.name}</name-box>
+        )}
       </TreeNodeName>
       {!editing && !dndPlaceholder && (
         <portal onClick={handlePortalClick}>