The logic for interacting with 3D annotation layers has been updated by filichabout · Pull Request #10299 · cvat-ai/cvat

filichabout · 2026-02-20T09:21:11Z

Motivation and context

Consistent behaviour for Tab/Shift+Tab on 2D and 3D workspace

Checklist

I submit my changes into the develop branch
I have created a changelog fragment
~~I have updated the documentation accordingly~~
~~I have added tests to cover my changes~~
~~I have linked related issues~~

License

I submit my code changes under the same MIT License that covers the project.
Feel free to contact the maintainers if that's a concern.

codecov-commenter · 2026-02-20T10:12:50Z

Codecov Report

❌ Patch coverage is 77.77778% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 73.81%. Comparing base (366c3be) to head (ef8f8a5).
⚠️ Report is 9 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #10299      +/-   ##
===========================================
- Coverage    74.71%   73.81%   -0.90%     
===========================================
  Files          431      432       +1     
  Lines        46654    46705      +51     
  Branches      4220     4230      +10     
===========================================
- Hits         34858    34477     -381     
- Misses       11796    12228     +432

Components	Coverage Δ
cvat-ui	`77.68% <77.77%> (-0.02%)`	⬇️
cvat-server	`70.51% <ø> (-1.66%)`	⬇️

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

bsekachev · 2026-02-23T11:16:51Z

cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/object-item.tsx

    private focusAndExpand = (): void => {
        const {
-            objectState, canvasInstance, focusedObjectPadding, expandObject,
+            objectState, canvasInstance, focusedObjectPadding,


Expand behaviour was previously added in this pull request #10172 to improve consensus UX.

On the one hand, I believe it is necessary in review mode, and maybe not necessary in other modes. On the other hand, I do not see reasons to have different behaviour for different workspaces.

So, currently let's revert this change.

bsekachev · 2026-02-23T11:19:41Z

cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/object-item.tsx


        if (canvasInstance instanceof Canvas && objectState.objectType !== ObjectType.TAG) {
            canvasInstance.focus(objectState.clientID as number, focusedObjectPadding);
+        } else if (canvasInstance instanceof Canvas3d && objectState.objectType !== ObjectType.TAG) {


objectState.objectType !== ObjectType.TAG repeated twice, thus it may be rewritten as:

if (objectState.objectType !== ..) {
if (isCanvas2D) { ... }
else if (isCanvas3D) { ... }
}

bsekachev · 2026-02-23T11:24:41Z

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

+            MOVE_RIGHT: () => { },
+            ZOOM_IN: () => { },
+            ZOOM_OUT: () => { },
+            NEXT_OBJECT: (event: KeyboardEvent | undefined) => {


Suggested change

NEXT_OBJECT: (event: KeyboardEvent | undefined) => {

NEXT_OBJECT: (event?: KeyboardEvent) => {

bsekachev · 2026-02-23T11:24:50Z

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

+                preventDefault(event);
+                navigateObject(1);
+            },
+            PREVIOUS_OBJECT: (event: KeyboardEvent | undefined) => {


Suggested change

PREVIOUS_OBJECT: (event: KeyboardEvent | undefined) => {

PREVIOUS_OBJECT: (event?: KeyboardEvent) => {

bsekachev · 2026-02-23T11:27:40Z

cvat-canvas3d/src/typescript/canvas3d.ts

+    public focusObject(clientID: number, animate: boolean = true): void {
+        this.view.focusObjectByClientId(clientID, animate);
+    }


May we keep the interface of 2D and 3D canvas similar?

I mean name this method just focus and remove the second parameter animate as in current implementation is always true and seems unnecessary

bsekachev · 2026-02-23T11:34:43Z

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

        frameData,
        contextMenuVisibility,
-        annotations,
+        annotations: annotations as ObjectState[],


Would not it be better to fix the typing for the state instead?

bsekachev · 2026-02-23T11:35:44Z

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

            keyMap: state.shortcuts.keyMap,
            normalizedKeyMap: state.shortcuts.normalizedKeyMap,
+            annotations: state.annotation.annotations.states as ObjectState[],
+            activatedStateID: state.annotation.annotations.activatedStateID as number | null,


is already number | null. Type case is useless

bsekachev · 2026-02-23T11:35:51Z

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

            normalizedKeyMap: state.shortcuts.normalizedKeyMap,
+            annotations: state.annotation.annotations.states as ObjectState[],
+            activatedStateID: state.annotation.annotations.activatedStateID as number | null,
+            curZLayer: state.annotation.annotations.zLayer.cur as number,


It is already number

bsekachev · 2026-02-23T11:37:26Z

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

            canvas.keyControls(new KeyboardEvent('keydown', { code, altKey, shiftKey }));
        };

+        const navigateObject = (step: number): void => {


The implementation seems very similar with 2D workspace, do you see any ways to reduce code duplication?

bsekachev · 2026-02-23T11:56:22Z

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

+        const objectState = annotations.find((state) => state.clientID === clientID);
+
+        if (objectState) {
+            const sidebarItem = window.document.getElementById(
+                `cvat-objects-sidebar-state-item-${clientID}`,
+            );
+
+            if (sidebarItem) {
+                sidebarItem.scrollIntoView();
+            }
+        }


It should not be here. When cursor just hovered, view should not be scrolled

bsekachev · 2026-02-23T11:59:04Z

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

        onSplitAnnotations(state);
    };

+    const onCanvasDoubleClicked = (event: CustomEvent<{ clientID: number | null }>): void => {


Let's implement the same logic as in onCanvasShapeClicked of 2D canvas when shape just clicked (not doubleclicked, so, event name should be canvas.clicked, to keep naming consistent.

bsekachev · 2026-02-23T12:01:57Z

Next object/Previous object shortcuts disappeared from Annotation page section. And now only in 3D workspace section

Before patch:

After patch:

…dated DEV-803

bsekachev · 2026-03-02T11:45:20Z

cvat-ui/src/utils/objects-sidebar.ts

@@ -0,0 +1,42 @@
+import { ObjectState } from 'cvat-core-wrapper';
+
+export function getSidebarItemId(state: ObjectState): string {


Used only internally, not necessary to be exported

bsekachev · 2026-03-02T11:45:31Z

cvat-ui/src/utils/objects-sidebar.ts

+    return `cvat-objects-sidebar-state-item-${clientID}`;
+}
+
+export function scrollSidebarItemIntoViewById(id: string): void {


Used only internally, not necessary to be exported

bsekachev · 2026-03-02T11:47:22Z

cvat-ui/src/utils/objects-sidebar.ts

+    expandObject(state);
+}
+
+export function scrollAndExpandByClientID(


The wrapper seems unnecessary as the find logic maybe implemented in calling function (and there is only one place it called from)

filichabout requested review from bsekachev and nmanovic as code owners February 20, 2026 09:21

bsekachev reviewed Feb 23, 2026

View reviewed changes

filichabout added 4 commits February 27, 2026 14:14

feat: The logic for interacting with 3D annotation layers has been up…

6b054b5

…dated DEV-803

added changelog

149dba6

remove trigger for auto open details

188c97c

Change of logic

ddd20fe

filichabout force-pushed the ap/DEV-803-shortcut-for-3d-workspace branch from 6624ad5 to ddd20fe Compare February 27, 2026 10:16

bsekachev reviewed Mar 2, 2026

View reviewed changes

filichabout force-pushed the ap/DEV-803-shortcut-for-3d-workspace branch from 3d69d02 to 1ff9c4f Compare March 4, 2026 13:32

update hover active item

6e9f33a

filichabout force-pushed the ap/DEV-803-shortcut-for-3d-workspace branch from 1ff9c4f to 6e9f33a Compare March 4, 2026 14:52

update for test

ef8f8a5

	NEXT_OBJECT: (event: KeyboardEvent \| undefined) => {
	NEXT_OBJECT: (event?: KeyboardEvent) => {

	PREVIOUS_OBJECT: (event: KeyboardEvent \| undefined) => {
	PREVIOUS_OBJECT: (event?: KeyboardEvent) => {

		@@ -0,0 +1,42 @@
		import { ObjectState } from 'cvat-core-wrapper';

		export function getSidebarItemId(state: ObjectState): string {

Conversation

filichabout commented Feb 20, 2026

Motivation and context

Checklist

License

Uh oh!

codecov-commenter commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bsekachev commented Feb 23, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov-commenter commented Feb 20, 2026 •

edited

Loading