Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump styled-components from 3.4.10 to 4.0.0 #4996

Merged
merged 4 commits into from
Oct 17, 2018
Merged

Bump styled-components from 3.4.10 to 4.0.0 #4996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03ead1e
Bump styled-components from 3.4.10 to 4.0.0
dependabot-support Oct 16, 2018
8fd9e2a
Replace .extend with styled()
eatyourgreens Oct 16, 2018
ad73366
Replace innerRef with ref
eatyourgreens Oct 16, 2018
0e18476
Replace .dive() with .children()
eatyourgreens Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/classifier/drawing-tools/components/DetailsSubTaskForm/DetailsSubTaskForm.jsx
View file
Open in desktop
Expand Up @@ -122,7 +122,7 @@ export class DetailsSubTaskForm extends React.Component {
return (
<ThemeProvider theme={{ mode: theme }}>
<StyledStickyModalForm
innerRef={(node) => { this.detailsForm = node; }}
ref={(node) => { this.detailsForm = node; }}
onSubmit={this.handleDetailsFormClose}
onCancel={this.handleDetailsFormClose}
>
Expand Down
2 changes: 1 addition & 1 deletion app/classifier/tasks/components/TaskInputField/TaskInputField.jsx
View file
Open in desktop
Expand Up @@ -165,7 +165,7 @@ export class TaskInputField extends React.Component {
return (
<ThemeProvider theme={{ mode: this.props.theme }}>
<StyledTaskInputField
innerRef={(node) => { this.field = node; }}
ref={(node) => { this.field = node; }}
className={this.props.className}
label={this.props.label}
data-focus={false}
Expand Down
2 changes: 1 addition & 1 deletion app/classifier/tasks/highlighter/components/HighlighterButton.jsx
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ import HighlighterButtonLabel from './HighlighterButtonLabel';


// TODO: the focus and hover styles while the component has the active class is not working
export const StyledHighlighterButton = StyledTaskInputField.extend`
export const StyledHighlighterButton = styled(StyledTaskInputField)`
font-size: inherit;
width: 100%;
`.withComponent('button');
Expand Down
2 changes: 1 addition & 1 deletion app/pages/project/components/ProjectNavbar/components/Avatar/Avatar.jsx
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ export const StyledAvatarImg = styled.img`
width: ${props => pxToRem(props.size)};
`;

export const DefaultProjectAvatarWrapper = StyledAvatarImg.withComponent('div').extend`
export const DefaultProjectAvatarWrapper = styled(StyledAvatarImg.withComponent('div'))`
background-color: ${theme('mode', { light: zooTheme.colors.teal.mid })};
color: ${theme('mode', { light: zooTheme.colors.brand.default })};
`;
Expand Down
4 changes: 2 additions & 2 deletions app/pages/project/components/ProjectNavbar/components/Background/Background.spec.js
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ describe('Background', function () {
});

it('should set BackgroundWrapper\'s prop.hasBg to false', function() {
expect(wrapper.dive().props().hasBg).to.be.false;
expect(wrapper.children().props().hasBg).to.be.false;
});

it('should not render ImgBackground', function() {
Expand All @@ -40,7 +40,7 @@ describe('Background', function () {
});

it('should set BackgroundWrapper\'s prop.hasBg to true', function () {
expect(wrapper.dive().props().hasBg).to.be.true;
expect(wrapper.children().props().hasBg).to.be.true;
});

it('should not render ImgBackground', function () {
Expand Down
2 changes: 1 addition & 1 deletion ...s/project/components/ProjectNavbar/components/ProjectNavbarNarrow/ProjectNavbarNarrow.jsx
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ export const StyledOuterWrapper = styled.div`
position: relative;
`;

export const StyledInnerWrapper = Wrapper.extend`
export const StyledInnerWrapper = styled(Wrapper)`
flex-direction: column;
justify-content: center;
padding: ${pxToRem(20)} 0;
Expand Down
2 changes: 1 addition & 1 deletion ...pages/project/components/ProjectNavbar/components/ProjectNavbarWide/ProjectNavbarWide.jsx
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ import StyledHeader from '../StyledHeader';
import Wrapper from '../Wrapper';
import { pxToRem } from '../../../../../../theme';

export const StyledHeaderWide = StyledHeader.extend`
export const StyledHeaderWide = styled(StyledHeader)`
box-shadow: 0 ${pxToRem(2)} ${pxToRem(4)} 0 rgba(0,0,0,0.5);
`;

Expand Down
99 changes: 39 additions & 60 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@
"sinon": "~7.0.0",
"sort-into-columns": "~1.0.0",
"striptags": "~3.1.1",
"styled-components": "~3.4.10",
"styled-components": "~4.0.0",
"styled-theming": "~2.2.0",
"sugar-client": "~1.0.1",
"svg-path-properties": "~0.4.5",
Expand Down