Skip to content

Fixed: Extra shortcuts enabled from brush tools on views where not necessary #8971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 21, 2025
Merged

Fixed: Extra shortcuts enabled from brush tools on views where not necessary #8971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d908185
Fixed extra shortcuts enabled in modes where brush tools not available
bsekachev Jan 21, 2025
aa29a52
Updated changelog
bsekachev Jan 21, 2025
ace6102
Update 20250121_135206_sekachev.bs_fixed_rendering.md
bsekachev Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog.d/20250121_135206_sekachev.bs_fixed_rendering.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Fixed

- Extra shortcuts enabled from brush tools on views where not necessary
(<https://github.com/cvat-ai/cvat/pull/8971>)
3 changes: 0 additions & 3 deletions cvat-ui/src/components/annotation-page/canvas/views/canvas2d/canvas-wrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -1144,8 +1143,6 @@ class CanvasWrapperComponent extends React.PureComponent<Props> {
}}
/>

<BrushTools />

<Popover
destroyTooltipOnHide
trigger='click'
Expand Down
2 changes: 2 additions & 0 deletions cvat-ui/src/components/annotation-page/single-shape-workspace/single-shape-workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand Down
2 changes: 2 additions & 0 deletions cvat-ui/src/components/annotation-page/standard-workspace/standard-workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
Loading