Commit a922eff0 by Ari Rizzitano

kill that stupid plugin, do styles manually, add reset wrapper class

parent 642a55c8
...@@ -8,13 +8,6 @@ ...@@ -8,13 +8,6 @@
"babel-preset-react" "babel-preset-react"
], ],
"plugins": [ "plugins": [
"transform-object-rest-spread", "transform-object-rest-spread"
["babel-plugin-react-css-modules", {
"webpackHotModuleReloading": true,
"filetypes": {
".scss": "postcss-scss"
},
"generateScopedName": '[name]__[local]___[hash:base64:5]'
}]
] ]
} }
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
"babel-cli": "^6.24.1", "babel-cli": "^6.24.1",
"babel-jest": "^20.0.3", "babel-jest": "^20.0.3",
"babel-loader": "^7.0.0", "babel-loader": "^7.0.0",
"babel-plugin-react-css-modules": "^2.7.1",
"babel-plugin-transform-object-rest-spread": "^6.23.0", "babel-plugin-transform-object-rest-spread": "^6.23.0",
"babel-preset-babili": "^0.0.12", "babel-preset-babili": "^0.0.12",
"babel-preset-env": "^1.4.0", "babel-preset-env": "^1.4.0",
......
/* eslint-disable no-unused-vars */
import React from 'react'; import React from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import borders from 'bootstrap/scss/utilities/_borders.scss';
import buttons from 'bootstrap/scss/_buttons.scss'; import buttons from 'bootstrap/scss/_buttons.scss';
function Button(props) { function Button(props) {
const styles = [ const classes = [
...props.classNames, buttons.btn,
'buttons.btn',
]; ];
if (props.buttonType) { if (props.buttonType) {
styles.push(`buttons.btn-${props.buttonType}`); classes.push(buttons[`btn-${props.buttonType}`]);
} }
return ( return (
<button <button
className={classNames([
...classes,
...props.classNames,
])}
onBlur={props.onBlur} onBlur={props.onBlur}
onClick={props.onClick} onClick={props.onClick}
onKeyDown={props.onKeyDown} onKeyDown={props.onKeyDown}
styleName={classNames(styles)}
type={props.type} type={props.type}
> >
{props.display} {props.display}
...@@ -33,9 +33,9 @@ Button.propTypes = { ...@@ -33,9 +33,9 @@ Button.propTypes = {
buttonType: PropTypes.string, buttonType: PropTypes.string,
classNames: PropTypes.arrayOf(PropTypes.string), classNames: PropTypes.arrayOf(PropTypes.string),
display: PropTypes.string.isRequired, display: PropTypes.string.isRequired,
onBlur: PropTypes.function, onBlur: PropTypes.func,
onClick: PropTypes.function, onClick: PropTypes.func,
onKeyDown: PropTypes.function, onKeyDown: PropTypes.func,
type: PropTypes.string, type: PropTypes.string,
}; };
......
import React from 'react'; import React from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import 'bootstrap/scss/_dropdown.scss'; import dd from 'bootstrap/scss/_dropdown.scss';
import borders from 'bootstrap/scss/utilities/_borders.scss';
import pc from './utils/base-styles.scss';
import Button from './Button'; import Button from './Button';
const triggerKeys = { const triggerKeys = {
...@@ -97,7 +99,7 @@ class Dropdown extends React.Component { ...@@ -97,7 +99,7 @@ class Dropdown extends React.Component {
generateMenuItems(menuItems) { generateMenuItems(menuItems) {
return menuItems.map((menuItem, i) => ( return menuItems.map((menuItem, i) => (
<li styleName='dropdown-item' key={i}> <li className={dd['dropdown-item']} key={i}>
<a <a
role="menuitem" role="menuitem"
href={menuItem.href} href={menuItem.href}
...@@ -117,26 +119,31 @@ class Dropdown extends React.Component { ...@@ -117,26 +119,31 @@ class Dropdown extends React.Component {
const menuItems = this.generateMenuItems(this.props.menuItems); const menuItems = this.generateMenuItems(this.props.menuItems);
return ( return (
<div <div
styleName={classNames([ className={classNames([
'dropdown', pc['paragon-component'],
{ show: this.state.open }, dd.dropdown,
{ [dd.show]: this.state.open },
])} ])}
ref={(container) => { this.container = container; }} ref={(container) => { this.container = container; }}
> >
<Button <Button
aria-expanded={this.state.open} aria-expanded={this.state.open}
aria-haspopup="true" aria-haspopup="true"
buttonType="secondary"
display={this.props.title} display={this.props.title}
className="dropdown-toggle"
onClick={this.toggle} onClick={this.toggle}
onKeyDown={this.handleToggleKeyDown} onKeyDown={this.handleToggleKeyDown}
classNames={[
borders['border-0'],
dd['dropdown-toggle'],
]}
type="button" type="button"
ref={(toggleElem) => { this.toggleElem = toggleElem; }} ref={(toggleElem) => { this.toggleElem = toggleElem; }}
/> />
<ul <ul
aria-label={this.props.title} aria-label={this.props.title}
aria-hidden={!this.state.open} aria-hidden={!this.state.open}
styleName='dropdown-menu' className={dd['dropdown-menu']}
role="menu" role="menu"
> >
{menuItems} {menuItems}
......
.paragon-component {
@import "~bootstrap/scss/_reboot";
@import "~bootstrap/scss/_normalize";
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment