ketcher-react 2.23.0-rc.2 → 2.24.0-rc.1

package/dist/script/builders/ketcher/KetcherBuilder.d.ts

@@ -14,8 +14,9 @@
  * limitations under the License.
  ***************************************************************************/
 /// <reference types="react" />
-import { Ketcher, ServiceMode, StructServiceProvider } from 'ketcher-core';
+import { Ketcher, ServiceMode, StructService, StructServiceProvider } from 'ketcher-core';
 import { ButtonsConfig } from './ButtonsConfig';
+import { initApp } from '../../ui';
 import { Root } from 'react-dom/client';
 declare class KetcherBuilder {
     private structService;
@@ -24,10 +25,13 @@ declare class KetcherBuilder {
     private formatterFactory;
     constructor();
     appendApiAsync(structServiceProvider: StructServiceProvider): Promise<void>;
+    reinitializeApi(structServiceProvider: StructServiceProvider, setStructServiceToStore: (structService: StructService) => void): StructService;
     appendServiceMode(mode: ServiceMode): void;
     appendUiAsync(element: HTMLDivElement | null, appRoot: Root, staticResourcesUrl: string, errorHandler: (message: string) => void, buttons?: ButtonsConfig, togglerComponent?: JSX.Element): Promise<{
         setKetcher: (ketcher: Ketcher) => void;
         ketcherId: string;
+        cleanup: ReturnType<typeof initApp> | null;
+        setServer: (structService: StructService) => void;
     }>;
     build(): Ketcher | undefined;
 }

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

@@ -99,11 +99,10 @@ declare class Editor implements KetcherEditor {
         handler: any;
     };
     unsubscribe(eventName: any, subscriber: any): void;
-    findItem(event: any, maps: Array<string> | null, skip?: any): any;
+    findItem(event: any, maps: Array<string> | null, skip?: any): import(".").ClosestItemWithMap<unknown> | null;
     findMerge(srcItems: any, maps: any): {
-        atoms: Map<number, number>;
-        bonds: Map<number, number>;
-        atomToFunctionalGroup: Map<number, number> | null;
+        atoms: Map<any, any>;
+        atomToFunctionalGroup: Map<any, any>;
     };
     explicitSelected(): any;
     structSelected(): Struct;

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

@@ -15,4 +15,5 @@
  ***************************************************************************/
 import { Editor } from './Editor';
 export { Editor };
+export * from './shared/closest.types';
 export default Editor;

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

@@ -1,14 +1,25 @@
-declare namespace _default {
-    export { findClosestAtom as atom };
-    export { findClosestItem as item };
-    export { findCloseMerge as merge };
-}
-export default _default;
-declare function findClosestAtom(restruct: any, pos: any, skip: any, minDist: any): {
+/****************************************************************************
+ * 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 { Vec2, ReStruct } from 'ketcher-core';
+import { ClosestItemWithMap } from './closest.types';
+declare function findClosestAtom(restruct: ReStruct, pos: Vec2, skip: any, minDist: any): {
     id: never;
     dist: any;
 } | null;
-declare function findClosestItem(restruct: any, pos: any, maps: any, skip: any, options: any): any;
+declare function findClosestItem(restruct: ReStruct, pos: Vec2, maps: any, skip: any, options: any): ClosestItemWithMap | null;
 /**
  * @param restruct { ReStruct }
  * @param selected { object }
@@ -20,9 +31,13 @@ declare function findClosestItem(restruct: any, pos: any, maps: any, skip: any,
  *    atomToFunctionalGroup: Map<number, 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;
+declare function findCloseMerge(restruct: ReStruct, selected: any, maps: string[] | undefined, options: any): {
+    atoms: Map<any, any>;
+    atomToFunctionalGroup: Map<any, any>;
+};
+declare const _default: {
+    atom: typeof findClosestAtom;
+    item: typeof findClosestItem;
+    merge: typeof findCloseMerge;
 };
-import { ReStruct } from "ketcher-core/dist/application/render/restruct";
+export default _default;

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

@@ -0,0 +1,9 @@
+import { Vec2 } from 'ketcher-core';
+export interface ClosestItem<T = Vec2> {
+    id: number;
+    dist: number;
+    ref?: T | null;
+}
+export interface ClosestItemWithMap<T = unknown> extends ClosestItem<T> {
+    map: string;
+}

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

@@ -1,5 +1,5 @@
 import { Editor } from '../../Editor';
 declare const isMacroMolecule: (editor: Editor, id: number) => boolean;
 declare const isMergingToMacroMolecule: (editor: Editor, dragCtx: any) => boolean;
-declare const isBondingWithMacroMolecule: (editor: Editor, event: MouseEvent) => boolean | undefined;
+declare const isBondingWithMacroMolecule: (editor: Editor, event: MouseEvent) => boolean | null | undefined;
 export { isBondingWithMacroMolecule, isMacroMolecule, isMergingToMacroMolecule, };

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

@@ -31,6 +31,7 @@ declare class LassoHelper {
         simpleObjects: number[];
         texts: number[];
         rgroupAttachmentPoints: number[];
+        images: number[];
     };
     begin(event: any): void;
     running(): boolean;
@@ -44,6 +45,7 @@ declare class LassoHelper {
         simpleObjects: number[];
         texts: number[];
         rgroupAttachmentPoints: number[];
+        images: number[];
     } | null;
     update(): void;
     end(): {
@@ -56,6 +58,7 @@ declare class LassoHelper {
         simpleObjects: number[];
         texts: number[];
         rgroupAttachmentPoints: number[];
+        images: number[];
     };
     cancel(): void;
 }

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

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-declare function getElementsInRectangle(restruct: any, p0: any, p1: any): {
+import { ReStruct } from 'ketcher-core';
+declare function getElementsInRectangle(restruct: ReStruct, p0: any, p1: any): {
     atoms: number[];
     bonds: number[];
     rxnArrows: number[];
@@ -23,8 +24,9 @@ declare function getElementsInRectangle(restruct: any, p0: any, p1: any): {
     simpleObjects: number[];
     texts: number[];
     rgroupAttachmentPoints: number[];
+    images: number[];
 };
-declare function getElementsInPolygon(restruct: any, rr: any): {
+declare function getElementsInPolygon(restruct: ReStruct, rr: any): {
     atoms: number[];
     bonds: number[];
     rxnArrows: number[];
@@ -34,6 +36,7 @@ declare function getElementsInPolygon(restruct: any, rr: any): {
     simpleObjects: number[];
     texts: number[];
     rgroupAttachmentPoints: number[];
+    images: number[];
 };
 declare const _default: {
     inRectangle: typeof getElementsInRectangle;

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

@@ -0,0 +1,18 @@
+import { Vec2 } from 'ketcher-core';
+import { Tool } from './Tool';
+import type Editor from '../Editor';
+export declare class ImageTool implements Tool {
+    private readonly editor;
+    static readonly INPUT_ID = "image-upload";
+    private element;
+    private dragCtx;
+    constructor(editor: Editor);
+    mousedown(event: MouseEvent): void;
+    click(event: MouseEvent): void;
+    mousemove(event: PointerEvent): void;
+    mouseup(): boolean;
+    onFileUpload(clickPosition: Vec2): void;
+    private createElement;
+    private getElement;
+    private resetElementValue;
+}

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

@@ -1,17 +1,2 @@
-/****************************************************************************
- * 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/utils/structLayout.d.ts

@@ -1,3 +1,3 @@
 import { ReStruct, Vec2 } from 'ketcher-core';
 export declare function getSelectionMap(structure: ReStruct): {};
-export declare function getStructCenter(ReStruct: any, selection?: any): Vec2;
+export declare function getStructCenter(reStruct: ReStruct, selection?: any): Vec2;

package/dist/script/index.d.ts

@@ -15,7 +15,7 @@
  ***************************************************************************/
 /// <reference types="react" />
 import { Root } from 'react-dom/client';
-import { ButtonsConfig } from './builders';
+import { ButtonsConfig, KetcherBuilder } from './builders';
 import { StructServiceProvider } from 'ketcher-core';
 interface Config {
     element: HTMLDivElement | null;
@@ -29,6 +29,9 @@ interface Config {
 declare function buildKetcherAsync({ element, appRoot, staticResourcesUrl, structServiceProvider, buttons, errorHandler, togglerComponent, }: Config): Promise<{
     ketcher: import("ketcher-core").Ketcher | undefined;
     ketcherId: string;
+    cleanup: (() => void) | null;
+    builder: KetcherBuilder;
+    setServer: (structService: import("ketcher-core").StructService) => void;
 }>;
 export type { Config, ButtonsConfig };
 export * from './providers';

package/dist/script/ui/App/initApp.d.ts

@@ -20,5 +20,6 @@ declare function initApp(element: HTMLDivElement | null, appRoot: Root, staticRe
     editor: any;
     setKetcher: (ketcher: Ketcher) => void;
     ketcherId: string;
-}) => void, togglerComponent?: JSX.Element): void;
+    setServer: (server: StructService) => void;
+}) => void, togglerComponent?: JSX.Element): () => void;
 export { initApp };

