Skip to content

Added to keyboard navigation into the photos. #402

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

Open
alperengineer wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Added to keyboard navigation into the photos. #402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
98 changes: 57 additions & 41 deletions src/views/EditorView/Editor/Editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
import React from 'react';
import './Editor.scss';
import {ISize} from '../../../interfaces/ISize';
import {ImageData, LabelPoint, LabelRect} from '../../../store/labels/types';
import {FileUtil} from '../../../utils/FileUtil';
import {AppState} from '../../../store';
import {connect} from 'react-redux';
import {updateImageDataById} from '../../../store/labels/actionCreators';
import {ImageRepository} from '../../../logic/imageRepository/ImageRepository';
import {LabelType} from '../../../data/enums/LabelType';
import {PopupWindowType} from '../../../data/enums/PopupWindowType';
import {CanvasUtil} from '../../../utils/CanvasUtil';
import {CustomCursorStyle} from '../../../data/enums/CustomCursorStyle';
import {ImageLoadManager} from '../../../logic/imageRepository/ImageLoadManager';
import {EventType} from '../../../data/enums/EventType';
import {EditorData} from '../../../data/EditorData';
import {EditorModel} from '../../../staticModels/EditorModel';
import {EditorActions} from '../../../logic/actions/EditorActions';
import {EditorUtil} from '../../../utils/EditorUtil';
import {ContextManager} from '../../../logic/context/ContextManager';
import {ContextType} from '../../../data/enums/ContextType';
import { ISize } from '../../../interfaces/ISize';
import { ImageData, LabelPoint, LabelRect } from '../../../store/labels/types';
import { FileUtil } from '../../../utils/FileUtil';
import { AppState } from '../../../store';
import { connect } from 'react-redux';
import { updateImageDataById } from '../../../store/labels/actionCreators';
import { ImageRepository } from '../../../logic/imageRepository/ImageRepository';
import { LabelType } from '../../../data/enums/LabelType';
import { PopupWindowType } from '../../../data/enums/PopupWindowType';
import { CanvasUtil } from '../../../utils/CanvasUtil';
import { CustomCursorStyle } from '../../../data/enums/CustomCursorStyle';
import { ImageLoadManager } from '../../../logic/imageRepository/ImageLoadManager';
import { EventType } from '../../../data/enums/EventType';
import { EditorData } from '../../../data/EditorData';
import { EditorModel } from '../../../staticModels/EditorModel';
import { EditorActions } from '../../../logic/actions/EditorActions';
import { EditorUtil } from '../../../utils/EditorUtil';
import { ContextManager } from '../../../logic/context/ContextManager';
import { ContextType } from '../../../data/enums/ContextType';
import Scrollbars from 'react-custom-scrollbars-2';
import {ViewPortActions} from '../../../logic/actions/ViewPortActions';
import {PlatformModel} from '../../../staticModels/PlatformModel';
import { ViewPortActions } from '../../../logic/actions/ViewPortActions';
import { PlatformModel } from '../../../staticModels/PlatformModel';
import LabelControlPanel from '../LabelControlPanel/LabelControlPanel';
import {IPoint} from '../../../interfaces/IPoint';
import {RenderEngineUtil} from '../../../utils/RenderEngineUtil';
import {LabelStatus} from '../../../data/enums/LabelStatus';
import {isEqual} from 'lodash';
import {AIActions} from '../../../logic/actions/AIActions';
import { IPoint } from '../../../interfaces/IPoint';
import { RenderEngineUtil } from '../../../utils/RenderEngineUtil';
import { LabelStatus } from '../../../data/enums/LabelStatus';
import { isEqual } from 'lodash';
import { AIActions } from '../../../logic/actions/AIActions';
import { ImageActions } from '../../../logic/actions/ImageActions'; // YENİ EKLENDİ

