ketcher-react 3.5.0-rc.2 → 3.5.0-rc.4

package/dist/cjs/script/builders/ketcher/ButtonName.d.ts

@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { MULTITAIL_ARROW_TOOL_NAME } from 'domain/constants';
+import { MULTITAIL_ARROW_TOOL_NAME } from 'ketcher-core';
 export declare type ButtonName = 'layout' | 'clean' | 'arom' | 'dearom' | 'cip' | 'check' | 'analyse' | 'recognize' | 'miew' | 'settings' | 'help' | 'about' | 'fullscreen' | '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' | typeof MULTITAIL_ARROW_TOOL_NAME | 'reaction-mapping-tools' | 'reaction-automap' | 'reaction-map' | 'reaction-unmap' | 'rgroup' | 'rgroup-label' | 'rgroup-fragment' | 'rgroup-attpoints' | 'shape' | 'shape-ellipse' | 'shape-rectangle' | 'shape-line' | 'text' | 'enhanced-stereo';

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

@@ -21,19 +21,16 @@ import { Root } from 'react-dom/client';
 import { CustomButton } from './CustomButtons';
 declare class KetcherBuilder {
     private structService;
-    private editor;
     private serviceMode;
     private formatterFactory;
     constructor();
-    appendApiAsync(structServiceProvider: StructServiceProvider): Promise<void>;
-    reinitializeApi(structServiceProvider: StructServiceProvider, setStructServiceToStore: (structService: StructService) => void): StructService;
+    appendApiAsync(structServiceProvider: StructServiceProvider): StructService;
+    reinitializeApi(ketcherId: string, 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, customButtons?: Array<CustomButton>): Promise<{
-        setKetcher: (ketcher: Ketcher) => void;
-        ketcherId: string;
+    appendUiAsync(prevKetcherId: string, ketcherId: string, element: HTMLDivElement | null, appRoot: Root, staticResourcesUrl: string, errorHandler: (message: string) => void, buttons?: ButtonsConfig, togglerComponent?: JSX.Element, customButtons?: Array<CustomButton>): Promise<{
         cleanup: ReturnType<typeof initApp> | null;
         setServer: (structService: StructService) => void;
     }>;
-    build(): Ketcher | undefined;
+    build(): Ketcher;
 }
 export { KetcherBuilder };

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

@@ -32,6 +32,7 @@ export interface Selection {
 }
 declare class Editor implements KetcherEditor {
     #private;
+    ketcherId: string;
     render: Render;
     _selection: Selection | null;
     _tool: Tool | null;
@@ -73,7 +74,7 @@ declare class Editor implements KetcherEditor {
     serverSettings: {};
     lastEvent: any;
     macromoleculeConvertionError: string | null | undefined;
-    constructor(clientArea: any, options: any, serverSettings: any);
+    constructor(ketcherId: any, clientArea: any, options: any, serverSettings: any, prevEditor?: any);
     isDitrty(): boolean;
     setOrigin(): void;
     tool(name?: any, opts?: any): Tool | null;

package/dist/cjs/script/editor/tool/arrow/arrow.types.d.ts

@@ -1,9 +1,6 @@
 import { Tool } from '../Tool';
-import { Vec2 } from 'domain/entities';
-import { Action } from 'application/editor';
+import { Vec2, MultitailArrowReferencePosition, Action, MULTITAIL_ARROW_KEY } from 'ketcher-core';
 import { ClosestItemWithMap } from '../../shared/closest.types';
-import { MultitailArrowReferencePosition } from 'application/render';
-import { MULTITAIL_ARROW_KEY } from 'domain/constants';
 export declare type ArrowAddTool = Required<Pick<Tool, 'mousemove' | 'mouseup' | 'mousedown'>>;
 export declare type ReactionArrowClosestItem = ClosestItemWithMap<Vec2, 'rxnArrows'>;
 export declare type MultitailArrowClosestItem = ClosestItemWithMap<MultitailArrowReferencePosition, typeof MULTITAIL_ARROW_KEY>;

package/dist/cjs/script/editor/tool/arrow/multitailArrowMoveTool.d.ts

@@ -8,5 +8,5 @@ export declare class MultitailArrowMoveTool extends ArrowTool implements ArrowMo
         closestItem: MultitailArrowClosestItem;
     };
     mousemove(event: PointerEvent, dragContext: CommonArrowDragContext<MultitailArrowClosestItem>): Action;
-    mouseup(event: PointerEvent, dragContext: CommonArrowDragContext<MultitailArrowClosestItem>): any;
+    mouseup(event: PointerEvent, dragContext: CommonArrowDragContext<MultitailArrowClosestItem>): Action | null;
 }

package/dist/cjs/script/editor/tool/arrow/reactionArrowMoveTool.d.ts

@@ -8,5 +8,5 @@ export declare class ReactionArrowMoveTool extends ArrowTool implements ArrowMov
         closestItem: ReactionArrowClosestItem;
     };
     mousemove(event: PointerEvent, dragContext: CommonArrowDragContext<ReactionArrowClosestItem>): import("ketcher-core").Action;
