ketcher-react 2.11.0-rc.4 → 2.12.0-rc.2

package/dist/script/editor/Editor.d.ts

@@ -19,6 +19,14 @@ import { Highlighter } from './highlighter';
 import { contextMenuInfo } from '../ui/views/components/ContextMenu/contextMenu.types';
 import { HoverIcon } from './HoverIcon';
 import RotateController from './tool/rotate-controller';
+import { Tool } from './tool/Tool';
+export declare type FloatingToolsParams = {
+    visible?: boolean;
+    rotateHandlePosition?: {
+        x: number;
+        y: number;
+    };
+};
 export interface Selection {
     atoms?: Array<number>;
     bonds?: Array<number>;
@@ -31,7 +39,7 @@ declare class Editor implements KetcherEditor {
     #private;
     render: Render;
     _selection: Selection | null;
-    _tool: any;
+    _tool: Tool | null;
     historyStack: any;
     historyPtr: any;
     errorHandler: ((message: string) => void) | null;
@@ -62,19 +70,20 @@ declare class Editor implements KetcherEditor {
         showInfo: PipelineSubscription;
         apiSettings: PipelineSubscription;
         cursor: Subscription;
+        updateFloatingTools: Subscription<FloatingToolsParams>;
     };
     lastEvent: any;
     constructor(clientArea: any, options: any);
     isDitrty(): boolean;
     setOrigin(): void;
-    tool(name?: any, opts?: any): any;
+    tool(name?: any, opts?: any): Tool | null;
     clear(): void;
     renderAndRecoordinateStruct(struct: Struct): Struct;
     struct(value?: Struct): Struct;
     structToAddFragment(value: Struct): Struct;
-    setOptions(opts: string): any;
-    options(value?: any): any;
-    zoom(value?: any): any;
+    setOptions(opts: string): false | import("ketcher-core/dist/application/render/render.types").RenderOptions;
+    options(value?: any): import("ketcher-core/dist/application/render/render.types").RenderOptions;
+    zoom(value?: any): number;
     selection(ci?: any): Selection | null;
     hover(ci: any, newTool?: any, event?: PointerEvent): void;
     update(action: Action | true, ignoreHistory?: boolean, options?: {
@@ -90,7 +99,7 @@ declare class Editor implements KetcherEditor {
         handler: any;
     };
     unsubscribe(eventName: any, subscriber: any): void;
-    findItem(event: any, maps: any, skip?: any): any;
+    findItem(event: any, maps: Array<string> | null, skip?: any): any;
     findMerge(srcItems: any, maps: any): {
         atoms: Map<number, number>;
         bonds: Map<number, number>;

package/dist/script/editor/shared/closest.d.ts

@@ -8,19 +8,19 @@ declare function findClosestAtom(restruct: any, pos: any, skip: any, minDist: an
     id: never;
     dist: any;
 } | null;
-declare function findClosestItem(restruct: any, pos: any, maps: any, skip: any, scale: any): any;
+declare function findClosestItem(restruct: any, pos: any, maps: any, skip: any, options: any): any;
 /**
  * @param restruct { ReStruct }
  * @param selected { object }
  * @param maps { Array<string> }
- * @param scale { number }
+ * @param options { RenderOption }
  * @return {{
  * 		atoms: Map<number, number>?
  * 		bonds: Map<number, number>?
  *    atomToFunctionalGroup: Map<number, number>?
  * }}
  */
-declare function findCloseMerge(restruct: ReStruct, selected: object, maps: string[] | undefined, scale: number): {
+declare function findCloseMerge(restruct: ReStruct, selected: object, maps: string[] | undefined, options: RenderOption): {
     atoms: Map<number, number>;
     bonds: Map<number, number>;
     atomToFunctionalGroup: Map<number, number> | null;

package/dist/script/editor/shared/utils.d.ts

@@ -3,46 +3,10 @@ declare namespace _default {
     export { fracAngle };
     export { calcNewAtomPos };
     export { degrees };
-    export { mergeBondsParams };
-    export { getOnlyNonGroupItems };
-    export { getNonGroupItemsAndAttachmentPoints };
 }
 export default _default;
 declare function calcAngle(pos0: any, pos1: any): number;
 import { fracAngle } from "ketcher-core/dist/application/editor";
 declare function calcNewAtomPos(pos0: any, pos1: any, ctrlKey: any): Vec2;
 declare function degrees(angle: any): number;
-declare function mergeBondsParams(struct1: any, bond1: any, struct2: any, bond2: any): {
-    merged: boolean;
-    angle: number;
-    scale: number;
-    cross: boolean;
-};
-/**
- * Get all items IDs that do not belong to sgroups
- * @param items {{ atoms?: number[]; bonds?: number[] } | null}
- * @param struct {Struct}
- * @returns {{ atoms: number[], bonds: number[] }}
- */
-declare function getOnlyNonGroupItems(items: {
-    atoms?: number[] | undefined;
-    bonds?: number[] | undefined;
-} | null, struct: Struct): {
-    atoms: number[];
-    bonds: number[];
-};
-/**
- * Get all items IDs that do not belong to sgroups (except their attachment points)
- * @param items {{ atoms?: number[]; bonds?: number[] } | null}
- * @param struct {Struct}
- * @returns {{ atoms: number[], bonds: number[] }}
- */
-declare function getNonGroupItemsAndAttachmentPoints(items: {
-    atoms?: number[] | undefined;
-    bonds?: number[] | undefined;
-} | null, struct: Struct): {
-    atoms: number[];
-    bonds: number[];
-};
 import { Vec2 } from "ketcher-core/dist/domain/entities/vec2";
-import { Struct } from "ketcher-core/dist/domain/entities/struct";

package/dist/script/editor/tool/Tool.d.ts

@@ -0,0 +1,21 @@
+import Editor from '../Editor';
+interface ToolEventHandler {
+    click?(event: Event): void;
+    dblclick?(event: Event): void;
+    mousedown?(event: Event): void;
+    mousemove?(event: Event): void;
+    mouseup?(event: Event): void;
+    mouseleave?(event: Event): void;
+    mouseLeaveClientArea?(event: Event): void;
+    mouseover?(event: Event): void;
+}
+export interface Tool extends ToolEventHandler {
+    cancel?(): void;
+    isSelectionRunning?(): boolean;
+    isNotActiveTool?: boolean;
+}
+export declare type ToolConstructorInterface = {
+    new (editor: Editor, ...args: any[]): Tool;
+};
+export declare type ToolEventHandlerName = keyof ToolEventHandler;
+export {};

package/dist/script/editor/tool/apoint.d.ts

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class APointTool {
-    editor: Editor;
+import { Tool } from './Tool';
+declare class APointTool implements Tool {
+    private readonly editor;
     constructor(editor: any);
     mousemove(event: any): void;
     click(event: any): true | undefined;

package/dist/script/editor/tool/atom.d.ts

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class AtomTool {
+import { Tool } from './Tool';
+declare class AtomTool implements Tool {
     #private;
-    editor: Editor;
-    atomProps: any;
-    dragCtx: any;
+    private readonly editor;
+    private readonly atomProps;
+    private dragCtx;
     isNotActiveTool: boolean | undefined;
     constructor(editor: any, atomProps: any);
     mousedown(event: any): void;

package/dist/script/editor/tool/attach.d.ts

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class AttachTool {
-    attach: any;
-    editor: Editor;
+import { Tool } from './Tool';
+declare class AttachTool implements Tool {
+    private readonly attach;
+    private readonly editor;
     constructor(editor: any, attachPoints: any);
     mousemove(event: any): boolean;
     click(event: any): true | undefined;

package/dist/script/editor/tool/bond.d.ts

@@ -14,14 +14,12 @@
  * limitations under the License.
  ***************************************************************************/
 import { Bond, Struct } from 'ketcher-core';
-import Editor from '../Editor';
-declare class BondTool {
-    editor: Editor;
-    atomProps: {
-        label: string;
-    };
-    bondProps: any;
-    dragCtx: any;
+import { Tool } from './Tool';
+declare class BondTool implements Tool {
+    private readonly editor;
+    private readonly atomProps;
+    private readonly bondProps;
+    private dragCtx;
     isNotActiveTool: boolean | undefined;
     constructor(editor: any, bondProps: any);
     mousedown(event: any): true | undefined;

package/dist/script/editor/tool/chain.d.ts

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class ChainTool {
-    editor: Editor;
-    dragCtx: any;
+import { Tool } from './Tool';
+declare class ChainTool implements Tool {
+    private readonly editor;
+    private dragCtx;
     constructor(editor: any);
     mousedown(event: any): true | undefined;
     mousemove(event: any): boolean;

package/dist/script/editor/tool/charge.d.ts

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class ChargeTool {
-    editor: Editor;
-    charge: any;
+import { Tool } from './Tool';
+declare class ChargeTool implements Tool {
+    private readonly editor;
+    private readonly charge;
     constructor(editor: any, charge: any);
     mousemove(event: any): boolean;
     click(event: any): true | undefined;

package/dist/script/editor/tool/enhanced-stereo.d.ts

@@ -14,9 +14,10 @@
  * limitations under the License.
  ***************************************************************************/
 import Editor from '../Editor';
-declare class EnhancedStereoTool {
-    editor: Editor;
-    stereoAtoms: Array<number>;
+import { Tool } from './Tool';
+declare class EnhancedStereoTool implements Tool {
+    private readonly editor;
+    private readonly stereoAtoms;
     isNotActiveTool: true;
     constructor(editor: any);
     static changeAtomsStereoAction(editor: Editor, stereoAtoms: Array<number>): any;

package/dist/script/editor/tool/eraser.d.ts

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import LassoHelper from './helper/lasso';
-import Editor from '../Editor';
-declare class EraserTool {
-    editor: Editor;
-    maps: Array<string>;
-    lassoHelper: LassoHelper;
+import { Tool } from './Tool';
+declare class EraserTool implements Tool {
+    private readonly editor;
+    private readonly maps;
+    private readonly lassoHelper;
     isNotActiveTool: boolean | undefined;
     constructor(editor: any, mode: any);
     mousedown(event: any): void;

package/dist/script/editor/tool/hand.d.ts

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-import { Vec2 } from 'ketcher-core';
-declare class HandTool {
-    editor: Editor;
-    begPos: Vec2 | null;
-    endPos: Vec2 | null;
+import { Tool } from './Tool';
+declare class HandTool implements Tool {
+    private readonly editor;
+    private begPos;
+    private endPos;
     constructor(editor: any);
     mousedown(event: any): void;
     mousemove(event: any): void;

package/dist/script/editor/tool/helper/deleteFunctionalGroups.d.ts

@@ -0,0 +1,2 @@
+import { ReStruct, Action } from 'ketcher-core';
+export declare function deleteFunctionalGroups(sGroupsId: number[], struct: ReStruct, action: Action): number[];

package/dist/script/editor/tool/helper/filterNotInCollapsedSGroup.d.ts

@@ -0,0 +1,13 @@
+import { Struct } from 'ketcher-core';
+/**
+ * return only such elements ids that not part of collapsed group
+ * Addition: if an atom in the contracted SGroup,
+ * but is an AttachmentPoint -> will be returned as well.
+ */
+export declare function filterNotInContractedSGroup(itemsToFilter: {
+    atoms?: number[];
+    bonds?: number[];
+}, struct: Struct): {
+    atoms: number[];
+    bonds: number[];
+};

package/dist/script/editor/tool/index.d.ts

@@ -1,47 +1,17 @@
-export default tools;
-declare namespace tools {
-    export { HandTool as hand };
-    export { RGroupAtomTool as rgroupatom };
-    export { SelectTool as select };
-    export { SGroupTool as sgroup };
-    export { EraserTool as eraser };
-    export { AtomTool as atom };
-    export { BondTool as bond };
-    export { ChainTool as chain };
-    export { TemplateTool as template };
-    export { ChargeTool as charge };
-    export { RGroupFragmentTool as rgroupfragment };
-    export { APointTool as apoint };
-    export { AttachTool as attach };
-    export { ReactionArrowTool as reactionarrow };
-    export { ReactionPlusTool as reactionplus };
-    export { ReactionMapTool as reactionmap };
-    export { ReactionUnmapTool as reactionunmap };
-    export { PasteTool as paste };
-    export { RotateTool as rotate };
-    export { EnhancedStereoTool as enhancedStereo };
-    export { SimpleObjectTool as simpleobject };
-    export { TextTool as text };
-}
-import HandTool from "./hand";
-import RGroupAtomTool from "./rgroupatom";
-import SelectTool from "./select";
-import SGroupTool from "./sgroup";
-import EraserTool from "./eraser";
-import AtomTool from "./atom";
-import BondTool from "./bond";
-import ChainTool from "./chain";
-import TemplateTool from "./template";
-import ChargeTool from "./charge";
-import RGroupFragmentTool from "./rgroupfragment";
-import APointTool from "./apoint";
-import AttachTool from "./attach";
-import ReactionArrowTool from "./reactionarrow";
-import ReactionPlusTool from "./reactionplus";
-import ReactionMapTool from "./reactionmap";
-import ReactionUnmapTool from "./reactionunmap";
-import PasteTool from "./paste";
-import RotateTool from "./rotate";
-import EnhancedStereoTool from "./enhanced-stereo";
-import SimpleObjectTool from "./simpleobject";
-import TextTool from "./text";
+/****************************************************************************
+ * Copyright 2021 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+import { ToolConstructorInterface } from './Tool';
+export declare const toolsMap: Record<string, ToolConstructorInterface>;

package/dist/script/editor/tool/paste.d.ts

@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { Struct } from 'ketcher-core';
-import Editor from '../Editor';
-declare class PasteTool {
-    editor: Editor;
-    struct: Struct;
-    action: any;
-    templateAction: any;
-    dragCtx: any;
-    findItems: string[];
-    mergeItems: any;
-    isSingleContractedGroup: boolean;
+import { Tool } from './Tool';
+declare class PasteTool implements Tool {
+    private readonly editor;
+    private readonly struct;
+    private action;
+    private dragCtx;
+    private mergeItems;
+    private readonly isSingleContractedGroup;
     constructor(editor: any, struct: any);
     mousedown(event: any): void;
     mousemove(event: any): void;

package/dist/script/editor/tool/reactionarrow.d.ts

@@ -13,15 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class ReactionArrowTool {
-    mode: any;
-    editor: Editor;
-    dragCtx: any;
+import { Tool } from './Tool';
+declare class ReactionArrowTool implements Tool {
+    private readonly mode;
+    private readonly editor;
+    private dragCtx;
     constructor(editor: any, mode: any);
+    private get render();
+    private get reStruct();
     mousedown(event: any): void;
-    mousemove(event: any): void;
-    mouseup(): boolean;
-    click(event: any): void;
+    mousemove(event: PointerEvent): void;
+    mouseup(event: any): boolean;
+    private addNewArrowWithDragging;
+    private addNewArrowWithClicking;
+    private updateResizingState;
 }
 export default ReactionArrowTool;

package/dist/script/editor/tool/reactionmap.d.ts

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class ReactionMapTool {
-    editor: Editor;
-    rcs: any;
-    dragCtx: any;
-    line: any;
+import { Tool } from './Tool';
+declare class ReactionMapTool implements Tool {
+    private readonly editor;
+    private dragCtx;
+    private line;
     constructor(editor: any);
     mousedown(event: any): void;
     mousemove(event: any): void;

package/dist/script/editor/tool/reactionplus.d.ts

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class ReactionPlusTool {
-    editor: Editor;
-    dragCtx: any;
+import { Tool } from './Tool';
+declare class ReactionPlusTool implements Tool {
+    private readonly editor;
+    private dragCtx;
     constructor(editor: any);
     mousedown(event: any): void;
     mousemove(event: any): void;

package/dist/script/editor/tool/reactionunmap.d.ts

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class ReactionUnmapTool {
-    editor: Editor;
+import { Tool } from './Tool';
+declare class ReactionUnmapTool implements Tool {
+    private readonly editor;
     constructor(editor: any);
     mousemove(event: any): void;
     mouseup(event: any): void;

package/dist/script/editor/tool/rgroupatom.d.ts

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class RGroupAtomTool {
-    editor: Editor;
+import { Tool } from './Tool';
+declare class RGroupAtomTool implements Tool {
+    private readonly editor;
     constructor(editor: any);
     mousemove(event: any): void;
     click(event: any): true | undefined;

package/dist/script/editor/tool/rgroupfragment.d.ts

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class RGroupFragmentTool {
-    editor: Editor;
+import { Tool } from './Tool';
+declare class RGroupFragmentTool implements Tool {
+    private readonly editor;
     constructor(editor: any);
     mousemove(event: any): void;
     click(event: any): true | undefined;

package/dist/script/editor/tool/rotate-controller.d.ts

@@ -1,12 +1,14 @@
+/// <reference types="lodash" />
 import Editor from '../Editor';
+import { getDifference } from './rotate-controller.utils';
 declare class RotateController {
+    isRotating: boolean;
     private editor;
     private rotateTool;
     private originalCenter;
     private normalizedCenterInitialHandleVec;
     private handleCenter;
     private initialRadius;
-    private isRotating;
     private isMovingCenter;
     private handle?;
     private boundingRect?;
@@ -21,6 +23,10 @@ declare class RotateController {
     private get center();
     rerender(): void;
     clean(): void;
+    /**
+     * Revert rotation by pressing "Escape" key
+     */
+    revert(): void;
     private isPartOfFragmentSelected;
     private show;
     private drawCross;
@@ -41,6 +47,7 @@ declare class RotateController {
     private dragCrossMove;
     private dragCrossEnd;
     private dragCrossEndOUtOfBounding;
+    updateFloatingToolsPosition: import("lodash").DebouncedFunc<() => void>;
 }
 export default RotateController;
-export declare const getDifference: (currentDegree: number, structRotateDegree: number) => number;
+export { getDifference };

package/dist/script/editor/tool/rotate-controller.utils.d.ts

@@ -0,0 +1,3 @@
+import { Vec2 } from 'ketcher-core';
+export declare const rotatePoint: (centerPoint: Vec2, startPoint: Vec2, angle: number) => Vec2;
+export declare const getDifference: (currentDegree: number, structRotateDegree: number) => number;

package/dist/script/editor/tool/rotate.d.ts

@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { Vec2 } from 'ketcher-core';
+import { FlipDirection, Vec2 } from 'ketcher-core';
 import Editor from '../Editor';
-declare class RotateTool {
-    editor: Editor;
+import { Tool } from './Tool';
+declare class RotateTool implements Tool {
+    private readonly editor;
     dragCtx: any;
-    isNotActiveTool: boolean | undefined;
-    constructor(editor: any, dir: any, isNotActiveTool?: boolean);
-    mousedown(event: any, handleCenter?: Vec2, center?: Vec2): boolean;
+    isNotActiveTool: boolean;
+    constructor(editor: Editor, flipDirection?: FlipDirection);
+    mousedownHandle(handleCenter: Vec2, center: Vec2): void;
     /**
      * @returns `[center, visibleAtoms]`,
      * `visibleAtoms` = selected atoms

package/dist/script/editor/tool/select.d.ts

@@ -13,24 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { ReSGroup, Atom, Bond } from 'ketcher-core';
+import { Atom, Bond } from 'ketcher-core';
 import { Editor } from '../Editor';
-declare class SelectTool {
+import { Tool } from './Tool';
+declare type SelectMode = 'lasso' | 'fragment' | 'rectangle';
+declare class SelectTool implements Tool {
     #private;
-    editor: Editor;
-    dragCtx: any;
-    constructor(editor: any, mode: any);
+    private readonly editor;
+    private dragCtx;
+    isMousedDown: boolean;
+    constructor(editor: Editor, mode: SelectMode);
     isSelectionRunning(): boolean;
     mousedown(event: any): boolean;
     mousemove(event: any): boolean;
     mouseup(event: any): void;
     dblclick(event: any): true | undefined;
     mouseleave(): void;
-    selectElementsOnCanvas(elements: {
-        atoms: number[];
-        bonds: number[];
-    }, editor: Editor, event: any): void;
-    isDraggingStructureOnSaltOrSolvent(dragCtx: any, sgroups: Map<number, ReSGroup>): any;
+    private selectElementsOnCanvas;
+    private isDraggingStructureOnSaltOrSolvent;
+    private updateArrowResizingState;
 }
 export declare function selMerge(selection: any, add: any, reversible: boolean): any;
 export declare function getSelectedAtoms(selection: any, molecule: any): Atom[];

package/dist/script/editor/tool/sgroup.d.ts

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import Editor from '../Editor';
-declare class SGroupTool {
-    editor: Editor;
-    lassoHelper: any;
+import { Tool } from './Tool';
+declare class SGroupTool implements Tool {
+    private readonly editor;
+    private readonly lassoHelper;
     isNotActiveTool: boolean | undefined;
     constructor(editor: any);
     checkSelection(): void;