Skip to content

Fullscreen Button Takes Applied Color #574

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 4 commits into from
Aug 27, 2018
Merged

Fullscreen Button Takes Applied Color #574

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
2ce46fa
fullscreen button should reflect applied colors now
ebrillhart Aug 27, 2018
0bb0c2d
fill to color
ebrillhart Aug 27, 2018
5ceef6c
adjust theme
ebrillhart Aug 27, 2018
3d394cd
update snapshots
ebrillhart 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
7 changes: 3 additions & 4 deletions src/components/__snapshots__/fullscreen.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,26 @@ exports[`<Fullscreen /> should render correctly. 1`] = `
<Fullscreen>
<Styled(FullscreenButton)
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<FullscreenButton
className="css-12n5ud e4v3eea0"
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<Styled(button)
aria-label="Toggle full screen"
className="css-12n5ud e4v3eea0"
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<button
aria-label="Toggle full screen"
className="e4v3eea0 css-1hv29sw ev51h780"
onClick={[Function]}
style={undefined}
viewBox="0 0 512 512"
>
<svg
Expand Down
21 changes: 9 additions & 12 deletions src/components/__snapshots__/manager.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,27 +335,26 @@ exports[`<Manager /> should render correctly. 1`] = `
<Fullscreen>
<Styled(FullscreenButton)
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<FullscreenButton
className="css-12n5ud e4v3eea0"
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<Styled(button)
aria-label="Toggle full screen"
className="css-12n5ud e4v3eea0"
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<button
aria-label="Toggle full screen"
className="e4v3eea0 css-1hv29sw ev51h780"
onClick={[Function]}
style={undefined}
viewBox="0 0 512 512"
>
<svg
Expand Down Expand Up @@ -669,27 +668,26 @@ exports[`<Manager /> should render the overview configuration when specified. 1`
<Fullscreen>
<Styled(FullscreenButton)
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<FullscreenButton
className="css-12n5ud e4v3eea0"
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<Styled(button)
aria-label="Toggle full screen"
className="css-12n5ud e4v3eea0"
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<button
aria-label="Toggle full screen"
className="e4v3eea0 css-1hv29sw ev51h780"
onClick={[Function]}
style={undefined}
viewBox="0 0 512 512"
>
<svg
Expand Down Expand Up @@ -1093,27 +1091,26 @@ exports[`<Manager /> should render with slideset slides 1`] = `
<Fullscreen>
<Styled(FullscreenButton)
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<FullscreenButton
className="css-12n5ud e4v3eea0"
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<Styled(button)
aria-label="Toggle full screen"
className="css-12n5ud e4v3eea0"
onClick={[Function]}
style={undefined}
styles={undefined}
viewBox="0 0 512 512"
>
<button
aria-label="Toggle full screen"
className="e4v3eea0 css-1hv29sw ev51h780"
onClick={[Function]}
style={undefined}
viewBox="0 0 512 512"
>
<svg
Expand Down
4 changes: 3 additions & 1 deletion src/components/fullscreen-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ const FullscreenButton = props => (
<path d="M0 0h24v24H0z" fill="none" />
<path
d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"
fill="currentColor"
fill={
props.styles && props.styles.fill ? props.styles.fill : 'currentColor'
}
/>
</svg>
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/fullscreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class Fullscreen extends Component {
return (
<StyledFullscreen
onClick={() => this.toggleFullscreen()}
style={this.context.styles.fullscreen}
styles={this.context.styles.fullscreen}
viewBox="0 0 512 512"
/>
);
Expand Down