@nuskin/foundation-ui-components 1.1.0 → 1.1.1

package/src/common/button/helper.ts

@@ -0,0 +1,82 @@
+type ContainedParams = {
+    backgroundColor: string;
+    textColor: string;
+    hovered: string;
+    pressed: string;
+    focused: string;
+};
+
+export function generateContainedStyle({
+    backgroundColor,
+    textColor,
+    hovered,
+    pressed,
+    focused,
+}: ContainedParams): string {
+    return `
+		background-color: ${backgroundColor};
+		color: ${textColor} !important;
+		&:hover {
+			background-color: ${hovered};
+		}
+		&:active {
+			background-color: ${pressed};
+		}
+		&:focus {
+			background-color: ${focused};
+		}
+	`;
+}
+type OutlinedParams = {
+    borderColor: string;
+    hovered: string;
+    pressed: string;
+    activeColor: string;
+};
+export function generateOutlinedStyle({ borderColor, hovered, pressed, activeColor }: OutlinedParams) {
+    return `
+		border-color: ${borderColor};
+		color: ${borderColor};
+		&:hover {
+				border-color: ${hovered};
+				color: ${borderColor};
+		}
+		&:active {
+				border-color: ${pressed};
+				color: ${activeColor};
+		}
+`;
+}
+
+type TextParams = {
+    underlineColor: string;
+    hovered: string;
+    pressed: string;
+};
+
+export function generateTextStyles({ underlineColor, hovered, pressed }: TextParams): string {
+    return `
+    text-decoration: underline 1px !important;
+    text-underline-offset: 4px;
+    padding: 0;
+    min-width: auto;
+    background-color: transparent !important;
+    text-decoration-color: ${underlineColor};
+    color: ${underlineColor};
+    &:hover {
+      color: ${hovered};
+      text-decoration-color: ${hovered};
+    }
+    &:active {
+      color: ${underlineColor};
+      text-decoration-color: ${pressed};
+    }
+  `;
+}
+
+export function generateIconOnlyStyles() {
+    return `
+			padding: 10px;
+	    min-width: unset;
+    `;
+}

package/src/common/card/NsFfgCard.tsx

@@ -2,15 +2,21 @@ import { NsNextImage, NsLink } from '../';
 import { NsFfgStyled } from './styled/NsFfgStyled';
 import { NsFfgCardProps } from './types.d';
 
