Fixed: Extra shortcuts enabled from brush tools on views where not ne…

…cessary (#8971)
cvat-ai · Jan 21, 2025 · 1140a92 · 1140a92
1 parent 5a99e73
commit 1140a92
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/changelog.d/20250121_135206_sekachev.bs_fixed_rendering.md b/changelog.d/20250121_135206_sekachev.bs_fixed_rendering.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- Extra shortcuts enabled from brush tools on views where not necessary
+  (<https://github.com/cvat-ai/cvat/pull/8971>)
diff --git a/cvat-ui/src/components/annotation-page/canvas/views/canvas2d/canvas-wrapper.tsx b/cvat-ui/src/components/annotation-page/canvas/views/canvas2d/canvas-wrapper.tsx
@@ -64,7 +64,6 @@ import { ShortcutScope } from 'utils/enums';
 import { registerComponentShortcuts } from 'actions/shortcuts-actions';
 import { subKeyMap } from 'utils/component-subkeymap';
 import ImageSetupsContent from './image-setups-content';
-import BrushTools from './brush-tools';
 import CanvasTipsComponent from './canvas-hints';
 
 const cvat = getCore();
@@ -1144,8 +1143,6 @@ class CanvasWrapperComponent extends React.PureComponent<Props> {
                     }}
                 />
 
-                <BrushTools />
-
                 <Popover
                     destroyTooltipOnHide
                     trigger='click'

diff --git a/cvat-ui/src/components/annotation-page/single-shape-workspace/single-shape-workspace.tsx b/cvat-ui/src/components/annotation-page/single-shape-workspace/single-shape-workspace.tsx
@@ -7,12 +7,14 @@ import React from 'react';
 import Layout from 'antd/lib/layout';
 
 import CanvasLayout from 'components/annotation-page/canvas/grid-layout/canvas-layout';
+import BrushTools from 'components/annotation-page/canvas/views/canvas2d/brush-tools';
 import SingleShapeSidebar from './single-shape-sidebar/single-shape-sidebar';
 
 export default function SingleShapeWorkspace(): JSX.Element {
     return (
         <Layout hasSider className='cvat-single-shape-workspace'>
             <CanvasLayout />
+            <BrushTools />
             <SingleShapeSidebar />
         </Layout>
     );

diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/standard-workspace.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/standard-workspace.tsx
@@ -16,12 +16,14 @@ import CanvasPointContextMenuComponent from 'components/annotation-page/canvas/v
 import IssueAggregatorComponent from 'components/annotation-page/review/issues-aggregator';
 import RemoveConfirmComponent from 'components/annotation-page/standard-workspace/remove-confirm';
 import PropagateConfirmComponent from 'components/annotation-page/standard-workspace/propagate-confirm';
+import BrushTools from 'components/annotation-page/canvas/views/canvas2d/brush-tools';
 
 export default function StandardWorkspaceComponent(): JSX.Element {
     return (
         <Layout hasSider className='cvat-standard-workspace'>
             <ControlsSideBarContainer />
             <CanvasLayout />
+            <BrushTools />
             <ObjectSideBarComponent objectsList={<ObjectsListContainer />} />
             <PropagateConfirmComponent />
             <CanvasContextMenuContainer />