lint fixes

vs-777 · vs-777 · commit 54286c30db35 · 2021-01-18T16:53:43.000+03:00
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,10 +1,4 @@
-import React, { useCallback } from 'react';
-import { Button, Col, Dropdown, Layout, Menu, Row } from 'antd';
-import { useKey } from 'react-use';
-import { library } from '@fortawesome/fontawesome-svg-core';
-import { fas } from '@fortawesome/free-solid-svg-icons';
 
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { OcrDocument } from './reducer/types';
 import { useAppReducer } from './reducerContext';
 import { createChangeOptions, createDeleteNode, createRedo, createSelectDocument, createUndo } from './reducer/actions';
@@ -18,6 +12,15 @@ import 'antd/dist/antd.css';
 import './App.css';
 import { LogView } from './components/LogView';
 
+import React, { useCallback } from 'react';
+import { Button, Col, Dropdown, Layout, Menu, Row } from 'antd';
+import { useKey } from 'react-use';
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { fas } from '@fortawesome/free-solid-svg-icons';
+
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+
+
 library.add(fas);
 
 function App() {
diff --git a/src/components/ExportModal/index.tsx b/src/components/ExportModal/index.tsx
@@ -1,14 +1,16 @@
+import { OcrDocument } from '../../reducer/types';
+import { PageTreeItem } from '../../types';
+import buildHocrDocument from '../../lib/hocrBuilder';
+import printHtml from '../../lib/htmlPrinter';
+
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Button, Modal, Space, Tooltip } from 'antd';
 import { PrismAsync as SyntaxHighlighter } from 'react-syntax-highlighter';
 import prism from 'react-syntax-highlighter/dist/esm/styles/prism/prism';
 import { useCopyToClipboard } from 'react-use';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
-import { OcrDocument } from '../../reducer/types';
-import { PageTreeItem } from '../../types';
-import buildHocrDocument from '../../lib/hocrBuilder';
-import printHtml from '../../lib/htmlPrinter';
+
 
 import './index.css';
 
diff --git a/src/components/LogView/index.tsx b/src/components/LogView/index.tsx
@@ -1,6 +1,8 @@
-import React from 'react';
 
 import { RecognizeUpdate } from '../../types';
+import React from 'react';
+
+
 
 import './index.scss';
 
diff --git a/src/components/PageCanvas/Block.tsx b/src/components/PageCanvas/Block.tsx
@@ -1,12 +1,14 @@
+import { DocumentTreeItem, ElementType, ItemId, Position } from '../../types';
+import { TreeItems } from '../../reducer/types';
+import { clamp } from '../../utils';
+import { calculateDragBounds } from './utils';
+
 import React, { useCallback, useEffect, useRef } from 'react';
 import { Group, Rect, Transformer } from 'react-konva';
 import Konva from 'konva';
 
 import { IRect } from 'konva/types/types';
