Skip to content
This repository was archived by the owner on Mar 26, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
5a1214b
Merge pull request #1063 from openlattice/master
UnsungHero97 Feb 9, 2021
668b02a
Bump css-loader from 5.0.1 to 5.0.2
dependabot[bot] Feb 9, 2021
db8f0c1
Bump enzyme-adapter-react-16 from 1.15.5 to 1.15.6
dependabot[bot] Feb 9, 2021
1e16c7f
Merge pull request #1061 from openlattice/dependabot/npm_and_yarn/css…
UnsungHero97 Feb 9, 2021
92e0206
Merge branch 'develop' into dependabot/npm_and_yarn/enzyme-adapter-re…
UnsungHero97 Feb 9, 2021
1d6008c
Merge pull request #1017 from openlattice/dependabot/npm_and_yarn/enz…
UnsungHero97 Feb 9, 2021
190d7ec
Bump eslint from 7.19.0 to 7.20.0
dependabot[bot] Feb 14, 2021
7f3cd9c
Merge pull request #1067 from openlattice/dependabot/npm_and_yarn/esl…
UnsungHero97 Feb 25, 2021
cf627fe
Bump @babel/core from 7.12.13 to 7.13.10
dependabot[bot] Mar 14, 2021
916d8f1
Bump @babel/runtime from 7.12.13 to 7.13.10
dependabot[bot] Mar 14, 2021
654f359
Bump @babel/preset-env from 7.12.13 to 7.13.10
dependabot[bot] Mar 14, 2021
d25b012
Merge pull request #1125 from openlattice/dependabot/npm_and_yarn/bab…
UnsungHero97 Mar 19, 2021
fbe0bd4
Merge branch 'develop' into dependabot/npm_and_yarn/babel/preset-env-…
UnsungHero97 Mar 19, 2021
a35b30e
Bump @babel/cli from 7.12.13 to 7.13.10
dependabot[bot] Mar 19, 2021
348cf0c
Bump eslint from 7.20.0 to 7.22.0
dependabot[bot] Mar 19, 2021
5147118
Merge pull request #1130 from openlattice/dependabot/npm_and_yarn/bab…
UnsungHero97 Mar 19, 2021
6574825
Merge branch 'develop' into dependabot/npm_and_yarn/babel/cli-7.13.10
UnsungHero97 Mar 19, 2021
9cf5999
Merge pull request #1131 from openlattice/dependabot/npm_and_yarn/bab…
UnsungHero97 Mar 19, 2021
4f8f522
Merge branch 'develop' into dependabot/npm_and_yarn/babel/runtime-7.1…
UnsungHero97 Mar 19, 2021
770561d
create Chip
Mar 19, 2021
382a4fa
create tests for chip
Mar 19, 2021
e83bcfa
create colors for chip
Mar 19, 2021
3ff9084
create function to convert hexToRgb for testing
Mar 19, 2021
c84d930
create types for chip
Mar 19, 2021
96d8d64
export chip
Mar 19, 2021
a4ab804
commit chip snapshots
Mar 19, 2021
9209ba8
chip stories
Mar 19, 2021
2531185
update type exports
Mar 19, 2021
b5903d0
export custom chip and types
Mar 19, 2021
af0ceb4
Merge pull request #1128 from openlattice/dependabot/npm_and_yarn/bab…
UnsungHero97 Mar 19, 2021
90c6b7d
switch to P100
Mar 19, 2021
3e03c73
update snapshots
Mar 19, 2021
87c70c3
move cursor styles
Mar 22, 2021
d2e08d5
add background to primary and secondary
Mar 22, 2021
6c8b171
Merge branch 'develop' into feature/update-hover-color-for-radio-and-…
solomontang Mar 22, 2021
7417d9f
updated chip snapshots
Mar 22, 2021
e2e23f1
Merge branch 'develop' into feature/APPS-2671-add-custom-colors-to-chip
UnsungHero97 Mar 22, 2021
ce11384
remove fixed width
Mar 22, 2021
8f34729
do find Chip
Mar 22, 2021
795b038
update screenshot
Mar 22, 2021
7f459a5
update snapshot
Mar 22, 2021
98fa268
add deletable to colors
Mar 22, 2021
2b4348b
update margin, hover, focus and active styles
Mar 22, 2021
edf19c9
fix prop types
Mar 22, 2021
0db4885
remove purple from stories
Mar 22, 2021
fc54cad
Merge branch 'feature/APPS-2671-add-custom-colors-to-chip' of github.…
Mar 22, 2021
2a1a698
update deletable color for primary
Mar 22, 2021
fedd7fa
remove small blue
Mar 22, 2021
7d2693c
use clickable colors
Mar 22, 2021
f41fd39
remove variant and set to default when passing to chip
Mar 22, 2021
439260e
remove box shadow
Mar 22, 2021
49fbdcd
update snapshot
Mar 22, 2021
573cf38
this is gone
Mar 23, 2021
fb041ab
this is gone
Mar 23, 2021
4f59710
Merge pull request #1141 from openlattice/feature/APPS-2671-add-custo…
UnsungHero97 Mar 23, 2021
e3e73f6
Merge branch 'develop' into feature/update-hover-color-for-radio-and-…
UnsungHero97 Mar 23, 2021
ded9ca7
Merge pull request #1142 from openlattice/feature/update-hover-color-…
UnsungHero97 Mar 23, 2021
afa7eb1
Merge branch 'develop' into dependabot/npm_and_yarn/eslint-7.22.0
UnsungHero97 Mar 23, 2021
28d2b83
Merge pull request #1139 from openlattice/dependabot/npm_and_yarn/esl…
UnsungHero97 Mar 23, 2021
55ccb64
set font-size to 60%
Mar 30, 2021
de3d4bc
update snapshot
Mar 30, 2021
642b934
Merge pull request #1156 from openlattice/task/APPS-2642-make-separat…
solomontang Apr 7, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,281 changes: 1,489 additions & 792 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@
"redux-reqseq": "0.5.0"
},
"devDependencies": {
"@babel/cli": "~7.12.13",
"@babel/core": "~7.12.13",
"@babel/cli": "~7.13.10",
"@babel/core": "~7.13.10",
"@babel/plugin-proposal-class-properties": "~7.12.13",
"@babel/plugin-proposal-object-rest-spread": "~7.12.13",
"@babel/plugin-transform-runtime": "~7.12.15",
"@babel/polyfill": "~7.12.1",
"@babel/preset-env": "~7.12.13",
"@babel/preset-env": "~7.13.10",
"@babel/preset-flow": "~7.12.13",
"@babel/preset-react": "~7.12.13",
"@babel/register": "~7.12.13",
"@babel/runtime": "~7.12.13",
"@babel/runtime": "~7.13.10",
"@storybook/addon-actions": "~6.1.17",
"@storybook/addon-docs": "~6.1.17",
"@storybook/addon-storysource": "~6.1.17",
Expand All @@ -75,7 +75,7 @@
"enzyme": "~3.11.0",
"enzyme-adapter-react-16": "~1.15.5",
"enzyme-to-json": "~3.6.1",
"eslint": "~7.19.0",
"eslint": "~7.22.0",
"eslint-config-airbnb": "~18.2.1",
"eslint-import-resolver-webpack": "~0.13.0",
"eslint-loader": "~4.0.2",
Expand Down
7 changes: 6 additions & 1 deletion src/breadcrumbs/src/components/Breadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/* eslint-disable react/jsx-props-no-spreading */
import type { Node } from 'react';

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

const Separator = styled(FontAwesomeIcon)`
font-size: 60%;
`;

const Breadcrumbs = (props :Props) => <MUIBreadcrumbs {...props} />;

Breadcrumbs.defaultProps = {
separator: <FontAwesomeIcon icon={faChevronRight} fixedWidth />
separator: <Separator icon={faChevronRight} fixedWidth />
};

export default Breadcrumbs;
217 changes: 105 additions & 112 deletions src/breadcrumbs/src/components/__snapshots__/Breadcrumbs.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Breadcrumbs should match snapshot 1`] = `
.c0 {
font-size: 60%;
}

<Breadcrumbs
separator={
<FontAwesomeIcon
border={false}
className=""
<Styled(FontAwesomeIcon)
fixedWidth={true}
flip={null}
icon={
Object {
"icon": Array [
Expand All @@ -21,28 +22,13 @@ exports[`Breadcrumbs should match snapshot 1`] = `
"prefix": "far",
}
}
inverse={false}
listItem={false}
mask={null}
pull={null}
pulse={false}
rotation={null}
size={null}
spin={false}
swapOpacity={false}
symbol={false}
title=""
transform={null}
/>
}
>
<WithStyles(ForwardRef(Breadcrumbs))
separator={
<FontAwesomeIcon
border={false}
className=""
<Styled(FontAwesomeIcon)
fixedWidth={true}
flip={null}
icon={
Object {
"icon": Array [
Expand All @@ -56,18 +42,6 @@ exports[`Breadcrumbs should match snapshot 1`] = `
"prefix": "far",
}
}
inverse={false}
listItem={false}
mask={null}
pull={null}
pulse={false}
rotation={null}
size={null}
spin={false}
swapOpacity={false}
symbol={false}
title=""
transform={null}
/>
}
>
Expand All @@ -81,11 +55,8 @@ exports[`Breadcrumbs should match snapshot 1`] = `
}
}
separator={
<FontAwesomeIcon
border={false}
className=""
<Styled(FontAwesomeIcon)
fixedWidth={true}
flip={null}
icon={
Object {
"icon": Array [
Expand All @@ -99,18 +70,6 @@ exports[`Breadcrumbs should match snapshot 1`] = `
"prefix": "far",
}
}
inverse={false}
listItem={false}
mask={null}
pull={null}
pulse={false}
rotation={null}
size={null}
spin={false}
swapOpacity={false}
symbol={false}
title=""
transform={null}
/>
}
>
Expand Down Expand Up @@ -179,11 +138,8 @@ exports[`Breadcrumbs should match snapshot 1`] = `
className="MuiBreadcrumbs-separator"
key="separator-0"
>
<FontAwesomeIcon
border={false}
className=""
<Styled(FontAwesomeIcon)
fixedWidth={true}
flip={null}
icon={
Object {
"icon": Array [
Expand All @@ -197,37 +153,57 @@ exports[`Breadcrumbs should match snapshot 1`] = `
"prefix": "far",
}
}
inverse={false}
listItem={false}
mask={null}
pull={null}
pulse={false}
rotation={null}
size={null}
spin={false}
swapOpacity={false}
symbol={false}
title=""
transform={null}
>
<svg
aria-hidden="true"
className="svg-inline--fa fa-chevron-right fa-w-8 fa-fw "
data-icon="chevron-right"
data-prefix="far"
focusable="false"
role="img"
style={Object {}}
viewBox="0 0 256 512"
xmlns="http://www.w3.org/2000/svg"
<FontAwesomeIcon
border={false}
className="c0"
fixedWidth={true}
flip={null}
icon={
Object {
"icon": Array [
256,
512,
Array [],
"f054",
"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",
],
"iconName": "chevron-right",
"prefix": "far",
}
}
inverse={false}
listItem={false}
mask={null}
pull={null}
pulse={false}
rotation={null}
size={null}
spin={false}
swapOpacity={false}
symbol={false}
title=""
transform={null}
>
<path
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"
fill="currentColor"
<svg
aria-hidden="true"
className="svg-inline--fa fa-chevron-right fa-w-8 fa-fw c0"
data-icon="chevron-right"
data-prefix="far"
focusable="false"
role="img"
style={Object {}}
/>
</svg>
</FontAwesomeIcon>
viewBox="0 0 256 512"
xmlns="http://www.w3.org/2000/svg"
>
<path
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"
fill="currentColor"
style={Object {}}
/>
</svg>
</FontAwesomeIcon>
</Styled(FontAwesomeIcon)>
</li>
<li
className="MuiBreadcrumbs-li"
Expand All @@ -244,11 +220,8 @@ exports[`Breadcrumbs should match snapshot 1`] = `
className="MuiBreadcrumbs-separator"
key="separator-1"
>
<FontAwesomeIcon
border={false}
className=""
<Styled(FontAwesomeIcon)
fixedWidth={true}
flip={null}
icon={
Object {
"icon": Array [
Expand All @@ -262,37 +235,57 @@ exports[`Breadcrumbs should match snapshot 1`] = `
"prefix": "far",
}
}
inverse={false}
listItem={false}
mask={null}
pull={null}
pulse={false}
rotation={null}
size={null}
spin={false}
swapOpacity={false}
symbol={false}
title=""
transform={null}
>
<svg
aria-hidden="true"
className="svg-inline--fa fa-chevron-right fa-w-8 fa-fw "
data-icon="chevron-right"
data-prefix="far"
focusable="false"
role="img"
style={Object {}}
viewBox="0 0 256 512"
xmlns="http://www.w3.org/2000/svg"
<FontAwesomeIcon
border={false}
className="c0"
fixedWidth={true}
flip={null}
icon={
Object {
"icon": Array [
256,
512,
Array [],
"f054",
"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",
],
"iconName": "chevron-right",
"prefix": "far",
}
}
inverse={false}
listItem={false}
mask={null}
pull={null}
pulse={false}
rotation={null}
size={null}
spin={false}
swapOpacity={false}
symbol={false}
title=""
transform={null}
>
<path
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"
fill="currentColor"
<svg
aria-hidden="true"
className="svg-inline--fa fa-chevron-right fa-w-8 fa-fw c0"
data-icon="chevron-right"
data-prefix="far"
focusable="false"
role="img"
style={Object {}}
/>
</svg>
</FontAwesomeIcon>
viewBox="0 0 256 512"
xmlns="http://www.w3.org/2000/svg"
>
<path
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"
fill="currentColor"
style={Object {}}
/>
</svg>
</FontAwesomeIcon>
</Styled(FontAwesomeIcon)>
</li>
<li
className="MuiBreadcrumbs-li"
Expand Down
11 changes: 11 additions & 0 deletions src/chip/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* @flow
*/

export { default as Chip } from './src/components/Chip';

export type {
ChipColor,
ChipProps,
ChipSize,
} from './src/components/types';
Loading