Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

Commit cae4dff

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/react-spinners-0.10.1
2 parents 0a2fc76 + c0b4fca commit cae4dff

3 files changed

Lines changed: 22 additions & 6 deletions

File tree

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"build-storybook": "build-storybook -c .storybook"
3737
},
3838
"peerDependencies": {
39-
"bootstrap": "~4.5.0",
39+
"bootstrap": "~4.6.0",
4040
"react": "~16.14.0",
4141
"react-bootstrap": "~1.0.1"
4242
},
@@ -93,17 +93,17 @@
9393
"awesome-typescript-loader": "~5.2.1",
9494
"babel-jest": "~24.9.0",
9595
"babel-loader": "~8.2.0",
96-
"bootstrap": "~4.5.0",
96+
"bootstrap": "~4.6.0",
9797
"commitizen": "~4.2.0",
9898
"commitlint-config-cz": "0.13.2",
9999
"cross-env": "~7.0.0",
100100
"cssnano": "~4.1.10",
101101
"cz-conventional-changelog": "~3.3.0",
102102
"enzyme": "~3.11.0",
103103
"enzyme-adapter-react-16": "~1.15.2",
104-
"eslint": "~7.16.0",
104+
"eslint": "~7.18.0",
105105
"eslint-config-airbnb": "~18.2.0",
106-
"eslint-config-prettier": "~7.1.0",
106+
"eslint-config-prettier": "~7.2.0",
107107
"eslint-plugin-import": "~2.22.0",
108108
"eslint-plugin-jest": "~24.1.0",
109109
"eslint-plugin-jsx-a11y": "~6.4.1",
@@ -126,7 +126,7 @@
126126
"semantic-release": "~17.3.0",
127127
"sinon": "~9.2.0",
128128
"tsdx": "~0.14.0",
129-
"tslib": "~2.0.0",
129+
"tslib": "~2.1.0",
130130
"typescript": "~3.8.2"
131131
},
132132
"dependencies": {
@@ -151,7 +151,7 @@
151151
"lodash": "~4.17.19",
152152
"moment": "~2.29.0",
153153
"react-bootstrap-typeahead": "^4.2.3",
154-
"react-datepicker": "~3.3.0",
154+
"react-datepicker": "~3.4.0",
155155
"react-spinners": "~0.10.1",
156156
"react-table": "~7.6.0",
157157
"react-toastify": "~5.5.0",

stories/icons.stories.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ storiesOf('Icons', module)
3636
<span>Dashboard: </span>
3737
<Icon icon="dashboard" />
3838
<br />
39+
<span>Down Arrow: </span>
40+
<Icon icon="down-arrow" />
41+
<br />
3942
<span>Edit: </span>
4043
<Icon icon="edit" />
4144
<br />
@@ -90,6 +93,9 @@ storiesOf('Icons', module)
9093
<span>Setting: </span>
9194
<Icon icon="setting" />
9295
<br />
96+
<span>Up Arrow: </span>
97+
<Icon icon="up-arrow" />
98+
<br />
9399
</div>
94100
))
95101
.add('Icon with custom class & style', () => (

test/icon.test.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,16 @@ describe('Icon', () => {
103103
const rightArrowFontAwesomeIcon = rightArrowIconWrapper.find(FontAwesomeIcon)
104104
expect(rightArrowFontAwesomeIcon).toHaveLength(1)
105105
expect(rightArrowFontAwesomeIcon.props().icon).toStrictEqual(['fas', 'chevron-right'])
106+
107+
const upArrowIconWrapper = shallow(<Icon icon="up-arrow" />)
108+
const upArrowFontAwesomeIcon = upArrowIconWrapper.find(FontAwesomeIcon)
109+
expect(upArrowFontAwesomeIcon).toHaveLength(1)
110+
expect(upArrowFontAwesomeIcon.props().icon).toStrictEqual(['fas', 'chevron-up'])
111+
112+
const downArrowIconWrapper = shallow(<Icon icon="down-arrow" />)
113+
const downArrowFontAwesomeIcon = downArrowIconWrapper.find(FontAwesomeIcon)
114+
expect(downArrowFontAwesomeIcon).toHaveLength(1)
115+
expect(downArrowFontAwesomeIcon.props().icon).toStrictEqual(['fas', 'chevron-down'])
106116
})
107117

108118
it('Logout Icon renders itself without crashing', () => {

0 commit comments

Comments
 (0)