ketcher-react 2.21.0-rc.1 → 2.22.0-rc.1-dev.1

package/dist/index.js

@@ -1850,7 +1850,7 @@ var atom = {
     charge: {
       title: 'Charge',
       type: 'string',
-      pattern: '^([+-]?)([0-9]{1,3})([+-]?)$',
+      pattern: '^([+-]?)(1[0-5]|0|[0-9])([+-]?)$',
       maxLength: 4,
       "default": '',
       invalidMessage: 'Invalid charge value'
@@ -2146,6 +2146,11 @@ var attachSchema = {
   }
 };
 
+function matchCharge(charge) {
+  var regex = new RegExp(atom.properties.charge.pattern);
+  return regex.exec(charge);
+}
+
 var _excluded$z = ["aromaticity", "ringMembership", "ringSize", "connectivity", "chirality", "customQuery"],
   _excluded2$7 = ["type", "radiobuttons"];
 function ownKeys$1j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -2246,21 +2251,21 @@ function fromAtom(satom) {
     customQuery: satom.queryProperties.customQuery === null ? '' : satom.queryProperties.customQuery.toString()
   };
 }
-function toAtom(atom$1) {
+function toAtom(atom) {
   var _restAtom$exactChange, _restAtom$unsaturated;
-  var _atom$aromaticity = atom$1.aromaticity,
+  var _atom$aromaticity = atom.aromaticity,
     aromaticity = _atom$aromaticity === void 0 ? null : _atom$aromaticity,
-    _atom$ringMembership = atom$1.ringMembership,
+    _atom$ringMembership = atom.ringMembership,
     ringMembership = _atom$ringMembership === void 0 ? null : _atom$ringMembership,
-    _atom$ringSize = atom$1.ringSize,
+    _atom$ringSize = atom.ringSize,
     ringSize = _atom$ringSize === void 0 ? null : _atom$ringSize,
-    _atom$connectivity = atom$1.connectivity,
+    _atom$connectivity = atom.connectivity,
     connectivity = _atom$connectivity === void 0 ? null : _atom$connectivity,
-    _atom$chirality = atom$1.chirality,
+    _atom$chirality = atom.chirality,
     chirality = _atom$chirality === void 0 ? null : _atom$chirality,
-    _atom$customQuery = atom$1.customQuery,
+    _atom$customQuery = atom.customQuery,
     customQuery = _atom$customQuery === void 0 ? '' : _atom$customQuery,
-    restAtom = _objectWithoutProperties__default["default"](atom$1, _excluded$z);
+    restAtom = _objectWithoutProperties__default["default"](atom, _excluded$z);
   if (customQuery && customQuery !== '') {
     return Object.assign({}, restAtom, {
       label: 'A',
@@ -2289,12 +2294,11 @@ function toAtom(atom$1) {
       exactChangeFlag: 0
     });
   }
-  var chargeRegexp = new RegExp(atom.properties.charge.pattern);
-  var pch = chargeRegexp.exec(restAtom.charge);
+  var pch = matchCharge(restAtom.charge);
   var charge = pch ? parseInt(pch[1] + pch[3] + pch[2]) : restAtom.charge;
   var conv = Object.assign({}, restAtom, {
     isotope: restAtom.isotope ? Number(restAtom.isotope) : null,
-    charge: restAtom.charge ? Number(charge) : null,
+    charge: restAtom.charge && charge !== 0 ? Number(charge) : null,
     alias: restAtom.alias || null,
     exactChangeFlag: +((_restAtom$exactChange = restAtom.exactChangeFlag) !== null && _restAtom$exactChange !== void 0 ? _restAtom$exactChange : false),
     unsaturatedAtom: +((_restAtom$unsaturated = restAtom.unsaturatedAtom) !== null && _restAtom$unsaturated !== void 0 ? _restAtom$unsaturated : false),
@@ -27983,8 +27987,7 @@ function pseudoAtomValid(value, atomType, isCustomQuery) {
   return value && isGenericElement;
 }
 function chargeValid(charge, isMultipleAtoms, isCustomQuery) {
-  var regex = new RegExp(atom.properties.charge.pattern);
-  var result = regex.exec(charge);
+  var result = matchCharge(charge);
   var isValidCharge = result && (result[1] === '' || result[3] === '');
   if (isCustomQuery || charge === '') {
     return true;
@@ -32824,8 +32827,8 @@ var KetcherBuilder = function () {
                 initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.21.0-rc.1" ,
-                  buildDate: "2024-04-15T19:45:15" ,
+                  version: "2.22.0-rc.1-dev.1" ,
+                  buildDate: "2024-05-09T11:46:46" ,
                   buildNumber: ''
                 }, structService, resolve, togglerComponent);
               });