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

[WIP/RFC] CSS-in-JS styling #1579

Closed
wants to merge 4 commits into from
Closed

[WIP/RFC] CSS-in-JS styling #1579

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
984e827
feat: Add CSS-in-JS dependencies
maxdeviant Apr 13, 2017
f6fdbf5
feat: Render Button with base styles
maxdeviant Apr 13, 2017
d082019
style: Remove semicolons
maxdeviant Apr 13, 2017
6cf8065
feat: Move more Button classes over to Glamor
maxdeviant Apr 14, 2017
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
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@
"babel-runtime": "^6.22.0",
"classnames": "^2.1.5",
"debug": "^2.6.3",
"lodash": "^4.17.2"
"glamor": "^2.20.24",
"lodash": "^4.17.2",
"semantic-ui-css-in-js": "0.0.1"
},
"devDependencies": {
"@types/react": "^15.0.14",
Expand All @@ -67,8 +69,8 @@
"babel-plugin-__coverage__": "^11.0.0",
"babel-plugin-lodash": "^3.2.10",
"babel-plugin-react-transform": "^2.0.2",
"babel-plugin-transform-react-remove-prop-types": "^0.3.2",
"babel-plugin-transform-react-handled-props": "^0.2.3",
"babel-plugin-transform-react-remove-prop-types": "^0.3.2",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.5.0",
Expand Down
37 changes: 20 additions & 17 deletions src/elements/Button/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import cx from 'classnames'
import _ from 'lodash'
import React, { Component, PropTypes } from 'react'
import { css } from 'glamor'
import { makeButtonStyles } from 'semantic-ui-css-in-js'

import {
customPropTypes,
Expand Down Expand Up @@ -212,23 +214,28 @@ class Button extends Component {
size,
toggle,
} = this.props
const buttonStyles = makeButtonStyles()
const sx = css(
buttonStyles.base,
active && buttonStyles.active,
basic && buttonStyles.basic,
circular && buttonStyles.circular,
compact && buttonStyles.compact,
fluid && buttonStyles.fluid,
(icon === true || icon && (labelPosition || !children && !content)) && buttonStyles.icon,
inverted && buttonStyles.inverted,
loading && buttonStyles.loading,
negative && buttonStyles.negative,
positive && buttonStyles.positive,
primary && buttonStyles.primary,
secondary && buttonStyles.secondary,
toggle && buttonStyles.toggle
)
const classes = cx(`${sx}`, className)

const baseClasses = cx(
color,
size,
useKeyOnly(active, 'active'),
useKeyOnly(basic, 'basic'),
useKeyOnly(circular, 'circular'),
useKeyOnly(compact, 'compact'),
useKeyOnly(fluid, 'fluid'),
useKeyOnly(icon === true || icon && (labelPosition || !children && !content), 'icon'),
useKeyOnly(inverted, 'inverted'),
useKeyOnly(loading, 'loading'),
useKeyOnly(negative, 'negative'),
useKeyOnly(positive, 'positive'),
useKeyOnly(primary, 'primary'),
useKeyOnly(secondary, 'secondary'),
useKeyOnly(toggle, 'toggle'),
useKeyOrValueAndKey(animated, 'animated'),
useKeyOrValueAndKey(attached, 'attached'),
)
Expand All @@ -245,7 +252,6 @@ class Button extends Component {
const tabIndex = this.computeTabIndex(ElementType)

if (!_.isNil(children)) {
const classes = cx('ui', baseClasses, wrapperClasses, labeledClasses, 'button', className)
debug('render children:', { classes })

return (
Expand All @@ -261,7 +267,6 @@ class Button extends Component {
} })

if (labelElement) {
const classes = cx('ui', baseClasses, 'button', className)
const containerClasses = cx('ui', labeledClasses, 'button', className, wrapperClasses)

debug('render label:', { classes, containerClasses }, this.props)
Expand All @@ -278,7 +283,6 @@ class Button extends Component {
}

if (!_.isNil(icon) && _.isNil(label)) {
const classes = cx('ui', labeledClasses, baseClasses, 'button', className, wrapperClasses)
debug('render icon && !label:', { classes })

return (
Expand All @@ -288,7 +292,6 @@ class Button extends Component {
)
}

const classes = cx('ui', labeledClasses, baseClasses, 'button', className, wrapperClasses)
debug('render default:', { classes })

return (
Expand Down