@nuskin/foundation-ui-components 1.0.0-develop.6 → 1.0.0-develop.7

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

@@ -3,14 +3,12 @@ import { render, fireEvent, screen } from '@testing-library/react';
 import { NsRadioGroup } from './';
 import { FoundationTheme } from '@nuskin/foundation-theme';
 
-
 describe('NsRadioGroup', () => {
-
     const options = [
         { id: 'Option1', label: 'Option 1', value: 'Option1' },
         { id: 'Option2', label: 'Option 2', value: 'Option2' },
         { id: 'Option3', label: 'Option 3', value: 'Option3' },
-    ]
+    ];
 
     const props = {
         disable: false,
@@ -27,38 +25,39 @@ describe('NsRadioGroup', () => {
     };
     const onChange = jest.fn();
 
-    it('renders options correctly', () => {
-        render(
-            <NsRadioGroup  {...props} onChange={onChange}
-            />,
-        );
+    it('1. renders options correctly', () => {
+        render(<NsRadioGroup {...props} onChange={onChange} />);
 
         options.forEach((option) => {
             const radioOption = screen.getByLabelText(option.label) as HTMLInputElement;
             expect(radioOption).toBeInTheDocument();
-            expect(radioOption.value).toBe(option.value)
-        })
-
-    })
+            expect(radioOption.value).toBe(option.value);
+        });
+    });
+    it('2. renders options correctly without additional slot', () => {
+        render(<NsRadioGroup {...props} onChange={onChange} additionalSlot={''} />);
 
-    it('calls OnChange when selecting option', () => {
+        options.forEach((option) => {
+            const radioOption = screen.getByLabelText(option.label) as HTMLInputElement;
+            expect(radioOption).toBeInTheDocument();
+            expect(radioOption.value).toBe(option.value);
+        });
+    });
 
-        render(<NsRadioGroup {...props} onChange={onChange} />)
+    it('3. calls OnChange when selecting option', () => {
+        render(<NsRadioGroup {...props} onChange={onChange} />);
 
-        const radioOption = screen.getByLabelText('Option 2') as HTMLInputElement
+        const radioOption = screen.getByLabelText('Option 2') as HTMLInputElement;
         fireEvent.click(radioOption);
         expect(onChange).toHaveBeenCalledTimes(1);
+    });
 
-    })
-
-    it('does not call Onchange when the same option is clicked', () => {
+    it('4. does not call Onchange when the same option is clicked', () => {
         const onChange = jest.fn();
-        render(<NsRadioGroup {...props} onChange={onChange} />)
+        render(<NsRadioGroup {...props} onChange={onChange} />);
 
-        const radioOption = screen.getByLabelText('Option 1') as HTMLInputElement
-        fireEvent.click(radioOption)
+        const radioOption = screen.getByLabelText('Option 1') as HTMLInputElement;
+        fireEvent.click(radioOption);
         expect(onChange).not.toHaveBeenCalled();
-    })
-
-
-})
+    });
+});

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

@@ -1,8 +1,7 @@
-
 import type { StoryObj, Meta } from '@storybook/react';
 import { within, userEvent } from '@storybook/testing-library';
 import { expect } from '@storybook/jest';
-import { NsRadioGroup } from './'
+import { NsRadioGroup } from './';
 import { FoundationTheme } from '@nuskin/foundation-theme';
 
 type ComponentType = typeof NsRadioGroup;
@@ -11,46 +10,32 @@ type MetaStory = Meta<ComponentType>;
 
 export default {
     component: NsRadioGroup,
-    title: 'Components/NsRadioGroup',
+    title: 'Components/Inputs/NsRadioGroup',
     argTypes: {
         disable: {
-            description:
-                'Indicates whether the radio button is enabled/disabled',
-
+            description: 'Indicates whether the radio button is enabled/disabled',
         },
         items: {
-            description:
-                'Value of the component to be emitted when selected.',
+            description: 'Value of the component to be emitted when selected.',
         },
         name: {
-            description:
-                'Name of the component',
-
+            description: 'Name of the component',
         },
         label: {
-            description:
-                'Label of the radio group',
-
+            description: 'Label of the radio group',
         },
         color: {
-            description:
-                'Color of the radio button',
-
+            description: 'Color of the radio button',
         },
         size: {
-            description:
-                'Margin Left for Additional Slot text',
-
+            description: 'Margin Left for Additional Slot text',
         },
         labelFontSize: {
-            description:
-                'Used to change font-size of the label'
+            description: 'Used to change font-size of the label',
         },
         additionalSlot: {
-            description:
-                'An additional slot allows for more text',
-
-        }
+            description: 'An additional slot allows for more text',
+        },
     },
 } as MetaStory;
 
