From d2f75dbba10b43283befdb0b2251180e39960463 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 12:11:39 +0300 Subject: [PATCH 01/11] Added point deletion context menu tooltip --- .../standard-workspace/canvas-point-context-menu.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/canvas-point-context-menu.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/canvas-point-context-menu.tsx index 122e832a0acc..bd534747e77f 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/canvas-point-context-menu.tsx +++ b/cvat-ui/src/components/annotation-page/standard-workspace/canvas-point-context-menu.tsx @@ -5,6 +5,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import Button from 'antd/lib/button'; +import Tooltip from 'antd/lib/tooltip'; interface Props { activatedStateID: number | null; @@ -29,9 +30,11 @@ export default function CanvasPointContextMenu(props: Props): JSX.Element | null return ReactDOM.createPortal(
- + + +
, window.document.body, ); From fc180c16168e1b4ef6d6d509724d6c55584c129c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 12:12:05 +0300 Subject: [PATCH 02/11] Added filled lock icon --- .../standard-workspace/objects-side-bar/object-item.tsx | 6 +++--- .../objects-side-bar/objects-list-header.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx index 2a43e042ff50..1a5b54cbc384 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx +++ b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx @@ -338,7 +338,7 @@ function ItemButtonsComponent(props: ItemButtonsComponentProps): JSX.Element { { locked - ? + ? : } @@ -388,7 +388,7 @@ function ItemButtonsComponent(props: ItemButtonsComponentProps): JSX.Element { { locked - ? + ? : } @@ -405,7 +405,7 @@ function ItemButtonsComponent(props: ItemButtonsComponentProps): JSX.Element { { locked - ? + ? : } diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx index 07337fc7d2e0..2aebd92cb0bf 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx +++ b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx @@ -97,7 +97,7 @@ function ObjectListHeader(props: Props): JSX.Element { { statesLocked - ? + ? : } From 099ff044f37350bd0c94e28623a144e59ca659f4 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 13:28:16 +0300 Subject: [PATCH 03/11] Added collapse button to AAM sidebar --- .../attribute-annotation-sidebar.tsx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx b/cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx index 9cf839c1925d..a3bb50c86db0 100644 --- a/cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx +++ b/cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx @@ -12,6 +12,7 @@ import { SelectValue } from 'antd/lib/select'; import { CheckboxChangeEvent } from 'antd/lib/checkbox'; import { Row, Col } from 'antd/lib/grid'; import Text from 'antd/lib/typography/Text'; +import Icon from 'antd/lib/icon'; import { LogType } from 'cvat-logger'; import { @@ -106,6 +107,8 @@ function AttributeAnnotationSidebar(props: StateToProps & DispatchToProps): JSX. }, {}), ); + const [sidebarCollapsed, setSidebarCollapsed] = useState(false); + const [activeObjectState] = activatedStateID === null ? [null] : states.filter((objectState: any): boolean => ( objectState.clientID === activatedStateID @@ -175,6 +178,7 @@ function AttributeAnnotationSidebar(props: StateToProps & DispatchToProps): JSX. reverseArrow: true, collapsible: true, trigger: null, + collapsed: sidebarCollapsed, }; const subKeyMap = { @@ -218,6 +222,16 @@ function AttributeAnnotationSidebar(props: StateToProps & DispatchToProps): JSX. if (activeObjectState) { return ( + {/* eslint-disable-next-line */} + setSidebarCollapsed(!sidebarCollapsed)} + > + {sidebarCollapsed ? + : } + From 0653e045f1c9522ada4440afa0b8f47d20b22da7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 14:14:57 +0300 Subject: [PATCH 04/11] fixed select points and projections dashing --- cvat-canvas/src/scss/canvas.scss | 4 ++++ cvat-canvas/src/typescript/svg.patch.ts | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cvat-canvas/src/scss/canvas.scss b/cvat-canvas/src/scss/canvas.scss index 152c91d13ad7..1aceb39a49fc 100644 --- a/cvat-canvas/src/scss/canvas.scss +++ b/cvat-canvas/src/scss/canvas.scss @@ -103,6 +103,10 @@ polyline.cvat_canvas_shape_splitting { stroke-dasharray: 5; } +.cvat_canvas_shape .svg_select_points, .cvat_canvas_shape .cvat_canvas_shape_projections { + stroke-dasharray: none; +} + .cvat_canvas_autoborder_point { opacity: 0.55; } diff --git a/cvat-canvas/src/typescript/svg.patch.ts b/cvat-canvas/src/typescript/svg.patch.ts index b16019dd7b7d..7f8230648f41 100644 --- a/cvat-canvas/src/typescript/svg.patch.ts +++ b/cvat-canvas/src/typescript/svg.patch.ts @@ -263,10 +263,10 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { this.rbProj = this.line(this.updateProjectionLine(this.cuboidModel.rb.getEquation(), this.cuboidModel.rb.points[1], this.cuboidModel.vpr)); - this.ftProj.stroke({ color: '#C0C0C0' }); - this.fbProj.stroke({ color: '#C0C0C0' }); - this.rtProj.stroke({ color: '#C0C0C0' }); - this.rbProj.stroke({ color: '#C0C0C0' }); + this.ftProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_shape_projections'); + this.fbProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_shape_projections'); + this.rtProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_shape_projections'); + this.rbProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_shape_projections'); }, setupEdges() { From f46bd58c1439f0fdedd9ce93c7edd37f5a46520b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 14:27:28 +0300 Subject: [PATCH 05/11] fixed ts types --- cvat-canvas/src/typescript/svg.patch.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cvat-canvas/src/typescript/svg.patch.ts b/cvat-canvas/src/typescript/svg.patch.ts index 7f8230648f41..cfda9dcb1e24 100644 --- a/cvat-canvas/src/typescript/svg.patch.ts +++ b/cvat-canvas/src/typescript/svg.patch.ts @@ -281,7 +281,7 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { this.rightBotEdge = this.line(this.cuboidModel.rb.points); }, - setupGrabPoints(circleType) { + setupGrabPoints(circleType: Function | string) { const viewModel = this.cuboidModel; const circle = typeof circleType === 'function' ? circleType : this.circle; @@ -372,7 +372,7 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { } if (value === false) { - this.getGrabPoints().forEach((point) => {point && point.remove()}); + this.getGrabPoints().forEach((point: SVG.Element) => {point && point.remove()}); } else { this.setupGrabPoints(this.face.remember('_selectHandler').drawPoint.bind( {nested: this, options: this.face.remember('_selectHandler').options} @@ -380,19 +380,19 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { // setup proper classes for selection points for proper cursor Array.from(this.face.remember('_selectHandler').nested.node.children) - .forEach((point: SVG.Circle, i: number) => { + .forEach((point: SVG.LinkedHTMLElement, i: number) => { point.classList.add(`svg_select_points_${['lt', 'lb', 'rb', 'rt'][i]}`) }); if (this.cuboidModel.orientation === Orientation.LEFT) { Array.from(this.dorsalRightEdge.remember('_selectHandler').nested.node.children) - .forEach((point: SVG.Circle, i: number) => { + .forEach((point: SVG.LinkedHTMLElement, i: number) => { point.classList.add(`svg_select_points_${['t', 'b'][i]}`); point.ondblclick = this.resetPerspective.bind(this); }); } else { Array.from(this.dorsalLeftEdge.remember('_selectHandler').nested.node.children) - .forEach((point: SVG.Circle, i: number) => { + .forEach((point: SVG.LinkedHTMLElement, i: number) => { point.classList.add(`svg_select_points_${['t', 'b'][i]}`); point.ondblclick = this.resetPerspective.bind(this); }); @@ -442,6 +442,7 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { accumulatedOffset.x = 0; accumulatedOffset.y = 0; const resizedFacePoint = getResizedPointIndex(event); + // @ts-ignore: ts(2339) resizedCubePoint = [0, 1].includes(resizedFacePoint) ? resizedFacePoint : 5 - resizedFacePoint; // 2,3 -> 3,2 this.fire(new CustomEvent('resizestart', event)); @@ -584,7 +585,7 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { setupDorsalEdge.call(this, this.dorsalLeftEdge, this.cuboidModel.orientation); } - function horizontalEdgeControl(updatingFace, midX, midY) { + function horizontalEdgeControl(updatingFace: any, midX: number, midY: number) { const leftPoints = this.updatedEdge( this.cuboidModel.fl.points[0], {x: midX, y: midY}, From fc05195b969ec6200bc23ddfefd9be4e6a215d7a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 15:40:37 +0300 Subject: [PATCH 06/11] added href option to task/job buttons --- .../components/annotation-page/top-bar/annotation-menu.tsx | 6 +++++- cvat-ui/src/components/task-page/job-list.tsx | 4 +++- cvat-ui/src/components/tasks-page/task-item.tsx | 6 +++++- .../containers/annotation-page/top-bar/annotation-menu.tsx | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx index 3fb1c192722f..c6047a005c83 100644 --- a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx +++ b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx @@ -20,6 +20,7 @@ interface Props { dumpActivities: string[] | null; exportActivities: string[] | null; installedReID: boolean; + taskID: number onClickMenu(params: ClickParam, file?: File): void; } @@ -42,6 +43,7 @@ export default function AnnotationMenuComponent(props: Props): JSX.Element { dumpActivities, exportActivities, installedReID, + taskID, } = props; let latestParams: ClickParam | null = null; @@ -121,7 +123,9 @@ export default function AnnotationMenuComponent(props: Props): JSX.Element { Remove annotations - Open the task + e.preventDefault()}> + Open the task + { installedReID && } diff --git a/cvat-ui/src/components/task-page/job-list.tsx b/cvat-ui/src/components/task-page/job-list.tsx index 195c30462156..76d0a48d9285 100644 --- a/cvat-ui/src/components/task-page/job-list.tsx +++ b/cvat-ui/src/components/task-page/job-list.tsx @@ -46,9 +46,11 @@ function JobListComponent(props: Props & RouteComponentProps): JSX.Element {
diff --git a/cvat-ui/src/components/tasks-page/task-item.tsx b/cvat-ui/src/components/tasks-page/task-item.tsx index aea0c0ec4274..36f1e04ecbff 100644 --- a/cvat-ui/src/components/tasks-page/task-item.tsx +++ b/cvat-ui/src/components/tasks-page/task-item.tsx @@ -184,7 +184,11 @@ class TaskItemComponent extends React.PureComponent history.push(`/tasks/${id}`)} + href={`/tasks/${id}`} + onClick={(e: React.MouseEvent): void => { + e.preventDefault(); + history.push(`/tasks/${id}`) + }} > Open diff --git a/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx index 8c73137d46f0..d4aac13b463e 100644 --- a/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx +++ b/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx @@ -165,6 +165,7 @@ function AnnotationMenuContainer(props: Props): JSX.Element { exportActivities={exportActivities} installedReID={installedReID} onClickMenu={onClickMenu} + taskID={jobInstance.task.id} /> ); } From 05d9e3dfc02cff6d39e7c4d8024d8b3e36808b16 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 16:36:23 +0300 Subject: [PATCH 07/11] added proper event emmitng when cuboid reset perspective --- cvat-canvas/src/typescript/canvasView.ts | 17 ++++++++++++++++- cvat-canvas/src/typescript/svg.patch.ts | 14 +++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/cvat-canvas/src/typescript/canvasView.ts b/cvat-canvas/src/typescript/canvasView.ts index 63acbefa6c85..71f6b05d900d 100644 --- a/cvat-canvas/src/typescript/canvasView.ts +++ b/cvat-canvas/src/typescript/canvasView.ts @@ -427,6 +427,9 @@ export class CanvasViewImpl implements CanvasView, Listener { private selectize(value: boolean, shape: SVG.Element): void { const self = this; + const { offset } = this.controller.geometry; + const translate = (points: number[]): number[] => points + .map((coord: number): number => coord - offset); function dblClickHandler(e: MouseEvent): void { const pointID = Array.prototype.indexOf @@ -437,10 +440,22 @@ export class CanvasViewImpl implements CanvasView, Listener { .filter((_state: any): boolean => ( _state.clientID === self.activeElement.clientID )); - if (['cuboid', 'rectangle'].includes(state.shapeType)) { + if (state.shapeType === 'rectangle') { e.preventDefault(); return; } + if (state.shapeType === 'cuboid') { + if (e.shiftKey) { + const points = translate(pointsToArray((e.target as any) + .parentElement.parentElement.instance.attr('points'))); + self.onEditDone( + state, + points, + ) + e.preventDefault(); + return; + } + } if (e.ctrlKey) { const { points } = state; self.onEditDone( diff --git a/cvat-canvas/src/typescript/svg.patch.ts b/cvat-canvas/src/typescript/svg.patch.ts index cfda9dcb1e24..ce9bad74c30b 100644 --- a/cvat-canvas/src/typescript/svg.patch.ts +++ b/cvat-canvas/src/typescript/svg.patch.ts @@ -388,13 +388,21 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { Array.from(this.dorsalRightEdge.remember('_selectHandler').nested.node.children) .forEach((point: SVG.LinkedHTMLElement, i: number) => { point.classList.add(`svg_select_points_${['t', 'b'][i]}`); - point.ondblclick = this.resetPerspective.bind(this); + point.ondblclick = (e: MouseEvent) => { + if (e.shiftKey) { + this.resetPerspective() + } + }; }); } else { Array.from(this.dorsalLeftEdge.remember('_selectHandler').nested.node.children) .forEach((point: SVG.LinkedHTMLElement, i: number) => { point.classList.add(`svg_select_points_${['t', 'b'][i]}`); - point.ondblclick = this.resetPerspective.bind(this); + point.ondblclick = (e: MouseEvent) => { + if (e.shiftKey) { + this.resetPerspective() + } + }; }); } @@ -921,7 +929,7 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { } }, - resetPerspective(){ + resetPerspective(e: any){ if (this.cuboidModel.orientation === Orientation.LEFT) { const edgePoints = this.cuboidModel.dl.points; const constraints = this.cuboidModel.computeSideEdgeConstraints(this.cuboidModel.dl); From bf96ecc62b5f7ca9a2e6d741f78308f061ef55e1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 17:17:12 +0300 Subject: [PATCH 08/11] Added CHANGELOG.md and changed cvat-ui version --- CHANGELOG.md | 5 +++++ cvat-ui/package-lock.json | 2 +- cvat-ui/package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87a6a475b661..a543f763008e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Updated Rest API document, Swagger document serving instruction issue (https://github.com/opencv/cvat/issues/1495) +- Fixed cuboid occluded view () +- Non-informative lock icon () +- Sidebar in AAM has no hide/show button () +- Task/Job buttons has no "Open in new tab" option () +- Delete point context menu option has no shortcut hint () ### Security - diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index 634b919ea469..b42b68d9f68d 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.0.0", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/cvat-ui/package.json b/cvat-ui/package.json index 6608aa56dca1..00831d57a648 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.0.0", + "version": "1.2.0", "description": "CVAT single-page application", "main": "src/index.tsx", "scripts": { From d815355146622cd976367badee746a2fea29f747 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 12 May 2020 17:20:11 +0300 Subject: [PATCH 09/11] hotfix --- cvat-canvas/src/typescript/svg.patch.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvat-canvas/src/typescript/svg.patch.ts b/cvat-canvas/src/typescript/svg.patch.ts index ce9bad74c30b..9cfe834c8e80 100644 --- a/cvat-canvas/src/typescript/svg.patch.ts +++ b/cvat-canvas/src/typescript/svg.patch.ts @@ -929,7 +929,7 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { } }, - resetPerspective(e: any){ + resetPerspective(){ if (this.cuboidModel.orientation === Orientation.LEFT) { const edgePoints = this.cuboidModel.dl.points; const constraints = this.cuboidModel.computeSideEdgeConstraints(this.cuboidModel.dl); From c989912ed0b8791eceeb2193790b8ccecb07982d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Wed, 13 May 2020 14:48:58 +0300 Subject: [PATCH 10/11] PR fixes --- cvat-canvas/src/scss/canvas.scss | 2 +- cvat-canvas/src/typescript/svg.patch.ts | 8 ++++---- .../attribute-annotation-sidebar.tsx | 2 +- .../annotation-page/standard-workspace/styles.scss | 6 ++++++ .../annotation-page/top-bar/annotation-menu.tsx | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cvat-canvas/src/scss/canvas.scss b/cvat-canvas/src/scss/canvas.scss index 1aceb39a49fc..b7d6c56d12c9 100644 --- a/cvat-canvas/src/scss/canvas.scss +++ b/cvat-canvas/src/scss/canvas.scss @@ -103,7 +103,7 @@ polyline.cvat_canvas_shape_splitting { stroke-dasharray: 5; } -.cvat_canvas_shape .svg_select_points, .cvat_canvas_shape .cvat_canvas_shape_projections { +.cvat_canvas_shape .svg_select_points, .cvat_canvas_shape .cvat_canvas_cuboid_projections { stroke-dasharray: none; } diff --git a/cvat-canvas/src/typescript/svg.patch.ts b/cvat-canvas/src/typescript/svg.patch.ts index 9cfe834c8e80..6523bcbcd5e6 100644 --- a/cvat-canvas/src/typescript/svg.patch.ts +++ b/cvat-canvas/src/typescript/svg.patch.ts @@ -263,10 +263,10 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { this.rbProj = this.line(this.updateProjectionLine(this.cuboidModel.rb.getEquation(), this.cuboidModel.rb.points[1], this.cuboidModel.vpr)); - this.ftProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_shape_projections'); - this.fbProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_shape_projections'); - this.rtProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_shape_projections'); - this.rbProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_shape_projections'); + this.ftProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_cuboid_projections'); + this.fbProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_cuboid_projections'); + this.rtProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_cuboid_projections'); + this.rbProj.stroke({ color: '#C0C0C0' }).addClass('cvat_canvas_cuboid_projections'); }, setupEdges() { diff --git a/cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx b/cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx index a3bb50c86db0..1c24f961f16e 100644 --- a/cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx +++ b/cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx @@ -233,7 +233,7 @@ function AttributeAnnotationSidebar(props: StateToProps & DispatchToProps): JSX. : } - + 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 96c105880f14..83474bad3086 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss +++ b/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss @@ -12,12 +12,18 @@ background-color: $background-color-1; } +.cvat-objects-sidebar-filter-input { + width: calc(100% - 35px); +} + .cvat-objects-sidebar-sider { top: 0px; right: 0px; left: auto; background-color: $background-color-2; border-left: 1px solid $border-color-1; + border-bottom: 1px solid $border-color-1; + border-radius: 4px 0 0 4px; z-index: 2; } diff --git a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx index c6047a005c83..5143bcd4ee67 100644 --- a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx +++ b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx @@ -20,7 +20,7 @@ interface Props { dumpActivities: string[] | null; exportActivities: string[] | null; installedReID: boolean; - taskID: number + taskID: number; onClickMenu(params: ClickParam, file?: File): void; } From 98e79a075835192ef2a703969f96e58e9cdb8681 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Wed, 13 May 2020 22:14:31 +0300 Subject: [PATCH 11/11] package version fixed --- cvat-canvas/src/typescript/svg.patch.ts | 1 - cvat-ui/package-lock.json | 2 +- cvat-ui/package.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cvat-canvas/src/typescript/svg.patch.ts b/cvat-canvas/src/typescript/svg.patch.ts index 6523bcbcd5e6..d17356c35af1 100644 --- a/cvat-canvas/src/typescript/svg.patch.ts +++ b/cvat-canvas/src/typescript/svg.patch.ts @@ -450,7 +450,6 @@ function getTopDown(edgeIndex: EdgeIndex): number[] { accumulatedOffset.x = 0; accumulatedOffset.y = 0; const resizedFacePoint = getResizedPointIndex(event); - // @ts-ignore: ts(2339) resizedCubePoint = [0, 1].includes(resizedFacePoint) ? resizedFacePoint : 5 - resizedFacePoint; // 2,3 -> 3,2 this.fire(new CustomEvent('resizestart', event)); diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index 1106d159acb0..3e2c48f40b39 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.1.2", + "version": "1.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/cvat-ui/package.json b/cvat-ui/package.json index baf227c21c92..f9b49018c56e 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.1.2", + "version": "1.0.2", "description": "CVAT single-page application", "main": "src/index.tsx", "scripts": {