-const NsFfgCard = ({ actionText, actionLink, text, topImageUrl, topImageAlt, additionalProps }: NsFfgCardProps) => {
+const NsFfgCard = ({ cardLink, text, topImageUrl, topImageAlt, additionalProps, cslp, onClick }: NsFfgCardProps) => {
     return (
-        <NsFfgStyled data-testid={additionalProps?.testid}>
-            <div className="top-image">
+        <NsFfgStyled
+            data-testid={additionalProps?.testid}
+            onClick={onClick}
+            className={additionalProps?.className ?? ''}
+        >
+            <header className="top-image">
                 <NsNextImage height={192} width={288} alt={topImageAlt} src={topImageUrl} />
-            </div>
-            <div className="body-text">{text}</div>
-            <NsLink className="action-link" href={actionLink}>
-                {actionText || 'LEARN MORE'}
+            </header>
+            <article className="body-text" {...cslp?.card_text}>
+                {text}
+            </article>
+            <NsLink className="action-link" href={cardLink.href} additionalProps={cslp?.action_text}>
+                {cardLink.title || 'LEARN MORE'}
             </NsLink>
         </NsFfgStyled>
     );

package/src/common/card/specs/NsFfgCard.spec.tsx

@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, fireEvent } from '@testing-library/react';
 import NsFfgCard from '../NsFfgCard';
 
 describe('NsFfgCard component', () => {
@@ -6,18 +6,28 @@ describe('NsFfgCard component', () => {
         topImageUrl: 'https://media.nuskin.com/m/6245528b8f76ad32/webimage-brand-ageLOC.png',
         topImageAlt: 'alt-text',
         text: 'card text',
-        actionLink: 'https://www.google.com',
+        cardLink: { href: 'https://www.google.com', title: 'Test' },
+        onClick: jest.fn(),
     };
-    it('renders with background image', () => {
+    it('1. renders with background image', () => {
         render(<NsFfgCard {...props} additionalProps={{ testid: 'ffg-card' }} />);
         const card = screen.getByTestId('ffg-card');
         expect(card).toHaveStyle(`
-    			background-color: #fff;
-    		`);
+          background-color: #fff;
+        `);
     });
-    it('renders with cover size', () => {
-        render(<NsFfgCard {...props} additionalProps={{ testid: 'ffg-card-1' }} actionText="Details" />);
-        const card = screen.getByText('Details');
+    it('2. renders with cover size', () => {
+        render(<NsFfgCard {...props} additionalProps={{ testid: 'ffg-card-1' }} />);
+        const card = screen.getByText(props.cardLink.title);
         expect(card).toBeInTheDocument();
     });
+    it('3. calls onclick', () => {
+        const handler = jest.fn();
+        const { getByTestId } = render(
+            <NsFfgCard {...props} onClick={handler} additionalProps={{ testid: 'ffg-card-1' }} />
+        );
+        const card = getByTestId('ffg-card-1');
+        fireEvent.click(card);
+        expect(handler).toHaveBeenCalled();
+    });
 });

package/src/common/card/stories/NsFfgCard.stories.tsx

@@ -11,30 +11,63 @@ type MetaStory = Meta<ComponentType>;
 export default {
     component: NsFfgCard,
     title: 'Components/Containers/Card/NsFfgCard',
-    argTypes: {},
+    argTypes: {
+        onClick: {
+            action: 'clicked',
+        },
+    },
     decorators: [withCenterDecorator],
 } as MetaStory;
 
+const text = `Every child deserves a chance to shine. Through our Nu Skin Force for Good Foundation,
+ we’re empowering children around the world with hope for a brighter future.`;
+const host = 'https://images.contentstack.io/v3/assets';
+
 export const Default: Story = {
     args: {
-        actionText: 'LEARN MORE',
-        actionLink: 'https://www.forceforgood.org/',
-        text: 'Every child deserves a chance to shine. Through our Nu Skin Force for Good Foundation, we’re empowering children around the world with hope for a brighter future.',
-        topImageUrl:
-            'https://images.contentstack.io/v3/assets/blt594f30e2dc643eae/blt34cdb300dc9b93ff/645ccaa7520ba1a1af13a08a/nsffg-foundation.webp',
+        cardLink: {
+            href: 'https://www.forceforgood.org/',
+            title: 'LEARN MORE',
+        },
+        text,
+        topImageUrl: `${host}/blt594f30e2dc643eae/blt34cdb300dc9b93ff/645ccaa7520ba1a1af13a08a/nsffg-foundation.webp`,
+        topImageAlt: 'Force for Good Foundation',
+        additionalProps: {
+            testid: 'ffg-card',
+        },
+        onClick: () => {
+            console.log('onClick called');
+        },
+    },
+    play: async ({ canvasElement }: any) => {
+        const canvas = within(canvasElement);
+        userEvent.hover(canvas.getByTestId('ffg-card'));
+        userEvent.hover(canvas.getByRole('link'));
+        expect(canvas.getByText(text)).toBeInTheDocument();
+    },
+};
+const d = { count: -1 };
+export const OnClick: Story = {
+    args: {
+        cardLink: {
+            href: 'https://www.forceforgood.org/',
+            title: 'LEARN MORE',
+        },
+        text,
+        topImageUrl: `${host}/blt594f30e2dc643eae/blt34cdb300dc9b93ff/645ccaa7520ba1a1af13a08a/nsffg-foundation.webp`,
         topImageAlt: 'Force for Good Foundation',
         additionalProps: {
             testid: 'ffg-card',
         },
+        onClick: () => {
+            d.count = 1;
+            console.log('on click called');
+        },
     },
-    play: async ({ canvasElement }) => {
+    play: async ({ canvasElement }: any) => {
+        d.count = 0;
         const canvas = within(canvasElement);
-        await userEvent.hover(canvas.getByTestId('ffg-card'));
-        await userEvent.hover(canvas.getByRole('link'));
-        await expect(
-            canvas.getByText(
-                'Every child deserves a chance to shine. Through our Nu Skin Force for Good Foundation, we’re empowering children around the world with hope for a brighter future.'
-            )
-        ).toBeInTheDocument();
+        userEvent.click(canvas.getByTestId('ffg-card'));
+        expect(d.count).toEqual(1);
     },
 };

package/src/common/card/styled/NsFfgStyled.tsx

@@ -1,8 +1,6 @@
 import { Box } from '@mui/material';
 import { styled } from '@nuskin/foundation-theme';
 
-const options = {};
-
 const Component = () => {
     return {
         backgroundClip: 'border-box',
@@ -10,9 +8,10 @@ const Component = () => {
         border: '1px solid #eff2f7',
         borderRadius: '1rem',
         boxShadow: '0 0.75rem 1.5rem rgba(18, 38, 63, .03)',
+        cursor: 'pointer',
         display: 'flex',
         flexDirection: 'column' as 'column', // https://github.com/cssinjs/jss/issues/1344
-        marginBottom: '2rem',
+        marginBottom: '16px',
         transition: 'all .2s ease',
         textAlign: 'center' as 'center',
         wordWrap: 'break-word' as 'break-word',
@@ -22,15 +21,19 @@ const Component = () => {
             '.action-link': {
                 color: '#2CD5C4',
                 textDecoration: 'none',
+                fontWeight: 600,
             },
         },
         '.body-text': {
-            padding: '0 1.5rem 3rem',
-            fontSize: '1rem',
+            padding: '0 1.5rem 4rem',
+            fontSize: '16px',
             color: '#8492a6',
         },
         '.top-image': {
-            padding: '1.5rem 3rem',
+            padding: '3rem 1.5rem',
+            img: {
+                maxWidth: '100%',
+            },
         },
         '.action-link': {
             color: '#3c4858',
@@ -41,4 +44,4 @@ const Component = () => {
         },
     };
 };
-export const NsFfgStyled = styled(Box, options)<{}>(Component);
+export const NsFfgStyled = styled(Box)(Component);

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

@@ -1,9 +1,12 @@
-import { AdditionalProps } from '../common.types';
-
+import { AdditionalProps, CslpTag } from '../common.types';
 export type NsFfgCardProps = AdditionalProps & {
     topImageUrl: string;
     topImageAlt: string;
     text: string;
-    actionLink: string;
-    actionText?: string;
+    cardLink: { href: string; title: string };
+    onClick(): void;
+    cslp?: {
+        card_text: CslpTag;
+        action_text: CslpTag;
+    };
 };

package/src/common/carousal/NsCarousal.tsx

@@ -1,11 +1,12 @@
 import Box from '@mui/material/Box';
 import { styled } from '@nuskin/foundation-theme';
-import { useRef, useCallback, ReactNode } from 'react';
+import { useRef, useCallback } from 'react';
 import Slider from 'react-slick';
 import 'slick-carousel/slick/slick.css';
 import 'slick-carousel/slick/slick-theme.css';
 import defaultCarousalSettings from './slickSetting';
 import CarousalControl from './CarousalControl';
+import { NsCarousalProps } from './types';
 
 const SlickContainer = styled(Box)(() => {
     return {
@@ -16,15 +17,8 @@ const SlickContainer = styled(Box)(() => {
         },
     };
 });
-interface CarousalProps<T = any> {
-    entries: T[];
-    // eslint-disable-next-line no-unused-vars
-    renderEntry(entry: T, index: number): ReactNode;
-    allEntryLink: string;
-    settings: any;
-}
 
-export default function NsCarousal({ entries, renderEntry, allEntryLink, settings }: CarousalProps) {
+export default function NsCarousal({ entries, renderEntry, allEntryLink, settings }: NsCarousalProps) {
     const sliderRef = useRef();
     const prev = useCallback(() => {
         if (sliderRef.current) {

package/src/common/cart-icon/NsCartIcon.spec.tsx

@@ -5,25 +5,14 @@ const { getByTestId } = screen;
 describe('NsCartIcon', () => {
     it('renders Cart icon when item count is 0', () => {
         render(<NsCartIcon itemCount={0} color="primary" size="large" />);
-        const cartIcon = getByTestId('cart-icon');
+        const cartIcon = getByTestId('cart-badge-icon');
         expect(cartIcon).toBeInTheDocument();
     });
-    it('renders Cart icon with optional values', () => {
-        render(<NsCartIcon itemCount={0} />);
-        const cartIcon = getByTestId('cart-icon');
-        expect(cartIcon).toBeInTheDocument();
-    });
-
-    it('renders Cart Badge icon when item count is greater than 0', () => {
-        render(<NsCartIcon itemCount={5} color="primary" size="large" />);
-        const cartBadgeIcon = getByTestId('cart-badge-icon');
-        expect(cartBadgeIcon).toBeInTheDocument();
-    });
 
     it('renders item count badge when item count is greater than 0', () => {
-        render(<NsCartIcon itemCount={5} color="primary" size="large" />);
-        const itemCountBadge = getByTestId('item-count-badge');
-        expect(itemCountBadge).toBeInTheDocument();
-        expect(itemCountBadge.textContent).toBe('5');
+        const itemCount = 5;
+        const { getByText } = render(<NsCartIcon itemCount={5} color="primary" size="large" />);
+        const badgeContentElement = getByText(itemCount.toString());
+        expect(badgeContentElement).toHaveTextContent('5'); // Adjust the value as per your badge content
     });
 });

package/src/common/cart-icon/NsCartIcon.stories.tsx

@@ -19,7 +19,7 @@ export default {
         },
     },
     args: {
-        itemCount: 1,
+        itemCount: 5,
         color: 'primary',
         size: 'large',
     },

package/src/common/cart-icon/NsCartIcon.styled.ts

@@ -1,40 +1,14 @@
-import { Theme } from '@mui/material';
+import { Badge, Theme } from '@mui/material';
 import { styled, FoundationTheme } from '@nuskin/foundation-theme';
-import { NsIconSizeType } from '../icon/types';
 
 type ItemCountParams = {
-    size: NsIconSizeType;
-    color: FoundationTheme.PaletteColors;
     theme?: Theme;
+    bgcolor: FoundationTheme.PaletteColors;
 };
 
-export const CartIconContainer = styled.div`
-    position: relative;
-    display: inline-block;
-`;
-
-const BadgeFontSizeMap = {
-    small: '8px',
-    medium: '10px',
-    large: '12px',
-    xLarge: '14px',
-};
-
-const BadgePosMap = {
-    small: '-8px',
-    medium: '-6px',
-    large: '-4px',
-    xLarge: '-1px',
-};
-
-export const ItemCount = styled.span<ItemCountParams>`
-    color: ${({ color, theme }) => theme?.palette?.[color]?.main};
-    font-size: ${({ size }) => BadgeFontSizeMap[size]};
-    right: ${({ size }) => BadgePosMap[size]};
-    text-align: center;
-    font-weight: 600;
-    position: absolute;
-    width: 32px;
-    height: auto;
-    top: -4px;
+export const StyledBadge = styled(Badge) <ItemCountParams>`
+    & .MuiBadge-badge {
+        background-color: ${({ bgcolor, theme }) => theme?.palette?.[bgcolor]?.main};
+        color: ${({ bgcolor, theme }) => theme?.palette?.[bgcolor]?.contrastText};
+    }
 `;

package/src/common/cart-icon/NsCartIcon.tsx

@@ -1,21 +1,12 @@
 import { NsIcon } from '../icon';
-import { CartIconContainer, ItemCount } from './NsCartIcon.styled';
+import { StyledBadge } from './NsCartIcon.styled';
 import { NsCartIconProps } from './types.d';
 
-const NsCartIcon = ({ itemCount, size = 'large', color = 'primary' }: NsCartIconProps) => {
+const NsCartIcon = ({ itemCount = 0, size = 'large', color = 'primary', maxItemCount = 999 }: NsCartIconProps) => {
     return (
-        <CartIconContainer>
-            {itemCount > 0 ? (
-                <NsIcon testId="cart-badge-icon" name="cartBadge" color={color} size={size} />
-            ) : (
-                <NsIcon testId="cart-icon" name="cart" color={color} size={size} />
-            )}
-            {itemCount > 0 && (
-                <ItemCount data-testid="item-count-badge" color={color} size={size}>
-                    {itemCount}
-                </ItemCount>
-            )}
-        </CartIconContainer>
+        <StyledBadge badgeContent={itemCount} max={maxItemCount} bgcolor={color}>
+            <NsIcon testId="cart-badge-icon" name="cart" size={size} color={color} />
+        </StyledBadge>
     );
 };
 

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

@@ -4,4 +4,5 @@ export type NsCartIconProps = {
     itemCount: number;
     size?: 'small' | 'medium' | 'large' | 'xLarge';
     color?: FoundationTheme.PaletteColors;
+    maxItemCount?:number;
 };

package/src/common/checkbox/NsCheckbox.styled.tsx

@@ -1,19 +1,18 @@
 /**
  * @author [vijayaprathap Kumar] (vpkumar@nuskin.com)
- * checkbox.tsx
  * @description Styled Components for Checkbox
  */
 import DoneIcon from '@mui/icons-material/Done';
 
-import { styled } from '@nuskin/foundation-theme';
+import { styled, ColorUtils } from '@nuskin/foundation-theme';
 import { NsFlag } from '../flag';
-
+const { paletteColor, buttonColor } = ColorUtils;
 /**
  * Wrapper BpIcon for checkbox.tsx
  * @params ( theme: { palette }) / Provide the color's to contaier from @nuskin/foundation-theme
  */
 
-export const BpIcon = styled(DoneIcon)(({ theme: { palette } }) => ({
+export const BpIcon = styled(DoneIcon)(({ theme }) => ({
     border: '1px solid #8C8C8C',
     path: {
         display: 'none',
@@ -25,31 +24,31 @@ export const BpIcon = styled(DoneIcon)(({ theme: { palette } }) => ({
         outline: '3px solid #94D6E9',
     },
     'input:disabled ~ &': {
-        background: palette?.primary?.buttonState?.hovered,
+        background: buttonColor('primary', 'hovered')({ theme }),
     },
 }));
 
 /**
  * Wrapper BpCheckedIcon for checkbox.tsx
- * @params ( theme: { palette }) / Provide the color's to contaier from @nuskin/foundation-theme
+ * @params ( theme: { palette }) / Provide the color's to container from @nuskin/foundation-theme
  */
 
-export const BpCheckedIcon = styled(BpIcon)(({ theme: { palette } }) => ({
+export const BpCheckedIcon = styled(BpIcon)(({ theme }) => ({
     path: {
         display: 'block',
     },
-    background: palette?.primary?.main ?? '#fff',
-    color: palette?.primary?.contrastText ?? '#000',
+    background: paletteColor('primary', 'main')({ theme }),
+    color: paletteColor('primary', 'contrastText')({ theme }),
 }));
 
-export const StyledLabel = styled('span')<{ $hasDisabled: boolean }>`
-    ${({ $hasDisabled, theme: { palette } }) =>
-        $hasDisabled &&
-        `
-    color: ${palette?.primary?.buttonState?.hovered};
-`}
-`;
+const getLabelColor = (isDisabled: boolean, color: string) => (!isDisabled ? '' : `color: ${color}`);
 
+export const StyledLabel = styled('span')<{ isDisabled: boolean }>`
+    ${({ isDisabled, theme }) => {
+        const color = buttonColor('primary', 'hovered')({ theme });
+        return getLabelColor(isDisabled, color);
+    }}
+`;
 export const StyledFlagLabel = styled(NsFlag)`
     margin-right: 16px;
 `;

package/src/common/checkbox/NsCheckbox.tsx

@@ -54,7 +54,7 @@ const NsCheckbox = (props: PropsWithChildren<NsCheckboxProps>) => {
         () => (
             <NsTypography variant="p-l">
                 <StyledFlagLabel {...flag} size={size} testId={`${name}-flag-label`} />
-                <StyledLabel className="checkbox-label-text" $hasDisabled={disabled}>
+                <StyledLabel className="checkbox-label-text" isDisabled={disabled}>
                     {label}
                 </StyledLabel>
             </NsTypography>

package/src/common/column-control/styled/common.ts

@@ -21,7 +21,7 @@ export const commonStyles = {
    ['1','2'] => ['27%','53%']
  */
 export function getPercentArray(fractionArray?: string[] | number[]) {
-    let numbers = fractionArray?.map((numberString) => +numberString)?.filter((num) => 0 < num && num < 10) ?? [];
+    const numbers = fractionArray?.map((numberString) => +numberString)?.filter((num) => 0 < num && num < 10) ?? [];
     const sum = numbers.reduce((currentSum, currentNumber) => currentSum + currentNumber, 0);
     return numbers.map((currentNumber) => ((currentNumber / sum) * 80).toFixed(2) + '%');
 }

package/src/common/column-control/utils.ts

@@ -40,15 +40,15 @@ const sizeKeyMap: Record<ValueOf<typeof sizeKeyPrefix>, string> = {
  * @returns {fractions:['1','1','1'], tabletFractions:['1','1'], mobileFractions:['1'] }
  */
 export const getColumnSizes = (inputColumnClass: string): sizeObjectType => {
-    let columnClass = inputColumnClass.trim() as NsColumnControlProps['columnClass'];
+    const columnClass = inputColumnClass.trim();
     const validClasses = columnClass
         .split(' ')
         .filter((e) => Object.values(sizeKeyPrefix).some((prefix) => e.startsWith(prefix)));
     const sizeObject: sizeObjectType = validClasses.reduce((acc: any, current: string) => {
-        for (let key of Object.values(sizeKeyPrefix)) {
+        for (const key of Object.values(sizeKeyPrefix)) {
             if (current.startsWith(key)) {
-                let interClass = current.replace(key, '');
-                let sizes = interClass.split('-').filter((e) => /^[1-9]$/.test(e));
+                const interClass = current.replace(key, '');
+                const sizes = interClass.split('-').filter((e) => /^[1-9]$/.test(e));
                 acc[sizeKeyMap[key]] = sizes;
                 break;
             }

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

@@ -1,12 +1,21 @@
-export type ContentStackLiveTags = {
-    'data-cslp'?: string;
-};
+import { FoundationTheme } from '@nuskin/foundation-theme';
+
+export type CslpTag = { 'data-cslp': string };
 
 export type AdditionalProps = {
-    darkModeEnabled?: boolean;
     additionalProps?: {
         ariaLabel?: string;
         testid?: string;
         className?: string;
-    } & ContentStackLiveTags;
+        'data-testid'?: string;
+    } & Partial<CslpTag>;
+    cslp?: Record<string, CslpTag>;
+} & DarkModeEnabledOption;
+
+export type Themed = {
+    theme: FoundationTheme.Theme;
+};
+
+export type DarkModeEnabledOption = {
+    darkModeEnabled?: boolean;
 };