@nuskin/foundation-ui-components 1.2.0 → 1.4.0

package/src/common/icon/icons/Check.tsx

@@ -0,0 +1,25 @@
+/* eslint-disable max-len */
+
+import { SvgIcon, SvgIconProps } from '@mui/material';
+
+const Check = (props: SvgIconProps) => {
+    return (
+        <SvgIcon
+            viewBox="0 0 21 20"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+            preserveAspectRatio="xMidYMid meet"
+            data-testid="check"
+            {...props}
+        >
+            <path
+                fillRule="evenodd"
+                clipRule="evenodd"
+                d="M20.0625 3.57806C20.3879 3.9035 20.3879 4.43114 20.0625 4.75657L8.39582 16.4232C8.23944 16.5796 8.02731 16.6674 7.80616 16.6673C7.585 16.6672 7.37296 16.5792 7.21673 16.4227L1.22007 10.4143C0.894947 10.0886 0.89546 9.56094 1.22121 9.23582C1.54697 8.9107 2.0746 8.91122 2.39972 9.23697L7.80714 14.6549L18.884 3.57806C19.2094 3.25263 19.737 3.25263 20.0625 3.57806Z"
+                fill={props.color}
+            />
+        </SvgIcon>
+    );
+};
+
+export default Check;

package/src/common/icon/icons/CloseIcon.tsx