-    mouseup(_event: PointerEvent, dragContext: CommonArrowDragContext<ReactionArrowClosestItem>): any;
+    mouseup(_event: PointerEvent, dragContext: CommonArrowDragContext<ReactionArrowClosestItem>): import("ketcher-core").Action | null;
 }

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

@@ -27,14 +27,14 @@ interface Config {
     customButtons?: Array<CustomButton>;
     errorHandler: (message: string) => void;
     togglerComponent?: JSX.Element;
-}
-declare function buildKetcherAsync({ element, appRoot, staticResourcesUrl, structServiceProvider, buttons, errorHandler, togglerComponent, customButtons, }: Config): Promise<{
-    ketcher: import("ketcher-core").Ketcher | undefined;
     ketcherId: string;
+}
+export type { Config, ButtonsConfig };
+export * from './providers';
+declare function buildKetcherAsync({ element, appRoot, staticResourcesUrl, structServiceProvider, buttons, errorHandler, togglerComponent, customButtons, ketcherId: prevKetcherId, }: Config): Promise<{
+    ketcher: import("ketcher-core").Ketcher;
     cleanup: (() => void) | null;
     builder: KetcherBuilder;
     setServer: (structService: import("ketcher-core").StructService) => void;
 }>;
-export type { Config, ButtonsConfig };
-export * from './providers';
 export default buildKetcherAsync;

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

@@ -14,12 +14,10 @@
  * limitations under the License.
  ***************************************************************************/
 /// <reference types="react" />
-import { Ketcher, StructService } from 'ketcher-core';
+import { StructService } from 'ketcher-core';
 import { Root } from 'react-dom/client';
