smarthr-ui 35.2.0 → 35.3.0
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/esm/components/Dropdown/FilterDropdown/FilterDropdown.d.ts +3 -0
- package/esm/components/Dropdown/FilterDropdown/FilterDropdown.js +10 -4
- package/esm/components/Dropdown/FilterDropdown/FilterDropdown.js.map +1 -1
- package/esm/components/InputFile/InputFile.js +4 -3
- package/esm/components/InputFile/InputFile.js.map +1 -1
- package/lib/components/Dropdown/FilterDropdown/FilterDropdown.d.ts +3 -0
- package/lib/components/Dropdown/FilterDropdown/FilterDropdown.js +10 -4
- package/lib/components/Dropdown/FilterDropdown/FilterDropdown.js.map +1 -1
- package/lib/components/InputFile/InputFile.js +3 -2
- package/lib/components/InputFile/InputFile.js.map +1 -1
- package/package.json +23 -23
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React, { ButtonHTMLAttributes, FC, ReactNode } from 'react';
|
|
2
|
+
import { ButtonProps } from '../../Button/BaseButton';
|
|
2
3
|
import type { DecoratorsType, ResponseMessageType } from '../../../types';
|
|
3
4
|
type Props = {
|
|
4
5
|
isFiltered?: boolean;
|
|
@@ -9,6 +10,8 @@ type Props = {
|
|
|
9
10
|
hasStatusText?: boolean;
|
|
10
11
|
decorators?: DecoratorsType<'status' | 'triggerButton' | 'applyButton' | 'cancelButton' | 'resetButton'>;
|
|
11
12
|
responseMessage?: ResponseMessageType;
|
|
13
|
+
/** 引き金となるボタンの大きさ */
|
|
14
|
+
triggerSize?: ButtonProps['size'];
|
|
12
15
|
};
|
|
13
16
|
type ElementProps = Omit<ButtonHTMLAttributes<HTMLButtonElement>, keyof Props>;
|
|
14
17
|
export declare const FilterDropdown: FC<Props & ElementProps>;
|
|
@@ -17,7 +17,7 @@ const APPLY_BUTTON_TEXT = '適用';
|
|
|
17
17
|
const CANCEL_BUTTON_TEXT = 'キャンセル';
|
|
18
18
|
const RESET_BUTTON_TEXT = '絞り込み条件を解除';
|
|
19
19
|
const executeDecorator = (defaultText, decorator) => decorator?.(defaultText) || defaultText;
|
|
20
|
-
export const FilterDropdown = ({ isFiltered = false, onApply, onCancel, onReset, children, hasStatusText, decorators, responseMessage, ...props }) => {
|
|
20
|
+
export const FilterDropdown = ({ isFiltered = false, onApply, onCancel, onReset, children, hasStatusText, decorators, responseMessage, triggerSize, ...props }) => {
|
|
21
21
|
const themes = useTheme();
|
|
22
22
|
const status = useMemo(() => executeDecorator(STATUS_FILTERED_TEXT, decorators?.status), [decorators]);
|
|
23
23
|
const triggerButton = useMemo(() => executeDecorator(TRIGGER_BUTTON_TEXT, decorators?.triggerButton), [decorators]);
|
|
@@ -28,9 +28,9 @@ export const FilterDropdown = ({ isFiltered = false, onApply, onCancel, onReset,
|
|
|
28
28
|
const isRequestProcessing = responseMessage !== undefined && responseMessage.status === 'processing';
|
|
29
29
|
return (React.createElement(Dropdown, null,
|
|
30
30
|
React.createElement(DropdownTrigger, null,
|
|
31
|
-
React.createElement(Button, { ...props, suffix: React.createElement(IsFilteredIconWrapper, { isFiltered: isFiltered, themes: themes },
|
|
31
|
+
React.createElement(Button, { ...props, suffix: React.createElement(IsFilteredIconWrapper, { isFiltered: isFiltered, themes: themes, size: triggerSize },
|
|
32
32
|
React.createElement(FaFilterIcon, null),
|
|
33
|
-
isFiltered ? React.createElement(FilteredCheckIcon, { "aria-label": filteredIconAriaLabel }) : null) }, triggerButton)),
|
|
33
|
+
isFiltered ? React.createElement(FilteredCheckIcon, { "aria-label": filteredIconAriaLabel }) : null), size: triggerSize }, triggerButton)),
|
|
34
34
|
hasStatusText && isFiltered ? React.createElement(StatusText, { themes: themes }, status) : null,
|
|
35
35
|
React.createElement(DropdownContent, { controllable: true },
|
|
36
36
|
React.createElement(DropdownScrollArea, null,
|
|
@@ -49,8 +49,14 @@ export const FilterDropdown = ({ isFiltered = false, onApply, onCancel, onReset,
|
|
|
49
49
|
};
|
|
50
50
|
const IsFilteredIconWrapper = styled.span `
|
|
51
51
|
position: relative;
|
|
52
|
-
color: ${({ isFiltered, themes }) => isFiltered ? themes.color.MAIN : themes.color.TEXT_BLACK};
|
|
52
|
+
color: ${({ isFiltered, themes }) => (isFiltered ? themes.color.MAIN : themes.color.TEXT_BLACK)};
|
|
53
53
|
line-height: 1;
|
|
54
|
+
${({ themes: { space }, size }) => css `
|
|
55
|
+
${size === 's' &&
|
|
56
|
+
css `
|
|
57
|
+
transform: translateX(${space(-0.25)});
|
|
58
|
+
`}
|
|
59
|
+
`}
|
|
54
60
|
|
|
55
61
|
& > [role='img'] + [role='img'] {
|
|
56
62
|
position: absolute;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterDropdown.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/FilterDropdown/FilterDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAuC,OAAO,EAAE,MAAM,OAAO,CAAA;AAC3E,OAAO,SAAS,MAAM,iBAAiB,CAAA;AACvC,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAS,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"FilterDropdown.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/FilterDropdown/FilterDropdown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef, useState, } from 'react';
|
|
1
|
+
import React, { forwardRef, useCallback, useId, useImperativeHandle, useMemo, useRef, useState, } from 'react';
|
|
2
2
|
import styled, { css } from 'styled-components';
|
|
3
3
|
import { useTheme } from '../../hooks/useTheme';
|
|
4
4
|
import { Button } from '../Button';
|
|
@@ -8,6 +8,7 @@ const DESTROY_BUTTON_TEXT = '削除';
|
|
|
8
8
|
export const InputFile = forwardRef(({ className = '', size = 'default', label, hasFileList = true, onChange, disabled = false, error, decorators, ...props }, ref) => {
|
|
9
9
|
const theme = useTheme();
|
|
10
10
|
const [files, setFiles] = useState([]);
|
|
11
|
+
const labelId = useId();
|
|
11
12
|
// Safari において、input.files への直接代入時に onChange が発火することを防ぐためのフラグ
|
|
12
13
|
const isUpdatingFilesDirectly = useRef(false);
|
|
13
14
|
const inputRef = useRef(null);
|
|
@@ -46,10 +47,10 @@ export const InputFile = forwardRef(({ className = '', size = 'default', label,
|
|
|
46
47
|
React.createElement("span", null,
|
|
47
48
|
React.createElement(Button, { variant: "text", prefix: React.createElement(FaTrashAltIcon, null), onClick: () => handleDelete(index), className: classNames.deleteButton }, destroyButtonText))))))),
|
|
48
49
|
React.createElement(InputWrapper, { className: inputWrapperClassName, themes: theme },
|
|
49
|
-
React.createElement("input", { ...props, type: "file", onChange: handleChange, disabled: disabled, className: classNames.input, ref: inputRef, "aria-invalid": error || undefined }),
|
|
50
|
+
React.createElement("input", { ...props, type: "file", onChange: handleChange, disabled: disabled, className: classNames.input, ref: inputRef, "aria-invalid": error || undefined, "aria-labelledby": labelId }),
|
|
50
51
|
React.createElement(Prefix, { themes: theme },
|
|
51
52
|
React.createElement(FaFolderOpenIcon, null)),
|
|
52
|
-
label)));
|
|
53
|
+
React.createElement("span", { id: labelId, "aria-hidden": "true" }, label))));
|
|
53
54
|
});
|
|
54
55
|
const Wrapper = styled.div `
|
|
55
56
|
display: block;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputFile.js","sourceRoot":"","sources":["../../../src/components/InputFile/InputFile.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAGZ,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,OAAO,EACP,MAAM,EACN,QAAQ,GACT,MAAM,OAAO,CAAA;AACd,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAS,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAwB/C,MAAM,mBAAmB,GAAG,IAAI,CAAA;AAEhC,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CACjC,CACE,EACE,SAAS,GAAG,EAAE,EACd,IAAI,GAAG,SAAS,EAChB,KAAK,EACL,WAAW,GAAG,IAAI,EAClB,QAAQ,EACR,QAAQ,GAAG,KAAK,EAChB,KAAK,EACL,UAAU,EACV,GAAG,KAAK,EACT,EACD,GAAG,EACH,EAAE;IACF,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"InputFile.js","sourceRoot":"","sources":["../../../src/components/InputFile/InputFile.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React, { ButtonHTMLAttributes, FC, ReactNode } from 'react';
|
|
2
|
+
import { ButtonProps } from '../../Button/BaseButton';
|
|
2
3
|
import type { DecoratorsType, ResponseMessageType } from '../../../types';
|
|
3
4
|
type Props = {
|
|
4
5
|
isFiltered?: boolean;
|
|
@@ -9,6 +10,8 @@ type Props = {
|
|
|
9
10
|
hasStatusText?: boolean;
|
|
10
11
|
decorators?: DecoratorsType<'status' | 'triggerButton' | 'applyButton' | 'cancelButton' | 'resetButton'>;
|
|
11
12
|
responseMessage?: ResponseMessageType;
|
|
13
|
+
/** 引き金となるボタンの大きさ */
|
|
14
|
+
triggerSize?: ButtonProps['size'];
|
|
12
15
|
};
|
|
13
16
|
type ElementProps = Omit<ButtonHTMLAttributes<HTMLButtonElement>, keyof Props>;
|
|
14
17
|
export declare const FilterDropdown: FC<Props & ElementProps>;
|
|
@@ -46,7 +46,7 @@ const APPLY_BUTTON_TEXT = '適用';
|
|
|
46
46
|
const CANCEL_BUTTON_TEXT = 'キャンセル';
|
|
47
47
|
const RESET_BUTTON_TEXT = '絞り込み条件を解除';
|
|
48
48
|
const executeDecorator = (defaultText, decorator) => decorator?.(defaultText) || defaultText;
|
|
49
|
-
const FilterDropdown = ({ isFiltered = false, onApply, onCancel, onReset, children, hasStatusText, decorators, responseMessage, ...props }) => {
|
|
49
|
+
const FilterDropdown = ({ isFiltered = false, onApply, onCancel, onReset, children, hasStatusText, decorators, responseMessage, triggerSize, ...props }) => {
|
|
50
50
|
const themes = (0, useTheme_1.useTheme)();
|
|
51
51
|
const status = (0, react_1.useMemo)(() => executeDecorator(STATUS_FILTERED_TEXT, decorators?.status), [decorators]);
|
|
52
52
|
const triggerButton = (0, react_1.useMemo)(() => executeDecorator(TRIGGER_BUTTON_TEXT, decorators?.triggerButton), [decorators]);
|
|
@@ -57,9 +57,9 @@ const FilterDropdown = ({ isFiltered = false, onApply, onCancel, onReset, childr
|
|
|
57
57
|
const isRequestProcessing = responseMessage !== undefined && responseMessage.status === 'processing';
|
|
58
58
|
return (react_1.default.createElement(Dropdown_1.Dropdown, null,
|
|
59
59
|
react_1.default.createElement(DropdownTrigger_1.DropdownTrigger, null,
|
|
60
|
-
react_1.default.createElement(Button_1.Button, { ...props, suffix: react_1.default.createElement(IsFilteredIconWrapper, { isFiltered: isFiltered, themes: themes },
|
|
60
|
+
react_1.default.createElement(Button_1.Button, { ...props, suffix: react_1.default.createElement(IsFilteredIconWrapper, { isFiltered: isFiltered, themes: themes, size: triggerSize },
|
|
61
61
|
react_1.default.createElement(Icon_1.FaFilterIcon, null),
|
|
62
|
-
isFiltered ? react_1.default.createElement(FilteredCheckIcon, { "aria-label": filteredIconAriaLabel }) : null) }, triggerButton)),
|
|
62
|
+
isFiltered ? react_1.default.createElement(FilteredCheckIcon, { "aria-label": filteredIconAriaLabel }) : null), size: triggerSize }, triggerButton)),
|
|
63
63
|
hasStatusText && isFiltered ? react_1.default.createElement(StatusText, { themes: themes }, status) : null,
|
|
64
64
|
react_1.default.createElement(DropdownContent_1.DropdownContent, { controllable: true },
|
|
65
65
|
react_1.default.createElement(DropdownScrollArea_1.DropdownScrollArea, null,
|
|
@@ -79,8 +79,14 @@ const FilterDropdown = ({ isFiltered = false, onApply, onCancel, onReset, childr
|
|
|
79
79
|
exports.FilterDropdown = FilterDropdown;
|
|
80
80
|
const IsFilteredIconWrapper = styled_components_1.default.span `
|
|
81
81
|
position: relative;
|
|
82
|
-
color: ${({ isFiltered, themes }) => isFiltered ? themes.color.MAIN : themes.color.TEXT_BLACK};
|
|
82
|
+
color: ${({ isFiltered, themes }) => (isFiltered ? themes.color.MAIN : themes.color.TEXT_BLACK)};
|
|
83
83
|
line-height: 1;
|
|
84
|
+
${({ themes: { space }, size }) => (0, styled_components_1.css) `
|
|
85
|
+
${size === 's' &&
|
|
86
|
+
(0, styled_components_1.css) `
|
|
87
|
+
transform: translateX(${space(-0.25)});
|
|
88
|
+
`}
|
|
89
|
+
`}
|
|
84
90
|
|
|
85
91
|
& > [role='img'] + [role='img'] {
|
|
86
92
|
position: absolute;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterDropdown.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/FilterDropdown/FilterDropdown.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2E;AAC3E,sEAAuC;AACvC,uEAA+C;AAE/C,sDAAyD;AACzD,yCAAqC;
|
|
1
|
+
{"version":3,"file":"FilterDropdown.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/FilterDropdown/FilterDropdown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,7 @@ const DESTROY_BUTTON_TEXT = '削除';
|
|
|
34
34
|
exports.InputFile = (0, react_1.forwardRef)(({ className = '', size = 'default', label, hasFileList = true, onChange, disabled = false, error, decorators, ...props }, ref) => {
|
|
35
35
|
const theme = (0, useTheme_1.useTheme)();
|
|
36
36
|
const [files, setFiles] = (0, react_1.useState)([]);
|
|
37
|
+
const labelId = (0, react_1.useId)();
|
|
37
38
|
// Safari において、input.files への直接代入時に onChange が発火することを防ぐためのフラグ
|
|
38
39
|
const isUpdatingFilesDirectly = (0, react_1.useRef)(false);
|
|
39
40
|
const inputRef = (0, react_1.useRef)(null);
|
|
@@ -72,10 +73,10 @@ exports.InputFile = (0, react_1.forwardRef)(({ className = '', size = 'default',
|
|
|
72
73
|
react_1.default.createElement("span", null,
|
|
73
74
|
react_1.default.createElement(Button_1.Button, { variant: "text", prefix: react_1.default.createElement(Icon_1.FaTrashAltIcon, null), onClick: () => handleDelete(index), className: classNames.deleteButton }, destroyButtonText))))))),
|
|
74
75
|
react_1.default.createElement(InputWrapper, { className: inputWrapperClassName, themes: theme },
|
|
75
|
-
react_1.default.createElement("input", { ...props, type: "file", onChange: handleChange, disabled: disabled, className: classNames.input, ref: inputRef, "aria-invalid": error || undefined }),
|
|
76
|
+
react_1.default.createElement("input", { ...props, type: "file", onChange: handleChange, disabled: disabled, className: classNames.input, ref: inputRef, "aria-invalid": error || undefined, "aria-labelledby": labelId }),
|
|
76
77
|
react_1.default.createElement(Prefix, { themes: theme },
|
|
77
78
|
react_1.default.createElement(Icon_1.FaFolderOpenIcon, null)),
|
|
78
|
-
label)));
|
|
79
|
+
react_1.default.createElement("span", { id: labelId, "aria-hidden": "true" }, label))));
|
|
79
80
|
});
|
|
80
81
|
const Wrapper = styled_components_1.default.div `
|
|
81
82
|
display: block;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputFile.js","sourceRoot":"","sources":["../../../src/components/InputFile/InputFile.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"InputFile.js","sourceRoot":"","sources":["../../../src/components/InputFile/InputFile.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "smarthr-ui",
|
|
3
3
|
"description": "SmartHR ui components built with React.",
|
|
4
|
-
"version": "35.
|
|
4
|
+
"version": "35.3.0",
|
|
5
5
|
"author": "SmartHR-UI Team",
|
|
6
6
|
"dependencies": {
|
|
7
7
|
"@smarthr/wareki": "^1.2.0",
|
|
@@ -15,41 +15,41 @@
|
|
|
15
15
|
"react-transition-group": "^4.4.5"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
|
-
"@babel/core": "^7.22.
|
|
19
|
-
"@babel/preset-env": "^7.22.
|
|
18
|
+
"@babel/core": "^7.22.20",
|
|
19
|
+
"@babel/preset-env": "^7.22.20",
|
|
20
20
|
"@babel/preset-react": "^7.22.15",
|
|
21
21
|
"@babel/preset-typescript": "^7.22.15",
|
|
22
22
|
"@commitlint/cli": "^17.7.1",
|
|
23
23
|
"@commitlint/config-conventional": "^17.7.0",
|
|
24
|
-
"@storybook/addon-a11y": "^7.4.
|
|
25
|
-
"@storybook/addon-essentials": "^7.4.
|
|
26
|
-
"@storybook/addon-interactions": "^7.4.
|
|
27
|
-
"@storybook/addon-storysource": "^7.4.
|
|
28
|
-
"@storybook/addons": "^7.4.
|
|
29
|
-
"@storybook/cli": "^7.4.
|
|
24
|
+
"@storybook/addon-a11y": "^7.4.2",
|
|
25
|
+
"@storybook/addon-essentials": "^7.4.2",
|
|
26
|
+
"@storybook/addon-interactions": "^7.4.2",
|
|
27
|
+
"@storybook/addon-storysource": "^7.4.2",
|
|
28
|
+
"@storybook/addons": "^7.4.2",
|
|
29
|
+
"@storybook/cli": "^7.4.2",
|
|
30
30
|
"@storybook/jest": "^0.2.2",
|
|
31
|
-
"@storybook/react": "^7.4.
|
|
32
|
-
"@storybook/react-webpack5": "^7.4.
|
|
31
|
+
"@storybook/react": "^7.4.2",
|
|
32
|
+
"@storybook/react-webpack5": "^7.4.2",
|
|
33
33
|
"@storybook/test-runner": "^0.13.0",
|
|
34
|
-
"@storybook/testing-library": "^0.2.
|
|
35
|
-
"@storybook/theming": "^7.4.
|
|
36
|
-
"@swc/core": "^1.3.
|
|
34
|
+
"@storybook/testing-library": "^0.2.1",
|
|
35
|
+
"@storybook/theming": "^7.4.2",
|
|
36
|
+
"@swc/core": "^1.3.86",
|
|
37
37
|
"@swc/jest": "^0.2.29",
|
|
38
38
|
"@testing-library/react-hooks": "^8.0.1",
|
|
39
|
-
"@types/jest": "^29.5.
|
|
39
|
+
"@types/jest": "^29.5.5",
|
|
40
40
|
"@types/lodash.merge": "^4.6.7",
|
|
41
41
|
"@types/lodash.range": "^3.2.7",
|
|
42
|
-
"@types/node": "^14.18.
|
|
42
|
+
"@types/node": "^14.18.61",
|
|
43
43
|
"@types/react": "^18.2.21",
|
|
44
44
|
"@types/react-dom": "^18.2.7",
|
|
45
|
-
"@types/react-test-renderer": "^17.0.
|
|
45
|
+
"@types/react-test-renderer": "^17.0.4",
|
|
46
46
|
"@types/react-transition-group": "^4.4.6",
|
|
47
47
|
"@types/styled-components": "^5.1.27",
|
|
48
48
|
"axe-playwright": "^1.2.3",
|
|
49
49
|
"babel-loader": "^9.1.3",
|
|
50
50
|
"babel-plugin-polyfill-corejs2": "^0.4.5",
|
|
51
51
|
"babel-plugin-polyfill-regenerator": "^0.5.2",
|
|
52
|
-
"chromatic": "^7.
|
|
52
|
+
"chromatic": "^7.2.0",
|
|
53
53
|
"ecma-version-validator-webpack-plugin": "^1.2.1",
|
|
54
54
|
"eslint": "^8.49.0",
|
|
55
55
|
"eslint-config-smarthr": "^6.11.0",
|
|
@@ -58,23 +58,23 @@
|
|
|
58
58
|
"glob": "^10.3.4",
|
|
59
59
|
"http-server": "^14.1.1",
|
|
60
60
|
"husky": "^8.0.3",
|
|
61
|
-
"jest": "^29.
|
|
62
|
-
"jest-environment-jsdom": "^29.
|
|
61
|
+
"jest": "^29.7.0",
|
|
62
|
+
"jest-environment-jsdom": "^29.7.0",
|
|
63
63
|
"jest-styled-components": "^7.1.1",
|
|
64
64
|
"lint-staged": "^14.0.1",
|
|
65
65
|
"memory-fs": "^0.5.0",
|
|
66
66
|
"npm-run-all": "^4.1.5",
|
|
67
|
-
"postcss-styled-syntax": "^0.
|
|
67
|
+
"postcss-styled-syntax": "^0.5.0",
|
|
68
68
|
"postcss-syntax": "^0.36.2",
|
|
69
69
|
"prettier": "^2.8.8",
|
|
70
70
|
"prettier-config-smarthr": "^1.0.0",
|
|
71
|
-
"puppeteer": "^21.
|
|
71
|
+
"puppeteer": "^21.2.1",
|
|
72
72
|
"react": "^18.2.0",
|
|
73
73
|
"react-dom": "^18.2.0",
|
|
74
74
|
"react-test-renderer": "^18.2.0",
|
|
75
75
|
"smarthr-normalize-css": "^1.1.0",
|
|
76
76
|
"standard-version": "^9.3.2",
|
|
77
|
-
"storybook": "^7.4.
|
|
77
|
+
"storybook": "^7.4.2",
|
|
78
78
|
"styled-components": "^5.3.11",
|
|
79
79
|
"styled-reset": "^4.5.1",
|
|
80
80
|
"stylelint": "^15.10.3",
|