@@ -61,7 +46,7 @@ export const RadioGroup: Story = {
             {
                 id: 'individual',
                 label: `Vendeur à domicile indépendant mandataire (The VDI mandataire
-                     enters into sales or service agreements 
+                     enters into sales or service agreements
                     with customers in the name and on behalf of the company.
                      His remuneration will be based on commissions made
                      on the sales of products to customers.)`,
@@ -70,7 +55,7 @@ export const RadioGroup: Story = {
             {
                 id: ' retailer',
                 label: `Vendeur à domicile indépendant acheteur-revendeur
-                 (The VDI acheteur-revendeur sells the company's products in his own name and behalf. 
+                 (The VDI acheteur-revendeur sells the company's products in his own name and behalf.
                  His remuneration will be based on commissions and on the margins made on the sales of
                   products to customers.)`,
                 value: 'retailer',
@@ -91,12 +76,9 @@ export const RadioGroup: Story = {
         await userEvent.hover(canvas.getByTestId('radio-group'));
         await expect(
             canvas.getByText(
+                // eslint-disable-next-line max-len
                 'Vendeur à domicile indépendant mandataire (The VDI mandataire enters into sales or service agreements with customers in the name and on behalf of the company. His remuneration will be based on commissions made on the sales of products to customers.)'
             )
         ).toBeInTheDocument();
     },
 };
-
-
-
-

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

@@ -1,5 +1,6 @@
 import { Radio, FormControlLabel, FormLabel, RadioGroup } from '@mui/material';
 import { ColorUtils, FoundationTheme, styled } from '@nuskin/foundation-theme';
+import { skipDarkModeEnabled } from '../util';
 
 const { paletteColor, isDarkMode, color } = ColorUtils;
 
@@ -23,7 +24,7 @@ export const StyledLabel = styled(FormLabel)`
 `;
 
 export const StyledRadio = styled(Radio)`
-    color: ${(props) => !isDarkMode(props) ? color('primary', 'black')(props) : color('primary', 'white')(props)}
+    color: ${(props) => color('primary', !isDarkMode(props) ? 'black' : 'white')(props)};
 `;
 
 export const StyledFormControlLabel = styled(FormControlLabel)<{ darkModeEnabled?: boolean }>((props) => {
@@ -31,20 +32,21 @@ export const StyledFormControlLabel = styled(FormControlLabel)<{ darkModeEnabled
         color: paletteColor('primary')(props),
         marginBottom: '10px',
         '.MuiFormControlLabel-label.Mui-disabled': {
-            color: `${!isDarkMode(props) ? color('neutral', 60)(props) : color('neutral', 20)(props)}`
+            color: `${color('neutral', !isDarkMode(props) ? 60 : 20)(props)}`,
+        },
+    };
+});
+const options = {
+    shouldForwardProp: skipDarkModeEnabled,
+};
+export const StyledRadioGroup = styled(
+    RadioGroup,
+    options
+)<{ color: FoundationTheme.PaletteColors; darkModeEnabled?: boolean }>(({ theme, color, darkModeEnabled }) => {
+    return {
+        marginTop: '10px',
+        '.MuiRadio-root.custom-radio.Mui-checked': {
+            color: paletteColor(color)({ theme, darkModeEnabled }),
         },
     };
 });
-
-export const StyledRadioGroup = styled(RadioGroup)<
-    { color: FoundationTheme.PaletteColors; darkModeEnabled?: boolean }
->(
-    ({ theme, color, darkModeEnabled }) => {
-        return {
-            marginTop: '10px',
-            '.MuiRadio-root.custom-radio.Mui-checked': {
-                color: paletteColor(color)({ theme, darkModeEnabled })
-            },
-        };
-    }
-);

package/src/common/radiogroup/NsRadioGroup.tsx

@@ -22,7 +22,7 @@ const NsRadioGroup = (props: NsRadioGroupProps) => {
         size,
         additionalProps,
         labelFontSize,
-        darkModeEnabled = true
+        darkModeEnabled = true,
     } = props;
 
     return (
@@ -50,10 +50,11 @@ const NsRadioGroup = (props: NsRadioGroupProps) => {
                     ))}
                 </StyledRadioGroup>
             </FormControl>
-            {additionalSlot ? <StyledHelperText className={`ml-${size}`}>
-                <StyledSpan className="text-sm">{additionalSlot}</StyledSpan>
-            </StyledHelperText> : null}
-
+            {additionalSlot ? (
+                <StyledHelperText className={`ml-${size}`}>
+                    <StyledSpan className="text-sm">{additionalSlot}</StyledSpan>
+                </StyledHelperText>
+            ) : null}
         </>
     );
 };

