#5200 -- measure units are saved into global state

epam · Aug 14, 2024 · 3be35f3 · 3be35f3
1 parent 2b898c6
commit 3be35f3
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 22 deletions.
diff --git a/packages/ketcher-core/src/application/render/restruct/reatom.ts b/packages/ketcher-core/src/application/render/restruct/reatom.ts
@@ -61,6 +61,13 @@ export enum ShowHydrogenLabels {
   On = 'all',
 }
 
+export enum MeasurementUnits {
+  Px = 'px',
+  Cm = 'cm',
+  Pt = 'pt',
+  Inch = 'inch',
+}
+
 export enum ShowHydrogenLabelNames {
   Off = 'Off',
   Hetero = 'Hetero',

diff --git a/packages/ketcher-react/src/script/ui/component/form/MeasureInput/measure-input.jsx b/packages/ketcher-react/src/script/ui/component/form/MeasureInput/measure-input.jsx
@@ -28,13 +28,18 @@ const selectOptions = getSelectOptionsFromSchema({
 
 const MeasureInput = ({
   schema,
+  extraSchema,
   value,
+  extraValue,
   onChange,
+  onExtraChange,
   name,
   className,
   ...rest
 }) => {
-  const [measure, setMeasure] = useState('px');
+  const [measure, setMeasure] = useState(
+    extraValue || extraSchema?.default || 'px',
+  );
   const [cust, setCust] = useState(value || schema.default);
 
   useEffect(() => {
@@ -44,27 +49,27 @@ const MeasureInput = ({
     } // Hack: Set init value (RESET)
   }, []);
 
+  useEffect(() => {
+    setMeasure(extraValue);
+  }, [extraValue]);
+
   const handleChange = (value) => {
     const convValue = convertValue(value, measure, 'px');
     setCust(value);
     onChange(convValue);
   };
 
-  const handleMeasChange = (m) => {
+  const handleMeasChange = (unit) => {
     setCust((prev) => {
-      convertValue(prev, measure, m);
+      convertValue(prev, measure, unit);
     });
-    setMeasure(m);
-  };
-
-  const calcValue = () => {
-    const newValue = convertValue(value, 'px', measure);
-    setCust(newValue);
+    setMeasure(unit);
+    onExtraChange(unit);
   };
 
   useEffect(() => {
-    calcValue();
-  }, [value, measure, calcValue]);
+    setCust(convertValue(value, 'px', measure));
+  }, [value, measure]);
 
   const desc = schema || schema.properties[name];
 

diff --git a/packages/ketcher-react/src/script/ui/component/form/form/form.jsx b/packages/ketcher-react/src/script/ui/component/form/form/form.jsx
@@ -71,18 +71,23 @@ class Form extends Component {
     onUpdate(instance, valid, errs);
   }
 
-  field(name, onChange) {
+  field(name, onChange, extraName) {
     const { result, errors } = this.props;
     const value = result[name];
+    const extraValue = extraName ? result[extraName] : null;
+
+    const handleOnChange = (name, value) => {
+      const newState = Object.assign({}, this.props.result, { [name]: value });
+      this.updateState(newState);
+      if (onChange) onChange(value);
+    };
 
     return {
       dataError: errors && errors[name],
       value,
-      onChange: (val) => {
-        const newState = Object.assign({}, this.props.result, { [name]: val });
-        this.updateState(newState);
-        if (onChange) onChange(val);
-      },
+      extraValue,
+      onChange: (val) => handleOnChange(name, val),
+      onExtraChange: (val) => handleOnChange(extraName, val),
     };
   }
 
@@ -126,7 +131,8 @@ function Label({ labelPos, title, children, ...props }) {
 }
 
 function Field(props) {
-  const { name, onChange, component, labelPos, className, ...rest } = props;
+  const { name, extraName, onChange, component, labelPos, className, ...rest } =
+    props;
   const [anchorEl, setAnchorEl] = useState(null);
   const handlePopoverOpen = useCallback((event) => {
     setAnchorEl(event.currentTarget);
@@ -136,13 +142,22 @@ function Field(props) {
   }, []);
   const { schema, stateStore } = useFormContext();
   const desc = rest.schema || schema.properties[name];
-  const { dataError, ...fieldOpts } = stateStore.field(name, onChange);
+  const { dataError, onExtraChange, extraValue, ...fieldOpts } =
+    stateStore.field(name, onChange, extraName);
+
+  const getExtraSchema = () => {
+    return rest.extraSchema || schema.properties[extraName];
+  };
+
   const Component = component;
   const formField = component ? (
     <Component
       name={name}
       schema={desc}
       className={className}
+      onExtraChange={onExtraChange}
+      extraValue={extraValue}
+      {...(extraName && { extraSchema: getExtraSchema() })}
       {...fieldOpts}
       {...rest}
     />

diff --git a/packages/ketcher-react/src/script/ui/data/schema/options-schema.ts b/packages/ketcher-react/src/script/ui/data/schema/options-schema.ts
@@ -17,6 +17,7 @@
 import {
   StereLabelStyleType,
   StereoColoringType,
+  MeasurementUnits,
   ShowHydrogenLabels,
   ShowHydrogenLabelNames,
   defaultBondThickness,
@@ -64,15 +65,20 @@ const render: {
   orFlagLabel: ExtendedSchema;
   font: ExtendedSchema;
   fontsz: ExtendedSchema;
+  fontszUnit: ExtendedSchema;
   fontszsub: ExtendedSchema;
+  fontszsubUnit: ExtendedSchema;
   carbonExplicitly: ExtendedSchema;
   showCharge: ExtendedSchema;
   showValence: ExtendedSchema;
   showHydrogenLabels: ExtendedSchema;
   aromaticCircle: ExtendedSchema;
   doubleBondWidth: ExtendedSchema;
+  doubleBondWidthUnit: ExtendedSchema;
   bondThickness: ExtendedSchema;
+  bondThicknessUnit: ExtendedSchema;
   stereoBondWidth: ExtendedSchema;
+  stereoBondWidthUnit: ExtendedSchema;
 } = {
   showValenceWarnings: {
     title: 'Show valence warnings',
@@ -173,13 +179,25 @@ const render: {
     minimum: 1,
     maximum: 96,
   },
+  fontszUnit: {
+    title: 'Font size unit',
+    enum: Object.values(MeasurementUnits),
+    enumNames: Object.values(MeasurementUnits),
+    default: MeasurementUnits.Px,
+  },
   fontszsub: {
     title: 'Sub font size',
     type: 'integer',
     default: 13,
     minimum: 1,
     maximum: 96,
   },
+  fontszsubUnit: {
+    title: 'Sub font size unit',
+    enum: Object.values(MeasurementUnits),
+    enumNames: Object.values(MeasurementUnits),
+    default: MeasurementUnits.Px,
+  },
   // Atom
   carbonExplicitly: {
     title: 'Display carbon explicitly',
@@ -219,20 +237,38 @@ const render: {
     minimum: 1,
     maximum: 96,
   },
+  doubleBondWidthUnit: {
+    title: 'Double bond width unit',
+    enum: Object.values(MeasurementUnits),
+    enumNames: Object.values(MeasurementUnits),
+    default: MeasurementUnits.Px,
+  },
   bondThickness: {
     title: 'Bond thickness',
     type: 'integer',
     default: defaultBondThickness,
     minimum: 1,
     maximum: 96,
   },
+  bondThicknessUnit: {
+    title: 'Bond thickness unit',
+    enum: Object.values(MeasurementUnits),
+    enumNames: Object.values(MeasurementUnits),
+    default: MeasurementUnits.Px,
+  },
   stereoBondWidth: {
     title: 'Stereo (Wedge) bond width',
     type: 'integer',
     default: 6,
     minimum: 1,
     maximum: 96,
   },
+  stereoBondWidthUnit: {
+    title: 'Stereo (Wedge) bond width unit',
+    enum: Object.values(MeasurementUnits),
+    enumNames: Object.values(MeasurementUnits),
+    default: MeasurementUnits.Px,
+  },
 };
 
 const server: {

diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/meta/Settings/Settings.tsx b/packages/ketcher-react/src/script/ui/views/modal/components/meta/Settings/Settings.tsx
@@ -153,8 +153,18 @@ const SettingsDialog = (props: Props) => {
         <Field name="showValenceWarnings" />
         <Field name="atomColoring" />
         <Field name="font" component={SystemFonts} data-testid="font" />
-        <Field name="fontsz" component={MeasureInput} labelPos={false} />
-        <Field name="fontszsub" component={MeasureInput} labelPos={false} />
+        <Field
+          name="fontsz"
+          component={MeasureInput}
+          labelPos={false}
+          extraName="fontszUnit"
+        />
+        <Field
+          name="fontszsub"
+          component={MeasureInput}
+          labelPos={false}
+          extraName="fontszsubUnit"
+        />
       </fieldset>
     ),
   };
@@ -222,12 +232,19 @@ const SettingsDialog = (props: Props) => {
           name="doubleBondWidth"
           component={MeasureInput}
           labelPos={false}
+          extraName="doubleBondWidthUnit"
+        />
+        <Field
+          name="bondThickness"
+          component={MeasureInput}
+          labelPos={false}
+          extraName="bondThicknessUnit"
         />
-        <Field name="bondThickness" component={MeasureInput} labelPos={false} />
         <Field
           name="stereoBondWidth"
           component={MeasureInput}
           labelPos={false}
+          extraName="stereoBondWidthUnit"
         />
       </fieldset>
     ),