Merge pull request #915 from epam/#866-absolute-radio-button-checked-…

…in-all-case #866 'Absolute' radio button checked in all case
epam · Nov 3, 2021 · ef96bac · ef96bac
2 parents 7932611 + ffd992e
commit ef96bac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/ketcher-react/src/script/ui/component/form/input.jsx b/packages/ketcher-react/src/script/ui/component/form/input.jsx
@@ -112,6 +112,7 @@ function FieldSet({
   selected,
   onSelect,
   type = 'radio',
+  checked,
   ...rest
 }) {
   return (
@@ -121,7 +122,9 @@ function FieldSet({
           <label className={classes.fieldSetLabel}>
             <input
               type={type}
-              defaultChecked={selected(val, value)}
+              defaultChecked={
+                type === 'radio' ? selected(val, checked) : selected(val, value)
+              }
               value={typeof val !== 'object' && val}
               {...rest}
             />

diff --git a/packages/ketcher-react/src/script/ui/dialog/toolbox/sdata.jsx b/packages/ketcher-react/src/script/ui/dialog/toolbox/sdata.jsx
@@ -99,14 +99,14 @@ function SData({
             name="fieldName"
             schema={sdataSchema[result.context]}
           />
-          {content(formSchema, result.context, result.fieldName)}
+          {content(formSchema, result.context, result.fieldName, radiobuttons)}
         </fieldset>
       </Form>
     </Dialog>
   )
 }
 
-const content = (schema, context, fieldName) =>
+const content = (schema, context, fieldName, checked) =>
   Object.keys(schema.properties)
     .filter(
       prop => prop !== 'type' && prop !== 'context' && prop !== 'fieldName'
@@ -115,6 +115,7 @@ const content = (schema, context, fieldName) =>
       prop === 'radiobuttons' ? (
         <Field
           name={prop}
+          checked={checked}
           type="radio"
           key={`${context}-${fieldName}-${prop}-radio`}
         />