package/src/common/search-bar/NsSearchBar.tsx

@@ -2,8 +2,6 @@ import React from 'react';
 import InputBase from '@mui/material/InputBase';
 import { styled } from '@nuskin/foundation-theme';
 
-interface NsSearchBarProps {}
-
 const Search = styled('div')`
     position: relative;
     borderRadius: 0;
@@ -31,7 +29,7 @@ const StyledInputBase = styled(InputBase)(() => ({
     },
 }));
 
-const NsSearchBar: React.FC<NsSearchBarProps> = () => {
+const NsSearchBar: React.FC = () => {
     return (
         <div>
             <Search>

package/src/common/select/NsSelect.spec.tsx

@@ -11,9 +11,7 @@ describe('NsSelectOption', () => {
     test('renders NsSelectOption component without errors', () => {
         const value = 'option1';
         const label = 'Option 1';
-        const { getByTestId, getByText } = render(
-            <NsSelectOption value={value} label={label} />
-        );
+        const { getByTestId, getByText } = render(<NsSelectOption value={value} label={label} />);
 
         // Check if the option container element exists
         const optionContainer = getByTestId(`option-${value}`);
@@ -27,14 +25,11 @@ describe('NsSelectOption', () => {
         const value = 'option1';
         const label = 'Option 1';
         const onSelect = jest.fn();
-        const { getByTestId } = render(
-            <NsSelectOption value={value} label={label} onSelect={onSelect} />
-        );
+        const { getByTestId } = render(<NsSelectOption value={value} label={label} onSelect={onSelect} />);
         const optionElement = getByTestId(`option-${value}`);
         fireEvent.click(optionElement);
         expect(onSelect).toHaveBeenCalledWith(value);
     });
-    
 });
 
 describe('NsSelect', () => {
@@ -69,8 +64,7 @@ describe('NsSelect', () => {
         const onSelect = jest.fn();
         const selectedLabel = 'Option 1';
         const { getByTestId, queryByTestId } = render(
-            <NsSelect selectedValue="Option1" selectedLabel={selectedLabel} onSelect={onSelect}>
-            </NsSelect>
+            <NsSelect selectedValue="Option1" selectedLabel={selectedLabel} onSelect={onSelect} />
         );
         const selectButton = getByTestId('select-head');
         fireEvent.mouseDown(selectButton);
@@ -132,12 +126,7 @@ describe('NsSelect', () => {
 
     it('select closes on mouse leave when closeOnMouseLeave is set to true', async () => {
         render(
-            <NsSelect
-                closeOnMouseLeave
-                selectedValue={selectedValue}
-                selectedLabel={selectedLabel}
-                onSelect={onSelect}
-            >
+            <NsSelect closeOnMouseLeave selectedValue={selectedValue} selectedLabel={selectedLabel} onSelect={onSelect}>
                 {createSelectOptions(options)}
             </NsSelect>
         );
@@ -186,7 +175,12 @@ describe('NsSelect', () => {
     test('renders SelectContainer with error styles when errorMessage is present', () => {
         const errorMessage = 'Invalid value';
         render(
-            <NsSelect selectedValue={selectedValue} selectedLabel={selectedLabel} onSelect={onSelect} errorMessage={errorMessage}>
+            <NsSelect
+                selectedValue={selectedValue}
+                selectedLabel={selectedLabel}
+                onSelect={onSelect}
+                errorMessage={errorMessage}
+            >
                 {createSelectOptions(options)}
             </NsSelect>
         );
@@ -196,5 +190,4 @@ describe('NsSelect', () => {
         expect(selectContainer).toHaveStyle('borderColor: red');
         expect(selectContainer).toHaveStyle('color: red');
     });
-
 });

package/src/common/select/NsSelect.styled.tsx

@@ -1,4 +1,6 @@
 import { styled, ColorUtils, FoundationTheme } from '@nuskin/foundation-theme';
+import { Themed } from '../common.types';
+import { getDropdownHeadBorder } from '../dropdown/NsDropdown.styled';
 const { color, paletteColor, isDarkMode } = ColorUtils;
 
 export const SelectContainer = styled.div<{ disabled: boolean }>`
