Skip to content

Commit 504f48c

Browse files
MarcosViniciusPCMarcosViniciusPC
committed
Merge branch 'master' into QTM-730
2 parents 06f1bd2 + c246b23 commit 504f48c

File tree

86 files changed

+4252
-5124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+4252
-5124
lines changed

‎.babelrc

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
]
1010
],
1111
"plugins": [
12-
"transform-class-properties",
13-
"transform-modern-regexp",
1412
"babel-plugin-styled-components",
1513
"./scripts/babel-css-modules.js"
1614
],

‎.eslintrc.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@
4242
"react/jsx-uses-react": "off",
4343
"react/react-in-jsx-scope": "off",
4444
"import/prefer-default-export": ["off", { "extensions": [".js"] }],
45-
"react/prop-types": ["off", { "extensions": [".stories.jsx"] }]
45+
"react/prop-types": ["off", { "extensions": [".stories.jsx"] }],
46+
"react/require-default-props": [
47+
"error",
48+
{
49+
"functions": "defaultArguments"
50+
}
51+
]
4652
},
4753
"globals": {
4854
"window": true,

‎.github/workflows/actions-development.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,21 @@ jobs:
77
runs-on: ubuntu-20.04
88

99
steps:
10-
- uses: actions/checkout@v3
11-
- name: Read .nvmrc
12-
run: echo NVMRC=$(cat .nvmrc) >> $GITHUB_OUTPUT
13-
id: nvm
10+
- uses: actions/checkout@v4
1411

1512
- name: Setup node
16-
uses: actions/setup-node@v3
13+
uses: actions/setup-node@v4
1714
with:
18-
node-version: '${{ steps.nvm.outputs.NVMRC }}'
15+
node-version-file: '.nvmrc'
1916

2017
- name: Install the dependencies
2118
run: yarn
2219

23-
- name: run storybook
20+
- name: Run storybook
2421
run: yarn storybook --smoke-test
2522

26-
- name: run unit tests
23+
- name: Run unit tests
2724
run: yarn test:components
2825

29-
- name: run the regression tests
26+
- name: Run the regression tests
3027
run: yarn build:regression

‎.github/workflows/actions-publish.yml

+14-16
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,55 @@ jobs:
1111
runs-on: ubuntu-20.04
1212

1313
steps:
14-
- uses: actions/checkout@v3
15-
- name: Read .nvmrc
16-
run: echo NVMRC=$(cat .nvmrc) >> $GITHUB_OUTPUT
17-
id: nvm
14+
- uses: actions/checkout@v4
1815

1916
- name: Setup node
20-
uses: actions/setup-node@v3
17+
uses: actions/setup-node@v4
2118
with:
22-
node-version: '${{ steps.nvm.outputs.NVMRC }}'
19+
node-version-file: '.nvmrc'
2320

2421
- name: Install the dependencies
2522
run: yarn
2623

27-
- name: run storybook
24+
- name: Run storybook
2825
run: yarn storybook --smoke-test
2926

30-
- name: run unit tests
27+
- name: Run unit tests
3128
run: yarn test:components
3229

33-
- name: run the regression tests
30+
- name: Run the regression tests
3431
run: yarn build:regression
3532

3633
publish:
3734
needs: tests
3835
runs-on: ubuntu-20.04
3936

4037
steps:
41-
- uses: actions/checkout@v3
42-
- name: Read .nvmrc
43-
run: echo NVMRC=$(cat .nvmrc) >> $GITHUB_OUTPUT
44-
id: nvm
38+
- uses: actions/checkout@v4
4539

4640
- name: Setup node
47-
uses: actions/setup-node@v3
41+
uses: actions/setup-node@v4
4842
with:
49-
node-version: '${{ steps.nvm.outputs.NVMRC }}'
43+
node-version-file: '.nvmrc'
5044

5145
- name: Install the dependencies
5246
run: yarn
47+
5348
- name: Build
5449
run: yarn build
55-
- name: setting npm token
50+
51+
- name: Setting NPM token
5652
run: ./scripts/publish.sh
5753
env:
5854
NPM_TOKEN: ${{secrets.NPM_TOKEN}}
55+
5956
- name: Publish package
6057
run: yarn semantic-release
6158
env:
6259
NPM_TOKEN: ${{secrets.NPM_TOKEN}}
6360
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6461
GH_URL: 'https://api.github.com/'
62+
6563
- name: Deploy storybook to Github Pages
6664
if: ${{ github.ref == 'refs/heads/master' }}
6765
run: yarn deploy-storybook -- --ci

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.17.1
1+
20.15.0

‎CONTRIBUTING.MD

+8-6
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@
33

44
## Summary
55

6-
- [Contribution Prerequisites](#contribution-prerequisites)
7-
- [Important Notices](#important-notices)
8-
- [Getting Started](#getting-started)
9-
- [Editing a Component](#editing-a-component)
6+
- [Contributor's Guide](#contributors-guide)
7+
- [Summary](#summary)
8+
- [Contribution Prerequisites](#contribution-prerequisites)
9+
- [Important Notices ⚠️](#important-notices-️)
10+
- [Getting Started](#getting-started)
11+
- [Editing a Component](#editing-a-component)
1012

1113

1214
---
1315
You can contribute in many ways: opening or participating of a issue, reporting a bug, sending a [pull request](#submitting-a-pull-request).
1416

1517
## Contribution Prerequisites
1618

17-
- Node v16.17.1;
19+
- Node v20.15.0;
1820

19-
Obs.: We have .nvmrc. When you run nvm use, it will set the node to the same version based on the .nvmrc file in the repository.
21+
Obs.: We have .nvmrc. When you run `nvm use`, it will set the node to the same version based on the .nvmrc file in the repository.
2022

2123
- Yarn;
2224

‎components/Alert/Alert.jsx

+17-17
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,22 @@ const Wrapper = styled.div`
7979
`}
8080
`;
8181

82-
const Alert = ({ icon, children, theme, onClose, ...rest }) => {
82+
const Alert = ({
83+
icon = null,
84+
skin = 'neutral',
85+
children,
86+
theme = {
87+
colors,
88+
baseFontSize: defaultBaseFontSize,
89+
spacing,
90+
breakpoints,
91+
components: {
92+
alert: components.alert,
93+
},
94+
},
95+
onClose = undefined,
96+
...rest
97+
}) => {
8398
const [show, setShow] = useState(true);
8499

85100
const handleClose = () => {
@@ -89,7 +104,7 @@ const Alert = ({ icon, children, theme, onClose, ...rest }) => {
89104

90105
return (
91106
show && (
92-
<Wrapper theme={theme} {...rest} role="alert">
107+
<Wrapper theme={theme} skin={skin} {...rest} role="alert">
93108
<Content>
94109
{icon && <AlertIcon name={icon} />}
95110
{children && <span>{children}</span>}
@@ -100,21 +115,6 @@ const Alert = ({ icon, children, theme, onClose, ...rest }) => {
100115
);
101116
};
102117

103-
Alert.defaultProps = {
104-
icon: null,
105-
skin: 'neutral',
106-
onClose: undefined,
107-
theme: {
108-
colors,
109-
baseFontSize: defaultBaseFontSize,
110-
spacing,
111-
breakpoints,
112-
components: {
113-
alert: components.alert,
114-
},
115-
},
116-
};
117-
118118
Alert.propTypes = {
119119
/** At least one children is required for Alert component properly works */
120120
children: PropTypes.node.isRequired,

‎components/Alert/__snapshots__/Alert.unit.test.jsx.snap

+14-7
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,12 @@ exports[`Alert component Should match a skin snapshot 1`] = `
153153
</span>
154154
<button
155155
class="ButtonBase-module__button___-CVUK ButtonBase-module__button-medium___BtByl ButtonBase-module__button-default___K4Nmm ButtonBase-module__button-default-primary___X9GaT ButtonBase-module__shadow-2-neutral-500___mSG-z ButtonBase-module__shadow-4-primary-900___OVVjG ButtonBase-module__shadow-4-primary-700___OKpXZ ButtonBase-module__shadow-8-primary-900___cXlt5 ButtonBase-module__icon-button___nb2zK ButtonBase-module__icon-button-medium___-pGge ButtonBase-module__icon-button-neutral___CseSn c3 c4"
156+
theme="[object Object]"
156157
type="button"
157158
>
158159
<svg
159160
aria-hidden="true"
160-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-1696fkf-MuiSvgIcon-root"
161+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-i4bv87-MuiSvgIcon-root"
161162
data-qtm-preloader="icon"
162163
data-testid="CloseIcon"
163164
focusable="false"
@@ -326,11 +327,12 @@ exports[`Alert component Should match a skin snapshot 2`] = `
326327
</span>
327328
<button
328329
class="ButtonBase-module__button___-CVUK ButtonBase-module__button-medium___BtByl ButtonBase-module__button-default___K4Nmm ButtonBase-module__button-default-primary___X9GaT ButtonBase-module__shadow-2-neutral-500___mSG-z ButtonBase-module__shadow-4-primary-900___OVVjG ButtonBase-module__shadow-4-primary-700___OKpXZ ButtonBase-module__shadow-8-primary-900___cXlt5 ButtonBase-module__icon-button___nb2zK ButtonBase-module__icon-button-medium___-pGge ButtonBase-module__icon-button-neutral___CseSn c3 c4"
330+
theme="[object Object]"
329331
type="button"
330332
>
331333
<svg
332334
aria-hidden="true"
333-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-1696fkf-MuiSvgIcon-root"
335+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-i4bv87-MuiSvgIcon-root"
334336
data-qtm-preloader="icon"
335337
data-testid="CloseIcon"
336338
focusable="false"
@@ -499,11 +501,12 @@ exports[`Alert component Should match a skin snapshot 3`] = `
499501
</span>
500502
<button
501503
class="ButtonBase-module__button___-CVUK ButtonBase-module__button-medium___BtByl ButtonBase-module__button-default___K4Nmm ButtonBase-module__button-default-primary___X9GaT ButtonBase-module__shadow-2-neutral-500___mSG-z ButtonBase-module__shadow-4-primary-900___OVVjG ButtonBase-module__shadow-4-primary-700___OKpXZ ButtonBase-module__shadow-8-primary-900___cXlt5 ButtonBase-module__icon-button___nb2zK ButtonBase-module__icon-button-medium___-pGge ButtonBase-module__icon-button-neutral___CseSn c3 c4"
504+
theme="[object Object]"
502505
type="button"
503506
>
504507
<svg
505508
aria-hidden="true"
506-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-1696fkf-MuiSvgIcon-root"
509+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-i4bv87-MuiSvgIcon-root"
507510
data-qtm-preloader="icon"
508511
data-testid="CloseIcon"
509512
focusable="false"
@@ -672,11 +675,12 @@ exports[`Alert component Should match a skin snapshot 4`] = `
672675
</span>
673676
<button
674677
class="ButtonBase-module__button___-CVUK ButtonBase-module__button-medium___BtByl ButtonBase-module__button-default___K4Nmm ButtonBase-module__button-default-primary___X9GaT ButtonBase-module__shadow-2-neutral-500___mSG-z ButtonBase-module__shadow-4-primary-900___OVVjG ButtonBase-module__shadow-4-primary-700___OKpXZ ButtonBase-module__shadow-8-primary-900___cXlt5 ButtonBase-module__icon-button___nb2zK ButtonBase-module__icon-button-medium___-pGge ButtonBase-module__icon-button-neutral___CseSn c3 c4"
678+
theme="[object Object]"
675679
type="button"
676680
>
677681
<svg
678682
aria-hidden="true"
679-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-1696fkf-MuiSvgIcon-root"
683+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-i4bv87-MuiSvgIcon-root"
680684
data-qtm-preloader="icon"
681685
data-testid="CloseIcon"
682686
focusable="false"
@@ -845,11 +849,12 @@ exports[`Alert component Should match a skin snapshot 5`] = `
845849
</span>
846850
<button
847851
class="ButtonBase-module__button___-CVUK ButtonBase-module__button-medium___BtByl ButtonBase-module__button-default___K4Nmm ButtonBase-module__button-default-primary___X9GaT ButtonBase-module__shadow-2-neutral-500___mSG-z ButtonBase-module__shadow-4-primary-900___OVVjG ButtonBase-module__shadow-4-primary-700___OKpXZ ButtonBase-module__shadow-8-primary-900___cXlt5 ButtonBase-module__icon-button___nb2zK ButtonBase-module__icon-button-medium___-pGge ButtonBase-module__icon-button-neutral___CseSn c3 c4"
852+
theme="[object Object]"
848853
type="button"
849854
>
850855
<svg
851856
aria-hidden="true"
852-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-1696fkf-MuiSvgIcon-root"
857+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-i4bv87-MuiSvgIcon-root"
853858
data-qtm-preloader="icon"
854859
data-testid="CloseIcon"
855860
focusable="false"
@@ -997,11 +1002,12 @@ exports[`Alert component Should match the snapshot of a simple alert 1`] = `
9971002
</span>
9981003
<button
9991004
class="ButtonBase-module__button___-CVUK ButtonBase-module__button-medium___BtByl ButtonBase-module__button-default___K4Nmm ButtonBase-module__button-default-primary___X9GaT ButtonBase-module__shadow-2-neutral-500___mSG-z ButtonBase-module__shadow-4-primary-900___OVVjG ButtonBase-module__shadow-4-primary-700___OKpXZ ButtonBase-module__shadow-8-primary-900___cXlt5 ButtonBase-module__icon-button___nb2zK ButtonBase-module__icon-button-medium___-pGge ButtonBase-module__icon-button-neutral___CseSn c3 c4"
1005+
theme="[object Object]"
10001006
type="button"
10011007
>
10021008
<svg
10031009
aria-hidden="true"
1004-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-1696fkf-MuiSvgIcon-root"
1010+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-i4bv87-MuiSvgIcon-root"
10051011
data-qtm-preloader="icon"
10061012
data-testid="CloseIcon"
10071013
focusable="false"
@@ -1171,11 +1177,12 @@ exports[`Alert component Should match the snapshot with an icon 1`] = `
11711177
</span>
11721178
<button
11731179
class="ButtonBase-module__button___-CVUK ButtonBase-module__button-medium___BtByl ButtonBase-module__button-default___K4Nmm ButtonBase-module__button-default-primary___X9GaT ButtonBase-module__shadow-2-neutral-500___mSG-z ButtonBase-module__shadow-4-primary-900___OVVjG ButtonBase-module__shadow-4-primary-700___OKpXZ ButtonBase-module__shadow-8-primary-900___cXlt5 ButtonBase-module__icon-button___nb2zK ButtonBase-module__icon-button-medium___-pGge ButtonBase-module__icon-button-neutral___CseSn c5 c6"
1180+
theme="[object Object]"
11741181
type="button"
11751182
>
11761183
<svg
11771184
aria-hidden="true"
1178-
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-1696fkf-MuiSvgIcon-root"
1185+
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium ButtonBase-module__button-icon___s3a-2 ButtonBase-module__button-icon-medium___HY30Y css-i4bv87-MuiSvgIcon-root"
11791186
data-qtm-preloader="icon"
11801187
data-testid="CloseIcon"
11811188
focusable="false"

0 commit comments

Comments
 (0)