@luscii-healthtech/web-ui 2.68.0 → 2.69.0

package/dist/components/Form/FormRadioGroup.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 import { Control, RegisterOptions } from "react-hook-form/dist/index.ie11";
 import { RadioGroupProps } from "../RadioGroup/RadioGroupV2";
 import { FormFieldLabelerWithFormProps } from "./form.types";
-interface FormRadioGroupProps extends Omit<RadioGroupProps, "name">, FormFieldLabelerWithFormProps {
+interface FormRadioGroupProps extends Omit<RadioGroupProps, "isError">, FormFieldLabelerWithFormProps {
     control: Control;
     rules?: Exclude<RegisterOptions, "valueAsNumber" | "valueAsDate" | "setValueAs">;
 }

package/dist/components/RadioGroup/RadioGroupV2.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import { RadioProps } from "../Radio/RadioV2";
-export interface RadioGroupProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, "value"> {
+export interface RadioGroupProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, "name" | "value" | "checked"> {
     name: string;
     isError?: boolean;
     options: Omit<RadioProps, "name">[];

package/dist/web-ui.cjs.development.js

@@ -4261,8 +4261,14 @@ function RadioGroupInner(_ref) {
   }, title && /*#__PURE__*/React__default.createElement(Text, {
     text: title
   }), options.map(function (option) {
+    var defaultChecked;
+
+    if (!lodash.isNil(defaultValue)) {
+      defaultChecked = defaultValue === option.value;
+    }
+
     return /*#__PURE__*/React__default.createElement(RadioV2, _extends({
-      defaultChecked: option.value === defaultValue,
+      defaultChecked: defaultChecked,
       key: option.value
     }, option, registerProps, {
       ref: innerRef
@@ -6890,8 +6896,7 @@ var CRUDPage = function CRUDPage(_ref) {
     currentStep: steps.currentStep,
     localization: steps.localization
   }), children, /*#__PURE__*/React__default.createElement(Line, {
-    left: [cancelButton],
-    right: [submitButton],
+    left: [submitButton, cancelButton],
     className: classNames("cweb-crud-page-button-line", "border-t border-solid border-color-divider pt-4 mt-4")
   }))));
 };
@@ -8303,11 +8308,15 @@ var FormRadioGroup = /*#__PURE__*/React__default.forwardRef(function (_ref, inne
       var onChange = _ref2.onChange,
           value = _ref2.value;
       return /*#__PURE__*/React__default.createElement(RadioGroupV2, _extends({}, fieldProps, {
+        options: fieldProps.options.map(function (option) {
+          return _extends({}, option, {
+            checked: value === option.value
+          });
+        }),
         isError: hasError(name, fieldErrors),
         ref: innerRef,
         name: name,
-        onChange: onChange,
-        defaultValue: value
+        onChange: onChange
       }));
     }
   }));