-declare function initApp(element: HTMLDivElement | null, appRoot: Root, staticResourcesUrl: string, options: any, server: StructService, resolve: (args: {
+declare function initApp(prevKetcherId: string, ketcherId: string, element: HTMLDivElement | null, appRoot: Root, staticResourcesUrl: string, options: any, server: StructService, resolve: (args: {
     editor: any;
-    setKetcher: (ketcher: Ketcher) => void;
-    ketcherId: string;
     setServer: (server: StructService) => void;
 }) => void, togglerComponent?: JSX.Element): () => void;
 export { initApp };

package/dist/cjs/script/ui/dialog/template/template-attach.d.ts

@@ -27,6 +27,8 @@ declare class Attach extends Component<any, any, any> {
             bondid: any;
         };
     } | null;
+    oldKetcherEditor: import("ketcher-core").Editor;
+    componentWillUnmount(): void;
     checkIsValidName(name: any): boolean;
     render(): import("react/jsx-runtime").JSX.Element;
 }

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

@@ -15,7 +15,7 @@
  ***************************************************************************/
 export declare function initKeydownListener(element: any): (dispatch: any, getState: any) => void;
 export declare function removeKeydownListener(element: any): () => void;
-export declare function initClipboard(dispatch: any): {
+export declare function initClipboard(dispatch: any, getState: any): {
     formats: any[];
     focused(): boolean;
     onLegacyCut(): {} | null;

package/dist/cjs/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.d.ts

@@ -3,5 +3,5 @@ import Editor, { ClosestItemWithMap } from 'src/script/editor';
 import { ContextMenuProps, GetIsItemInSelectionArgs } from './contextMenu.types';
 import { Selection } from '../../../../editor/Editor';
 export declare const getIsItemInSelection: ({ item, selection, selectedSGroupsIds, selectedFunctionalGroups, }: GetIsItemInSelectionArgs) => boolean;
-export declare function getMenuPropsForClosestItem(editor: Editor, closestItem: ClosestItemWithMap): ContextMenuProps | null;
-export declare function getMenuPropsForSelection(selection: Selection | null, selectedFunctionalGroups: Map<number, FunctionalGroup>): ContextMenuProps | null;
+export declare function getMenuPropsForClosestItem(editor: Editor, closestItem: ClosestItemWithMap, ketcherId: string): ContextMenuProps | null;
+export declare function getMenuPropsForSelection(selection: Selection | null, selectedFunctionalGroups: Map<number, FunctionalGroup>, ketcherId: string): ContextMenuProps | null;

package/dist/cjs/script/ui/views/components/ContextMenu/contextMenu.types.d.ts

@@ -12,37 +12,37 @@ export declare enum CONTEXT_MENU_ID {
 }
 export declare type ItemData = unknown;
 interface BaseContextMenuProps {
-    id: CONTEXT_MENU_ID;
+    id: string;
 }
 interface WithExtraItems {
     extraItemsSelected?: boolean;
 }
 export interface BondsContextMenuProps extends BaseContextMenuProps, WithExtraItems {
-    id: CONTEXT_MENU_ID.FOR_BONDS;
+    id: string;
     bondIds: Array<number>;
 }
 export interface AtomContextMenuProps extends BaseContextMenuProps, WithExtraItems {
-    id: CONTEXT_MENU_ID.FOR_ATOMS;
+    id: string;
     atomIds: Array<number>;
 }
 export interface RGroupAttachmentPointContextMenuProps extends BaseContextMenuProps, WithExtraItems {
-    id: CONTEXT_MENU_ID.FOR_R_GROUP_ATTACHMENT_POINT;
+    id: string;
     rgroupAttachmentPoints: Array<number>;
     atomIds?: AtomContextMenuProps['atomIds'];
 }
 export interface SelectionContextMenuProps extends BaseContextMenuProps, Partial<Pick<BondsContextMenuProps, 'bondIds'>>, Partial<Pick<AtomContextMenuProps, 'atomIds'>>, Partial<Pick<RGroupAttachmentPointContextMenuProps, 'rgroupAttachmentPoints'>> {
-    id: CONTEXT_MENU_ID.FOR_SELECTION;
+    id: string;
 }
 export interface FunctionalGroupsContextMenuProps extends BaseContextMenuProps {
-    id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS;
+    id: string;
     functionalGroups: FunctionalGroup[];
 }
 export interface MacromoleculeContextMenuProps extends BaseContextMenuProps {
-    id: CONTEXT_MENU_ID.FOR_MACROMOLECULE;
+    id: string;
     functionalGroups: FunctionalGroup[];
 }
 export interface MultitailArrowContextMenuProps {
-    id: CONTEXT_MENU_ID.FOR_MULTITAIL_ARROW;
+    id: string;
     itemId: number;
     tailId: number | null;
 }

package/dist/cjs/script/ui/views/modal/Modal.container.d.ts

@@ -14,6 +14,6 @@
  * limitations under the License.
  ***************************************************************************/
 import { Modal, ModalProps } from './Modal';
-import { BaseCallProps } from './modal.types';
-declare const ModalContainer: import("react-redux").ConnectedComponent<typeof Modal, import("react-redux").Omit<ModalProps & BaseCallProps, "modal" | "onCancel" | "onOk">>;
+import { BaseCallProps, ModalContainerProps } from './modal.types';
+declare const ModalContainer: import("react-redux").ConnectedComponent<typeof Modal, import("react-redux").Omit<ModalProps & BaseCallProps & ModalContainerProps, "modal" | "onCancel" | "onOk"> & ModalContainerProps>;
 export default ModalContainer;

package/dist/cjs/script/ui/views/modal/Modal.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { BaseCallProps } from './modal.types';
+import { BaseCallProps, ModalContainerProps } from './modal.types';
 interface ModalProps extends BaseCallProps {
     modal: {
         name: string;
@@ -21,7 +21,7 @@ interface ModalProps extends BaseCallProps {
         prop: any;
     };
 }
-declare type Props = ModalProps & BaseCallProps;
+declare type Props = ModalProps & BaseCallProps & ModalContainerProps;
 declare function Modal(props: Props): import("react/jsx-runtime").JSX.Element | null;
 export type { ModalProps };
 export { Modal };

package/dist/cjs/script/ui/views/modal/modal.types.d.ts

@@ -25,4 +25,7 @@ interface BaseCallProps {
     onCancel: () => void;
     onOk: (result: any) => void;
 }
-export type { BaseProps, BaseCallProps };
+interface ModalContainerProps {
+    ketcherId: string;
+}
+export type { BaseProps, BaseCallProps, ModalContainerProps };

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { IMAGE_KEY, MULTITAIL_ARROW_TOOL_NAME } from 'domain/constants';
+import { IMAGE_KEY, MULTITAIL_ARROW_TOOL_NAME } from 'ketcher-core';
 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';

package/dist/components/StructRender/types.d.ts

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { RenderOptions } from 'application/render/render.types';
-import { Struct } from 'ketcher-core';
+import { Struct, RenderOptions } from 'ketcher-core';
 interface CasheOptions {
     cachePrefix?: string;
     needCache?: boolean;

package/dist/contexts/appContext.d.ts

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { Ketcher } from 'ketcher-core';
 import React from 'react';
 export interface IAppContext {
-    getKetcherInstance: () => Ketcher;
     ketcherId: string;
+    prevKetcherId: string;
 }
 declare const appContext: React.Context<IAppContext>;
 export default appContext;