@@ -12,7 +12,7 @@ const CloseIcon = (props: SvgIconProps) => {
             {...props}
             data-testid="close"
         >
-            <g fill="none" stroke={props.color || '#000'} strokeWidth="1">
+            <g fill="none" stroke={props.color} strokeWidth="1">
                 <path strokeLinecap="round" d="M 0 0 L 12 12 M 0 12 L 12 0" />
             </g>
         </SvgIcon>

package/src/common/icon/icons/ErrorIcon.tsx

@@ -1,7 +1,8 @@
 /* eslint-disable max-len */
 import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
+
 /**
- *
+ * pass colorOverride = '#C81D1D'
  * @param props { color: color to be filled for icon}
  * @returns ErrorIcon, can be used in Input field, when input field is in error state
  */
@@ -18,7 +19,7 @@ const ErrorIcon = (props: SvgIconProps) => {
         >
             <path
                 d="M17.07 2.92999C15.4338 1.29429 13.2811 0.276523 10.9786 0.0501185C8.67611 -0.176286 6.36637 0.402675 4.44291 1.68835C2.51945 2.97403 1.1013 4.88687 0.430089 7.10094C-0.241121 9.31502 -0.123857 11.6933 0.761901 13.8306C1.64766 15.9679 3.24711 17.732 5.28771 18.8222C7.32831 19.9125 9.68381 20.2614 11.9528 19.8096C14.2219 19.3578 16.2641 18.1332 17.7314 16.3445C19.1988 14.5557 20.0005 12.3136 20 9.99999C19.9994 7.34804 18.9455 4.80491 17.07 2.92999ZM9 5.37999C9 5.11477 9.10536 4.86041 9.29289 4.67288C9.48043 4.48534 9.73478 4.37999 10 4.37999C10.2652 4.37999 10.5196 4.48534 10.7071 4.67288C10.8946 4.86041 11 5.11477 11 5.37999V10.6C11 10.8652 10.8946 11.1196 10.7071 11.3071C10.5196 11.4946 10.2652 11.6 10 11.6C9.73478 11.6 9.48043 11.4946 9.29289 11.3071C9.10536 11.1196 9 10.8652 9 10.6V5.37999ZM10 15.51C9.74684 15.51 9.49936 15.4349 9.28887 15.2943C9.07837 15.1536 8.91431 14.9537 8.81743 14.7198C8.72055 14.4859 8.6952 14.2286 8.74459 13.9803C8.79398 13.732 8.91589 13.5039 9.0949 13.3249C9.27391 13.1459 9.50199 13.024 9.75028 12.9746C9.99858 12.9252 10.2559 12.9505 10.4898 13.0474C10.7237 13.1443 10.9236 13.3084 11.0643 13.5189C11.2049 13.7294 11.28 13.9768 11.28 14.23C11.28 14.5695 11.1451 14.895 10.9051 15.1351C10.665 15.3751 10.3395 15.51 10 15.51Z"
-                fill={props.color || '#C81D1D'}
+                fill={props.color}
             />
         </SvgIcon>
     );

package/src/common/icon/icons/SearchIcon.tsx

@@ -1,7 +1,8 @@
 /* eslint-disable max-len */
 import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
+
 /**
- *
+ * pass colorOverride = '#5F5F5F'
  * @param props {fill: color to be filled for icon, color: color of the tick icon}
  * @returns SearchIcon, can be used in Input field, when input field is in success state
  */
@@ -20,7 +21,7 @@ const SearchIcon = (props: SvgIconProps) => {
                 fillRule="evenodd"
                 clipRule="evenodd"
                 d="M0 9.98777C0 4.47167 4.46598 0 9.97505 0C15.4841 0 19.9501 4.47167 19.9501 9.98777C19.9501 11.7568 19.49 13.4205 18.6829 14.8629L23.2366 19.4844C24.2593 20.5223 24.2537 22.1921 23.2241 23.2231C22.1755 24.273 20.4704 24.2567 19.442 23.1869L15.0315 18.5988C13.5485 19.4736 11.8192 19.9755 9.97505 19.9755C4.46598 19.9755 0 15.5039 0 9.98777ZM16.6388 17.42L20.8646 21.8159C21.1265 22.0884 21.5608 22.0926 21.8279 21.8251C22.0902 21.5625 22.0916 21.1372 21.8311 20.8728L17.5309 16.5087C17.2531 16.8311 16.9551 17.1355 16.6388 17.42ZM9.97505 1.97696C5.55644 1.97696 1.97444 5.56352 1.97444 9.98777C1.97444 14.412 5.55644 17.9986 9.97505 17.9986C11.7025 17.9986 13.2995 17.4515 14.6063 16.5208C15.3948 15.9594 16.0773 15.2583 16.6179 14.454C17.4753 13.1784 17.9757 11.6431 17.9757 9.98777C17.9757 5.56352 14.3937 1.97696 9.97505 1.97696Z"
-                fill={props.color || '#5F5F5F'}
+                fill={props.color}
             />
         </SvgIcon>
     );

package/src/common/icon/icons/SuccessIcon.tsx

@@ -1,5 +1,11 @@
 /* eslint-disable max-len */
 import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
+
+/**
+ * pass fill = '#fff' and colorOverride ='#5BAC85'
+ * @param props
+ * @returns
+ */
 const SuccessIcon = (props: SvgIconProps) => {
     return (
         <SvgIcon
@@ -12,7 +18,7 @@ const SuccessIcon = (props: SvgIconProps) => {
             {...props}
         >
             <g id="Check Circle">
-                <circle id="Ellipse 70" cx="10" cy="10" r="10" fill={props.color || '#5BAC85'} />
+                <circle id="Ellipse 70" cx="10" cy="10" r="10" fill={props.color} />
                 <g id="check 12px">
                     <g id="checkmark">
                         <path

package/src/common/icon/icons/TrashIcon.tsx

@@ -1,5 +1,6 @@
 /* eslint-disable max-len */
 import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
+
 /**
  *
  * @param props {fill: color of the trash icon}
@@ -20,7 +21,7 @@ const TrashIcon = (props: SvgIconProps) => {
                 fillRule="evenodd"
                 clipRule="evenodd"
                 d="M10 0C10.5523 0 11 0.447715 11 1V2.5H19C19.5523 2.5 20 2.94772 20 3.5C20 4.05228 19.5523 4.5 19 4.5H17.5V18C17.5 19.6569 16.1569 21 14.5 21H5.5C3.84315 21 2.5 19.6569 2.5 18V4.5H1C0.447715 4.5 0 4.05228 0 3.5C0 2.94772 0.447715 2.5 1 2.5H9V1C9 0.447715 9.44771 0 10 0ZM4.5 4.5V18C4.5 18.5523 4.94772 19 5.5 19H14.5C15.0523 19 15.5 18.5523 15.5 18V4.5H4.5ZM6.5 5.5C7.05228 5.5 7.5 5.94772 7.5 6.5V17C7.5 17.5523 7.05228 18 6.5 18C5.94772 18 5.5 17.5523 5.5 17V6.5C5.5 5.94772 5.94772 5.5 6.5 5.5ZM10 5.5C10.5523 5.5 11 5.94772 11 6.5V17C11 17.5523 10.5523 18 10 18C9.44771 18 9 17.5523 9 17V6.5C9 5.94772 9.44771 5.5 10 5.5ZM13.5 5.5C14.0523 5.5 14.5 5.94772 14.5 6.5V17C14.5 17.5523 14.0523 18 13.5 18C12.9477 18 12.5 17.5523 12.5 17V6.5C12.5 5.94772 12.9477 5.5 13.5 5.5Z"
-                fill={props.color || '#252525'}
+                fill={props.color}
             />
         </SvgIcon>
     );

package/src/common/icon/icons/UserIcon.tsx

@@ -6,7 +6,13 @@ import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
  */
 const UserIcon = (props: SvgIconProps) => {
     return (
-        <SvgIcon viewBox="0 0 24 24" data-testid="userIcon" xmlns="http://www.w3.org/2000/svg" {...props}>
+        <SvgIcon
+            viewBox="0 0 24 24"
+            data-testid="userIcon"
+            xmlns="http://www.w3.org/2000/svg"
+            {...props}
+            fill="transparent"
+        >
             <path
                 fillRule="evenodd"
                 clipRule="evenodd"
@@ -17,6 +23,7 @@ const UserIcon = (props: SvgIconProps) => {
             <path
                 d="M19 20C18.9425 19.3229 19 17.5669 17.3793 17.2226C14.7126 16.6144 13.931 16.4078 14.1034 14.2272C15.8046 13.0796 15.7816 11.0252 15.7471 8.74139C15.7471 6.67508 14.0695 5 12 5C9.93052 5 8.25287 6.67508 8.25287 8.74139C8.25287 11.0367 8.25287 13.137 9.89655 14.2272C10.0575 16.4078 9.28736 16.6144 6.62069 17.2226C5 17.5669 5.05747 19.3229 5 20"
                 stroke={props.color}
+                fill={props.color}
                 strokeWidth="2"
                 strokeLinecap="round"
             />

package/src/common/icon/icons/UserOutline.tsx

@@ -1,6 +1,9 @@
 /* eslint-disable max-len */
 import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
 
+/**
+ *  * pass colorOverride = '#272525'
+ */
 function UserOutline(props: SvgIconProps) {
     return (
         <SvgIcon
@@ -15,7 +18,7 @@ function UserOutline(props: SvgIconProps) {
                 fill-rule="evenodd"
                 clip-rule="evenodd"
                 d="M12 1.25C6.06294 1.25 1.25 6.06294 1.25 12C1.25 17.9371 6.06294 22.75 12 22.75C17.9371 22.75 22.75 17.9371 22.75 12C22.75 6.06294 17.9371 1.25 12 1.25ZM2.75 12C2.75 6.89137 6.89137 2.75 12 2.75C17.1086 2.75 21.25 6.89137 21.25 12C21.25 14.5514 20.217 16.8615 18.5465 18.535C18.5373 18.5053 18.5278 18.4757 18.5177 18.4462C18.2909 17.7811 17.7908 17.0816 16.7743 16.861C16.1976 16.7279 15.7597 16.6249 15.4126 16.5154C15.0619 16.4048 14.8722 16.3075 14.7621 16.2197C14.6519 16.1318 14.5229 15.9893 14.534 15.3824C15.2564 14.7722 15.6208 13.9828 15.7989 13.145C15.9917 12.2377 15.9765 11.218 15.9621 10.2575L15.9618 10.2367C15.9587 8.04108 14.1928 6.25 12 6.25C9.80523 6.25 8.03818 8.04427 8.03818 10.2425L8.03818 10.2902C8.03812 11.2492 8.03807 12.2685 8.23093 13.1685C8.40828 13.9961 8.76096 14.7856 9.46415 15.382C9.47219 15.9884 9.34391 16.1319 9.23338 16.2204C9.12398 16.3079 8.93522 16.4051 8.58559 16.5155C8.23946 16.6249 7.80232 16.728 7.22572 16.861C6.20921 17.0816 5.70909 17.7811 5.48226 18.4462C5.47222 18.4757 5.46266 18.5053 5.45354 18.535C3.78298 16.8615 2.75 14.5514 2.75 12ZM6.77658 19.6351C8.26295 20.6539 10.0619 21.25 12 21.25C13.9381 21.25 15.7371 20.6539 17.2234 19.6351C17.206 19.3999 17.1779 19.1646 17.098 18.9304C16.9903 18.6146 16.822 18.4054 16.4533 18.3262L16.4423 18.3239L16.4423 18.3238C15.8787 18.1938 15.3772 18.0771 14.9615 17.946C14.5483 17.8157 14.1512 17.6513 13.8266 17.3922C13.0849 16.8004 12.9768 15.9412 13.0552 14.9385L13.0833 14.58L13.3803 14.3774C13.9081 14.0173 14.1862 13.5172 14.3317 12.8331C14.4843 12.1148 14.477 11.265 14.4619 10.2537L14.4617 10.2425H14.4618C14.4618 8.8592 13.3529 7.75 12 7.75C10.6471 7.75 9.53818 8.8592 9.53818 10.2425C9.53818 11.259 9.54149 12.1256 9.69764 12.8542C9.84777 13.5548 10.1225 14.0439 10.6148 14.3741L10.9184 14.5777L10.9451 14.9423C11.0181 15.9429 10.9092 16.8005 10.1706 17.3915C9.84647 17.6509 9.45024 17.8154 9.03756 17.9458C8.62239 18.077 8.12144 18.1938 7.55771 18.3238L7.54669 18.3263L7.54667 18.3262C7.17801 18.4054 7.00968 18.6146 6.90197 18.9304C6.8221 19.1646 6.79403 19.3999 6.77658 19.6351Z"
-                fill={props.color || '#272525'}
+                fill={props.color}
             />
         </SvgIcon>
     );

package/src/common/icon/icons/WarningIcon.tsx

@@ -1,7 +1,8 @@
 /* eslint-disable max-len */
 import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon';
+
 /**
- *
+ * pass colorOverride = '#FEBD00'
  * @param props { fill: color to be filled for icon, color: color of the tick icon}
  * @returns ErrorIcon, can be used in Input field, when input field is in error state
  */
@@ -24,7 +25,7 @@ const WarningIcon = (props: SvgIconProps) => {
                     15.5143276 0.328282319,15.6093523 0.505163987,15.6123832 L17.5120236,15.6123832 C17.6889052,15.6093523 17.8513135,15.5143276 17.940195,15.3618609 C18.0290766,
                     15.2093943 18.0314841,15.0216954 17.9465423,14.8670135 Z"
                         id="Shape"
-                        fill={props.color || '#FEBD00'}
+                        fill={props.color}
                         fillRule="nonzero"
                     ></path>
                     <path

package/src/common/icon/types.d.ts

@@ -1,15 +1,16 @@
 import { FoundationTheme } from '@nuskin/foundation-theme';
+import { HTMLProps } from 'react';
+
 import { NsIconVariants } from '.';
 
 export type NsIconSizeType = 'small' | 'medium' | 'large' | 'xLarge';
 
 export type NsIconNameType = keyof typeof NsIconVariants;
 
-export type NsIconProps = {
+export type NsIconProps = HTMLProps & {
     name: NsIconNameType;
     size?: NsIconSizeType;
     color?: FoundationTheme.PaletteColors;
     testId?: string;
-    className?: string;
     colorOverride?: string;
 };

package/src/common/index.ts

@@ -1,17 +1,18 @@
 export * from './accordion';
 export * from './alert';
 export * from './auth-dropdown';
+export * from './autocomplete';
 export * from './banner';
 
-export * from './breadcrumb';
 export * from './brand-components';
+export * from './breadcrumb';
 export * from './button';
 export * from './card';
 export * from './carousal';
 export * from './cart-icon';
-export * from './column-control';
 export * from './checkbox';
 export * from './common.types.d';
+export * from './column-control';
 export * from './dropdown';
 export * from './email-simple';
 export * from './flag';
@@ -22,11 +23,14 @@ export * from './input';
 export * from './label';
 export * from './link';
 export * from './modal';
-export * from './nav-tab';
 export * from './nav-product-card';
+export * from './nav-tab';
+export * from './progress';
 export * from './radiogroup';
+export * from './select';
 export * from './spinner';
-export * from './text-strip';
 export * from './table';
+export * from './text-strip';
 export * from './typography';
 export * from './utility';
+export * from './videos';

package/src/common/progress/NsProgress.spec.tsx

@@ -4,7 +4,7 @@ import Progress from './NsProgress';
 
 describe(' NsProgress Component', () => {
     test('should render Progress bar', () => {
-        render(<Progress color="primary" value={10}></Progress>);
+        render(<Progress barColor="primary" value={10}></Progress>);
 
         const pbar = screen.getByRole('progressbar');
 
@@ -16,7 +16,7 @@ describe(' NsProgress Component', () => {
         const value = 50;
 
         // Render the StyledProgress component with the value prop
-        const { container } = render(<Progress color="primary" value={value} />);
+        const { container } = render(<Progress barColor="primary" value={value} />);
 
         // Get the progress bar element
         const progressBar = container.querySelector('.MuiLinearProgress-bar');

package/src/common/progress/NsProgress.stories.tsx

@@ -1,6 +1,7 @@
 import { withCenterDecorator } from '@/stories/decorators/withCenterDecorator';
 import type { StoryObj, Meta } from '@storybook/react';
 import NsProgress from './NsProgress';
+import { PaletteColors } from '@nuskin/foundation-theme';
 
 type ComponentType = typeof NsProgress;
 type Story = StoryObj<ComponentType>;
@@ -8,10 +9,12 @@ type MetaStory = Meta<ComponentType>;
 
 export default {
     component: NsProgress,
-    title: 'Input/NsProgress',
+    title: 'Components/Inputs/NsProgress',
     decorators: [withCenterDecorator],
     argTypes: {
-        color: {
+        barColor: {
+            control: 'select',
+            options: PaletteColors,
             description: 'defines the color for the completed progress',
         },
         height: {
@@ -21,6 +24,8 @@ export default {
             description: 'value of the progress done',
         },
         backgroundColor: {
+            control: 'select',
+            options: PaletteColors,
             description: 'color of incomplete progress',
         },
     },
@@ -28,9 +33,9 @@ export default {
 
 export const ProgressBar: Story = {
     args: {
-        color: 'primary',
-        backgroundColor: '#19dbdb',
-        value: undefined,
+        barColor: 'primary',
+        backgroundColor: 'secondary',
+        value: 40,
         height: '10px',
         body: <span>{'% Complete'}</span>,
     },

package/src/common/progress/NsProgress.styled.tsx

@@ -2,8 +2,9 @@ import { styled, ColorUtils } from '@nuskin/foundation-theme';
 import { LinearProgress } from '@mui/material';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import { NsProgressProps } from './types';
+import { NsTypography } from '../typography';
 
-const { color } = ColorUtils;
+const { color, paletteColor } = ColorUtils;
 export const StyledCheckCircle = styled(CheckCircleIcon)`
     color: ${color('neutral', '50')};
     padding-top: 0.6em;
@@ -11,29 +12,46 @@ export const StyledCheckCircle = styled(CheckCircleIcon)`
     justify-self: flex-end;
 `;
 
-export const PercentDiv = styled('div')`
-    color: ${color('primary', '100')};
+export const ProgressInfo = styled(NsTypography)`
     display: flex;
     justify-content: flex-end;
-    font-family: Inter;
-    font-size: 12px;
-    font-style: normal;
     font-weight: 700;
     text-transform: uppercase;
 `;
 
 export const StyledLinearProgress = styled(LinearProgress)<Omit<NsProgressProps, 'value'>>(
-    ({ height, backgroundColor, color }) => ({
+    ({ height, backgroundColor, barColor, theme }) => ({
         width: '334px',
         height,
-        backgroundColor,
-        borderRadius: '3px',
+        backgroundColor: paletteColor(backgroundColor)({ theme }),
+        borderRadius: '8px',
         display: 'inline-block',
 
         '.MuiLinearProgress-bar': {
-            backgroundColor: color,
+            backgroundColor: paletteColor(barColor)({ theme }),
         },
     })
 );
-
-export default StyledLinearProgress;
+export const StyledProgress = styled('div')(() => {
+    return {
+        display: 'grid',
+        gridTemplateRows: '30px 30px',
+        '.progress-info': {
+            justifyContent: 'flex-end',
+            display: 'flex',
+            alignItems: 'center',
+        },
+        '.progress-bar': {
+            display: 'flex',
+            alignItems: 'center',
+            '.MuiSvgIcon-root': {
+                padding: '0',
+                margin: '0',
+                height: '100%',
+                position: 'relative',
+                left: '-4px',
+                scale: '1.3',
+            },
+        },
+    };
+});

package/src/common/progress/NsProgress.tsx

@@ -1,26 +1,28 @@
 import React from 'react';
 
 import { NsProgressProps } from './types';
-import StyledLinearProgress, { PercentDiv, StyledCheckCircle } from './NsProgress.styled';
+import { StyledLinearProgress, ProgressInfo, StyledCheckCircle, StyledProgress } from './NsProgress.styled';
 
 const NsProgress = (props: NsProgressProps) => {
-    const { color, backgroundColor, height, value, body } = props;
+    const { barColor, backgroundColor, height, value, body } = props;
     return (
-        <>
-            <PercentDiv>
+        <StyledProgress className="ns-progress">
+            <ProgressInfo variant="p-xs" className="progress-info">
                 {value}
-                {body}
-            </PercentDiv>
-            <StyledLinearProgress
-                variant="determinate"
-                role="progressbar"
-                color={color}
-                value={value}
-                height={height}
-                backgroundColor={backgroundColor}
-            />
-            <StyledCheckCircle />
-        </>
+                <span>{body ?? ' % Complete'}</span>
+            </ProgressInfo>
+            <div className="progress-bar">
+                <StyledLinearProgress
+                    variant="determinate"
+                    role="progressbar"
+                    value={value}
+                    height={height}
+                    barColor={barColor}
+                    backgroundColor={backgroundColor}
+                />
+                <StyledCheckCircle />
+            </div>
+        </StyledProgress>
     );
 };
 

package/src/common/progress/types.d.ts

@@ -13,8 +13,8 @@ declare module '@mui/material/LinearProgress' {
 }
 
 export type NsProgressProps = {
-    color?: FoundationTheme.PaletteColors;
-    backgroundColor?: string;
+    barColor?: FoundationTheme.PaletteColors;
+    backgroundColor?: FoundationTheme.PaletteColors;
     height?: string;
     value: number;
     body?: ReactNode;

package/src/common/radiogroup/NsRadioGroup.spec.tsx

@@ -16,7 +16,7 @@ describe('NsRadioGroup', () => {
         name: 'test',
         label: 'I choose to signup as',
         color: '#272525' as FoundationTheme.PaletteColors,
-        additionalSlot: 'An additional slot allows for more text',
+        helperText: 'help text for more information',
         size: 24,
         labelFontSize: 16,
         additionalProps: {
@@ -35,7 +35,7 @@ describe('NsRadioGroup', () => {
         });
     });
     it('2. renders options correctly without additional slot', () => {
-        render(<NsRadioGroup {...props} onChange={onChange} additionalSlot={''} />);
+        render(<NsRadioGroup {...props} onChange={onChange} helperText={''} />);
 
         options.forEach((option) => {
             const radioOption = screen.getByLabelText(option.label) as HTMLInputElement;

package/src/common/radiogroup/NsRadioGroup.stories.tsx

@@ -33,7 +33,7 @@ export default {
         labelFontSize: {
             description: 'Used to change font-size of the label',
         },
-        additionalSlot: {
+        helperText: {
             description: 'An additional slot allows for more text',
         },
     },
@@ -64,7 +64,7 @@ export const RadioGroup: Story = {
         name: 'test',
         label: 'I choose to signup as',
         color: '#272525' as FoundationTheme.PaletteColors,
-        additionalSlot: 'An additional slot allows for more text',
+        helperText: 'An additional slot allows for more text',
         size: 10,
         labelFontSize: 16,
         additionalProps: {

package/src/common/radiogroup/NsRadioGroup.tsx

@@ -14,7 +14,7 @@ import { NsRadioGroupProps } from './types';
 const NsRadioGroup = (props: NsRadioGroupProps) => {
     const {
         items,
-        additionalSlot,
+        helperText,
         label,
         onChange,
         color,
@@ -23,6 +23,7 @@ const NsRadioGroup = (props: NsRadioGroupProps) => {
         additionalProps,
         labelFontSize,
         darkModeEnabled = true,
+        row,
     } = props;
 
     return (
@@ -30,6 +31,7 @@ const NsRadioGroup = (props: NsRadioGroupProps) => {
             <FormControl data-testid={additionalProps?.testid}>
                 <NsLabel size={labelFontSize}>{label}</NsLabel>
                 <StyledRadioGroup
+                    row={row}
                     aria-labelledby="radio-buttons-group-label"
                     defaultValue={items?.[0]?.value}
                     name="radio-buttons-group"
@@ -50,9 +52,9 @@ const NsRadioGroup = (props: NsRadioGroupProps) => {
                     ))}
                 </StyledRadioGroup>
             </FormControl>
-            {additionalSlot ? (
+            {helperText ? (
                 <StyledHelperText className={`ml-${size}`}>
-                    <StyledSpan className="text-sm">{additionalSlot}</StyledSpan>
+                    <StyledSpan className="text-sm">{helperText}</StyledSpan>
                 </StyledHelperText>
             ) : null}
         </>

package/src/common/radiogroup/types.d.ts

@@ -1,20 +1,19 @@
 import { FoundationTheme } from '@nuskin/foundation-theme';
+import { RadioGroupProps } from '@mui/material';
 import { AdditionalProps } from '../common.types';
 
-export type NsRadioGroupProps = {
-    disable : boolean ;
-    name : string; 
-    additionalSlot : string;
-    label : string ;
-    items: RadioItems[] ;
+export type NsRadioGroupProps = Pick<RadioGroupProps, 'name' | 'onChange' | 'value' | 'defaultValue' | 'row'> & {
+    disable: boolean;
+    helperText: string;
+    label: string;
+    items: RadioItems[];
     color: FoundationTheme.PaletteColors;
-    size : number;
-    labelFontSize:number,
-    onChange : () => void;
+    size: number;
+    labelFontSize: number;
 } & AdditionalProps;
 
 export type RadioItems = {
-    label : string ; 
-    value :string | number ;
+    label: string;
+    value: string | number;
     id: string | number;
-}
+};