interface IProps {
size: ISize;
Expand Down Expand Up @@ -64,7 +65,7 @@ class Editor extends React.Component<IProps, IState> {
public componentDidMount(): void {
this.mountEventListeners();

const {imageData, activeLabelType} = this.props;
const { imageData, activeLabelType } = this.props;

ContextManager.switchCtx(ContextType.EDITOR);
EditorActions.mountRenderEnginesAndHelpers(activeLabelType);
Expand All @@ -77,7 +78,7 @@ class Editor extends React.Component<IProps, IState> {
}

public componentDidUpdate(prevProps: Readonly<IProps>, prevState: Readonly<{}>, snapshot?: any): void {
const {imageData, activeLabelType} = this.props;
const { imageData, activeLabelType } = this.props;

prevProps.imageData.id !== imageData.id && ImageLoadManager.addAndRun(this.loadImage(imageData));

Expand All @@ -98,13 +99,15 @@ class Editor extends React.Component<IProps, IState> {
window.addEventListener(EventType.MOUSE_UP, this.update);
EditorModel.canvas.addEventListener(EventType.MOUSE_DOWN, this.update);
EditorModel.canvas.addEventListener(EventType.MOUSE_WHEEL, this.handleZoom);
window.addEventListener('keydown', this.handleKeyDown); // YENİ EKLENDİ
}

private unmountEventListeners() {
window.removeEventListener(EventType.MOUSE_MOVE, this.update);
window.removeEventListener(EventType.MOUSE_UP, this.update);
EditorModel.canvas.removeEventListener(EventType.MOUSE_DOWN, this.update);
EditorModel.canvas.removeEventListener(EventType.MOUSE_WHEEL, this.handleZoom);
window.removeEventListener('keydown', this.handleKeyDown); // YENİ EKLENDİ
}

// =================================================================================================================
Expand All @@ -122,7 +125,7 @@ class Editor extends React.Component<IProps, IState> {
EditorActions.setLoadingStatus(true);
const saveLoadedImagePartial = (image: HTMLImageElement) => this.saveLoadedImage(image, imageData);
FileUtil.loadImage(imageData.fileData)
.then((image:HTMLImageElement) => saveLoadedImagePartial(image))
.then((image: HTMLImageElement) => saveLoadedImagePartial(image))
.catch((error) => this.handleLoadImageError())
}
}
Expand All @@ -138,11 +141,24 @@ class Editor extends React.Component<IProps, IState> {
this.updateModelAndRender()
};

private handleLoadImageError = () => {};
private handleLoadImageError = () => { };

// =================================================================================================================
// HELPER METHODS
// =================================================================================================================
private handleKeyDown = (event: KeyboardEvent) => {
if (this.props.activePopupType) {
return;
}

switch (event.key) {
case "ArrowLeft":
ImageActions.getPreviousImage();
break;
case "ArrowRight":
ImageActions.getNextImage();
break;
default:
break;
}
};

private updateModelAndRender = () => {
ViewPortActions.updateViewPortSize();
Expand Down Expand Up @@ -185,7 +201,7 @@ class Editor extends React.Component<IProps, IState> {
return this.props.imageData.labelRects
.filter((labelRect: LabelRect) => labelRect.isCreatedByAI && labelRect.status !== LabelStatus.ACCEPTED)
.map((labelRect: LabelRect) => {
const positionOnImage: IPoint = {x: labelRect.rect.x, y: labelRect.rect.y};
const positionOnImage: IPoint = { x: labelRect.rect.x, y: labelRect.rect.y };
const positionOnViewPort: IPoint = RenderEngineUtil.transferPointFromImageToViewPortContent(positionOnImage, editorData);
return <LabelControlPanel
position={positionOnViewPort}
Expand All @@ -199,7 +215,7 @@ class Editor extends React.Component<IProps, IState> {
return this.props.imageData.labelPoints
.filter((labelPoint: LabelPoint) => labelPoint.isCreatedByAI && labelPoint.status !== LabelStatus.ACCEPTED)
.map((labelPoint: LabelPoint) => {
const positionOnImage: IPoint = {x: labelPoint.point.x, y: labelPoint.point.y};
const positionOnImage: IPoint = { x: labelPoint.point.x, y: labelPoint.point.y };
const positionOnViewPort: IPoint = RenderEngineUtil.transferPointFromImageToViewPortContent(positionOnImage, editorData);
return <LabelControlPanel
position={positionOnViewPort}
Expand All @@ -212,13 +228,13 @@ class Editor extends React.Component<IProps, IState> {
else return null;
};

private onScrollbarsUpdate = (scrollbarContent)=>{
private onScrollbarsUpdate = (scrollbarContent) => {
const newViewPortContentSize = {
width: scrollbarContent.scrollWidth,
height: scrollbarContent.scrollHeight
};
if(!isEqual(newViewPortContentSize, this.state.viewPortSize)) {
this.setState({viewPortSize: newViewPortContentSize})
if (!isEqual(newViewPortContentSize, this.state.viewPortSize)) {
this.setState({ viewPortSize: newViewPortContentSize })
}
};

Expand All @@ -231,8 +247,8 @@ class Editor extends React.Component<IProps, IState> {
>
<Scrollbars
ref={ref => EditorModel.viewPortScrollbars = ref}
renderTrackHorizontal={props => <div {...props} className='track-horizontal'/>}
renderTrackVertical={props => <div {...props} className='track-vertical'/>}
renderTrackHorizontal={props => <div {...props} className='track-horizontal' />}
renderTrackVertical={props => <div {...props} className='track-vertical' />}
onUpdate={this.onScrollbarsUpdate}
>
<div
Expand Down Expand Up @@ -284,4 +300,4 @@ const mapStateToProps = (state: AppState) => ({
export default connect(
mapStateToProps,
mapDispatchToProps
)(Editor);
)(Editor);