Skip to content
This repository was archived by the owner on Mar 26, 2022. It is now read-only.

Commit 537d923

Browse files
UnsungHero97UnsungHero97
authored
Merge pull request #1165 from openlattice/develop
Release 2021-04-07
2 parents c967efc + 642b934 commit 537d923

File tree

16 files changed

+3800
-913
lines changed

16 files changed

+3800
-913
lines changed

‎package-lock.json‎

Lines changed: 1489 additions & 792 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@
4747
"redux-reqseq": "0.5.0"
4848
},
4949
"devDependencies": {
50-
"@babel/cli": "~7.12.13",
51-
"@babel/core": "~7.12.13",
50+
"@babel/cli": "~7.13.10",
51+
"@babel/core": "~7.13.10",
5252
"@babel/plugin-proposal-class-properties": "~7.12.13",
5353
"@babel/plugin-proposal-object-rest-spread": "~7.12.13",
5454
"@babel/plugin-transform-runtime": "~7.12.15",
5555
"@babel/polyfill": "~7.12.1",
56-
"@babel/preset-env": "~7.12.13",
56+
"@babel/preset-env": "~7.13.10",
5757
"@babel/preset-flow": "~7.12.13",
5858
"@babel/preset-react": "~7.12.13",
5959
"@babel/register": "~7.12.13",
60-
"@babel/runtime": "~7.12.13",
60+
"@babel/runtime": "~7.13.10",
6161
"@storybook/addon-actions": "~6.1.17",
6262
"@storybook/addon-docs": "~6.1.17",
6363
"@storybook/addon-storysource": "~6.1.17",
@@ -75,7 +75,7 @@
7575
"enzyme": "~3.11.0",
7676
"enzyme-adapter-react-16": "~1.15.5",
7777
"enzyme-to-json": "~3.6.1",
78-
"eslint": "~7.19.0",
78+
"eslint": "~7.22.0",
7979
"eslint-config-airbnb": "~18.2.1",
8080
"eslint-import-resolver-webpack": "~0.13.0",
8181
"eslint-loader": "~4.0.2",

‎src/breadcrumbs/src/components/Breadcrumbs.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/* eslint-disable react/jsx-props-no-spreading */
33
import type { Node } from 'react';
44

5+
import styled from 'styled-components';
56
import { faChevronRight } from '@fortawesome/pro-regular-svg-icons';
67
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
78
import { Breadcrumbs as MUIBreadcrumbs } from '@material-ui/core';
@@ -10,10 +11,14 @@ type Props = {
1011
separator ?:Node;
1112
};
1213

14+
const Separator = styled(FontAwesomeIcon)`
15+
font-size: 60%;
16+
`;
17+
1318
const Breadcrumbs = (props :Props) => <MUIBreadcrumbs {...props} />;
1419

1520
Breadcrumbs.defaultProps = {
16-
separator: <FontAwesomeIcon icon={faChevronRight} fixedWidth />
21+
separator: <Separator icon={faChevronRight} fixedWidth />
1722
};
1823

1924
export default Breadcrumbs;

‎src/breadcrumbs/src/components/__snapshots__/Breadcrumbs.test.js.snap‎

Lines changed: 105 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`Breadcrumbs should match snapshot 1`] = `
4+
.c0 {
5+
font-size: 60%;
6+
}
7+
48
<Breadcrumbs
59
separator={
6-
<FontAwesomeIcon
7-
border={false}
8-
className=""
10+
<Styled(FontAwesomeIcon)
911
fixedWidth={true}
10-
flip={null}
1112
icon={
1213
Object {
1314
"icon": Array [
@@ -21,28 +22,13 @@ exports[`Breadcrumbs should match snapshot 1`] = `
2122
"prefix": "far",
2223
}
2324
}
24-
inverse={false}
25-
listItem={false}
26-
mask={null}
27-
pull={null}
28-
pulse={false}
29-
rotation={null}
30-
size={null}
31-
spin={false}
32-
swapOpacity={false}
33-
symbol={false}
34-
title=""
35-
transform={null}
3625
/>
3726
}
3827
>
3928
<WithStyles(ForwardRef(Breadcrumbs))
4029
separator={
41-
<FontAwesomeIcon
42-
border={false}
43-
className=""
30+
<Styled(FontAwesomeIcon)
4431
fixedWidth={true}
45-
flip={null}
4632
icon={
4733
Object {
4834
"icon": Array [
@@ -56,18 +42,6 @@ exports[`Breadcrumbs should match snapshot 1`] = `
5642
"prefix": "far",
5743
}
5844
}
59-
inverse={false}
60-
listItem={false}
61-
mask={null}
62-
pull={null}
63-
pulse={false}
64-
rotation={null}
65-
size={null}
66-
spin={false}
67-
swapOpacity={false}
68-
symbol={false}
69-
title=""
70-
transform={null}
7145
/>
7246
}
7347
>
@@ -81,11 +55,8 @@ exports[`Breadcrumbs should match snapshot 1`] = `
8155
}
8256
}
8357
separator={
84-
<FontAwesomeIcon
85-
border={false}
86-
className=""
58+
<Styled(FontAwesomeIcon)
8759
fixedWidth={true}
88-
flip={null}
8960
icon={
9061
Object {
9162
"icon": Array [
@@ -99,18 +70,6 @@ exports[`Breadcrumbs should match snapshot 1`] = `
9970
"prefix": "far",
10071
}
10172
}
102-
inverse={false}
103-
listItem={false}
104-
mask={null}
105-
pull={null}
106-
pulse={false}
107-
rotation={null}
108-
size={null}
109-
spin={false}
110-
swapOpacity={false}
111-
symbol={false}
112-
title=""
113-
transform={null}
11473
/>
11574
}
11675
>
@@ -179,11 +138,8 @@ exports[`Breadcrumbs should match snapshot 1`] = `
179138
className="MuiBreadcrumbs-separator"
180139
key="separator-0"
181140
>
182-
<FontAwesomeIcon
183-
border={false}
184-
className=""
141+
<Styled(FontAwesomeIcon)
185142
fixedWidth={true}
186-
flip={null}
187143
icon={
188144
Object {
189145
"icon": Array [
@@ -197,37 +153,57 @@ exports[`Breadcrumbs should match snapshot 1`] = `
197153
"prefix": "far",
198154
}
199155
}
200-
inverse={false}
201-
listItem={false}
202-
mask={null}
203-
pull={null}
204-
pulse={false}
205-
rotation={null}
206-
size={null}
207-
spin={false}
208-
swapOpacity={false}
209-
symbol={false}
210-
title=""
211-
transform={null}
212156
>
213-
<svg
214-
aria-hidden="true"
215-
className="svg-inline--fa fa-chevron-right fa-w-8 fa-fw "
216-
data-icon="chevron-right"
217-
data-prefix="far"
218-
focusable="false"
219-
role="img"
220-
style={Object {}}
221-
viewBox="0 0 256 512"
222-
xmlns="http://www.w3.org/2000/svg"
157+
<FontAwesomeIcon
158+
border={false}
159+
className="c0"
160+
fixedWidth={true}
161+
flip={null}
162+
icon={
163+
Object {
164+
"icon": Array [
165+
256,
166+
512,
167+
Array [],
168+
"f054",
169+
"M24.707 38.101L4.908 57.899c-4.686 4.686-4.686 12.284 0 16.971L185.607 256 4.908 437.13c-4.686 4.686-4.686 12.284 0 16.971L24.707 473.9c4.686 4.686 12.284 4.686 16.971 0l209.414-209.414c4.686-4.686 4.686-12.284 0-16.971L41.678 38.101c-4.687-4.687-12.285-4.687-16.971 0z",
170+
],
171+
"iconName": "chevron-right",
172+
"prefix": "far",
173+
}
174+
}
175+
inverse={false}
176+
listItem={false}
177+
mask={null}
178+
pull={null}
179+
pulse={false}
180+
rotation={null}
181+
size={null}
182+
spin={false}
183+
swapOpacity={false}
184+
symbol={false}
185+
title=""
186+
transform={null}
223187
>
224-
<path
225-
d="M24.707 38.101L4.908 57.899c-4.686 4.686-4.686 12.284 0 16.971L185.607 256 4.908 437.13c-4.686 4.686-4.686 12.284 0 16.971L24.707 473.9c4.686 4.686 12.284 4.686 16.971 0l209.414-209.414c4.686-4.686 4.686-12.284 0-16.971L41.678 38.101c-4.687-4.687-12.285-4.687-16.971 0z"
226-
fill="currentColor"
188+
<svg
189+
aria-hidden="true"
190+
className="svg-inline--fa fa-chevron-right fa-w-8 fa-fw c0"
191+
data-icon="chevron-right"
192+
data-prefix="far"
193+
focusable="false"
194+
role="img"
227195
style={Object {}}
228-
/>
229-
</svg>
230-
</FontAwesomeIcon>
196+
viewBox="0 0 256 512"
197+
xmlns="http://www.w3.org/2000/svg"
198+
>
199+
<path
200+
d="M24.707 38.101L4.908 57.899c-4.686 4.686-4.686 12.284 0 16.971L185.607 256 4.908 437.13c-4.686 4.686-4.686 12.284 0 16.971L24.707 473.9c4.686 4.686 12.284 4.686 16.971 0l209.414-209.414c4.686-4.686 4.686-12.284 0-16.971L41.678 38.101c-4.687-4.687-12.285-4.687-16.971 0z"
201+
fill="currentColor"
202+
style={Object {}}
203+
/>
204+
</svg>
205+
</FontAwesomeIcon>
206+
</Styled(FontAwesomeIcon)>
231207
</li>
232208
<li
233209
className="MuiBreadcrumbs-li"
@@ -244,11 +220,8 @@ exports[`Breadcrumbs should match snapshot 1`] = `
244220
className="MuiBreadcrumbs-separator"
245221
key="separator-1"
246222
>
247-
<FontAwesomeIcon
248-
border={false}
249-
className=""
223+
<Styled(FontAwesomeIcon)
250224
fixedWidth={true}
251-
flip={null}
252225
icon={
253226
Object {
254227
"icon": Array [
@@ -262,37 +235,57 @@ exports[`Breadcrumbs should match snapshot 1`] = `
262235
"prefix": "far",
263236
}
264237
}
265-
inverse={false}
266-
listItem={false}
267-
mask={null}
268-
pull={null}
269-
pulse={false}
270-
rotation={null}
271-
size={null}
272-
spin={false}
273-
swapOpacity={false}
274-
symbol={false}
275-
title=""
276-
transform={null}
277238
>
278-
<svg
279-
aria-hidden="true"
280-
className="svg-inline--fa fa-chevron-right fa-w-8 fa-fw "
281-
data-icon="chevron-right"
282-
data-prefix="far"
283-
focusable="false"
284-
role="img"
285-
style={Object {}}
286-
viewBox="0 0 256 512"
287-
xmlns="http://www.w3.org/2000/svg"
239+
<FontAwesomeIcon
240+
border={false}
241+
className="c0"
242+
fixedWidth={true}
243+
flip={null}
244+
icon={
245+
Object {
246+
"icon": Array [
247+
256,
248+
512,
249+
Array [],
250+
"f054",
251+
"M24.707 38.101L4.908 57.899c-4.686 4.686-4.686 12.284 0 16.971L185.607 256 4.908 437.13c-4.686 4.686-4.686 12.284 0 16.971L24.707 473.9c4.686 4.686 12.284 4.686 16.971 0l209.414-209.414c4.686-4.686 4.686-12.284 0-16.971L41.678 38.101c-4.687-4.687-12.285-4.687-16.971 0z",
252+
],
253+
"iconName": "chevron-right",
254+
"prefix": "far",
255+
}
256+
}
257+
inverse={false}
258+
listItem={false}
259+
mask={null}
260+
pull={null}
261+
pulse={false}
262+
rotation={null}
263+
size={null}
264+
spin={false}
265+
swapOpacity={false}
266+
symbol={false}
267+
title=""
268+
transform={null}
288269
>
289-
<path
290-
d="M24.707 38.101L4.908 57.899c-4.686 4.686-4.686 12.284 0 16.971L185.607 256 4.908 437.13c-4.686 4.686-4.686 12.284 0 16.971L24.707 473.9c4.686 4.686 12.284 4.686 16.971 0l209.414-209.414c4.686-4.686 4.686-12.284 0-16.971L41.678 38.101c-4.687-4.687-12.285-4.687-16.971 0z"
291-
fill="currentColor"
270+
<svg
271+
aria-hidden="true"
272+
className="svg-inline--fa fa-chevron-right fa-w-8 fa-fw c0"
273+
data-icon="chevron-right"
274+
data-prefix="far"
275+
focusable="false"
276+
role="img"
292277
style={Object {}}
293-
/>
294-
</svg>
295-
</FontAwesomeIcon>
278+
viewBox="0 0 256 512"
279+
xmlns="http://www.w3.org/2000/svg"
280+
>
281+
<path
282+
d="M24.707 38.101L4.908 57.899c-4.686 4.686-4.686 12.284 0 16.971L185.607 256 4.908 437.13c-4.686 4.686-4.686 12.284 0 16.971L24.707 473.9c4.686 4.686 12.284 4.686 16.971 0l209.414-209.414c4.686-4.686 4.686-12.284 0-16.971L41.678 38.101c-4.687-4.687-12.285-4.687-16.971 0z"
283+
fill="currentColor"
284+
style={Object {}}
285+
/>
286+
</svg>
287+
</FontAwesomeIcon>
288+
</Styled(FontAwesomeIcon)>
296289
</li>
297290
<li
298291
className="MuiBreadcrumbs-li"

‎src/chip/index.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* @flow
3+
*/
4+
5+
export { default as Chip } from './src/components/Chip';
6+
7+
export type {
8+
ChipColor,
9+
ChipProps,
10+
ChipSize,
11+
} from './src/components/types';

0 commit comments

Comments
 (0)