package/dist/script/ui/action/index.d.ts

@@ -400,6 +400,13 @@ declare const config: {
     bonds: {
         hidden: (options: any) => boolean;
     };
+    images: {
+        title: string;
+        action: {
+            tool: string;
+        };
+        hidden: (options: any) => boolean;
+    };
     'force-update': {
         shortcut: string;
         action: (editor: any) => void;

package/dist/script/ui/action/tools.d.ts

@@ -339,6 +339,13 @@ declare const _default: {
     bonds: {
         hidden: (options: any) => boolean;
     };
+    images: {
+        title: string;
+        action: {
+            tool: string;
+        };
+        hidden: (options: any) => boolean;
+    };
 };
 export default _default;
 import { isFlipDisabled } from "./flips";

package/dist/script/ui/state/hotkeys.d.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 export declare function initKeydownListener(element: any): (dispatch: any, getState: any) => void;
+export declare function removeKeydownListener(element: any): () => void;
 export declare function initClipboard(dispatch: any): {
     formats: any[];
     focused(): boolean;

package/dist/script/ui/state/index.d.ts

@@ -1,6 +1,11 @@
 export default function _default(options: any, server: any, setEditor: any): import("redux").Store<any, any> & {
     dispatch: any;
 };
+export function setServer(server: any): {
+    type: string;
+    server: any;
+};
+export const SET_SERVER: "SET_SERVER";
 import { onAction } from "./shared";
 import { load } from "./shared";
 export { onAction, load };

package/dist/script/ui/state/mouse.d.ts

@@ -14,3 +14,4 @@
  * limitations under the License.
  ***************************************************************************/
 export declare function initMouseListener(element: any): (dispatch: any, getState: any) => void;
+export declare function removeMouseListeners(element: any): () => void;

package/dist/script/ui/views/components/ContextMenu/ContextMenu.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-/// <reference types="react" />
+import React from 'react';
 import 'react-contexify/ReactContexify.css';
 declare const ContextMenu: React.FC;
 export default ContextMenu;

package/dist/script/ui/views/modal/components/toolbox/Atom/helper.d.ts

@@ -1,6 +1,6 @@
 import { AtomType } from 'ketcher-core';
 export declare function atomValid(label: string, isMultipleAtoms: boolean, atomType: AtomType, isCustomQuery: boolean): boolean | "";
 export declare function AtomListValid(value: string, atomType: AtomType, isCustomQuery: boolean): boolean;
-export declare function pseudoAtomValid(value: string, atomType: AtomType, isCustomQuery: boolean): boolean | "";
+export declare function pseudoAtomValid(value: string, atomType: AtomType, isCustomQuery: boolean, disableQueryElements?: string[] | null): boolean | "";
 export declare function chargeValid(charge: any, isMultipleAtoms: boolean, isCustomQuery: boolean): boolean | null;
 export declare function customQueryValid(value: string, isCustomQuery: boolean): boolean;

package/dist/script/ui/views/toolbars/toolbar.types.d.ts

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
+import { IMAGE_KEY } from 'domain/constants';
 declare type TopGroup = 'document' | 'edit' | 'zoom' | 'process' | 'meta';
 declare type LeftGroup = 'hand' | 'select' | 'bond' | 'charge' | 'transform' | 'sgroup' | 'rgroup' | 'shape' | 'text';
 declare type BottomGroup = 'template-common' | 'template-lib';
 declare type RightGroup = 'atom' | 'period-table';
 declare type ToolbarGroupVariant = TopGroup | LeftGroup | BottomGroup | RightGroup;
 declare type TopToolbarItemVariant = 'clear' | 'open' | 'save' | 'undo' | 'redo' | 'cut' | 'copies' | 'copy' | 'copy-image' | 'copy-mol' | 'copy-ket' | 'paste' | 'zoom-in' | 'zoom-out' | 'zoom-list' | 'layout' | 'clean' | 'arom' | 'dearom' | 'cip' | 'check' | 'analyse' | 'recognize' | 'miew' | 'settings' | 'help' | 'about';
-declare type LeftToolbarItemVariant = 'hand' | 'select' | 'select-lasso' | 'select-rectangle' | 'select-fragment' | 'erase' | 'bonds' | 'bond-common' | 'bond-single' | 'bond-double' | 'bond-triple' | 'bond-dative' | 'bond-stereo' | 'bond-up' | 'bond-down' | 'bond-updown' | 'bond-crossed' | 'bond-query' | 'bond-special' | 'bond-any' | 'bond-hydrogen' | 'bond-aromatic' | 'bond-singledouble' | 'bond-singlearomatic' | 'bond-doublearomatic' | 'chain' | 'charge-plus' | 'charge-minus' | 'sgroup' | 'reaction-plus' | 'arrows' | 'reaction-arrow-open-angle' | 'reaction-arrow-filled-triangle' | 'reaction-arrow-filled-bow' | 'reaction-arrow-dashed-open-angle' | 'reaction-arrow-failed' | 'reaction-arrow-both-ends-filled-triangle' | 'reaction-arrow-equilibrium-filled-half-bow' | 'reaction-arrow-equilibrium-filled-triangle' | 'reaction-arrow-equilibrium-open-angle' | 'reaction-arrow-unbalanced-equilibrium-filled-half-bow' | 'reaction-arrow-unbalanced-equilibrium-open-half-angle' | 'reaction-arrow-unbalanced-equilibrium-large-filled-half-bow' | 'reaction-arrow-unbalanced-equilibrium-filled-half-triangle' | 'reaction-arrow-elliptical-arc-arrow-filled-bow' | 'reaction-arrow-elliptical-arc-arrow-filled-triangle' | 'reaction-arrow-elliptical-arc-arrow-open-angle' | 'reaction-arrow-elliptical-arc-arrow-open-half-angle' | 'reaction-mapping-tools' | 'reaction-automap' | 'reaction-map' | 'reaction-unmap' | 'rgroup' | 'rgroup-label' | 'rgroup-fragment' | 'rgroup-attpoints' | 'shapes' | 'shape-ellipse' | 'shape-rectangle' | 'shape-line' | 'text';
+declare type LeftToolbarItemVariant = 'hand' | 'select' | 'select-lasso' | 'select-rectangle' | 'select-fragment' | 'erase' | 'bonds' | 'bond-common' | 'bond-single' | 'bond-double' | 'bond-triple' | 'bond-dative' | 'bond-stereo' | 'bond-up' | 'bond-down' | 'bond-updown' | 'bond-crossed' | 'bond-query' | 'bond-special' | 'bond-any' | 'bond-hydrogen' | 'bond-aromatic' | 'bond-singledouble' | 'bond-singlearomatic' | 'bond-doublearomatic' | 'chain' | 'charge-plus' | 'charge-minus' | 'sgroup' | 'reaction-plus' | 'arrows' | 'reaction-arrow-open-angle' | 'reaction-arrow-filled-triangle' | 'reaction-arrow-filled-bow' | 'reaction-arrow-dashed-open-angle' | 'reaction-arrow-failed' | 'reaction-arrow-both-ends-filled-triangle' | 'reaction-arrow-equilibrium-filled-half-bow' | 'reaction-arrow-equilibrium-filled-triangle' | 'reaction-arrow-equilibrium-open-angle' | 'reaction-arrow-unbalanced-equilibrium-filled-half-bow' | 'reaction-arrow-unbalanced-equilibrium-open-half-angle' | 'reaction-arrow-unbalanced-equilibrium-large-filled-half-bow' | 'reaction-arrow-unbalanced-equilibrium-filled-half-triangle' | 'reaction-arrow-elliptical-arc-arrow-filled-bow' | 'reaction-arrow-elliptical-arc-arrow-filled-triangle' | 'reaction-arrow-elliptical-arc-arrow-open-angle' | 'reaction-arrow-elliptical-arc-arrow-open-half-angle' | 'reaction-mapping-tools' | 'reaction-automap' | 'reaction-map' | 'reaction-unmap' | 'rgroup' | 'rgroup-label' | 'rgroup-fragment' | 'rgroup-attpoints' | 'shapes' | 'shape-ellipse' | 'shape-rectangle' | 'shape-line' | 'text' | typeof IMAGE_KEY;
 declare type BottomToolbarItemVariant = 'template-common' | 'template-lib' | 'enhanced-stereo' | 'fullscreen';
 declare type RightToolbarItemVariant = 'atom' | 'freq-atoms' | 'period-table' | 'extended-table' | 'any-atom';
 declare type FloatingToolItemVariant = 'transform-flip-h' | 'transform-flip-v' | 'erase';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ketcher-react",
-  "version": "2.23.0-rc.2",
+  "version": "2.24.0-rc.1",
   "description": "Web-based molecule sketcher",
   "license": "Apache-2.0",
   "homepage": "http://lifescience.opensource.epam.com/ketcher",