#4902 - delete image, fixed image selection, moved text consts

packages/ketcher-core/src/application/editor/actions/erase.ts

@@ -18,6 +18,7 @@ import {
   AtomDelete,
   BondDelete,
   CalcImplicitH,
+  RasterImageDelete,
   RGroupAttachmentPointRemove,
   RxnArrowDelete,
   RxnPlusDelete,
@@ -39,6 +40,7 @@ import { fromFragmentSplit } from './fragment';
 import { fromRGroupAttachmentPointDeletion } from './rgroupAttachmentPoint';
 import { ReStruct } from 'application/render';
 import { isNumber } from 'lodash';
+import { RASTER_IMAGE_KEY } from 'domain/constants';
 
 export function fromOneAtomDeletion(restruct, atomId: number) {
   return fromFragmentDeletion(restruct, { atoms: [atomId] });
@@ -216,6 +218,10 @@ export function fromFragmentDeletion(restruct, rawSelection) {
     action.addOp(new TextDelete(id));
   });
 
+  selection[RASTER_IMAGE_KEY].forEach((id) => {
+    action.addOp(new RasterImageDelete(id));
+  });
+
   const actionToDeleteRGroupAttachmentPoints = new Action();
   selection.rgroupAttachmentPoints.forEach((id) => {
     if (!removedRGroupAttachmentPoints.includes(id)) {

packages/ketcher-core/src/application/editor/actions/fragment.ts

@@ -30,12 +30,13 @@ import {
   TextMove,
   RasterImageMove,
 } from '../operations';
-import { Pile, RASTER_IMAGE_KEY, RGroup, Vec2 } from 'domain/entities';
+import { Pile, RGroup, Vec2 } from 'domain/entities';
 import { fromRGroupFragment, fromUpdateIfThen } from './rgroup';
 
 import { Action } from './action';
 import { fromAtomsFragmentAttr } from './atom';
 import { getRelSGroupsBySelection } from './utils';
+import { RASTER_IMAGE_KEY } from 'domain/constants';
 
 export function fromMultipleMove(restruct, lists, d: Vec2) {
   d = new Vec2(d);

packages/ketcher-core/src/application/editor/actions/rasterImage.ts

@@ -1,6 +1,10 @@
 import { ReStruct } from 'application/render';
 import { Vec2 } from 'domain/entities';
-import { Action, RasterImageUpsert } from 'application/editor';
+import {
+  Action,
+  RasterImageDelete,
+  RasterImageUpsert,
+} from 'application/editor';
 import { RasterImage } from 'domain/entities/rasterImage';
 
 export function fromRasterImageCreation(
@@ -14,3 +18,9 @@ export function fromRasterImageCreation(
   action.addOp(new RasterImageUpsert(rasterImage));
   return action.perform(reStruct);
 }
+
+export function fromRasterImageDeletion(reStruct: ReStruct, id: number) {
+  const action = new Action();
+  action.addOp(new RasterImageDelete(id));
+  return action.perform(reStruct);
+}

packages/ketcher-core/src/application/editor/operations/rasterImage/rasterImageUpsertDelete.ts

@@ -58,6 +58,7 @@ export class RasterImageDelete extends BaseOperation {
       return;
     }
 
+    reStruct.clearVisel(reRasterImage.visel);
     reRasterImage.remove();
     reStruct.markItemRemoved();
     reStruct.rasterImages.delete(this.id);

packages/ketcher-core/src/application/editor/shared/constants.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  ***************************************************************************/
 
+import { RASTER_IMAGE_KEY } from 'domain/constants';
+
 export const SgContexts = {
   Fragment: 'Fragment',
   Multifragment: 'Multifragment',
@@ -33,6 +35,7 @@ export const selectionKeys = [
   'rxnPluses',
   'simpleObjects',
   'texts',
+  RASTER_IMAGE_KEY,
 ] as const;
 
 export const defaultBondThickness = 2;

packages/ketcher-core/src/application/render/restruct/rerasterImage.ts

@@ -1,10 +1,11 @@
 import { ReObject, ReStruct } from 'application/render/restruct';
-import { RASTER_IMAGE_KEY, RasterImage } from 'domain/entities/rasterImage';
+import { RasterImage } from 'domain/entities/rasterImage';
 import { RenderOptions } from 'application/render/render.types';
 import { Scale } from 'domain/helpers';
 import { RaphaelElement } from 'raphael';
 import { Box2Abs, Vec2 } from 'domain/entities';
 import draw from 'application/render/draw';
+import { RASTER_IMAGE_KEY } from 'domain/constants';
 
 export class ReRasterImage extends ReObject {
   private element?: RaphaelElement;

packages/ketcher-core/src/application/render/restruct/restruct.ts

@@ -42,6 +42,7 @@ import Visel from './visel';
 import util from '../util';
 import { ReRGroupAttachmentPoint } from './rergroupAttachmentPoint';
 import { ReRasterImage } from 'application/render/restruct/rerasterImage';
+import { RASTER_IMAGE_KEY } from 'domain/constants';
 
 class ReStruct {
   public static readonly maps = {
@@ -58,9 +59,7 @@ class ReStruct {
     reloops: ReLoop,
     simpleObjects: ReSimpleObject,
     texts: ReText,
-    // We cannot use const RASTER_IMAGE_KEY here because this is being executed before initializing the variable
-    // But it must contain the same value otherwise the code will stop working
-    rasterImages: ReRasterImage,
+    [RASTER_IMAGE_KEY]: ReRasterImage,
   } as const;
 
   public render: Render;

packages/ketcher-core/src/domain/constants/index.ts

@@ -2,3 +2,4 @@ export * from './elementColor';
 export * from './elements';
 export * from './element.types';
 export * from './generics';
+export * from './rasterImage';

packages/ketcher-core/src/domain/constants/rasterImage.ts

@@ -0,0 +1,2 @@
+export const RASTER_IMAGE_KEY = 'rasterImages';
+export const RASTER_IMAGE_SERIALIZE_KEY = 'rasterImage';

packages/ketcher-core/src/domain/entities/rasterImage.ts

@@ -17,16 +17,13 @@
 import { BaseMicromoleculeEntity } from 'domain/entities/BaseMicromoleculeEntity';
 import { Point, Vec2 } from 'domain/entities/vec2';
 import { getNodeWithInvertedYCoord, KetFileNode } from 'domain/serializers';
+import { RASTER_IMAGE_SERIALIZE_KEY } from 'domain/constants';
 
 interface KetFileNodeContent {
   bitmap: string;
   halfSize: Point;
 }
 
-// Having the key as plural guarantees that restruct map
-export const RASTER_IMAGE_KEY = 'rasterImages';
-export const RASTER_IMAGE_SERIALIZE_KEY = 'rasterImage';
-
 export class RasterImage extends BaseMicromoleculeEntity {
   constructor(
     public bitmap: string,

packages/ketcher-core/src/domain/serializers/ket/ketSerializer.ts

@@ -17,7 +17,6 @@
 import {
   Atom,
   Bond,
-  RASTER_IMAGE_SERIALIZE_KEY,
   SGroupAttachmentPoint,
   Struct,
   UnresolvedMonomer,
@@ -80,6 +79,7 @@ import { MonomerItemType } from 'domain/types';
 import { PolymerBond } from 'domain/entities/PolymerBond';
 import { rasterImageToKet } from 'domain/serializers/ket/toKet/rasterImageToKet';
 import { rasterImageToStruct } from 'domain/serializers/ket/fromKet/rasterImageToStruct';
+import { RASTER_IMAGE_SERIALIZE_KEY } from 'domain/constants';
 
 function parseNode(node: any, struct: any) {
   const type = node.type;

packages/ketcher-core/src/domain/serializers/ket/toKet/rasterImageToKet.ts

@@ -14,11 +14,11 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { RASTER_IMAGE_KEY } from 'domain/entities/rasterImage';
+import { RASTER_IMAGE_SERIALIZE_KEY } from 'domain/constants';
 
 export function rasterImageToKet(rasterImageNode) {
   return {
-    type: RASTER_IMAGE_KEY,
+    type: RASTER_IMAGE_SERIALIZE_KEY,
     center: rasterImageNode.center,
     data: rasterImageNode.data,
     selected: rasterImageNode.selected,

packages/ketcher-react/src/script/editor/shared/closest.ts

@@ -705,8 +705,8 @@ function findClosestRasterImage(
   reStruct: ReStruct,
   cursorPosition: Vec2,
 ): ClosestReturnType {
-  return Array.from(reStruct.rasterImages.values()).reduce(
-    (acc: ClosestReturnType, item, id) => {
+  return Array.from(reStruct.rasterImages.entries()).reduce(
+    (acc: ClosestReturnType, [id, item]) => {
       const distanceToPoint =
         item.rasterImage.calculateDistanceToPoint(cursorPosition);
       if (distanceToPoint < SELECTION_DISTANCE_COEFFICIENT) {

packages/ketcher-react/src/script/editor/tool/eraser.ts

@@ -20,12 +20,14 @@ import {
   fromOneAtomDeletion,
   fromOneBondDeletion,
   fromPlusDeletion,
+  fromRasterImageDeletion,
   fromRGroupAttachmentPointDeletion,
   fromSgroupDeletion,
   fromSimpleObjectDeletion,
   fromTextDeletion,
   FunctionalGroup,
   SGroup,
+  RASTER_IMAGE_KEY,
 } from 'ketcher-core';
 
 import LassoHelper from './helper/lasso';
@@ -52,6 +54,7 @@ class EraserTool implements Tool {
       'simpleObjects',
       'texts',
       'rgroupAttachmentPoints',
+      RASTER_IMAGE_KEY,
     ];
     this.lassoHelper = new LassoHelper(mode || 0, editor, null);
 
@@ -368,6 +371,8 @@ class EraserTool implements Tool {
       this.editor.update(fromTextDeletion(restruct, ci.id));
     } else if (ci.map === 'rgroupAttachmentPoints') {
       this.editor.update(fromRGroupAttachmentPointDeletion(restruct, ci.id));
+    } else if (ci.map === RASTER_IMAGE_KEY) {
+      this.editor.update(fromRasterImageDeletion(restruct, ci.id));
     } else {
       // TODO re-factoring needed - should be "map-independent"
       console.error(

packages/ketcher-react/src/script/editor/tool/helper/locate.ts

@@ -20,7 +20,6 @@ import {
   RASTER_IMAGE_KEY,
   Struct,
   Vec2,
-  ReRasterImage,
   ReStruct,
 } from 'ketcher-core';
 
@@ -176,8 +175,8 @@ function getElementsInRectangle(restruct: ReStruct, p0, p1) {
     }
   });
 
-  const rerasterImages = Array.from(restruct.rasterImages.values()).reduce(
-    (acc: Array<number>, item: ReRasterImage, id): Array<number> => {
+  const rerasterImages = Array.from(restruct.rasterImages.entries()).reduce(
+    (acc: Array<number>, [id, item]): Array<number> => {
       if (
         Object.values(item.rasterImage.getReferencePositions()).some((point) =>
           point.isInsidePolygon([
@@ -336,8 +335,8 @@ function getElementsInPolygon(restruct: ReStruct, rr) {
     }
   });
 
-  const rerasterImages = Array.from(restruct.rasterImages.values()).reduce(
-    (acc: Array<number>, item: ReRasterImage, id) => {
+  const rerasterImages = Array.from(restruct.rasterImages.entries()).reduce(
+    (acc: Array<number>, [id, item]) => {
       if (
         Object.values(item.rasterImage.getReferencePositions()).some((point) =>
           isPointInPolygon(r, point),

packages/ketcher-react/src/script/ui/views/toolbars/toolbar.types.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-import { RASTER_IMAGE_KEY } from 'domain/entities/rasterImage';
+import { RASTER_IMAGE_KEY } from 'domain/constants';
 
 type TopGroup = 'document' | 'edit' | 'zoom' | 'process' | 'meta';