Skip to content

Change prop from style to styles for table components #463

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

Merged
merged 2 commits into from
Aug 28, 2018
Merged

Change prop from style to styles for table components #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
519dd45
Change prop from `style` to `styles` for table components
mpeyper Jan 27, 2018
25580ff
Merge branch 'master' into fix/base-props-not-being-passed-to-table-c…
mpeyper Aug 27, 2018
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
14 changes: 2 additions & 12 deletions src/components/__snapshots__/table-header-item.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`<TableHeaderItem /> should render correctly 1`] = `
<TableHeaderItem>
<Styled(td)
className={undefined}
style={
styles={
Array [
Object {
"color": "#e01",
Expand All @@ -16,17 +16,7 @@ exports[`<TableHeaderItem /> should render correctly 1`] = `
}
>
<td
className="css-0 e51bxha0"
style={
Array [
Object {
"color": "#e01",
},
Object {},
Object {},
undefined,
]
}
className="css-4x5e e51bxha0"
>
Header Text
</td>
Expand Down
14 changes: 2 additions & 12 deletions src/components/__snapshots__/table-item.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`<TableItem /> should render correctly 1`] = `
<TableItem>
<Styled(td)
className={undefined}
style={
styles={
Array [
Object {
"color": "#444",
Expand All @@ -16,17 +16,7 @@ exports[`<TableItem /> should render correctly 1`] = `
}
>
<td
className="css-0 eaiy41g0"
style={
Array [
Object {
"color": "#444",
},
Object {},
Object {},
undefined,
]
}
className="css-11os9ew eaiy41g0"
>
Table Item Content
</td>
Expand Down
13 changes: 2 additions & 11 deletions src/components/__snapshots__/table-row.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`<TableRow /> should render correctly 1`] = `
<TableRow>
<Styled(tr)
className={undefined}
style={
styles={
Array [
Object {
"color": "#00f",
Expand All @@ -15,16 +15,7 @@ exports[`<TableRow /> should render correctly 1`] = `
}
>
<tr
className="css-0 emir1a80"
style={
Array [
Object {
"color": "#00f",
},
Object {},
undefined,
]
}
className="css-1jziecw emir1a80"
>
<td>
Table Row Content
Expand Down
2 changes: 1 addition & 1 deletion src/components/table-header-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class TableHeaderItem extends Component {
return (
<StyledTableHeaderItem
className={this.props.className}
style={[
styles={[
this.context.styles.components.tableHeaderItem,
getStyles.call(this),
typefaceStyle,
Expand Down
2 changes: 1 addition & 1 deletion src/components/table-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class TableItem extends Component {
return (
<StyledTableItem
className={this.props.className}
style={[
styles={[
this.context.styles.components.tableItem,
getStyles.call(this),
typefaceStyle,
Expand Down
2 changes: 1 addition & 1 deletion src/components/table-row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default class TableRow extends Component {
return (
<StyledTableRow
className={this.props.className}
style={[
styles={[
this.context.styles.components.tableRow,
getStyles.call(this),
this.props.style
Expand Down