Skip to content
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.

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

CVAT UI: batch of fixes #1705

Merged
merged 25 commits into from
Jun 25, 2020
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
07c5b81
Added image preview on settings page and fixed bugtracker input
ActiveChooN Jun 1, 2020
580e5af
A
ActiveChooN Jun 8, 2020
a2a8217
Merge branch 'develop' into dk/batch-of-fixes
ActiveChooN Jun 8, 2020
5e85f47
added colorpicker library and canvas fix on sidebar closing
ActiveChooN Jun 9, 2020
b050eed
added canvas background color picker,
ActiveChooN Jun 14, 2020
74a5b9c
Merge branch 'develop' of https://github.com/opencv/cvat into develop
ActiveChooN Jun 14, 2020
77efb93
Merge branch 'develop' into dk/batch-of-fixes
ActiveChooN Jun 14, 2020
c9f00e1
upgraded npm package version
ActiveChooN Jun 14, 2020
eefb702
fixed paths
ActiveChooN Jun 14, 2020
4101844
Added CHANGELOG.md
ActiveChooN Jun 14, 2020
564164e
fixed eslint problems
ActiveChooN Jun 15, 2020
5cc2f0b
Merge branch 'develop' of https://github.com/opencv/cvat into develop
ActiveChooN Jun 17, 2020
6d1700e
Merge branch 'develop' into dk/batch-of-fixes
ActiveChooN Jun 17, 2020
9558bf5
Fixed show settings shortcut, grid size and bug tracker escape event
ActiveChooN Jun 18, 2020
be7f47f
fixed autosave and settings tabs padding
ActiveChooN Jun 18, 2020
0c5911f
fixed changelog
ActiveChooN Jun 18, 2020
567e518
fixed CHANGELOG.md
ActiveChooN Jun 18, 2020
56a5fb1
Fixed displaying all text
ActiveChooN Jun 19, 2020
6d15c04
fixed CHNAGELOG.md
ActiveChooN Jun 19, 2020
3e6d77f
moved to standart dom transitionend event
ActiveChooN Jun 19, 2020
80daa43
fixed show all interpolation tracks parameter switch
ActiveChooN Jun 22, 2020
45b09df
Merge branch 'develop' into dk/batch-of-fixes
ActiveChooN Jun 22, 2020
36ec40f
fixed PR
ActiveChooN Jun 23, 2020
86c29fb
Merge branch 'develop' into dk/batch-of-fixes
ActiveChooN Jun 23, 2020
c87e1af
Merge branch 'develop' into dk/batch-of-fixes
ActiveChooN Jun 24, 2020
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
Prev Previous commit
Next Next commit
moved to standart dom transitionend event
ActiveChooN committed Jun 19, 2020
commit 3e6d77f1bcda25cf98b29719178a6849d12ade09
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: MIT

import './styles.scss';
import React from 'react';
import React, { useEffect } from 'react';
import Text from 'antd/lib/typography/Text';
import Icon from 'antd/lib/icon';
import Tabs from 'antd/lib/tabs';
@@ -80,6 +80,20 @@ function ObjectsSideBar(props: Props): JSX.Element {
changeShowProjections,
};

useEffect(() => {
const listener = (): void => {
canvasInstance.fit();
};

const [sidebar] = window.document.getElementsByClassName('cvat-objects-sidebar');

sidebar.addEventListener('transitionend', listener);

return () => {
sidebar.removeEventListener('transitionend', listener);
};
}, []);

return (
<Layout.Sider
className='cvat-objects-sidebar'
@@ -90,9 +104,6 @@ function ObjectsSideBar(props: Props): JSX.Element {
collapsible
trigger={null}
collapsed={sidebarCollapsed}
onTransitionEnd={() => {
canvasInstance.fit();
}}
>
{/* eslint-disable-next-line */}
<span