Skip to content

Add class names to address #954 styling issue #957

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add class names to address #954 styling issue #957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
263 changes: 130 additions & 133 deletions src/components/chrome/Chrome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,164 +1,161 @@
import React from 'react'
import PropTypes from 'prop-types'
import reactCSS from 'reactcss'
import merge from 'lodash/merge'
import React from "react";
import PropTypes from "prop-types";
import reactCSS from "reactcss";
import merge from "lodash/merge";
import { ColorWrap, Saturation, Hue, Alpha, Checkboard } from "../common";
import ChromeFields from "./ChromeFields";
import ChromePointer from "./ChromePointer";
import ChromePointerCircle from "./ChromePointerCircle";

import { ColorWrap, Saturation, Hue, Alpha, Checkboard } from '../common'
import ChromeFields from './ChromeFields'
import ChromePointer from './ChromePointer'
import ChromePointerCircle from './ChromePointerCircle'

export const Chrome = ({ width, onChange, disableAlpha, rgb, hsl, hsv, hex, renderers,
styles: passedStyles = {}, className = '', defaultView }) => {
const styles = reactCSS(merge({
'default': {
picker: {
width,
background: '#fff',
borderRadius: '2px',
boxShadow: '0 0 2px rgba(0,0,0,.3), 0 4px 8px rgba(0,0,0,.3)',
boxSizing: 'initial',
fontFamily: 'Menlo',
},
saturation: {
width: '100%',
paddingBottom: '55%',
position: 'relative',
borderRadius: '2px 2px 0 0',
overflow: 'hidden',
},
Saturation: {
radius: '2px 2px 0 0',
},
body: {
padding: '16px 16px 12px',
},
controls: {
display: 'flex',
},
color: {
width: '32px',
},
swatch: {
marginTop: '6px',
width: '16px',
height: '16px',
borderRadius: '8px',
position: 'relative',
overflow: 'hidden',
},
active: {
absolute: '0px 0px 0px 0px',
borderRadius: '8px',
boxShadow: 'inset 0 0 0 1px rgba(0,0,0,.1)',
background: `rgba(${ rgb.r }, ${ rgb.g }, ${ rgb.b }, ${ rgb.a })`,
zIndex: '2',
},
toggles: {
flex: '1',
},
hue: {
height: '10px',
position: 'relative',
marginBottom: '8px',
},
Hue: {
radius: '2px',
},
alpha: {
height: '10px',
position: 'relative',
},
Alpha: {
radius: '2px',
},
},
'disableAlpha': {
color: {
width: '22px',
},
alpha: {
display: 'none',
},
hue: {
marginBottom: '0px',
},
swatch: {
width: '10px',
height: '10px',
marginTop: '0px',
},
},
}, passedStyles), { disableAlpha })
export const Chrome = ({
width,
onChange,
disableAlpha,
rgb,
hsl,
hsv,
hex,
renderers,
styles: passedStyles = {},
className = "",
defaultView,
}) => {
const styles = reactCSS(
merge(
{
default: {
picker: {
width,
},
saturation: {
width: "100%",
paddingBottom: "55%",
position: "relative",
overflow: "hidden",
},
Saturation: {},
body: {
padding: "16px 16px 12px",
},
controls: {
display: "flex",
},
color: {
width: "32px",
},
swatch: {
marginTop: "6px",
width: "16px",
height: "16px",
position: "relative",
overflow: "hidden",
},
active: {
absolute: "0px 0px 0px 0px",
background: `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${rgb.a})`,
zIndex: "2",
},
toggles: {
flex: "1",
},
hue: {
height: "10px",
position: "relative",
marginBottom: "8px",
},
Hue: {},
alpha: {
height: "10px",
position: "relative",
},
Alpha: {},
},
disableAlpha: {
color: {
width: "22px",
},
alpha: {
display: "none",
},
hue: {
marginBottom: "0px",
},
swatch: {
width: "10px",
height: "10px",
marginTop: "0px",
},
},
},
passedStyles
),
{ disableAlpha }
);

return (
<div style={ styles.picker } className={ `chrome-picker ${ className }` }>
<div style={ styles.saturation }>
<div style={styles.picker} className={`chrome-picker ${className}`}>
<div style={styles.saturation} className="saturation">
<Saturation
style={ styles.Saturation }
hsl={ hsl }
hsv={ hsv }
pointer={ ChromePointerCircle }
onChange={ onChange }
style={styles.Saturation}
hsl={hsl}
hsv={hsv}
pointer={ChromePointerCircle}
onChange={onChange}
/>
</div>
<div style={ styles.body }>
<div style={ styles.controls } className="flexbox-fix">
<div style={ styles.color }>
<div style={ styles.swatch }>
<div style={ styles.active } />
<Checkboard renderers={ renderers } />
<div style={styles.body} className="body">
<div style={styles.controls} className="controls flexbox-fix">
<div style={styles.color} className="color">
<div style={styles.swatch} className="swatch">
<div style={styles.active} className="active" />
<Checkboard renderers={renderers} />
</div>
</div>
<div style={ styles.toggles }>
<div style={ styles.hue }>
<div style={styles.toggles} className="toggles">
<div style={styles.hue} className="hue hue-horizontal">
<Hue
style={ styles.Hue }
hsl={ hsl }
pointer={ ChromePointer }
onChange={ onChange }
style={styles.Hue}
hsl={hsl}
pointer={ChromePointer}
onChange={onChange}
/>
</div>
<div style={ styles.alpha }>
<div style={styles.alpha} className="alpha">
<Alpha
style={ styles.Alpha }
rgb={ rgb }
hsl={ hsl }
pointer={ ChromePointer }
renderers={ renderers }
onChange={ onChange }
style={styles.Alpha}
rgb={rgb}
hsl={hsl}
pointer={ChromePointer}
renderers={renderers}
onChange={onChange}
/>
</div>
</div>
</div>
<ChromeFields
rgb={ rgb }
hsl={ hsl }
hex={ hex }
view={ defaultView }
onChange={ onChange }
disableAlpha={ disableAlpha }
rgb={rgb}
hsl={hsl}
hex={hex}
view={defaultView}
onChange={onChange}
disableAlpha={disableAlpha}
/>
</div>
</div>
)
}
);
};

Chrome.propTypes = {
width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
disableAlpha: PropTypes.bool,
styles: PropTypes.object,
defaultView: PropTypes.oneOf([
"hex",
"rgb",
"hsl",
]),
}
defaultView: PropTypes.oneOf(["hex", "rgb", "hsl"]),
};

Chrome.defaultProps = {
width: 225,
disableAlpha: false,
styles: {},
}
};

export default ColorWrap(Chrome)
export default ColorWrap(Chrome);