From 60cae999dd29aee54cba8092d4f42860f22f9714 Mon Sep 17 00:00:00 2001 From: naumov Date: Mon, 25 Sep 2023 12:52:35 +0200 Subject: [PATCH] CB-3864 move NavigationNodeControl styles closer to the component --- .../ConnectionsRenderer/ConnectionNavNodeControl.tsx | 3 +-- .../NavigationNode}/NavigationNodeControl.m.css | 0 .../NavigationNode/NavigationNodeControl.tsx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename webapp/packages/plugin-navigation-tree/src/NavigationTree/{ => ElementsTree/NavigationTreeNode/NavigationNode}/NavigationNodeControl.m.css (100%) diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionsRenderer/ConnectionNavNodeControl.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionsRenderer/ConnectionNavNodeControl.tsx index f820d13a19..69f4298d75 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionsRenderer/ConnectionNavNodeControl.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionsRenderer/ConnectionNavNodeControl.tsx @@ -7,7 +7,6 @@ */ import { observer } from 'mobx-react-lite'; import React, { forwardRef, useContext } from 'react'; -import styled, { use } from 'reshadow'; import { ConnectionImageWithMask, @@ -26,9 +25,9 @@ import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events import { EObjectFeature, NavNodeInfoResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree'; import type { NavTreeControlComponent, NavTreeControlProps } from '../ElementsTree/NavigationNodeComponent'; +import style from '../ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.m.css'; import { NavigationNodeExpand } from '../ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeExpand'; import { TreeNodeMenuLoader } from '../ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenuLoader'; -import style from '../NavigationNodeControl.m.css'; export const ConnectionNavNodeControl: NavTreeControlComponent = observer( forwardRef(function ConnectionNavNodeControl({ node, nodeInfo, dndElement, dndPlaceholder, className, onClick }, ref) { diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationNodeControl.m.css b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.m.css similarity index 100% rename from webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationNodeControl.m.css rename to webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.m.css diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx index 56be184985..1c6bf07691 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx @@ -26,10 +26,10 @@ import { useService } from '@cloudbeaver/core-di'; import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events'; import { getNodePlainName, type INodeActions, NavNodeInfoResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree'; -import style from '../../../NavigationNodeControl.m.css'; import type { NavTreeControlComponent, NavTreeControlProps } from '../../NavigationNodeComponent'; import { TreeNodeMenuLoader } from '../TreeNodeMenu/TreeNodeMenuLoader'; import { DATA_ATTRIBUTE_NODE_EDITING } from './DATA_ATTRIBUTE_NODE_EDITING'; +import style from './NavigationNodeControl.m.css'; import { NavigationNodeExpand } from './NavigationNodeExpand'; import { NavigationNodeEditorLoader } from './NavigationNodeLoaders';