@nuskin/foundation-ui-components 1.0.0-develop.7 → 1.0.0-develop.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/common/accordion/NsAccordion.tsx +3 -1
- package/src/common/accordion/NsAccordionHeader.tsx +25 -19
- package/src/common/accordion/NsAccordionItem.tsx +8 -0
- package/src/common/accordion/NsCollapse.tsx +26 -10
- package/src/common/accordion/NsToggleSection.tsx +2 -0
- package/src/common/accordion/ToggleSection.styled.tsx +5 -2
- package/src/common/accordion/enums.ts +0 -7
- package/src/common/accordion/specs/NsAccordion.spec.tsx +1 -0
- package/src/common/accordion/specs/NsAccordionItem.spec.tsx +4 -0
- package/src/common/accordion/specs/NsCollapse.spec.tsx +23 -20
- package/src/common/accordion/specs/NsToggleSection.spec.tsx +4 -0
- package/src/common/accordion/stories/NsAccordion.stories.tsx +5 -0
- package/src/common/accordion/stories/NsAccordionHeader.stories.tsx +2 -1
- package/src/common/accordion/stories/NsAccordionItem.stories.tsx +6 -1
- package/src/common/accordion/stories/NsCollapse.stories.tsx +17 -2
- package/src/common/accordion/stories/NsToggleSection.stories.tsx +5 -1
- package/src/common/accordion/stories/data.tsx +66 -83
- package/src/common/accordion/types.d.ts +13 -12
- package/src/common/card/NsFfgCard.tsx +13 -7
- package/src/common/card/specs/NsFfgCard.spec.tsx +18 -8
- package/src/common/card/stories/NsFfgCard.stories.tsx +47 -17
- package/src/common/card/styled/NsFfgStyled.tsx +9 -7
- package/src/common/card/types.d.ts +7 -4
- package/src/common/common.types.d.ts +3 -4
- package/src/common/index.ts +5 -3
- package/src/common/modal/NsModal.spec.tsx +46 -0
- package/src/common/modal/NsModal.styled.tsx +28 -0
- package/src/common/modal/NsModal.tsx +37 -0
- package/src/common/modal/helper-component/NsModalContentBox.tsx +32 -0
- package/src/common/modal/helper-component/NsModalDefault.tsx +25 -0
- package/src/common/modal/helper-component/NsModalStatus.tsx +15 -0
- package/src/common/modal/helper-component/NsModalStatusIcon.tsx +14 -0
- package/src/common/modal/helper-component/NsModalTitle.tsx +26 -0
- package/src/common/modal/index.ts +2 -0
- package/src/common/modal/model/NsModalVariantMap.tsx +24 -0
- package/src/common/modal/stories/NsModal.stories.tsx +86 -0
- package/src/common/modal/stories/mock.tsx +46 -0
- package/src/common/modal/types.ts +56 -0
- package/src/common/nav-tab/types.d.ts +2 -2
- package/src/common/utility/Show.tsx +13 -0
- package/src/common/utility/index.ts +1 -0
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { DialogContent } from '@mui/material';
|
|
2
|
+
import NsModalTitle from './NsModalTitle';
|
|
3
|
+
import { NsModalComponentProps } from '../types';
|
|
4
|
+
import { ModalFooter } from '../NsModal.styled';
|
|
5
|
+
import { Show } from '../../utility';
|
|
6
|
+
|
|
7
|
+
const NsDefaultModal = ({ header, handleClose, body, footer, additionalProps }: NsModalComponentProps) => {
|
|
8
|
+
const { dividers } = additionalProps || {};
|
|
9
|
+
|
|
10
|
+
return (
|
|
11
|
+
<div data-testid="modal-default">
|
|
12
|
+
<NsModalTitle header={header} handleClose={handleClose} />
|
|
13
|
+
<DialogContent dividers={dividers}>
|
|
14
|
+
<Show when={body?.show ?? false}>
|
|
15
|
+
<div data-testid="modal-body-content">{body?.children}</div>
|
|
16
|
+
</Show>
|
|
17
|
+
<Show when={footer?.show ?? false}>
|
|
18
|
+
<ModalFooter data-testid="modal-footer">{footer?.children}</ModalFooter>
|
|
19
|
+
</Show>
|
|
20
|
+
</DialogContent>
|
|
21
|
+
</div>
|
|
22
|
+
);
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
export default NsDefaultModal;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { NsInfoWrapper } from '../NsModal.styled';
|
|
2
|
+
import { NsModalComponentProps } from '../types';
|
|
3
|
+
import NsModalContentBox from './NsModalContentBox';
|
|
4
|
+
import NsModalStatusIcon from './NsModalStatusIcon';
|
|
5
|
+
|
|
6
|
+
const NsStatusModal = ({ handleClose, statusInfo, variant }: NsModalComponentProps) => {
|
|
7
|
+
return (
|
|
8
|
+
<NsInfoWrapper data-testid="modal-status">
|
|
9
|
+
<NsModalStatusIcon {...{ variant }} />
|
|
10
|
+
<NsModalContentBox {...{ handleClose, statusInfo }} />
|
|
11
|
+
</NsInfoWrapper>
|
|
12
|
+
);
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
export default NsStatusModal;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { NsIcon, NsIconNameType } from '../../';
|
|
2
|
+
import { StatusIconMap } from '../model/NsModalVariantMap';
|
|
3
|
+
import { NsModalComponentProps, NsModalVariant } from '../types';
|
|
4
|
+
|
|
5
|
+
const NsModalStatusIcon = ({ variant }: NsModalComponentProps) => {
|
|
6
|
+
const iconName = variant ? StatusIconMap[variant] : null;
|
|
7
|
+
return (
|
|
8
|
+
<div className="status-icon">
|
|
9
|
+
<NsIcon name={iconName as NsIconNameType} size="medium" color={variant as NsModalVariant} />
|
|
10
|
+
</div>
|
|
11
|
+
);
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export default NsModalStatusIcon;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { NsIcon } from '../..';
|
|
2
|
+
import { DialogTitle } from '@mui/material';
|
|
3
|
+
import { CloseButton, NsInfoWrapper } from '../NsModal.styled';
|
|
4
|
+
import { NsModalComponentProps } from '../types';
|
|
5
|
+
import { Show } from '../../utility';
|
|
6
|
+
|
|
7
|
+
const NsModalTitle = ({ header, handleClose }: NsModalComponentProps) => {
|
|
8
|
+
const { show, children, isCloseIcon, iconName } = header || {};
|
|
9
|
+
return (
|
|
10
|
+
<Show when={show}>
|
|
11
|
+
<DialogTitle data-testid="modal-title">
|
|
12
|
+
<NsInfoWrapper>
|
|
13
|
+
{iconName ? <NsIcon name={iconName} className="title-icon" /> : null}
|
|
14
|
+
{children}
|
|
15
|
+
</NsInfoWrapper>
|
|
16
|
+
<Show when={isCloseIcon}>
|
|
17
|
+
<CloseButton aria-label="close" onClick={handleClose} data-testid="modal-close-button">
|
|
18
|
+
<NsIcon name="close" size="small" />
|
|
19
|
+
</CloseButton>
|
|
20
|
+
</Show>
|
|
21
|
+
</DialogTitle>
|
|
22
|
+
</Show>
|
|
23
|
+
);
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
export default NsModalTitle;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { ElementType } from 'react';
|
|
2
|
+
import NsDefaultModal from '../helper-component/NsModalDefault';
|
|
3
|
+
import NsStatusModal from '../helper-component/NsModalStatus';
|
|
4
|
+
import { StatusIconMapProps } from '../types';
|
|
5
|
+
|
|
6
|
+
type ModalMapType = {
|
|
7
|
+
[key: string]: ElementType;
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
export const ModalVariantMap: ModalMapType = {
|
|
11
|
+
default: NsDefaultModal,
|
|
12
|
+
confirmation: NsDefaultModal,
|
|
13
|
+
success: NsStatusModal,
|
|
14
|
+
warning: NsStatusModal,
|
|
15
|
+
error: NsStatusModal,
|
|
16
|
+
info: NsStatusModal,
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
export const StatusIconMap: StatusIconMapProps = {
|
|
20
|
+
success: 'success',
|
|
21
|
+
warning: 'warning',
|
|
22
|
+
error: 'error',
|
|
23
|
+
info: 'infoFilled',
|
|
24
|
+
};
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import type { StoryObj, Meta } from '@storybook/react';
|
|
2
|
+
import { withCenterDecorator } from '@/stories/decorators/withCenterDecorator';
|
|
3
|
+
import NsModal from '../NsModal';
|
|
4
|
+
import { NsButton } from '../../button';
|
|
5
|
+
import { Grid, Typography } from '@mui/material';
|
|
6
|
+
import { useState } from 'react';
|
|
7
|
+
import { NsModalProps } from '../types';
|
|
8
|
+
import { NsModalData } from './mock';
|
|
9
|
+
|
|
10
|
+
type ComponentType = typeof NsModal;
|
|
11
|
+
type Story = StoryObj<ComponentType>;
|
|
12
|
+
type MetaStory = Meta<ComponentType>;
|
|
13
|
+
|
|
14
|
+
export default {
|
|
15
|
+
title: 'Components/NsModal',
|
|
16
|
+
component: NsModal,
|
|
17
|
+
decorators: [withCenterDecorator],
|
|
18
|
+
argTypes: {},
|
|
19
|
+
args: {
|
|
20
|
+
...NsModalData,
|
|
21
|
+
},
|
|
22
|
+
} as MetaStory;
|
|
23
|
+
|
|
24
|
+
const RenderNsModal = (args: NsModalProps) => {
|
|
25
|
+
const [isOpen, setOpen] = useState(false);
|
|
26
|
+
|
|
27
|
+
const onModalHandler = () => {
|
|
28
|
+
setOpen(!isOpen);
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
return (
|
|
32
|
+
<>
|
|
33
|
+
<NsButton onClick={onModalHandler}>Open Modal</NsButton>
|
|
34
|
+
<NsModal {...args} open={isOpen} handleClose={onModalHandler} />
|
|
35
|
+
</>
|
|
36
|
+
);
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
export const Modal: Story = {
|
|
40
|
+
args: {
|
|
41
|
+
header: {
|
|
42
|
+
...NsModalData?.header,
|
|
43
|
+
isCloseIcon: false,
|
|
44
|
+
},
|
|
45
|
+
} as NsModalProps,
|
|
46
|
+
render: RenderNsModal,
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
export const WithCloseIcon: Story = {
|
|
50
|
+
render: RenderNsModal,
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
export const ImageWidthText: Story = {
|
|
54
|
+
args: {
|
|
55
|
+
header: {
|
|
56
|
+
show: true,
|
|
57
|
+
isCloseIcon: true,
|
|
58
|
+
},
|
|
59
|
+
body: {
|
|
60
|
+
show: true,
|
|
61
|
+
children: (
|
|
62
|
+
<Grid container spacing={2}>
|
|
63
|
+
<Grid xs={6}>
|
|
64
|
+
<img
|
|
65
|
+
src="https://www.nuskin.com/content/products/01/55/00/01550014/_jcr_content/fullImage.img.160.160.png.64.64.png"
|
|
66
|
+
alt={'NsImage'}
|
|
67
|
+
/>
|
|
68
|
+
</Grid>
|
|
69
|
+
<Grid xs={6} className="p-5">
|
|
70
|
+
<Typography gutterBottom variant="h5" component="div">
|
|
71
|
+
Lizard
|
|
72
|
+
</Typography>
|
|
73
|
+
<Typography variant="body2" color="text.secondary">
|
|
74
|
+
Lizards are a widespread group of squamate reptiles, with over 6,000 species, ranging across
|
|
75
|
+
all continents except Antarctica
|
|
76
|
+
</Typography>
|
|
77
|
+
</Grid>
|
|
78
|
+
</Grid>
|
|
79
|
+
),
|
|
80
|
+
},
|
|
81
|
+
footer: {
|
|
82
|
+
show: false,
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
render: RenderNsModal,
|
|
86
|
+
};
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { NsButton } from '../../button';
|
|
2
|
+
import { NsTypography } from '../../typography';
|
|
3
|
+
|
|
4
|
+
export const NsModalData = {
|
|
5
|
+
open: true,
|
|
6
|
+
handleClose: () => {},
|
|
7
|
+
variant: 'default',
|
|
8
|
+
header: {
|
|
9
|
+
show: true,
|
|
10
|
+
children: (
|
|
11
|
+
<NsTypography variant="h4" weight="bold">
|
|
12
|
+
Dialog with hero icon
|
|
13
|
+
</NsTypography>
|
|
14
|
+
),
|
|
15
|
+
isCloseIcon: true,
|
|
16
|
+
iconName: 'infoOutlined',
|
|
17
|
+
},
|
|
18
|
+
body: {
|
|
19
|
+
show: true,
|
|
20
|
+
children: (
|
|
21
|
+
<NsTypography variant="p-s">
|
|
22
|
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquet sed odio donec tellus nibh dictum quis.
|
|
23
|
+
Dis tempus aliquam tristique auctor justo, lacus in pellentesque. Quam semper facilisi posuere hendrerit
|
|
24
|
+
scelerisque sed.
|
|
25
|
+
</NsTypography>
|
|
26
|
+
),
|
|
27
|
+
},
|
|
28
|
+
statusInfo: {
|
|
29
|
+
title: 'Are you sure you want to delete your account?',
|
|
30
|
+
description: `Lorem ipsum dolor sit amet, consectetur adipiscing elit,
|
|
31
|
+
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.`,
|
|
32
|
+
},
|
|
33
|
+
footer: {
|
|
34
|
+
show: true,
|
|
35
|
+
children: (
|
|
36
|
+
<>
|
|
37
|
+
<NsButton onClick={() => {}} variant="outlined">
|
|
38
|
+
Cancel
|
|
39
|
+
</NsButton>
|
|
40
|
+
<NsButton onClick={() => {}} variant="contained">
|
|
41
|
+
Confirm
|
|
42
|
+
</NsButton>
|
|
43
|
+
</>
|
|
44
|
+
),
|
|
45
|
+
},
|
|
46
|
+
};
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { ReactNode } from 'react';
|
|
2
|
+
import { NsIconNameType } from '../icon';
|
|
3
|
+
|
|
4
|
+
export interface DialogTitleProps {
|
|
5
|
+
id: string;
|
|
6
|
+
children?: ReactNode;
|
|
7
|
+
onClose: () => void;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export interface NsModalProps extends NsModalComponentProps {
|
|
11
|
+
open: boolean;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export interface NsModalComponentProps {
|
|
15
|
+
handleClose?: () => void;
|
|
16
|
+
additionalProps?: NsModalAdditionalProps;
|
|
17
|
+
variant?: NsModalVariant | 'default';
|
|
18
|
+
header?: NsModalContentProps;
|
|
19
|
+
body?: NsModalContentProps;
|
|
20
|
+
footer?: NsModalContentProps;
|
|
21
|
+
statusInfo?: NsModalStatusProps;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export interface NsModalContentProps {
|
|
25
|
+
show?: boolean;
|
|
26
|
+
children?: string | ReactNode;
|
|
27
|
+
isCloseIcon?: boolean;
|
|
28
|
+
iconName?: NsIconNameType;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export interface NsModalStatusProps {
|
|
32
|
+
title: string;
|
|
33
|
+
description: string;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export interface NsModalAdditionalProps {
|
|
37
|
+
className?: string;
|
|
38
|
+
scrollType?: 'paper' | 'body';
|
|
39
|
+
ariaLabel?: NsModalAriaLabelProps;
|
|
40
|
+
dividers?: boolean;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export interface NsModalAriaLabelProps {
|
|
44
|
+
ariaLabelledby?: string;
|
|
45
|
+
ariaDescribedby?: string;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export type NsModalVariant = 'success' | 'warning' | 'error' | 'info';
|
|
49
|
+
|
|
50
|
+
export interface StatusIconMapProps {
|
|
51
|
+
success: string;
|
|
52
|
+
warning: string;
|
|
53
|
+
error: string;
|
|
54
|
+
info: string;
|
|
55
|
+
default?: string;
|
|
56
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ReactNode } from 'react';
|
|
2
2
|
import { FoundationTheme } from '@nuskin/foundation-theme';
|
|
3
3
|
import { Variants } from '../typography/types';
|
|
4
|
-
import { AdditionalProps,
|
|
4
|
+
import { AdditionalProps, CslpTag } from '../common.types';
|
|
5
5
|
|
|
6
6
|
export type NavTabs = {
|
|
7
7
|
tabName: string;
|
|
@@ -9,7 +9,7 @@ export type NavTabs = {
|
|
|
9
9
|
activeColor: FoundationTheme.PaletteColors;
|
|
10
10
|
color?: FoundationTheme.PaletteColors;
|
|
11
11
|
textVariant: Variants;
|
|
12
|
-
liveTag?:
|
|
12
|
+
liveTag?: CslpTag;
|
|
13
13
|
};
|
|
14
14
|
|
|
15
15
|
export type NSNavTabComponentProps = {
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { PropsWithChildren, ReactElement } from 'react';
|
|
2
|
+
|
|
3
|
+
type ShowType = PropsWithChildren & {
|
|
4
|
+
when?: boolean;
|
|
5
|
+
elseContent?: ReactElement;
|
|
6
|
+
};
|
|
7
|
+
const Show = ({ when, children, elseContent }: ShowType): ReactElement => {
|
|
8
|
+
if (when) {
|
|
9
|
+
return <>{children}</>;
|
|
10
|
+
}
|
|
11
|
+
return <>{elseContent}</>;
|
|
12
|
+
};
|
|
13
|
+
export default Show;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default as Show } from './Show';
|