Merge branch 'master' into feature/multiselection

# Conflicts:
#	src/components/CurrentEntity/CurrentEntity.js
#	yarn.lock

src/components/CurrentEntity/CurrentEntity.js

@@ -1,6 +1,6 @@
 import { inject, observer } from "mobx-react";
 import React, { useEffect } from "react";
-import { LsSettings, LsTrash } from "../../assets/icons";
+import { IconInfo, LsSettings, LsTrash } from "../../assets/icons";
 import { Button } from "../../common/Button/Button";
 import { confirm } from "../../common/Modal/Modal";
 import { Space } from "../../common/Space/Space";
@@ -48,7 +48,7 @@ export const CurrentEntity = injector(observer(({
         return;
       }
     };
-    
+
     const copyHandler = (ev) =>{
       const selection = window.getSelection();
 
@@ -70,7 +70,7 @@ export const CurrentEntity = injector(observer(({
 
       copyToClipboard(ev);
       entity.deleteSelectedRegions();
-      
+
       console.log("Window event: cutHandler", ev);
     };
 

src/mixins/HighlightMixin.js

@@ -1,4 +1,4 @@
-import { types, getRoot } from "mobx-state-tree";
+import { getRoot, types } from "mobx-state-tree";
 
 import Utils from "../utils";
 import { guidGenerator } from "../utils/unique";

src/regions/AudioRegion.js

@@ -1,4 +1,4 @@
-import { types, getRoot } from "mobx-state-tree";
+import { getRoot, types } from "mobx-state-tree";
 
 import WithStatesMixin from "../mixins/WithStates";
 import Constants from "../core/Constants";

src/regions/BrushRegion.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo, useRef, useState } from "react";
-import { Group, Layer, Image, Shape } from "react-konva";
+import { Group, Image, Layer, Shape } from "react-konva";
 import { observer } from "mobx-react";
-import { types, getParent, getRoot, cast, isAlive } from "mobx-state-tree";
+import { cast, getParent, getRoot, isAlive, types } from "mobx-state-tree";
 
 import Canvas from "../utils/canvas";
 import NormalizationMixin from "../mixins/Normalization";

src/regions/EllipseRegion.js

@@ -1,6 +1,6 @@
 import React, { Fragment } from "react";
 import { Ellipse } from "react-konva";
-import { types, getRoot } from "mobx-state-tree";
+import { getRoot, types } from "mobx-state-tree";
 import WithStatesMixin from "../mixins/WithStates";
 import Constants  from "../core/Constants";
 import DisabledMixin from "../mixins/Normalization";
@@ -11,7 +11,7 @@ import { ImageModel } from "../tags/object/Image";
 import { guidGenerator } from "../core/Helpers";
 import { LabelOnEllipse } from "../components/ImageView/LabelOnRegion";
 import { AreaMixin } from "../mixins/AreaMixin";
-import { getBoundingBoxAfterChanges, fixRectToFit } from "../utils/image";
+import { fixRectToFit, getBoundingBoxAfterChanges } from "../utils/image";
 import { useRegionColors } from "../hooks/useRegionColor";
 import { AliveRegion } from "./AliveRegion";
 import { KonvaRegionMixin } from "../mixins/KonvaRegion";

src/regions/KeyPointRegion.js

@@ -1,6 +1,6 @@
 import React, { Fragment } from "react";
 import { Circle } from "react-konva";
-import { types, getRoot } from "mobx-state-tree";
+import { getRoot, types } from "mobx-state-tree";
 
 import WithStatesMixin from "../mixins/WithStates";
 import NormalizationMixin from "../mixins/Normalization";

src/regions/RectRegion.js

@@ -1,6 +1,6 @@
 import React, { Fragment } from "react";
 import { Rect } from "react-konva";
-import { types, getRoot } from "mobx-state-tree";
+import { getRoot, types } from "mobx-state-tree";
 
 import Constants  from "../core/Constants";
 import DisabledMixin from "../mixins/Normalization";
@@ -12,7 +12,7 @@ import { ImageModel } from "../tags/object/Image";
 import { LabelOnRect } from "../components/ImageView/LabelOnRegion";
 import { guidGenerator } from "../core/Helpers";
 import { AreaMixin } from "../mixins/AreaMixin";
-import { getBoundingBoxAfterChanges, fixRectToFit } from "../utils/image";
+import { fixRectToFit, getBoundingBoxAfterChanges } from "../utils/image";
 import { useRegionColors } from "../hooks/useRegionColor";
 import { AliveRegion } from "./AliveRegion";
 import { KonvaRegionMixin } from "../mixins/KonvaRegion";

src/regions/Result.js

@@ -1,4 +1,4 @@
-import { types, getParent, getRoot, getSnapshot } from "mobx-state-tree";
+import { getParent, getRoot, getSnapshot, types } from "mobx-state-tree";
 import { guidGenerator } from "../core/Helpers";
 import Registry from "../core/Registry";
 import { AnnotationMixin } from "../mixins/AnnotationMixin";

src/stores/RelationStore.js

@@ -1,4 +1,4 @@
-import { types, destroy, getParentOfType, getRoot, isValidReference } from "mobx-state-tree";
+import { destroy, getParentOfType, getRoot, isValidReference, types } from "mobx-state-tree";
 
 import { cloneNode, guidGenerator } from "../core/Helpers";
 import { RelationsModel } from "../tags/control/Relations";

src/tags/control/Choice.js

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import { Checkbox, Radio, Form } from "antd";
-import { observer, inject } from "mobx-react";
+import { Checkbox, Form, Radio } from "antd";
+import { inject, observer } from "mobx-react";
 import { types } from "mobx-state-tree";
 
 import Hint from "../../components/Hint/Hint";

src/tags/control/Label.js

@@ -1,7 +1,7 @@
 import ColorScheme from "pleasejs";
 import React from "react";
 import { types } from "mobx-state-tree";
-import { observer, inject } from "mobx-react";
+import { inject, observer } from "mobx-react";
 
 import ProcessAttrsMixin from "../../mixins/ProcessAttrs";
 import Registry from "../../core/Registry";

src/tags/control/List.js

@@ -2,7 +2,7 @@ import React from "react";
 import arrayMove from "array-move";
 import { List } from "antd";
 import { SortableContainer, SortableElement, sortableHandle } from "react-sortable-hoc";
-import { observer, inject } from "mobx-react";
+import { inject, observer } from "mobx-react";
 import { types } from "mobx-state-tree";
 
 import Registry from "../../core/Registry";

src/tags/control/Number.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { observer, inject } from "mobx-react";
+import { inject, observer } from "mobx-react";
 import { types } from "mobx-state-tree";
 
 import InfoModal from "../../components/Infomodal/Infomodal";

src/tags/control/Ranker.js

@@ -2,7 +2,7 @@ import React from "react";
 import arrayMove from "array-move";
 import { List } from "antd";
 import { SortableContainer, SortableElement, sortableHandle } from "react-sortable-hoc";
-import { observer, inject } from "mobx-react";
+import { inject, observer } from "mobx-react";
 import { types } from "mobx-state-tree";
 
 import Registry from "../../core/Registry";

src/tags/control/Rating.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { Rate } from "antd";
-import { observer, inject } from "mobx-react";
+import { inject, observer } from "mobx-react";
 import { types } from "mobx-state-tree";
 import { StarOutlined } from "@ant-design/icons";
 

src/tags/control/Shortcut.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { Tag } from "antd";
-import { observer, inject } from "mobx-react";
-import { types, getParent } from "mobx-state-tree";
+import { inject, observer } from "mobx-react";
+import { getParent, types } from "mobx-state-tree";
 
 import Hint from "../../components/Hint/Hint";
 import ProcessAttrsMixin from "../../mixins/ProcessAttrs";

src/tags/control/TextArea/TextArea.js

@@ -1,8 +1,8 @@
 import React, { forwardRef, useCallback, useEffect, useRef } from "react";
-import { Form, Input, Button } from "antd";
+import { Button, Form, Input } from "antd";
 import { DeleteOutlined } from "@ant-design/icons";
 import { observer } from "mobx-react";
-import { types, destroy, isAlive } from "mobx-state-tree";
+import { destroy, isAlive, types } from "mobx-state-tree";
 
 import ProcessAttrsMixin from "../../../mixins/ProcessAttrs";
 import RequiredMixin from "../../../mixins/Required";

src/tags/object/Audio.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { observer, inject } from "mobx-react";
+import { inject, observer } from "mobx-react";
 import { types } from "mobx-state-tree";
 
 import AudioControls from "./Audio/Controls";

src/tags/object/AudioPlus.js

@@ -1,6 +1,6 @@
 import React, { Fragment } from "react";
-import { observer, inject } from "mobx-react";
-import { types, getRoot, getType } from "mobx-state-tree";
+import { inject, observer } from "mobx-react";
+import { getRoot, getType, types } from "mobx-state-tree";
 
 import AudioControls from "./Audio/Controls";
 import ObjectTag from "../../components/Tags/Object";

src/tags/object/HyperText.js

@@ -1,15 +1,15 @@
 import * as xpath from "xpath-range";
 import React, { Component } from "react";
-import { observer, inject } from "mobx-react";
-import { types, getType } from "mobx-state-tree";
+import { inject, observer } from "mobx-react";
+import { getType, types } from "mobx-state-tree";
 
 import Utils from "../../utils";
 import ObjectBase from "./Base";
 import ObjectTag from "../../components/Tags/Object";
 import RegionsMixin from "../../mixins/Regions";
 import Registry from "../../core/Registry";
 import { HyperTextRegionModel } from "../../regions/HyperTextRegion";
-import { restoreNewsnapshot, guidGenerator } from "../../core/Helpers";
+import { guidGenerator, restoreNewsnapshot } from "../../core/Helpers";
 import { splitBoundaries } from "../../utils/html";
 import { parseValue } from "../../utils/data";
 import { customTypes } from "../../core/CustomTypes";

src/tags/object/Image.js

@@ -1,4 +1,4 @@
-import { types, getType, getRoot, destroy, getParent } from "mobx-state-tree";
+import { destroy, getParent, getRoot, getType, types } from "mobx-state-tree";
 import { inject } from "mobx-react";
 
 import * as Tools from "../../tools";

src/tags/object/Paragraphs.js

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import { observer, inject } from "mobx-react";
-import { types, getRoot } from "mobx-state-tree";
+import { inject, observer } from "mobx-react";
+import { getRoot, types } from "mobx-state-tree";
 import ColorScheme from "pleasejs";
 import { Button } from "antd";
 import { PauseCircleOutlined, PlayCircleOutlined } from "@ant-design/icons";
@@ -12,7 +12,7 @@ import Registry from "../../core/Registry";
 import Utils from "../../utils";
 import { ParagraphsRegionModel } from "../../regions/ParagraphsRegion";
 import { restoreNewsnapshot } from "../../core/Helpers";
-import { splitBoundaries, findNodeAt, matchesSelector } from "../../utils/html";
+import { findNodeAt, matchesSelector, splitBoundaries } from "../../utils/html";
 import { parseValue } from "../../utils/data";
 import messages from "../../utils/messages";
 import styles from "./Paragraphs/Paragraphs.module.scss";

src/tags/object/RichText/model.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { types, getType, flow } from "mobx-state-tree";
+import { flow, getType, types } from "mobx-state-tree";
 import { observe } from "mobx";
 
 import { customTypes } from "../../../core/CustomTypes";

src/tags/object/Text.js

@@ -1,6 +1,6 @@
 import * as xpath from "xpath-range";
 import React, { Component } from "react";
-import { observer, inject } from "mobx-react";
+import { inject, observer } from "mobx-react";
 import { types } from "mobx-state-tree";
 
 import ObjectBase from "./Base";

src/tags/object/TimeSeries.js

@@ -1,7 +1,7 @@
 import React from "react";
 import * as d3 from "d3";
-import { observer, inject } from "mobx-react";
-import { types, getRoot, getType } from "mobx-state-tree";
+import { inject, observer } from "mobx-react";
+import { getRoot, getType, types } from "mobx-state-tree";
 import throttle from "lodash.throttle";
 import { Spin } from "antd";
 
@@ -13,12 +13,12 @@ import Types from "../../core/Types";
 import { restoreNewsnapshot } from "../../core/Helpers";
 import {
   checkD3EventLoop,
-  idFromValue,
-  getRegionColor,
   fixMobxObserve,
   formatTrackerTime,
-  sparseValues,
-  getOptimalWidth
+  getOptimalWidth,
+  getRegionColor,
+  idFromValue,
+  sparseValues
 } from "./TimeSeries/helpers";
 import { parseCSV, tryToParseJSON } from "../../utils/data";
 import messages from "../../utils/messages";

src/tags/object/TimeSeries/Channel.js

@@ -1,13 +1,13 @@
 import React from "react";
 import { observer } from "mobx-react";
-import { types, getRoot } from "mobx-state-tree";
+import { getRoot, types } from "mobx-state-tree";
 
 import * as d3 from "d3";
 import ObjectBase from "../Base";
 import Registry from "../../../core/Registry";
 import Types from "../../../core/Types";
 import { cloneNode, guidGenerator } from "../../../core/Helpers";
-import { getOptimalWidth, getRegionColor, fixMobxObserve, sparseValues, checkD3EventLoop } from "./helpers";
+import { checkD3EventLoop, fixMobxObserve, getOptimalWidth, getRegionColor, sparseValues } from "./helpers";
 import { errorBuilder } from "../../../core/DataValidator/ConfigValidator";
 import { TagParentMixin } from "../../../mixins/TagParentMixin";
 

src/tags/visual/Table.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { Table } from "antd";
-import { observer, inject } from "mobx-react";
-import { types, getRoot } from "mobx-state-tree";
+import { inject, observer } from "mobx-react";
+import { getRoot, types } from "mobx-state-tree";
 
 import Registry from "../../core/Registry";