#9645 - Migrate to Indigo v1.43.0-rc.1 in-browser module

ketcher-autotests/tests/specs/Chromium-popup/Bugs/ketcher-3.11.0-bugs.spec.ts

@@ -838,8 +838,8 @@ test.describe('Bugs: ketcher-3.11.0 — first trio', () => {
     );
     await CommonLeftToolbar(page).areaSelectionTool();
     await selectMonomersAndBonds(page, {
-      monomerIds: [68, 69, 82, 83, 73, 76, 71, 72, 80, 79, 81, 84],
-      bondIds: [97, 112, 115, 101, 102, 113, 114, 100, 111, 108, 104, 109],
+      monomerIds: [68, 69, 82, 83, 73, 71, 72, 80, 79, 84],
+      bondIds: [97, 112, 115, 101, 102, 113, 114, 100, 111, 108],
     });
     await ContextMenu(page, getMonomerLocator(page, { monomerId: 80 })).click(
       MonomerOption.ArrangeAsARing,

packages/ketcher-core/package.json

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

packages/ketcher-macromolecules/package.json

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

packages/ketcher-react/package.json

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

packages/ketcher-react/src/script/ui/dialog/toolbox/labeledit.tsx

@@ -16,7 +16,7 @@
 
 import Form, { Field } from '../../component/form/form/form';
 
-import { Dialog } from '../../views/components';
+import { Dialog } from 'components';
 import { Elements } from 'ketcher-core';
 import { capitalize } from 'lodash/fp';
 import { connect } from 'react-redux';
@@ -58,11 +58,13 @@ export function serialize(lc: AtomLabelData): string {
 }
 
 const LABEL_REGEX = /^(\d+)?([a-z*]{1,3})(\.|:|\^\^)?(\d+[-+]|[-+])?$/i;
-const VALID_GENERIC_LABELS = ['A', 'Q', 'X', 'M'];
+const VALID_GENERIC_LABELS = new Set(['A', 'Q', 'X', 'M']);
+
+const isValidLabel = (value: string): boolean => deserialize(value) !== null;
 
 function parseCharge(chargeStr: string): number {
-  let charge = parseInt(chargeStr);
-  if (isNaN(charge)) {
+  let charge = Number.parseInt(chargeStr, 10);
+  if (Number.isNaN(charge)) {
     charge = 1;
   }
   if (chargeStr.endsWith('-')) {
@@ -78,11 +80,13 @@ export function deserialize(value: string): AtomLabelData | null {
   }
 
   const label = match[2] === '*' ? 'A' : capitalize(match[2]);
-  const isotope: number | null = match[1] ? parseInt(match[1]) : null;
+  const isotope: number | null = match[1]
+    ? Number.parseInt(match[1], 10)
+    : null;
   const radical = match[3] ? { ':': 1, '.': 2, '^^': 3 }[match[3]] ?? 0 : 0;
   const charge: number | null = match[4] ? parseCharge(match[4]) : null;
 
-  if (VALID_GENERIC_LABELS.includes(label) || Elements.get(label)) {
+  if (VALID_GENERIC_LABELS.has(label) || Elements.get(label)) {
     return { label, charge, isotope, radical };
   }
 
@@ -109,16 +113,16 @@ function LabelEdit(props: Readonly<LabelEditProps>) {
     >
       <Form
         schema={labelEditSchema}
-        customValid={{ label: (l: string) => deserialize(l) }}
+        customValid={{ label: isValidLabel }}
         init={init}
         {...formState}
       >
         <Field
           name="label"
           maxLength={20}
-          // @ts-expect-error FieldProps missing size and autoFocus (defined in FieldWithModalProps)
+          // @ts-expect-error FieldProps missing size and isFocused (passed through to Input)
           size="10"
-          autoFocus
+          isFocused
           className={styles.labelEditInputField}
         />
       </Form>

packages/ketcher-standalone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ketcher-standalone",
-  "version": "3.14.0-rc.1",
+  "version": "3.15.0-rc.1",
   "description": "Web-based molecule sketcher",
   "license": "Apache-2.0",
   "homepage": "http://lifescience.opensource.epam.com/ketcher",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.26.10",
-    "indigo-ketcher": "1.43.0-dev.2",
+    "indigo-ketcher": "1.43.0-rc.1",
     "ketcher-core": "*"
   },
   "devDependencies": {