Skip to content

Default chrome view picker #665

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
Jan 8, 2020
Merged

Default chrome view picker #665

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
99240b8
extended chrome props to accept a default view on render
arrayofone Dec 21, 2019
d9cddcd
added view alpha logic in chrome constructor
arrayofone Dec 27, 2019
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
8 changes: 7 additions & 1 deletion src/components/chrome/Chrome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ChromePointer from './ChromePointer'
import ChromePointerCircle from './ChromePointerCircle'

export const Chrome = ({ width, onChange, disableAlpha, rgb, hsl, hsv, hex, renderers,
styles: passedStyles = {}, className = '' }) => {
styles: passedStyles = {}, className = '', defaultView }) => {
const styles = reactCSS(merge({
'default': {
picker: {
Expand Down Expand Up @@ -135,6 +135,7 @@ export const Chrome = ({ width, onChange, disableAlpha, rgb, hsl, hsv, hex, rend
rgb={ rgb }
hsl={ hsl }
hex={ hex }
view={ defaultView }
onChange={ onChange }
disableAlpha={ disableAlpha }
/>
Expand All @@ -147,6 +148,11 @@ Chrome.propTypes = {
width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
disableAlpha: PropTypes.bool,
styles: PropTypes.object,
defaultView: PropTypes.oneOf([
"hex",
"rgb",
"hsl",
]),
}

Chrome.defaultProps = {
Expand Down
22 changes: 14 additions & 8 deletions src/components/chrome/ChromeFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ import { EditableInput } from '../common'
import UnfoldMoreHorizontalIcon from '@icons/material/UnfoldMoreHorizontalIcon'

export class ChromeFields extends React.Component {
state = {
view: '',
}
constructor(props) {
super()

componentDidMount() {
if (this.props.hsl.a === 1 && this.state.view !== 'hex') {
this.setState({ view: 'hex' })
} else if (this.state.view !== 'rgb' && this.state.view !== 'hsl') {
this.setState({ view: 'rgb' })
if (props.hsl.a !== 1 && props.view === "hex") {
this.state = {
view: "rgb"
};
} else {
this.state = {
view: props.view,
}
}
}

Expand Down Expand Up @@ -267,4 +269,8 @@ export class ChromeFields extends React.Component {
}
}

ChromeFields.defaultProps = {
view: "hex",
}

export default ChromeFields