From 3c128b2a73ce265ff3c30e0f93251cc17294ba2b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 24 Mar 2020 15:59:38 +0300 Subject: [PATCH] fixed PR --- cvat-ui/src/actions/annotation-actions.ts | 2 +- .../standard-workspace/canvas-wrapper.tsx | 11 +-- .../standard-workspace/styles.scss | 74 ------------------- .../components/annotation-page/styles.scss | 15 ++++ .../canvas-point-context-menu.tsx | 10 +-- .../standard-workspace/canvas-wrapper.tsx | 2 +- cvat-ui/src/reducers/interfaces.ts | 2 +- 7 files changed, 27 insertions(+), 89 deletions(-) diff --git a/cvat-ui/src/actions/annotation-actions.ts b/cvat-ui/src/actions/annotation-actions.ts index 79ebaaa0..891d0fde 100644 --- a/cvat-ui/src/actions/annotation-actions.ts +++ b/cvat-ui/src/actions/annotation-actions.ts @@ -370,8 +370,8 @@ export function updateCanvasContextMenu( visible: boolean, left: number, top: number, + pointID: number | null = null, type?: ContextMenuType, - pointID?: number, ): AnyAction { return { type: AnnotationActionTypes.UPDATE_CANVAS_CONTEXT_MENU, diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx index 75927697..4d55d31b 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx +++ b/cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx @@ -5,14 +5,11 @@ import React from 'react'; import { GlobalHotKeys, KeyMap } from 'react-hotkeys'; -import { - Layout, - Slider, - Icon, - Tooltip, -} from 'antd'; +import Tooltip from 'antd/lib/tooltip'; +import Icon from 'antd/lib/icon'; +import Layout from 'antd/lib/layout/layout'; +import Slider, { SliderValue } from 'antd/lib/slider'; -import { SliderValue } from 'antd/lib/slider'; import { ColorBy, GridColor, diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss b/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss index 1dd7d769..e731a27f 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss +++ b/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss @@ -119,77 +119,3 @@ margin: 0px 5px; } } - -.cvat-canvas-context-menu { - opacity: 0.6; - position: fixed; - width: 300px; - z-index: 10; - max-height: 50%; - overflow-y: auto; - - &:hover { - opacity: 1; - } -} - -.cvat-canvas-point-context-menu { - opacity: 0.6; - position: fixed; - width: 135px; - z-index: 10; - max-height: 50%; - overflow-y: auto; - background-color: #ffffff; - border-radius: 4px; - - &:hover { - opacity: 1; - } -} - -.cvat-canvas-z-axis-wrapper { - position: absolute; - background: $background-color-2; - bottom: 10px; - right: 10px; - height: 150px; - z-index: 100; - border-radius: 6px; - opacity: 0.5; - border: 1px solid $border-color-3; - display: flex; - flex-direction: column; - justify-content: space-between; - padding: 3px; - - &:hover { - opacity: 1; - } - - > .ant-slider { - height: 75%; - margin: 5px 3px; - - > .ant-slider-rail { - background-color: #979797; - } - - > .ant-slider-handle { - transform: none !important; - } - } - - > i { - opacity: 0.7; - color: $objects-bar-icons-color; - - &:hover { - opacity: 1; - } - - &:active { - opacity: 0.7; - } - } -} diff --git a/cvat-ui/src/components/annotation-page/styles.scss b/cvat-ui/src/components/annotation-page/styles.scss index ac89b303..005ff868 100644 --- a/cvat-ui/src/components/annotation-page/styles.scss +++ b/cvat-ui/src/components/annotation-page/styles.scss @@ -229,6 +229,21 @@ } } +.cvat-canvas-point-context-menu { + opacity: 0.6; + position: fixed; + width: 135px; + z-index: 10; + max-height: 50%; + overflow-y: auto; + background-color: #ffffff; + border-radius: 4px; + + &:hover { + opacity: 1; + } +} + .cvat-canvas-z-axis-wrapper { position: absolute; background: $background-color-2; diff --git a/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-point-context-menu.tsx b/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-point-context-menu.tsx index 59786d8d..5db5363c 100644 --- a/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-point-context-menu.tsx +++ b/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-point-context-menu.tsx @@ -13,7 +13,7 @@ import CanvasPointContextMenuComponent from 'components/annotation-page/standard interface StateToProps { activatedStateID: number | null; - activatedPointID: number | null | undefined; + activatedPointID: number | null; states: any[]; visible: boolean; top: number; @@ -70,15 +70,15 @@ function mapDispatchToProps(dispatch: any): DispatchToProps { type Props = StateToProps & DispatchToProps; interface State { - activatedStateID: number | null | undefined; - activatedPointID: number | null | undefined; + activatedStateID: number | null; + activatedPointID: number | null; latestLeft: number; latestTop: number; left: number; top: number; } -class CanvasContextMenuContainer extends React.PureComponent { +class CanvasPointContextMenuContainer extends React.PureComponent { public constructor(props: Props) { super(props); @@ -190,4 +190,4 @@ class CanvasContextMenuContainer extends React.PureComponent { export default connect( mapStateToProps, mapDispatchToProps, -)(CanvasContextMenuContainer); +)(CanvasPointContextMenuContainer); diff --git a/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-wrapper.tsx b/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-wrapper.tsx index 89f0af7e..75645fc2 100644 --- a/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-wrapper.tsx +++ b/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-wrapper.tsx @@ -260,7 +260,7 @@ function mapDispatchToProps(dispatch: any): DispatchToProps { }, onUpdateContextMenu(visible: boolean, left: number, top: number, type: ContextMenuType, pointID?: number): void { - dispatch(updateCanvasContextMenu(visible, left, top, type, pointID)); + dispatch(updateCanvasContextMenu(visible, left, top, pointID, type)); }, onAddZLayer(): void { dispatch(addZLayer()); diff --git a/cvat-ui/src/reducers/interfaces.ts b/cvat-ui/src/reducers/interfaces.ts index 3eb393e3..5fb1fd02 100644 --- a/cvat-ui/src/reducers/interfaces.ts +++ b/cvat-ui/src/reducers/interfaces.ts @@ -304,7 +304,7 @@ export interface AnnotationState { top: number; left: number; type: ContextMenuType; - pointID: number | null | undefined; + pointID: number | null; }; instance: Canvas; ready: boolean;