-import { DocumentTreeItem, ElementType, ItemId, Position } from '../../types';
-import { TreeItems } from '../../reducer/types';
-import { clamp } from '../../utils';
-import { calculateDragBounds } from './utils';
+
 
 interface Box extends IRect {
   rotation: number;
diff --git a/src/components/PageCanvas/Blocks.tsx b/src/components/PageCanvas/Blocks.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
+
+
 import { BlockTreeItem, ItemId } from '../../types';
 import { TreeItems } from '../../reducer/types';
 import { getNodeOrThrow } from '../../treeUtils';
 import Block, { ChangeCallbackParams, SetInnerRefFn } from './Block';
-
+import React from 'react';
 interface Props {
   tree: {
     rootId: ItemId;
diff --git a/src/components/PageCanvas/CanvasToolbar.tsx b/src/components/PageCanvas/CanvasToolbar.tsx
@@ -1,8 +1,4 @@
-import React, { PropsWithChildren, useCallback, useMemo } from 'react';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Rectangle } from 'tesseract.js';
 
-import { Button, Dropdown, Menu, Space } from 'antd';
 import { useAppReducer } from '../../reducerContext';
 import {
   createAddDocument,
@@ -19,6 +15,12 @@ import { loadImage } from '../../utils';
 import hocrParser from '../../lib/hocrParser';
 import { Page, PageImage } from '../../types';
 
+import React, { PropsWithChildren, useCallback, useMemo } from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { Rectangle } from 'tesseract.js';
+import { Button, Dropdown, Menu, Space } from 'antd';
+
+
 import './CanvasToolbar.scss';
 
 type Entry = [PageImage | null, Page | null];
diff --git a/src/components/PageCanvas/DrawLayer.tsx b/src/components/PageCanvas/DrawLayer.tsx
@@ -1,9 +1,11 @@
+import { Position } from '../../types';
+import { clamp } from '../../utils';
+
+
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import Konva from 'konva';
 import { Group, Layer, Rect, Transformer } from 'react-konva';
 import { IRect } from 'konva/types/types';
-import { Position } from '../../types';
-import { clamp } from '../../utils';
 
 interface Box extends IRect {
   rotation: number;
diff --git a/src/components/PageCanvas/PageGraphics.tsx b/src/components/PageCanvas/PageGraphics.tsx
@@ -1,13 +1,15 @@
-import React, { Dispatch } from 'react';
-import Konva from 'konva';
-import { Image, Stage } from 'react-konva';
-import { IRect } from 'konva/types/types';
+
+
 import { ItemId, Position } from '../../types';
 import { createUpdateTreeNodeRect } from '../../reducer/actions';
 import { AppReducerAction, OcrDocument } from '../../reducer/types';
 import Blocks from './Blocks';
 import BlocksLayer from './BlocksLayer';
 import DrawLayer from './DrawLayer';
+import React, { Dispatch } from 'react';
+import Konva from 'konva';
+import { Image, Stage } from 'react-konva';
+import { IRect } from 'konva/types/types';
 
 export interface Props {
   document: OcrDocument | undefined;
diff --git a/src/components/PageCanvas/index.tsx b/src/components/PageCanvas/index.tsx
@@ -1,11 +1,4 @@
-import React, { Dispatch, useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { Stage } from 'react-konva';
-import { useKey, useMeasure } from 'react-use';
-import cx from 'classnames';
-import { Button, Space } from 'antd';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
-import { IRect } from 'konva/types/types';
 import { ItemId, Position } from '../../types';
 import {
   createChangeSelected,
@@ -24,6 +17,15 @@ import assert from '../../lib/assert';
 import PageGraphics from './PageGraphics';
 import CanvasToolbar from './CanvasToolbar';
 
+import React, { Dispatch, useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { Stage } from 'react-konva';
+import { useKey, useMeasure } from 'react-use';
+import cx from 'classnames';
+import { Button, Space } from 'antd';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { IRect } from 'konva/types/types';
+
+
 import './index.css';
 
 interface Props {
diff --git a/src/components/PageCanvas/utils.ts b/src/components/PageCanvas/utils.ts
@@ -1,7 +1,8 @@
-import Konva from 'konva';
-import { Bbox } from 'tesseract.js';
 import { BaseTreeItem, DocumentTreeItem, ElementType, Position } from '../../types';
 import { TreeItems } from '../../reducer/types';
+import Konva from 'konva';
+import { Bbox } from 'tesseract.js';
+
 
 export type BoundsTuple = [number, number, number, number];
 
diff --git a/src/components/PageList/index.tsx b/src/components/PageList/index.tsx
@@ -1,8 +1,10 @@
+import { OcrDocument } from '../../reducer/types';
+
 import React, { useCallback } from 'react';
 import cx from 'classnames';
 import { Menu, Progress } from 'antd';
 
-import { OcrDocument } from '../../reducer/types';
+
 
 import './index.scss';
 
diff --git a/src/components/PageTreeView/TreeNode.tsx b/src/components/PageTreeView/TreeNode.tsx
@@ -1,8 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import cx from 'classnames';
-import { useKey } from 'react-use';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import type { IconName } from '@fortawesome/free-solid-svg-icons';
+
 
 import { ItemId, RenderItemParams } from '../SortableTree';
 import { DocumentTreeItem, ElementType } from '../../types';
@@ -12,6 +8,13 @@ import { createModifyNode } from '../../reducer/actions';
 import { TreeItems } from '../../reducer/types';
 import TreeNodeTextEditor from './TreeNodeTextEditor';
 
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import cx from 'classnames';
+import { useKey } from 'react-use';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { IconName } from '@fortawesome/free-solid-svg-icons';
+
+
 interface TreeNodeProps {
   isSelected?: boolean;
   onMouseEnter?: (evt: React.MouseEvent, nodeId: ItemId) => void;
diff --git a/src/components/PageTreeView/index.tsx b/src/components/PageTreeView/index.tsx
@@ -1,4 +1,5 @@
-import React, { useCallback, Dispatch } from 'react';
+
+
 
 import { createChangeSelected, createModifyNode, createMoveNode } from '../../reducer/actions';
 import Tree from '../SortableTree/components/Tree';
@@ -9,6 +10,10 @@ import { AppReducerAction, OcrDocument } from '../../reducer/types';
 import { useHoveredState } from '../../hoverContext';
 import TreeNode from './TreeNode';
 
+import React, { useCallback, Dispatch } from 'react';
+
+
+
 interface Props {
   currentDocument: OcrDocument | undefined;
   selectedId: ItemId | null;
diff --git a/src/components/SortableTree/components/Tree/Tree.tsx b/src/components/SortableTree/components/Tree/Tree.tsx
@@ -1,3 +1,14 @@
+
+import { noop } from '../../utils/handy';
+import { flattenTree, mutateTree } from '../../utils/tree';
+import { FlattenedItem, ItemId, Path, TreeData, TreeDestinationPosition, TreeSourcePosition } from '../../types';
+import TreeItem from '../TreeItem';
+import { getDestinationPath, getItemById, getIndexById } from '../../utils/flat-tree';
+import DelayedFunction from '../../utils/delayed-function';
+import { DocumentTreeItem, ElementType } from '../../../../types';
+import { Props, State, DragState } from './Tree-types';
+import { calculateFinalDropPositions } from './Tree-utils';
+
 import React, { Component, ReactElement } from 'react';
 import { FixedSizeList as List, ListChildComponentProps } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
@@ -15,15 +26,6 @@ import {
   DroppableStateSnapshot,
 } from 'react-beautiful-dnd';
 import { getBox } from 'css-box-model';
-import { noop } from '../../utils/handy';
-import { flattenTree, mutateTree } from '../../utils/tree';
-import { FlattenedItem, ItemId, Path, TreeData, TreeDestinationPosition, TreeSourcePosition } from '../../types';
-import TreeItem from '../TreeItem';
-import { getDestinationPath, getItemById, getIndexById } from '../../utils/flat-tree';
-import DelayedFunction from '../../utils/delayed-function';
-import { DocumentTreeItem, ElementType } from '../../../../types';
-import { Props, State, DragState } from './Tree-types';
-import { calculateFinalDropPositions } from './Tree-utils';
 
 const TREE_DRAG_STATE_LEGAL = 'Tree-drag--legal';
 const TREE_DRAG_STATE_ILLEGAL = 'Tree-drag--illegal';
diff --git a/src/components/SortableTree/components/TreeItem/TreeItem.tsx b/src/components/SortableTree/components/TreeItem/TreeItem.tsx
@@ -1,9 +1,10 @@
-import { Component } from 'react';
-import { DraggableProvidedDraggableProps, DraggableStateSnapshot } from 'react-beautiful-dnd';
+
+
 import { isSamePath } from '../../utils/path';
 import { sameProps } from '../../utils/react';
 import { Props, TreeDraggableProvided } from './TreeItem-types';
-
+import { Component } from 'react';
+import { DraggableProvidedDraggableProps, DraggableStateSnapshot } from 'react-beautiful-dnd';
 export default class TreeItem extends Component<Props> {
   shouldComponentUpdate(nextProps: Props) {
     return (
diff --git a/src/hoverContext.ts b/src/hoverContext.ts
@@ -1,4 +1,5 @@
-import { createStateContext } from 'react-use';
 import { ItemId } from './types';
+import { createStateContext } from 'react-use';
+
 
 export const [useHoveredState, HoveredStateProvider] = createStateContext<ItemId | null>(null);
diff --git a/src/index.tsx b/src/index.tsx
@@ -1,10 +1,13 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
+
 import './index.css';
+
 import App from './App';
 import * as serviceWorker from './serviceWorker';
 import { AppReducerProvider } from './reducerContext';
 import { HoveredStateProvider } from './hoverContext';
+import React from 'react';
+import ReactDOM from 'react-dom';
+
 
 ReactDOM.render(
   <React.StrictMode>
diff --git a/src/lib/tesseractConverter.ts b/src/lib/tesseractConverter.ts
@@ -1,6 +1,8 @@
-import * as t from 'tesseract.js';
+
+
 import { PageImage, Block, Direction, Line, Page, Paragraph, Word, Graphic, BlockType } from '../types';
 import { createUniqueIdentifier } from '../utils';
+import * as t from 'tesseract.js';
 
 const isGraphic = (block: t.Block) =>
   block.blocktype === BlockType.PULLOUT_IMAGE ||
diff --git a/src/ocr.ts b/src/ocr.ts
@@ -1,8 +1,10 @@
-import tesseract, { RecognizeResult, Rectangle } from 'tesseract.js';
+
+
 import { OcrDocument } from './reducer/types';
 import { Page, RecognizeUpdate } from './types';
 import { convertPage } from './lib/tesseractConverter';
 import assert from './lib/assert';
+import tesseract, { RecognizeResult, Rectangle } from 'tesseract.js';
 
 export type DeepPartial<T> = {
   [P in keyof T]?: T[P] extends Array<infer U>
diff --git a/src/reducer/actions.ts b/src/reducer/actions.ts
@@ -1,5 +1,5 @@
-import { createAction } from '@reduxjs/toolkit';
-import { IRect } from 'konva/types/types';
+
+
 
 import { ChangeCallbackParams } from '../components/PageCanvas/Block';
 import { ItemId, Page, PageImage, RecognizeUpdate } from '../types';
@@ -15,6 +15,8 @@ import {
   Options,
   SetDocumentImagePayload,
 } from './types';
+import { createAction } from '@reduxjs/toolkit';
+import { IRect } from 'konva/types/types';
 
 export const createAddDocument = createAction<
   (filename: string, pageImage: PageImage) => { payload: AddDocumentPayload },
diff --git a/src/reducer/index.ts b/src/reducer/index.ts
@@ -1,8 +1,4 @@
-import { Bbox } from 'tesseract.js';
-import { produce } from 'immer';
-import type { Draft } from 'immer/dist/types/types-external';
 
-import { IRect } from 'konva/types/types';
 import { DocumentTreeItem, ElementType, ItemId, Position } from '../types';
 import { buildTree, walkChildren } from '../treeBuilder';
 import { TreeDestinationPosition, TreeSourcePosition } from '../components/SortableTree';
@@ -18,6 +14,12 @@ import {
 import assert from '../lib/assert';
 import { ActionType, AppReducerAction, ModifyNodePayload, OcrDocument, State, Tree } from './types';
 
+import { Bbox } from 'tesseract.js';
+import { produce } from 'immer';
+import type { Draft } from 'immer/dist/types/types-external';
+
+import { IRect } from 'konva/types/types';
+
 const MAX_CHANGESETS = 40;
 
 const EMPTY_RECT: IRect = {
diff --git a/src/reducer/types.ts b/src/reducer/types.ts
@@ -1,7 +1,9 @@
-import { IRect } from 'konva/types/types';
+
+
 import { Page, DocumentTreeItem, ItemId, PageImage, RecognizeUpdate } from '../types';
 import { TreeDestinationPosition, TreeSourcePosition } from '../components/SortableTree';
 import * as actions from './actions';
+import { IRect } from 'konva/types/types';
 
 export type TreeItems = Record<ItemId, DocumentTreeItem>;
 
diff --git a/src/reducerContext.ts b/src/reducerContext.ts
@@ -1,4 +1,5 @@
-import { createReducerContext } from 'react-use';
 import { reducer, initialState } from './reducer';
+import { createReducerContext } from 'react-use';
+
 
 export const [useAppReducer, AppReducerProvider, AppReducerContext] = createReducerContext(reducer, initialState);
diff --git a/src/treeUtils.ts b/src/treeUtils.ts
@@ -1,10 +1,11 @@
-import { Bbox } from 'tesseract.js';
 
 import { Tree, TreeItems } from './reducer/types';
 import { DocumentTreeItem, ItemId, Position } from './types';
 import assert from './lib/assert';
 import { walkChildren } from './treeBuilder';
 
+import { Bbox } from 'tesseract.js';
+
 export function getNodeOrThrow(treeItems: TreeItems, nodeId: ItemId): DocumentTreeItem {
   const node = treeItems[nodeId.toString()];
 
diff --git a/src/utils.ts b/src/utils.ts