@@ -13,8 +15,7 @@ export const SelectHead = styled.div<{ type: string; disabled: boolean }>`
     display: flex;
     justify-content: space-between;
     align-items: center;
-    border: ${({ type, theme }) =>
-        type === 'outlined' ? `1px solid ${color('primary', 'black')({ theme })}` : 'none'};
+    border: ${getDropdownHeadBorder}
     color: ${paletteColor('primary')};
     width: 207px;
     position: relative;
@@ -36,47 +37,65 @@ export const SelectList = styled.div<{ borderColor: FoundationTheme.PaletteColor
     background-color: ${paletteColor('primary', 'contrastText')};
 `;
 
-const getDividerColor = (props: { theme: FoundationTheme.Theme}) => {
-    const dividerColor = !isDarkMode(props) ? color('neutral', '30')(props) : color('neutral', '20')(props);
-    return dividerColor;
+const getDividerColor = (props: { theme: FoundationTheme.Theme }) => {
+    return !isDarkMode(props) ? color('neutral', '30')(props) : color('neutral', '20')(props);
 };
 
 const getListBgColor = (props: { theme: FoundationTheme.Theme }) => {
-    const bgColor = !isDarkMode(props) ? color('accentColorB', '10')(props) : color('accentColorB', '50')(props);
-    return bgColor;
+    return !isDarkMode(props) ? color('accentColorB', '10')(props) : color('accentColorB', '50')(props);
 };
+type ContainerParam = { borderBottom: string; bgColor: string; color: string; hoveredBg: string };
+function createListContainerStyle({ borderBottom, bgColor, color, hoveredBg }: ContainerParam) {
+    return `
+    cursor: pointer;
+    padding: 5px 0;
+    border-bottom: 1px solid ${borderBottom};
+    background-color: ${bgColor};
+    color: ${color};
 
-export const ListItemContainer = styled.div<{ showListDivider: boolean; isSelected: boolean }>`
-     ${({ showListDivider, isSelected, theme }) => `
-        cursor: pointer;
-        padding: 5px 0;
-        border-bottom: 1px solid ${showListDivider ? getDividerColor({ theme }) : 'none'};
-        background-color: ${isSelected ? paletteColor('primary')({ theme }) : 'white'};
-        color: ${isSelected ? 'white' : 'black'};
-
-        &:hover {
-            background-color: ${getListBgColor({ theme })};
-        }
+    &:hover {
+        background-color: ${hoveredBg};
+    }
 
-        &:last-child {
-            border-bottom: none;
-        }
-    `}
+    &:last-child {
+        border-bottom: none;
+    }
+`;
+}
+export const ListItemContainer = styled.div<{ showListDivider: boolean; isSelected: boolean }>`
+    ${({ showListDivider, isSelected, theme }) => {
+        const borderBottom = showListDivider ? getDividerColor({ theme }) : 'none';
+        const bgColor = isSelected ? paletteColor('primary')({ theme }) : 'white';
+        const color = isSelected ? 'white' : 'black';
+        const hoveredBg = getListBgColor({ theme });
+        return createListContainerStyle({ borderBottom, bgColor, color, hoveredBg });
+    }}
 `;
+const getListItemBgColor = ({ isSelected, theme }: { isSelected: boolean } & Themed) => {
+    if (isSelected) {
+        return paletteColor('primary')({ theme });
+    }
+    return getListBgColor({ theme });
+};
 
-export const ListItem = styled.div<{ isSelected: boolean}>`
-    padding: 5px 10px;
-    border-left: ${({ isSelected, theme }) =>
-        isSelected ? `2px solid ${paletteColor('primary')({ theme })}` : 'none'};
-    background-color: ${({ isSelected, theme }) =>
-        isSelected ? paletteColor('primary', 'main')({ theme }) : 'white'};
-    color: ${({ isSelected }) => (isSelected ? 'white' : 'black')};
-    &:hover {
-        background-color: ${({ isSelected, theme }) =>
-        isSelected ? paletteColor('primary')({ theme }) : getListBgColor({ theme })};
-            font-weight: bold; 
+const getListItemBorderLeftColor = ({ isSelected, theme }: { isSelected: boolean } & Themed) => {
+    if (isSelected) {
+        const color = paletteColor('primary')({ theme });
+        return `2px solid ${color}`;
     }
-`;
+    return 'none';
+};
+
+export const ListItem = styled.div<{ isSelected: boolean }>(({ isSelected, theme }) => ({
+    padding: '5px 10px',
+    borderLeft: getListItemBorderLeftColor({ isSelected, theme }),
+    backgroundColor: isSelected ? paletteColor('primary', 'main')({ theme }) : 'white',
+    color: isSelected ? 'white' : 'black',
+    '&:hover': {
+        backgroundColor: getListItemBgColor({ isSelected, theme }),
+        fontWeight: 'bold',
+    },
+}));
 
 export const SelectLabel = styled.label`
     display: block;

package/src/common/select/stories/NsSelect.stories.tsx

@@ -4,7 +4,7 @@ import NsSelect from '../NsSelect';
 import NsSelectOption from '../NsSelectOption';
 
 export default {
-    title: 'Components/NsSelect',
+    title: 'Components/Inputs/NsSelect',
     decorators: [
         (story) => <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>{story()}</div>,
     ],
@@ -21,11 +21,11 @@ export default {
         showListDivider: { control: 'boolean' },
         label: { control: 'text' },
         name: { control: 'text' },
-        menuProps:{ control: 'text' },
-        reverseArrowControls:{ control: 'boolean' },
-        validateOnBlur:{ control: 'boolean' },
+        menuProps: { control: 'text' },
+        reverseArrowControls: { control: 'boolean' },
+        validateOnBlur: { control: 'boolean' },
         autoComplete: { control: 'text' },
-        rules: {control: 'array'},
+        rules: { control: 'array' },
     },
     parameters: {
         options: [
@@ -91,15 +91,15 @@ export default {
         selectedValue: '',
         selectedLabel: '',
         label: 'State',
-        placeholder:'',
-        name:'',
-        menuProps:'auto',
+        placeholder: '',
+        name: '',
+        menuProps: 'auto',
         reverseArrowControls: false,
-        itemText:'Text',
-        itemValue:'Value',
+        itemText: 'Text',
+        itemValue: 'Value',
         validateOnBlur: false,
         autoComplete: '',
-        rules:[]
+        rules: [],
     },
 } as ComponentMeta<typeof NsSelect>;
 

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

@@ -5,7 +5,7 @@ export interface SelectProps {
     selectedValue: string;
     selectedLabel: string;
     onSelect: (arg: string) => void; // eslint-disable-line
-    children: ReactNode;
+    children?: ReactNode | null;
     disabled?: boolean;
     type?: 'outlined' | 'unfilled';
     placeholder?: string;
@@ -14,11 +14,11 @@ export interface SelectProps {
     showListDivider?: boolean;
     label?: string;
     readOnly?: boolean;
-    name?: string; 
+    name?: string;
     errorMessage?: string;
     menuProps?: string | object;
     reverseArrowControls?: boolean;
-    itemText?: string; 
+    itemText?: string;
     itemValue?: string;
     validateOnBlur?: boolean;
     autoComplete?: string;

package/src/common/spinner/NsSpinner.spec.tsx

@@ -0,0 +1,21 @@
+import React from 'react';
+import { render, screen } from '@/test-utils/index';
+import NsSpinner from './NsSpinner';
+
+describe('NsSpinner', () => {
+    test('1.renders spinner', () => {
+        const { container } = render(<NsSpinner additionalProps={{ 'data-testid': 'spinner' }} />);
+
+        expect(screen.getByTestId('spinner')).toBeInTheDocument();
+        expect(container.getElementsByTagName('svg')).toHaveLength(1);
+        expect(screen.getByTestId('spinner')).toHaveStyle('width:100px');
+    });
+
+    test('2.renders spinner with different size', () => {
+        render(<NsSpinner size={200} additionalProps={{ 'data-testid': 'spinner' }} />);
+
+        expect(screen.getByTestId('spinner')).toBeInTheDocument();
+        expect(screen.getByTestId('spinner')).toHaveStyle('width:200px');
+        expect(screen.getByTestId('spinner')).toHaveStyle('height:200px');
+    });
+});

package/src/common/spinner/NsSpinner.stories.tsx

@@ -0,0 +1,26 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import NsSpinner from './NsSpinner';
+import { withCenterDecorator } from '@/stories/decorators/withCenterDecorator';
+
+type ComponentType = typeof NsSpinner;
+type Story = StoryObj<ComponentType>;
+type MetaStory = Meta<ComponentType>;
+
+export default {
+    title: 'Components/Feedback/NsSpinner',
+    component: NsSpinner,
+    decorators: [
+        (Story) => (
+            <div className="flex place-content-center">
+                <Story />
+            </div>
+        ),
+        withCenterDecorator,
+    ],
+    argTypes: {},
+    args: {
+        size: 200,
+    },
+} as MetaStory;
+
+export const Spinner: Story = {};