Update dependencies and linter (#1180)
parent
bc18e56065
commit
9d6ec1eedd
|
@ -1,3 +1,10 @@
|
|||
**/node_modules/
|
||||
**/build/
|
||||
docs/
|
||||
spec/
|
||||
lib
|
||||
karma.conf.js
|
||||
gulpfile.js
|
||||
tests.webpack*
|
||||
server.js
|
||||
webpack*
|
||||
|
|
239
.eslintrc
239
.eslintrc
|
@ -1,227 +1,30 @@
|
|||
{
|
||||
"parser": "babel-eslint",
|
||||
"extends": "airbnb",
|
||||
"env": {
|
||||
"browser": true,
|
||||
"node": true,
|
||||
"mocha": true,
|
||||
"jest": true,
|
||||
"es6": true
|
||||
},
|
||||
|
||||
"ecmaFeatures": {
|
||||
"jsx": true,
|
||||
"templateStrings": true,
|
||||
"superInFunctions": false,
|
||||
"classes": true,
|
||||
"modules": true
|
||||
},
|
||||
|
||||
"parser": "babel-eslint",
|
||||
|
||||
"plugins": [
|
||||
"babel",
|
||||
"react"
|
||||
],
|
||||
|
||||
"rules": {
|
||||
"block-scoped-var": [0],
|
||||
"brace-style": [2, "1tbs", {
|
||||
"allowSingleLine": true
|
||||
}],
|
||||
"camelcase": [0],
|
||||
"comma-dangle": [2, "never"],
|
||||
"comma-spacing": [2],
|
||||
"comma-style": [2, "last"],
|
||||
"complexity": [0, 11],
|
||||
"constructor-super": [2],
|
||||
"consistent-return": [0],
|
||||
"consistent-this": [0, "that"],
|
||||
"curly": [2, "multi-line"],
|
||||
"default-case": [2],
|
||||
"dot-notation": [2, {
|
||||
"allowKeywords": true
|
||||
}],
|
||||
"eol-last": [2],
|
||||
"eqeqeq": [2],
|
||||
"func-names": [0],
|
||||
"func-style": [0, "declaration"],
|
||||
"generator-star-spacing": [2, "after"],
|
||||
"guard-for-in": [0],
|
||||
"handle-callback-err": [0],
|
||||
"key-spacing": [2, {
|
||||
"beforeColon": false,
|
||||
"afterColon": true
|
||||
}],
|
||||
"quotes": [2, "single", "avoid-escape"],
|
||||
"max-depth": [0, 4],
|
||||
"max-len": [0, 80, 4],
|
||||
"max-nested-callbacks": [0, 2],
|
||||
"max-params": [0, 3],
|
||||
"max-statements": [0, 10],
|
||||
"new-parens": [2],
|
||||
"new-cap": [0],
|
||||
"newline-after-var": [0],
|
||||
"no-alert": [2],
|
||||
"no-array-constructor": [2],
|
||||
"no-bitwise": [0],
|
||||
"no-caller": [2],
|
||||
"no-catch-shadow": [2],
|
||||
"no-cond-assign": [2],
|
||||
"no-console": [0],
|
||||
"no-constant-condition": [1],
|
||||
"no-continue": [2],
|
||||
"no-control-regex": [2],
|
||||
"no-debugger": [2],
|
||||
"no-delete-var": [2],
|
||||
"no-div-regex": [0],
|
||||
"no-dupe-args": [2],
|
||||
"no-dupe-keys": [2],
|
||||
"no-duplicate-case": [2],
|
||||
"no-else-return": [0],
|
||||
"no-empty": [2],
|
||||
"no-empty-character-class": [2],
|
||||
"no-eq-null": [0],
|
||||
"no-eval": [2],
|
||||
"no-ex-assign": [2],
|
||||
"no-extend-native": [1],
|
||||
"no-extra-bind": [2],
|
||||
"no-extra-boolean-cast": [2],
|
||||
"no-extra-parens": [0],
|
||||
"no-extra-semi": [1],
|
||||
"no-fallthrough": [2],
|
||||
"no-floating-decimal": [2],
|
||||
"no-func-assign": [2],
|
||||
"no-implied-eval": [2],
|
||||
"no-inline-comments": [0],
|
||||
"no-inner-declarations": [2, "functions"],
|
||||
"no-invalid-regexp": [2],
|
||||
"no-irregular-whitespace": [2],
|
||||
"no-iterator": [2],
|
||||
"no-label-var": [2],
|
||||
"no-labels": [2],
|
||||
"no-lone-blocks": [2],
|
||||
"no-lonely-if": [2],
|
||||
"no-loop-func": [2],
|
||||
"no-mixed-requires": [0, false],
|
||||
"no-mixed-spaces-and-tabs": [2, false],
|
||||
"no-multi-spaces": [2],
|
||||
"no-multi-str": [2],
|
||||
"no-multiple-empty-lines": [2, {
|
||||
"max": 2
|
||||
}],
|
||||
"no-native-reassign": [1],
|
||||
"no-negated-in-lhs": [2],
|
||||
"no-nested-ternary": [0],
|
||||
"no-new": [2],
|
||||
"no-new-func": [2],
|
||||
"no-new-object": [2],
|
||||
"no-new-require": [0],
|
||||
"no-new-wrappers": [2],
|
||||
"no-obj-calls": [2],
|
||||
"no-octal": [2],
|
||||
"no-octal-escape": [2],
|
||||
"no-path-concat": [0],
|
||||
"no-param-reassign": [2],
|
||||
"no-plusplus": [0],
|
||||
"no-process-env": [0],
|
||||
"no-process-exit": [2],
|
||||
"no-proto": [2],
|
||||
"no-redeclare": [2],
|
||||
"no-regex-spaces": [2],
|
||||
"no-reserved-keys": [0],
|
||||
"no-restricted-modules": [0],
|
||||
"no-return-assign": [2],
|
||||
"no-script-url": [2],
|
||||
"no-self-compare": [0],
|
||||
"no-sequences": [2],
|
||||
"no-shadow": [2],
|
||||
"no-shadow-restricted-names": [2],
|
||||
"semi-spacing": [2],
|
||||
"no-spaced-func": [2],
|
||||
"no-sparse-arrays": [2],
|
||||
"no-sync": [0],
|
||||
"no-ternary": [0],
|
||||
"no-this-before-super": [2],
|
||||
"no-throw-literal": [2],
|
||||
"no-trailing-spaces": [2],
|
||||
"no-undef": [2],
|
||||
"no-undef-init": [2],
|
||||
"no-undefined": [0],
|
||||
"no-underscore-dangle": [0],
|
||||
"no-unreachable": [2],
|
||||
"no-unused-expressions": [2, {
|
||||
"allowShortCircuit": true
|
||||
}],
|
||||
"no-unused-vars": [1, {
|
||||
"vars": "all",
|
||||
"args": "after-used"
|
||||
}],
|
||||
"no-use-before-define": [2, "nofunc"],
|
||||
"no-var": [2],
|
||||
"no-void": [0],
|
||||
"no-warning-comments": [0, {
|
||||
"terms": ["todo", "fixme", "xxx"],
|
||||
"location": "start"
|
||||
}],
|
||||
"no-with": [2],
|
||||
"object-shorthand": [2],
|
||||
"one-var": [0],
|
||||
"operator-assignment": [0, "always"],
|
||||
"operator-linebreak": [2, "before"],
|
||||
"padded-blocks": [0],
|
||||
"prefer-const": [2],
|
||||
"prefer-spread": [2],
|
||||
"quote-props": [0],
|
||||
"radix": [0],
|
||||
"semi": [2],
|
||||
"sort-vars": [0],
|
||||
"keyword-spacing": [2, {"after": true}],
|
||||
"space-before-function-paren": [2, { "anonymous": "always", "named": "always" }],
|
||||
"space-before-blocks": [0, "always"],
|
||||
"space-in-brackets": [0, "never", {
|
||||
"singleValue": true,
|
||||
"arraysInArrays": false,
|
||||
"arraysInObjects": false,
|
||||
"objectsInArrays": true,
|
||||
"objectsInObjects": true,
|
||||
"propertyName": false
|
||||
}],
|
||||
"space-in-parens": [2, "never"],
|
||||
"space-infix-ops": [2],
|
||||
"space-unary-ops": [2, {
|
||||
"words": true,
|
||||
"nonwords": false
|
||||
}],
|
||||
"spaced-line-comment": [0, "always"],
|
||||
"strict": [1],
|
||||
"use-isnan": [2],
|
||||
"valid-jsdoc": [0],
|
||||
"valid-typeof": [2],
|
||||
"vars-on-top": [0],
|
||||
"wrap-iife": [2],
|
||||
"wrap-regex": [2],
|
||||
"yoda": [2, "never", {
|
||||
"exceptRange": true
|
||||
}],
|
||||
"react/display-name": 0,
|
||||
"react/jsx-boolean-value": 1,
|
||||
"react/jsx-closing-bracket-location": 0,
|
||||
"react/jsx-curly-spacing": 1,
|
||||
"react/jsx-max-props-per-line": 0,
|
||||
"react/jsx-indent-props": 0,
|
||||
"react/jsx-no-duplicate-props": 1,
|
||||
"react/jsx-no-undef": 1,
|
||||
"react/jsx-pascal-case": 1,
|
||||
"react/sort-prop-types": 1,
|
||||
"react/jsx-sort-props": 0,
|
||||
"react/jsx-uses-react": 1,
|
||||
"react/jsx-uses-vars": 1,
|
||||
"react/no-danger": 0,
|
||||
"react/no-did-mount-set-state": 0,
|
||||
"react/no-did-update-set-state": 1,
|
||||
"react/no-multi-comp": 0,
|
||||
"react/no-unknown-property": 1,
|
||||
"react/prop-types": [2, {"ignore": ["onMouseDown", "onTouchStart"]}],
|
||||
"react/react-in-jsx-scope": 1,
|
||||
"react/self-closing-comp": 1,
|
||||
"react/sort-comp": 1
|
||||
"func-names": "off",
|
||||
"global-require": "off",
|
||||
"no-use-before-define": 0,
|
||||
"no-underscore-dangle": 0,
|
||||
"react/sort-prop-types": 2,
|
||||
"react/jsx-no-bind": 2,
|
||||
"react/require-default-props": 0,
|
||||
"react/no-find-dom-node": 0,
|
||||
"react/jsx-filename-extension": 0,
|
||||
"import/prefer-default-export": 0,
|
||||
"jsx-a11y/no-static-element-interactions": 0,
|
||||
"import/no-extraneous-dependencies": [
|
||||
"error", {
|
||||
"devDependencies": true,
|
||||
"optionalDependencies": false,
|
||||
"peerDependencies": false
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { APP_BAR } from '../identifiers.js';
|
||||
import InjectIconButton from '../button/IconButton.js';
|
||||
import { APP_BAR } from '../identifiers';
|
||||
import InjectIconButton from '../button/IconButton';
|
||||
|
||||
const factory = (IconButton) => {
|
||||
class AppBar extends React.Component {
|
||||
|
@ -13,13 +13,13 @@ const factory = (IconButton) => {
|
|||
flat: PropTypes.bool,
|
||||
leftIcon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
onLeftIconClick: PropTypes.func,
|
||||
onRightIconClick: PropTypes.func,
|
||||
rightIcon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
scrollHide: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
|
@ -30,16 +30,16 @@ const factory = (IconButton) => {
|
|||
leftIcon: PropTypes.string,
|
||||
rightIcon: PropTypes.string,
|
||||
scrollHide: PropTypes.string,
|
||||
title: PropTypes.string
|
||||
title: PropTypes.string,
|
||||
}),
|
||||
title: PropTypes.node
|
||||
title: PropTypes.node,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
fixed: false,
|
||||
flat: false,
|
||||
scrollHide: false
|
||||
scrollHide: false,
|
||||
};
|
||||
|
||||
state = { hidden: false, height: 0 };
|
||||
|
@ -79,31 +79,42 @@ const factory = (IconButton) => {
|
|||
|
||||
handleScroll = () => {
|
||||
const scrollDiff = this.curScroll - window.scrollY;
|
||||
const hidden = scrollDiff < 0 && window.scrollY !== undefined && window.scrollY > this.state.height;
|
||||
const hidden = scrollDiff < 0
|
||||
&& window.scrollY !== undefined
|
||||
&& window.scrollY > this.state.height;
|
||||
this.setState({ hidden });
|
||||
this.curScroll = window.scrollY;
|
||||
};
|
||||
|
||||
render() {
|
||||
const { children, leftIcon, onLeftIconClick, onRightIconClick, rightIcon, theme, title } = this.props;
|
||||
const {
|
||||
children,
|
||||
leftIcon,
|
||||
onLeftIconClick,
|
||||
onRightIconClick,
|
||||
rightIcon,
|
||||
theme,
|
||||
title,
|
||||
} = this.props;
|
||||
const className = classnames(theme.appBar, {
|
||||
[theme.fixed]: this.props.fixed,
|
||||
[theme.flat]: this.props.flat,
|
||||
[theme.scrollHide]: this.state.hidden
|
||||
[theme.scrollHide]: this.state.hidden,
|
||||
}, this.props.className);
|
||||
|
||||
return (
|
||||
<header
|
||||
className={className}
|
||||
data-react-toolbox='app-bar'
|
||||
ref={node => {this.rootNode = node;}}
|
||||
data-react-toolbox="app-bar"
|
||||
ref={(node) => { this.rootNode = node; }}
|
||||
>
|
||||
<div className={theme.inner}>
|
||||
{leftIcon && <IconButton
|
||||
inverse
|
||||
className={classnames(theme.leftIcon)}
|
||||
onClick={onLeftIconClick}
|
||||
icon={leftIcon} />
|
||||
icon={leftIcon}
|
||||
/>
|
||||
}
|
||||
{title && <h1 className={classnames(theme.title)}>{title}</h1>}
|
||||
{children}
|
||||
|
@ -111,7 +122,8 @@ const factory = (IconButton) => {
|
|||
inverse
|
||||
className={classnames(theme.rightIcon)}
|
||||
onClick={onRightIconClick}
|
||||
icon={rightIcon} />
|
||||
icon={rightIcon}
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
</header>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { APP_BAR } from '../identifiers.js';
|
||||
import { appBarFactory } from './AppBar.js';
|
||||
import { APP_BAR } from '../identifiers';
|
||||
import { appBarFactory } from './AppBar';
|
||||
import { IconButton } from '../button';
|
||||
import theme from './theme.css';
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/* eslint-disable */
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import classnames from 'classnames';
|
||||
|
@ -10,7 +11,7 @@ import events from '../utils/events.js';
|
|||
const POSITION = {
|
||||
AUTO: 'auto',
|
||||
DOWN: 'down',
|
||||
UP: 'up'
|
||||
UP: 'up',
|
||||
};
|
||||
|
||||
const factory = (Chip, Input) => {
|
||||
|
@ -22,12 +23,12 @@ const factory = (Chip, Input) => {
|
|||
disabled: PropTypes.bool,
|
||||
error: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.node
|
||||
React.PropTypes.node,
|
||||
]),
|
||||
keepFocusOnChange: PropTypes.bool,
|
||||
label: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.node
|
||||
React.PropTypes.node,
|
||||
]),
|
||||
multiple: PropTypes.bool,
|
||||
onBlur: PropTypes.func,
|
||||
|
@ -49,9 +50,9 @@ const factory = (Chip, Input) => {
|
|||
suggestions: PropTypes.string,
|
||||
up: PropTypes.string,
|
||||
value: PropTypes.string,
|
||||
values: PropTypes.string
|
||||
values: PropTypes.string,
|
||||
}),
|
||||
value: PropTypes.any
|
||||
value: PropTypes.any,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -64,7 +65,7 @@ const factory = (Chip, Input) => {
|
|||
showSelectedWhenNotInSource: false,
|
||||
showSuggestionsWhenValueIsSet: false,
|
||||
source: {},
|
||||
suggestionMatch: 'start'
|
||||
suggestionMatch: 'start',
|
||||
};
|
||||
|
||||
state = {
|
||||
|
@ -72,7 +73,7 @@ const factory = (Chip, Input) => {
|
|||
focus: false,
|
||||
showAllSuggestions: this.props.showSuggestionsWhenValueIsSet,
|
||||
query: this.props.query ? this.props.query : this.query(this.props.value),
|
||||
isValueAnObject: false
|
||||
isValueAnObject: false,
|
||||
};
|
||||
|
||||
componentWillReceiveProps(nextProps) {
|
||||
|
@ -170,16 +171,15 @@ const factory = (Chip, Input) => {
|
|||
const screen_height = window.innerHeight || document.documentElement.offsetHeight;
|
||||
const up = client.top > ((screen_height / 2) + client.height);
|
||||
return up ? 'up' : 'down';
|
||||
} else {
|
||||
return this.props.direction;
|
||||
}
|
||||
return this.props.direction;
|
||||
}
|
||||
|
||||
query(key) {
|
||||
let query_value = '';
|
||||
if (!this.props.multiple && key) {
|
||||
const source_value = this.source().get(`${key}`);
|
||||
query_value = source_value ? source_value : key;
|
||||
query_value = source_value || key;
|
||||
}
|
||||
return query_value;
|
||||
}
|
||||
|
@ -262,10 +262,9 @@ const factory = (Chip, Input) => {
|
|||
source() {
|
||||
const { source: src } = this.props;
|
||||
if (src.hasOwnProperty('length')) {
|
||||
return new Map(src.map((item) => Array.isArray(item) ? [...item] : [item, item]));
|
||||
} else {
|
||||
return new Map(Object.keys(src).map((key) => [`${key}`, src[key]]));
|
||||
return new Map(src.map(item => Array.isArray(item) ? [...item] : [item, item]));
|
||||
}
|
||||
return new Map(Object.keys(src).map(key => [`${key}`, src[key]]));
|
||||
}
|
||||
|
||||
values() {
|
||||
|
@ -334,8 +333,7 @@ const factory = (Chip, Input) => {
|
|||
|
||||
renderSelected() {
|
||||
if (this.props.multiple) {
|
||||
const selectedItems = [...this.values()].map(([key, value]) => {
|
||||
return (
|
||||
const selectedItems = [...this.values()].map(([key, value]) => (
|
||||
<Chip
|
||||
key={key}
|
||||
className={this.props.theme.value}
|
||||
|
@ -344,8 +342,7 @@ const factory = (Chip, Input) => {
|
|||
>
|
||||
{value}
|
||||
</Chip>
|
||||
);
|
||||
});
|
||||
));
|
||||
|
||||
return <ul className={this.props.theme.values}>{selectedItems}</ul>;
|
||||
}
|
||||
|
@ -371,7 +368,7 @@ const factory = (Chip, Input) => {
|
|||
return (
|
||||
<ul
|
||||
className={classnames(theme.suggestions, { [theme.up]: this.state.direction === 'up' })}
|
||||
ref={node => { this.suggestionsNode = node; }}
|
||||
ref={(node) => { this.suggestionsNode = node; }}
|
||||
>
|
||||
{suggestions}
|
||||
</ul>
|
||||
|
@ -385,15 +382,15 @@ const factory = (Chip, Input) => {
|
|||
theme, ...other
|
||||
} = this.props;
|
||||
const className = classnames(theme.autocomplete, {
|
||||
[theme.focus]: this.state.focus
|
||||
[theme.focus]: this.state.focus,
|
||||
}, this.props.className);
|
||||
|
||||
return (
|
||||
<div data-react-toolbox='autocomplete' className={className}>
|
||||
<div data-react-toolbox="autocomplete" className={className}>
|
||||
{this.props.selectedPosition === 'above' ? this.renderSelected() : null}
|
||||
<Input
|
||||
{...other}
|
||||
ref={node => { this.inputNode = node; }}
|
||||
ref={(node) => { this.inputNode = node; }}
|
||||
autoComplete="off"
|
||||
className={theme.input}
|
||||
error={error}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { AUTOCOMPLETE } from '../identifiers.js';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { autocompleteFactory } from './Autocomplete.js';
|
||||
import Chip from '../chip';
|
||||
import Input from '../input';
|
||||
import { AUTOCOMPLETE } from '../identifiers';
|
||||
import { autocompleteFactory } from './Autocomplete';
|
||||
import { Chip } from '../chip';
|
||||
import { Input } from '../input';
|
||||
import theme from './theme.css';
|
||||
|
||||
const Autocomplete = autocompleteFactory(Chip, Input);
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { AVATAR } from '../identifiers.js';
|
||||
import InjectFontIcon from '../font_icon/FontIcon.js';
|
||||
import { AVATAR } from '../identifiers';
|
||||
import InjectFontIcon from '../font_icon/FontIcon';
|
||||
|
||||
const factory = (FontIcon) => {
|
||||
const Avatar = ({ alt, children, className, cover, icon, image, theme, title, ...other }) => (
|
||||
<div data-react-toolbox='avatar' className={classnames(theme.avatar, className)} {...other}>
|
||||
<div data-react-toolbox="avatar" className={classnames(theme.avatar, className)} {...other}>
|
||||
{children}
|
||||
{cover && typeof image === 'string' && <span aria-label={alt} className={theme.image} style={{ backgroundImage: `url(${image})` }} />}
|
||||
{!cover && (typeof image === 'string' ? <img alt={alt} className={theme.image} src={image} /> : image)}
|
||||
|
@ -25,14 +25,14 @@ const factory = (FontIcon) => {
|
|||
theme: PropTypes.shape({
|
||||
avatar: PropTypes.string,
|
||||
image: PropTypes.string,
|
||||
letter: PropTypes.string
|
||||
letter: PropTypes.string,
|
||||
}),
|
||||
title: PropTypes.string
|
||||
title: PropTypes.string,
|
||||
};
|
||||
|
||||
Avatar.defaultProps = {
|
||||
alt: '',
|
||||
cover: false
|
||||
cover: false,
|
||||
};
|
||||
|
||||
return Avatar;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { AVATAR } from '../identifiers.js';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { avatarFactory } from './Avatar.js';
|
||||
import FontIcon from '../font_icon/FontIcon.js';
|
||||
import { AVATAR } from '../identifiers';
|
||||
import { avatarFactory } from './Avatar';
|
||||
import { FontIcon } from '../font_icon/FontIcon';
|
||||
import theme from './theme.css';
|
||||
|
||||
const Avatar = avatarFactory(FontIcon);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { BUTTON } from '../identifiers.js';
|
||||
import InjectFontIcon from '../font_icon/FontIcon.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import { BUTTON } from '../identifiers';
|
||||
import InjectFontIcon from '../font_icon/FontIcon';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
|
||||
const factory = (ripple, FontIcon) => {
|
||||
class SimpleBrowseButton extends Component {
|
||||
|
@ -16,7 +16,7 @@ const factory = (ripple, FontIcon) => {
|
|||
floating: PropTypes.bool,
|
||||
icon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
inverse: PropTypes.bool,
|
||||
label: PropTypes.string,
|
||||
|
@ -39,9 +39,9 @@ const factory = (ripple, FontIcon) => {
|
|||
primary: PropTypes.string,
|
||||
raised: PropTypes.string,
|
||||
rippleWrapper: PropTypes.string,
|
||||
toggle: PropTypes.string
|
||||
toggle: PropTypes.string,
|
||||
}),
|
||||
type: PropTypes.string
|
||||
type: PropTypes.string,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -52,16 +52,28 @@ const factory = (ripple, FontIcon) => {
|
|||
mini: false,
|
||||
neutral: true,
|
||||
primary: false,
|
||||
raised: false
|
||||
raised: false,
|
||||
};
|
||||
|
||||
getLevel = () => {
|
||||
if (this.props.primary) return 'primary';
|
||||
if (this.props.accent) return 'accent';
|
||||
return 'neutral';
|
||||
}
|
||||
|
||||
getShape = () => {
|
||||
if (this.props.raised) return 'raised';
|
||||
if (this.props.floating) return 'floating';
|
||||
return 'flat';
|
||||
}
|
||||
|
||||
handleMouseUp = (event) => {
|
||||
this.refs.label.blur();
|
||||
this.labelNode.blur();
|
||||
if (this.props.onMouseUp) this.props.onMouseUp(event);
|
||||
};
|
||||
|
||||
handleMouseLeave = (event) => {
|
||||
this.refs.label.blur();
|
||||
this.labelNode.blur();
|
||||
if (this.props.onMouseLeave) this.props.onMouseLeave(event);
|
||||
};
|
||||
|
||||
|
@ -70,33 +82,47 @@ const factory = (ripple, FontIcon) => {
|
|||
};
|
||||
|
||||
render() {
|
||||
const { accent, children, className, flat, floating, icon,
|
||||
inverse, label, mini, neutral, primary, theme, raised, ...others} = this.props;
|
||||
const {
|
||||
accent, // eslint-disable-line
|
||||
children,
|
||||
className,
|
||||
flat, // eslint-disable-line
|
||||
floating, // eslint-disable-line
|
||||
icon,
|
||||
inverse,
|
||||
label,
|
||||
mini,
|
||||
neutral,
|
||||
primary, // eslint-disable-line
|
||||
raised, // eslint-disable-line
|
||||
theme,
|
||||
...others
|
||||
} = this.props;
|
||||
const element = 'label';
|
||||
const level = primary ? 'primary' : accent ? 'accent' : 'neutral';
|
||||
const shape = flat ? 'flat' : raised ? 'raised' : floating ? 'floating' : 'flat';
|
||||
const level = this.getLevel();
|
||||
const shape = this.getShape();
|
||||
|
||||
const classes = classnames(theme.button, [theme[shape]], {
|
||||
[theme[level]]: neutral,
|
||||
[theme.mini]: mini,
|
||||
[theme.inverse]: inverse
|
||||
[theme.inverse]: inverse,
|
||||
}, className);
|
||||
|
||||
const props = {
|
||||
...others,
|
||||
ref: 'label',
|
||||
ref: (node) => { this.labelNode = node; },
|
||||
className: classes,
|
||||
disabled: this.props.disabled,
|
||||
onMouseUp: this.handleMouseUp,
|
||||
onMouseLeave: this.handleMouseLeave,
|
||||
'data-react-toolbox': 'label'
|
||||
'data-react-toolbox': 'label',
|
||||
};
|
||||
|
||||
return React.createElement(element, props,
|
||||
icon ? <FontIcon className={theme.icon} value={icon} /> : null,
|
||||
<span>{label}</span>,
|
||||
<input className={classes} type="file" onChange={this.handleFileChange} />,
|
||||
children
|
||||
children,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { BUTTON } from '../identifiers.js';
|
||||
import InjectFontIcon from '../font_icon/FontIcon.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import { BUTTON } from '../identifiers';
|
||||
import InjectFontIcon from '../font_icon/FontIcon';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
|
||||
const factory = (ripple, FontIcon) => {
|
||||
class Button extends Component {
|
||||
|
@ -17,7 +17,7 @@ const factory = (ripple, FontIcon) => {
|
|||
href: PropTypes.string,
|
||||
icon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
inverse: PropTypes.bool,
|
||||
label: PropTypes.string,
|
||||
|
@ -39,9 +39,9 @@ const factory = (ripple, FontIcon) => {
|
|||
primary: PropTypes.string,
|
||||
raised: PropTypes.string,
|
||||
rippleWrapper: PropTypes.string,
|
||||
toggle: PropTypes.string
|
||||
toggle: PropTypes.string,
|
||||
}),
|
||||
type: PropTypes.string
|
||||
type: PropTypes.string,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -53,48 +53,76 @@ const factory = (ripple, FontIcon) => {
|
|||
neutral: true,
|
||||
primary: false,
|
||||
raised: false,
|
||||
type: 'button'
|
||||
type: 'button',
|
||||
};
|
||||
|
||||
getLevel = () => {
|
||||
if (this.props.primary) return 'primary';
|
||||
if (this.props.accent) return 'accent';
|
||||
return 'neutral';
|
||||
}
|
||||
|
||||
getShape = () => {
|
||||
if (this.props.raised) return 'raised';
|
||||
if (this.props.floating) return 'floating';
|
||||
return 'flat';
|
||||
}
|
||||
|
||||
handleMouseUp = (event) => {
|
||||
this.refs.button.blur();
|
||||
this.buttonNode.blur();
|
||||
if (this.props.onMouseUp) this.props.onMouseUp(event);
|
||||
};
|
||||
|
||||
handleMouseLeave = (event) => {
|
||||
this.refs.button.blur();
|
||||
this.buttonNode.blur();
|
||||
if (this.props.onMouseLeave) this.props.onMouseLeave(event);
|
||||
};
|
||||
|
||||
render() {
|
||||
const { accent, children, className, flat, floating, href, icon,
|
||||
inverse, label, mini, neutral, primary, theme, type, raised, ...others} = this.props;
|
||||
const {
|
||||
accent, // eslint-disable-line
|
||||
children,
|
||||
className,
|
||||
flat, // eslint-disable-line
|
||||
floating, // eslint-disable-line
|
||||
href,
|
||||
icon,
|
||||
inverse,
|
||||
label,
|
||||
mini,
|
||||
neutral,
|
||||
primary, // eslint-disable-line
|
||||
raised, // eslint-disable-line
|
||||
theme,
|
||||
type,
|
||||
...others
|
||||
} = this.props;
|
||||
const element = href ? 'a' : 'button';
|
||||
const level = primary ? 'primary' : accent ? 'accent' : 'neutral';
|
||||
const shape = flat ? 'flat' : raised ? 'raised' : floating ? 'floating' : 'flat';
|
||||
const level = this.getLevel();
|
||||
const shape = this.getShape();
|
||||
|
||||
const classes = classnames(theme.button, [theme[shape]], {
|
||||
[theme[level]]: neutral,
|
||||
[theme.mini]: mini,
|
||||
[theme.inverse]: inverse
|
||||
[theme.inverse]: inverse,
|
||||
}, className);
|
||||
|
||||
const props = {
|
||||
...others,
|
||||
href,
|
||||
ref: 'button',
|
||||
ref: (node) => { this.buttonNode = node; },
|
||||
className: classes,
|
||||
disabled: this.props.disabled,
|
||||
onMouseUp: this.handleMouseUp,
|
||||
onMouseLeave: this.handleMouseLeave,
|
||||
type: !href ? type : null,
|
||||
'data-react-toolbox': 'button'
|
||||
'data-react-toolbox': 'button',
|
||||
};
|
||||
|
||||
return React.createElement(element, props,
|
||||
icon ? <FontIcon className={theme.icon} value={icon} /> : null,
|
||||
label,
|
||||
children
|
||||
children,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { BUTTON } from '../identifiers.js';
|
||||
import InjectFontIcon from '../font_icon/FontIcon.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import { BUTTON } from '../identifiers';
|
||||
import InjectFontIcon from '../font_icon/FontIcon';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
|
||||
const factory = (ripple, FontIcon) => {
|
||||
class IconButton extends Component {
|
||||
|
@ -15,15 +15,28 @@ const factory = (ripple, FontIcon) => {
|
|||
href: PropTypes.string,
|
||||
icon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
inverse: PropTypes.bool,
|
||||
neutral: PropTypes.bool,
|
||||
onMouseLeave: PropTypes.func,
|
||||
onMouseUp: PropTypes.func,
|
||||
primary: PropTypes.bool,
|
||||
theme: PropTypes.object,
|
||||
type: PropTypes.string
|
||||
theme: PropTypes.shape({
|
||||
accent: PropTypes.string,
|
||||
button: PropTypes.string,
|
||||
flat: PropTypes.string,
|
||||
floating: PropTypes.string,
|
||||
icon: PropTypes.string,
|
||||
inverse: PropTypes.string,
|
||||
mini: PropTypes.string,
|
||||
neutral: PropTypes.string,
|
||||
primary: PropTypes.string,
|
||||
raised: PropTypes.string,
|
||||
rippleWrapper: PropTypes.string,
|
||||
toggle: PropTypes.string,
|
||||
}),
|
||||
type: PropTypes.string,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -31,44 +44,65 @@ const factory = (ripple, FontIcon) => {
|
|||
className: '',
|
||||
neutral: true,
|
||||
primary: false,
|
||||
type: 'button'
|
||||
type: 'button',
|
||||
};
|
||||
|
||||
getLevel = () => {
|
||||
if (this.props.primary) return 'primary';
|
||||
if (this.props.accent) return 'accent';
|
||||
return 'neutral';
|
||||
}
|
||||
|
||||
handleMouseUp = (event) => {
|
||||
this.refs.button.blur();
|
||||
this.buttonNode.blur();
|
||||
if (this.props.onMouseUp) this.props.onMouseUp(event);
|
||||
};
|
||||
|
||||
handleMouseLeave = (event) => {
|
||||
this.refs.button.blur();
|
||||
this.buttonNode.blur();
|
||||
if (this.props.onMouseLeave) this.props.onMouseLeave(event);
|
||||
};
|
||||
|
||||
render() {
|
||||
const {accent, children, className, href, icon, inverse, neutral,
|
||||
primary, theme, type, ...others} = this.props;
|
||||
const {
|
||||
accent, // eslint-disable-line
|
||||
children,
|
||||
className,
|
||||
href,
|
||||
icon,
|
||||
inverse,
|
||||
neutral,
|
||||
primary, // eslint-disable-line
|
||||
theme,
|
||||
type,
|
||||
...others
|
||||
} = this.props;
|
||||
const element = href ? 'a' : 'button';
|
||||
const level = primary ? 'primary' : accent ? 'accent' : 'neutral';
|
||||
const level = this.getLevel();
|
||||
const classes = classnames([theme.toggle], {
|
||||
[theme[level]]: neutral,
|
||||
[theme.inverse]: inverse
|
||||
[theme.inverse]: inverse,
|
||||
}, className);
|
||||
|
||||
const props = {
|
||||
...others,
|
||||
href,
|
||||
ref: 'button',
|
||||
ref: (node) => { this.buttonNode = node; },
|
||||
className: classes,
|
||||
disabled: this.props.disabled,
|
||||
onMouseUp: this.handleMouseUp,
|
||||
onMouseLeave: this.handleMouseLeave,
|
||||
type: !href ? type : null,
|
||||
'data-react-toolbox': 'button'
|
||||
'data-react-toolbox': 'button',
|
||||
};
|
||||
|
||||
const iconElement = typeof icon === 'string'
|
||||
? <FontIcon className={theme.icon} value={icon} />
|
||||
: icon;
|
||||
|
||||
return React.createElement(element, props,
|
||||
icon ? typeof icon === 'string' ? <FontIcon className={theme.icon} value={icon} /> : icon : null,
|
||||
children
|
||||
icon && iconElement,
|
||||
children,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/* eslint-disable */
|
||||
import expect from 'expect';
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
|
@ -10,23 +11,23 @@ const getRenderedClassName = (tree, Component) => {
|
|||
return ReactDOM.findDOMNode(rendered).getAttribute('class');
|
||||
};
|
||||
|
||||
describe('Button', function () {
|
||||
describe('#render', function () {
|
||||
it('uses flat and neutral styles by default', function () {
|
||||
describe('Button', () => {
|
||||
describe('#render', () => {
|
||||
it('uses flat and neutral styles by default', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Button theme={theme} />);
|
||||
const className = getRenderedClassName(tree, RawButton);
|
||||
expect(className).toContain(theme.flat);
|
||||
expect(className).toContain(theme.neutral);
|
||||
});
|
||||
|
||||
it('renders accent button with accent style', function () {
|
||||
it('renders accent button with accent style', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Button accent theme={theme} />);
|
||||
const className = getRenderedClassName(tree, RawButton);
|
||||
expect(className).toContain(theme.flat);
|
||||
expect(className).toContain(theme.accent);
|
||||
});
|
||||
|
||||
it('renders mini button with mini style', function () {
|
||||
it('renders mini button with mini style', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Button floating mini theme={theme} />);
|
||||
const className = getRenderedClassName(tree, RawButton);
|
||||
expect(className).toContain(theme.floating);
|
||||
|
@ -34,7 +35,7 @@ describe('Button', function () {
|
|||
expect(className).toContain(theme.mini);
|
||||
});
|
||||
|
||||
it('renders mini accented button with both styles', function () {
|
||||
it('renders mini accented button with both styles', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Button accent mini theme={theme} />);
|
||||
const className = getRenderedClassName(tree, RawButton);
|
||||
expect(className).toContain(theme.flat);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import { BUTTON } from '../identifiers.js';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { buttonFactory } from './Button.js';
|
||||
import { browseButtonFactory } from './BrowseButton.js';
|
||||
import { iconButtonFactory } from './IconButton.js';
|
||||
import FontIcon from '../font_icon/FontIcon.js';
|
||||
import { BUTTON } from '../identifiers';
|
||||
import { buttonFactory } from './Button';
|
||||
import { browseButtonFactory } from './BrowseButton';
|
||||
import { iconButtonFactory } from './IconButton';
|
||||
import { FontIcon } from '../font_icon/FontIcon';
|
||||
import themedRippleFactory from '../ripple';
|
||||
import theme from './theme.css';
|
||||
|
||||
|
|
|
@ -1,28 +1,28 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import classnames from 'classnames';
|
||||
import { CARD } from '../identifiers.js';
|
||||
import { CARD } from '../identifiers';
|
||||
|
||||
const Card = ({ children, className, raised, theme, ...other }) => {
|
||||
const classes = classnames(theme.card, {
|
||||
[theme.raised]: raised
|
||||
[theme.raised]: raised,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
<div data-react-toolbox='card' className={classes} {...other}>
|
||||
<div data-react-toolbox="card" className={classes} {...other}>
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
Card.propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
raised: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
card: PropTypes.string,
|
||||
raised: PropTypes.string
|
||||
})
|
||||
raised: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
export default themr(CARD)(Card);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import classnames from 'classnames';
|
||||
import { CARD } from '../identifiers.js';
|
||||
import { CARD } from '../identifiers';
|
||||
|
||||
const CardActions = ({ children, className, theme, ...other }) => (
|
||||
<div className={classnames(theme.cardActions, className)} {...other}>
|
||||
|
@ -10,11 +10,11 @@ const CardActions = ({ children, className, theme, ...other }) => (
|
|||
);
|
||||
|
||||
CardActions.propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
theme: PropTypes.shape({
|
||||
cardActions: PropTypes.string
|
||||
})
|
||||
cardActions: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
export default themr(CARD)(CardActions);
|
||||
|
|
|
@ -1,20 +1,29 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import classnames from 'classnames';
|
||||
import { CARD } from '../identifiers.js';
|
||||
import { CARD } from '../identifiers';
|
||||
|
||||
const CardMedia = ({ aspectRatio, children, className, color, contentOverlay, image, theme, ...other }) => {
|
||||
const CardMedia = ({
|
||||
aspectRatio,
|
||||
children,
|
||||
className,
|
||||
color,
|
||||
contentOverlay,
|
||||
image,
|
||||
theme,
|
||||
...other
|
||||
}) => {
|
||||
const classes = classnames(theme.cardMedia, {
|
||||
[theme[aspectRatio]]: aspectRatio
|
||||
[theme[aspectRatio]]: aspectRatio,
|
||||
}, className);
|
||||
|
||||
const innerClasses = classnames(theme.content, {
|
||||
[theme.contentOverlay]: contentOverlay
|
||||
[theme.contentOverlay]: contentOverlay,
|
||||
});
|
||||
|
||||
const bgStyle = {
|
||||
backgroundColor: color ? color : undefined,
|
||||
backgroundImage: typeof image === 'string' ? `url('${image}')` : undefined
|
||||
backgroundColor: color || undefined,
|
||||
backgroundImage: typeof image === 'string' ? `url('${image}')` : undefined,
|
||||
};
|
||||
|
||||
return (
|
||||
|
@ -28,21 +37,21 @@ const CardMedia = ({ aspectRatio, children, className, color, contentOverlay, im
|
|||
|
||||
CardMedia.propTypes = {
|
||||
aspectRatio: PropTypes.oneOf(['wide', 'square']),
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
color: PropTypes.string,
|
||||
contentOverlay: PropTypes.bool,
|
||||
image: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
theme: PropTypes.shape({
|
||||
cardMedia: PropTypes.string,
|
||||
content: PropTypes.string,
|
||||
contentOverlay: PropTypes.string,
|
||||
square: PropTypes.string,
|
||||
wide: PropTypes.string
|
||||
})
|
||||
wide: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
export default themr(CARD)(CardMedia);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import classnames from 'classnames';
|
||||
import { CARD } from '../identifiers.js';
|
||||
import { CARD } from '../identifiers';
|
||||
|
||||
const CardText = ({ children, className, theme, ...other }) => (
|
||||
<div className={classnames(theme.cardText, className)} {...other}>
|
||||
|
@ -10,11 +10,11 @@ const CardText = ({ children, className, theme, ...other }) => (
|
|||
);
|
||||
|
||||
CardText.propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
theme: PropTypes.shape({
|
||||
cardText: PropTypes.string
|
||||
})
|
||||
cardText: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
export default themr(CARD)(CardText);
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { CARD } from '../identifiers.js';
|
||||
import InjectAvatar from '../avatar/Avatar.js';
|
||||
import { CARD } from '../identifiers';
|
||||
import InjectAvatar from '../avatar/Avatar';
|
||||
|
||||
const factory = (Avatar) => {
|
||||
const CardTitle = ({ avatar, children, className, subtitle, theme, title, ...other }) => {
|
||||
const classes = classnames(theme.cardTitle, {
|
||||
[theme.small]: avatar,
|
||||
[theme.large]: !avatar
|
||||
[theme.large]: !avatar,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
|
@ -29,28 +29,28 @@ const factory = (Avatar) => {
|
|||
CardTitle.propTypes = {
|
||||
avatar: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
children: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element,
|
||||
PropTypes.array
|
||||
PropTypes.array,
|
||||
]),
|
||||
className: PropTypes.string,
|
||||
subtitle: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
theme: PropTypes.shape({
|
||||
large: PropTypes.string,
|
||||
title: PropTypes.string,
|
||||
small: PropTypes.string,
|
||||
subtitle: PropTypes.string
|
||||
subtitle: PropTypes.string,
|
||||
}),
|
||||
title: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
])
|
||||
PropTypes.element,
|
||||
]),
|
||||
};
|
||||
|
||||
return CardTitle;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { CARD } from '../identifiers.js';
|
||||
import { Card } from './Card.js';
|
||||
import { CardActions } from './CardActions.js';
|
||||
import { CardMedia } from './CardMedia.js';
|
||||
import { CardText } from './CardText.js';
|
||||
import { cardTitleFactory } from './CardTitle.js';
|
||||
import Avatar from '../avatar';
|
||||
import { CARD } from '../identifiers';
|
||||
import { Card } from './Card';
|
||||
import { CardActions } from './CardActions';
|
||||
import { CardMedia } from './CardMedia';
|
||||
import { CardText } from './CardText';
|
||||
import { cardTitleFactory } from './CardTitle';
|
||||
import { Avatar } from '../avatar';
|
||||
import theme from './theme.css';
|
||||
|
||||
const CardTitle = cardTitleFactory(Avatar);
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import styleShape from 'react-style-proptype';
|
||||
|
||||
const factory = (ripple) => {
|
||||
const Check = ({ checked, children, onMouseDown, theme, style }) => (
|
||||
<div
|
||||
data-react-toolbox='check'
|
||||
data-react-toolbox="check"
|
||||
className={classnames(theme.check, { [theme.checked]: checked })}
|
||||
onMouseDown={onMouseDown}
|
||||
style={style}
|
||||
|
@ -15,13 +16,13 @@ const factory = (ripple) => {
|
|||
|
||||
Check.propTypes = {
|
||||
checked: PropTypes.bool,
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
onMouseDown: PropTypes.func,
|
||||
style: PropTypes.object,
|
||||
style: styleShape,
|
||||
theme: PropTypes.shape({
|
||||
check: PropTypes.string,
|
||||
checked: PropTypes.string
|
||||
})
|
||||
checked: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
return ripple(Check);
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import styleShape from 'react-style-proptype';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { CHECKBOX } from '../identifiers.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import checkFactory from './Check.js';
|
||||
import { CHECKBOX } from '../identifiers';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
import checkFactory from './Check';
|
||||
|
||||
const factory = (Check) => {
|
||||
class Checkbox extends Component {
|
||||
|
@ -14,25 +15,25 @@ const factory = (Check) => {
|
|||
disabled: PropTypes.bool,
|
||||
label: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.node
|
||||
PropTypes.node,
|
||||
]),
|
||||
name: PropTypes.string,
|
||||
onChange: PropTypes.func,
|
||||
onMouseEnter: PropTypes.func,
|
||||
onMouseLeave: PropTypes.func,
|
||||
style: PropTypes.object,
|
||||
style: styleShape,
|
||||
theme: PropTypes.shape({
|
||||
disabled: PropTypes.string,
|
||||
field: PropTypes.string,
|
||||
input: PropTypes.string,
|
||||
ripple: PropTypes.string
|
||||
})
|
||||
ripple: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
checked: false,
|
||||
className: '',
|
||||
disabled: false
|
||||
disabled: false,
|
||||
};
|
||||
|
||||
handleToggle = (event) => {
|
||||
|
@ -43,23 +44,28 @@ const factory = (Check) => {
|
|||
};
|
||||
|
||||
blur() {
|
||||
this.inputNode && this.inputNode.blur();
|
||||
if (this.inputNode) {
|
||||
this.inputNode.blur();
|
||||
}
|
||||
}
|
||||
|
||||
focus() {
|
||||
this.inputNode && this.inputNode.focus();
|
||||
if (this.inputNode) {
|
||||
this.inputNode.focus();
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
const { checked, children, disabled, label, name, style, onChange, // eslint-disable-line
|
||||
onMouseEnter, onMouseLeave, theme, ...others } = this.props;
|
||||
const className = classnames(theme.field, {
|
||||
[theme.disabled]: this.props.disabled
|
||||
[theme.disabled]: this.props.disabled,
|
||||
}, this.props.className);
|
||||
|
||||
return (
|
||||
<label
|
||||
data-react-toolbox='checkbox'
|
||||
data-react-toolbox="checkbox"
|
||||
htmlFor={name}
|
||||
className={className}
|
||||
onMouseEnter={onMouseEnter}
|
||||
onMouseLeave={onMouseLeave}
|
||||
|
@ -72,8 +78,8 @@ const factory = (Check) => {
|
|||
name={name}
|
||||
onChange={() => {}}
|
||||
onClick={this.handleToggle}
|
||||
ref={node => { this.inputNode = node; }}
|
||||
type='checkbox'
|
||||
ref={(node) => { this.inputNode = node; }}
|
||||
type="checkbox"
|
||||
/>
|
||||
<Check
|
||||
checked={checked}
|
||||
|
@ -82,7 +88,7 @@ const factory = (Check) => {
|
|||
style={style}
|
||||
theme={theme}
|
||||
/>
|
||||
{label ? <span data-react-toolbox='label' className={theme.text}>{label}</span> : null}
|
||||
{label ? <span data-react-toolbox="label" className={theme.text}>{label}</span> : null}
|
||||
{children}
|
||||
</label>
|
||||
);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { CHECKBOX } from '../identifiers.js';
|
||||
import { CHECKBOX } from '../identifiers';
|
||||
import themedRippleFactory from '../ripple';
|
||||
import { checkboxFactory } from './Checkbox.js';
|
||||
import checkFactory from './Check.js';
|
||||
import { checkboxFactory } from './Checkbox';
|
||||
import checkFactory from './Check';
|
||||
import theme from './theme.css';
|
||||
|
||||
const ThemedCheck = checkFactory(themedRippleFactory({ centered: true, spread: 2.6 }));
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { CHIP } from '../identifiers.js';
|
||||
import InjectAvatar from '../avatar/Avatar.js';
|
||||
import { CHIP } from '../identifiers';
|
||||
import InjectAvatar from '../avatar/Avatar';
|
||||
|
||||
const factory = (Avatar) => {
|
||||
const Chip = ({ children, className, deletable, onDeleteClick, theme, ...other }) => {
|
||||
|
@ -15,11 +15,11 @@ const factory = (Avatar) => {
|
|||
|
||||
const classes = classnames(theme.chip, {
|
||||
[theme.deletable]: !!deletable,
|
||||
[theme.avatar]: !!hasAvatar
|
||||
[theme.avatar]: !!hasAvatar,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
<div data-react-toolbox='chip' className={classes} {...other}>
|
||||
<div data-react-toolbox="chip" className={classes} {...other}>
|
||||
{typeof children === 'string' ? <span>{children}</span> : children}
|
||||
{
|
||||
deletable ? (
|
||||
|
@ -45,13 +45,13 @@ const factory = (Avatar) => {
|
|||
deletable: PropTypes.string,
|
||||
delete: PropTypes.string,
|
||||
deleteIcon: PropTypes.string,
|
||||
deleteX: PropTypes.string
|
||||
})
|
||||
deleteX: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
Chip.defaultProps = {
|
||||
className: '',
|
||||
deletable: false
|
||||
deletable: false,
|
||||
};
|
||||
|
||||
return Chip;
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/* eslint-disable */
|
||||
import expect from 'expect';
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
|
@ -10,27 +11,27 @@ import { tooltipFactory } from '../../tooltip';
|
|||
const Avatar = ({ title }) => <span>{title}</span>; // eslint-disable-line react/prop-types
|
||||
const Chip = themr(CHIP)(chipFactory(Avatar));
|
||||
|
||||
describe('Chip', function () {
|
||||
describe('with avatar', function () {
|
||||
it('adds the avatar class to the element', function () {
|
||||
describe('Chip', () => {
|
||||
describe('with avatar', () => {
|
||||
it('adds the avatar class to the element', () => {
|
||||
const tree = ReactTestUtils.renderIntoDocument(
|
||||
<Chip theme={{ avatar: 'avatar-class' }}>
|
||||
<Avatar title='Test'/>
|
||||
<Avatar title="Test" />
|
||||
<span>Test</span>
|
||||
</Chip>
|
||||
</Chip>,
|
||||
);
|
||||
const chip = ReactTestUtils.findRenderedComponentWithType(tree, Chip);
|
||||
const chipNode = ReactDOM.findDOMNode(chip);
|
||||
expect(chipNode.className).toMatch(/\bavatar-class\b/);
|
||||
});
|
||||
|
||||
it('works with non-flat children', function () {
|
||||
it('works with non-flat children', () => {
|
||||
const TooltippedChip = tooltipFactory()(Chip);
|
||||
const tree = ReactTestUtils.renderIntoDocument(
|
||||
<TooltippedChip theme={{avatar: 'avatar-class'}} tooltip='Test tooltip'>
|
||||
<Avatar title='Test'/>
|
||||
<TooltippedChip theme={{ avatar: 'avatar-class' }} tooltip="Test tooltip">
|
||||
<Avatar title="Test" />
|
||||
<span>Test</span>
|
||||
</TooltippedChip>
|
||||
</TooltippedChip>,
|
||||
);
|
||||
const chip = ReactTestUtils.findRenderedComponentWithType(tree, Chip);
|
||||
const chipNode = ReactDOM.findDOMNode(chip);
|
||||
|
@ -38,12 +39,12 @@ describe('Chip', function () {
|
|||
});
|
||||
});
|
||||
|
||||
describe('without avatar', function () {
|
||||
it('does not add avatar class to the element', function () {
|
||||
describe('without avatar', () => {
|
||||
it('does not add avatar class to the element', () => {
|
||||
const tree = ReactTestUtils.renderIntoDocument(
|
||||
<Chip theme={{ avatar: 'avatar-class' }}>
|
||||
<span>Test</span>
|
||||
</Chip>
|
||||
</Chip>,
|
||||
);
|
||||
const chip = ReactTestUtils.findRenderedComponentWithType(tree, Chip);
|
||||
const chipNode = ReactDOM.findDOMNode(chip);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { CHIP } from '../identifiers.js';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { chipFactory } from './Chip.js';
|
||||
import Avatar from '../avatar';
|
||||
import { CHIP } from '../identifiers';
|
||||
import { chipFactory } from './Chip';
|
||||
import { Avatar } from '../avatar';
|
||||
import theme from './theme.css';
|
||||
|
||||
const Chip = chipFactory(Avatar);
|
||||
|
|
|
@ -1,44 +1,43 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import CssTransitionGroup from 'react-addons-css-transition-group';
|
||||
import { range, getAnimationModule } from '../utils/utils';
|
||||
import time from '../utils/time.js';
|
||||
import CalendarMonth from './CalendarMonth.js';
|
||||
import time from '../utils/time';
|
||||
import CalendarMonth from './CalendarMonth';
|
||||
|
||||
const DIRECTION_STEPS = { left: -1, right: 1 };
|
||||
|
||||
const factory = (IconButton) => {
|
||||
class Calendar extends Component {
|
||||
static propTypes = {
|
||||
disabledDates: React.PropTypes.array,
|
||||
disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
|
||||
display: PropTypes.oneOf(['months', 'years']),
|
||||
enabledDates: React.PropTypes.array,
|
||||
enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
|
||||
handleSelect: PropTypes.func,
|
||||
locale: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.object
|
||||
React.PropTypes.object,
|
||||
]),
|
||||
maxDate: PropTypes.object,
|
||||
minDate: PropTypes.object,
|
||||
maxDate: PropTypes.instanceOf(Date),
|
||||
minDate: PropTypes.instanceOf(Date),
|
||||
onChange: PropTypes.func,
|
||||
selectedDate: PropTypes.object,
|
||||
selectedDate: PropTypes.instanceOf(Date),
|
||||
sundayFirstDayOfWeek: React.PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
active: PropTypes.string,
|
||||
calendar: PropTypes.string,
|
||||
next: PropTypes.string,
|
||||
prev: PropTypes.string,
|
||||
years: PropTypes.string
|
||||
years: PropTypes.string,
|
||||
}),
|
||||
viewDate: PropTypes.object
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
display: 'months',
|
||||
selectedDate: new Date()
|
||||
selectedDate: new Date(),
|
||||
};
|
||||
|
||||
state = {
|
||||
viewDate: this.props.selectedDate
|
||||
viewDate: this.props.selectedDate,
|
||||
};
|
||||
|
||||
componentWillMount() {
|
||||
|
@ -46,7 +45,7 @@ const factory = (IconButton) => {
|
|||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
if (this.refs.activeYear) {
|
||||
if (this.activeYearNode) {
|
||||
this.scrollToActive();
|
||||
}
|
||||
}
|
||||
|
@ -56,9 +55,8 @@ const factory = (IconButton) => {
|
|||
}
|
||||
|
||||
scrollToActive() {
|
||||
this.refs.years.scrollTop = this.refs.activeYear.offsetTop
|
||||
- this.refs.years.offsetHeight / 2
|
||||
+ this.refs.activeYear.offsetHeight / 2;
|
||||
const offset = (this.yearsNode.offsetHeight / 2) + (this.activeYearNode.offsetHeight / 2);
|
||||
this.yearsNode.scrollTop = this.activeYearNode.offsetTop - offset;
|
||||
}
|
||||
|
||||
handleDayClick = (day) => {
|
||||
|
@ -66,7 +64,7 @@ const factory = (IconButton) => {
|
|||
};
|
||||
|
||||
handleYearClick = (event) => {
|
||||
const year = parseInt(event.currentTarget.id);
|
||||
const year = parseInt(event.currentTarget.id, 10);
|
||||
const viewDate = time.setYear(this.props.selectedDate, year);
|
||||
this.setState({ viewDate });
|
||||
this.props.onChange(viewDate, false);
|
||||
|
@ -75,7 +73,9 @@ const factory = (IconButton) => {
|
|||
handleKeys = (e) => {
|
||||
const { selectedDate } = this.props;
|
||||
|
||||
if (e.which === 37 || e.which === 38 || e.which === 39 || e.which === 40 || e.which === 13) e.preventDefault();
|
||||
if (e.which === 37 || e.which === 38 || e.which === 39 || e.which === 40 || e.which === 13) {
|
||||
e.preventDefault();
|
||||
}
|
||||
|
||||
switch (e.which) {
|
||||
case 13: this.props.handleSelect(); break; // enter
|
||||
|
@ -96,22 +96,31 @@ const factory = (IconButton) => {
|
|||
const direction = event.currentTarget.id;
|
||||
this.setState({
|
||||
direction,
|
||||
viewDate: time.addMonths(this.state.viewDate, DIRECTION_STEPS[direction])
|
||||
viewDate: time.addMonths(this.state.viewDate, DIRECTION_STEPS[direction]),
|
||||
});
|
||||
};
|
||||
|
||||
renderYears() {
|
||||
return (
|
||||
<ul data-react-toolbox='years' ref="years" className={this.props.theme.years}>
|
||||
<ul
|
||||
data-react-toolbox="years"
|
||||
className={this.props.theme.years}
|
||||
ref={(node) => { this.yearsNode = node; }}
|
||||
>
|
||||
{range(1900, 2100).map(year => (
|
||||
<li
|
||||
children={year}
|
||||
className={year === this.state.viewDate.getFullYear() ? this.props.theme.active : ''}
|
||||
id={year}
|
||||
key={year}
|
||||
onClick={this.handleYearClick}
|
||||
ref={year === this.state.viewDate.getFullYear() ? 'activeYear' : undefined}
|
||||
/>
|
||||
ref={(node) => {
|
||||
if (year === this.state.viewDate.getFullYear()) {
|
||||
this.activeYearNode = node;
|
||||
}
|
||||
}}
|
||||
>
|
||||
{year}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
);
|
||||
|
@ -122,9 +131,9 @@ const factory = (IconButton) => {
|
|||
const animation = this.state.direction === 'left' ? 'slideLeft' : 'slideRight';
|
||||
const animationModule = getAnimationModule(animation, theme);
|
||||
return (
|
||||
<div data-react-toolbox='calendar'>
|
||||
<IconButton id='left' className={theme.prev} icon='chevron_left' onClick={this.changeViewMonth} />
|
||||
<IconButton id='right' className={theme.next} icon='chevron_right' onClick={this.changeViewMonth} />
|
||||
<div data-react-toolbox="calendar">
|
||||
<IconButton id="left" className={theme.prev} icon="chevron_left" onClick={this.changeViewMonth} />
|
||||
<IconButton id="right" className={theme.next} icon="chevron_right" onClick={this.changeViewMonth} />
|
||||
<CssTransitionGroup
|
||||
transitionName={animationModule}
|
||||
transitionEnterTimeout={350}
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import time from '../utils/time.js';
|
||||
import time from '../utils/time';
|
||||
|
||||
class Day extends Component {
|
||||
static propTypes = {
|
||||
day: PropTypes.number,
|
||||
disabled: PropTypes.bool,
|
||||
onClick: PropTypes.func,
|
||||
selectedDate: PropTypes.object,
|
||||
selectedDate: PropTypes.instanceOf(Date),
|
||||
sundayFirstDayOfWeek: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
active: PropTypes.string,
|
||||
day: PropTypes.string,
|
||||
disabled: PropTypes.string
|
||||
disabled: PropTypes.string,
|
||||
}),
|
||||
viewDate: PropTypes.object
|
||||
viewDate: PropTypes.instanceOf(Date),
|
||||
};
|
||||
|
||||
dayStyle() {
|
||||
|
@ -22,9 +22,10 @@ class Day extends Component {
|
|||
const e = (this.props.sundayFirstDayOfWeek) ? 0 : 1;
|
||||
const firstDay = time.getFirstWeekDay(this.props.viewDate) - e;
|
||||
return {
|
||||
marginLeft: `${ (firstDay >= 0 ? firstDay : 6) * 100 / 7 }%`
|
||||
marginLeft: `${(firstDay >= 0 ? firstDay : 6) * (100 / 7)}%`,
|
||||
};
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
isSelected() {
|
||||
|
@ -43,11 +44,11 @@ class Day extends Component {
|
|||
render() {
|
||||
const className = classnames(this.props.theme.day, {
|
||||
[this.props.theme.active]: this.isSelected(),
|
||||
[this.props.theme.disabled]: this.props.disabled
|
||||
[this.props.theme.disabled]: this.props.disabled,
|
||||
});
|
||||
|
||||
return (
|
||||
<div data-react-toolbox='day' className={className} style={this.dayStyle()}>
|
||||
<div data-react-toolbox="day" className={className} style={this.dayStyle()}>
|
||||
<span onClick={this.handleClick}>
|
||||
{this.props.day}
|
||||
</span>
|
||||
|
|
|
@ -1,33 +1,33 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import { range } from '../utils/utils';
|
||||
import time from '../utils/time.js';
|
||||
import CalendarDay from './CalendarDay.js';
|
||||
import time from '../utils/time';
|
||||
import CalendarDay from './CalendarDay';
|
||||
|
||||
class Month extends Component {
|
||||
static propTypes = {
|
||||
disabledDates: React.PropTypes.array,
|
||||
enabledDates: React.PropTypes.array,
|
||||
disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
|
||||
enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
|
||||
locale: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.object
|
||||
React.PropTypes.object,
|
||||
]),
|
||||
maxDate: PropTypes.object,
|
||||
minDate: PropTypes.object,
|
||||
maxDate: PropTypes.instanceOf(Date),
|
||||
minDate: PropTypes.instanceOf(Date),
|
||||
onDayClick: PropTypes.func,
|
||||
selectedDate: PropTypes.object,
|
||||
selectedDate: PropTypes.instanceOf(Date),
|
||||
sundayFirstDayOfWeek: React.PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
days: PropTypes.string,
|
||||
month: PropTypes.string,
|
||||
title: PropTypes.string,
|
||||
week: PropTypes.string
|
||||
week: PropTypes.string,
|
||||
}),
|
||||
viewDate: PropTypes.object
|
||||
viewDate: PropTypes.instanceOf(Date),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
disabledDates: [],
|
||||
enabledDates: []
|
||||
enabledDates: [],
|
||||
};
|
||||
|
||||
handleDayClick = (day) => {
|
||||
|
@ -47,11 +47,11 @@ class Month extends Component {
|
|||
renderWeeks() {
|
||||
const days = range(0, 7).map(d => time.getDayOfWeekLetter(d, this.props.locale));
|
||||
const source = (this.props.sundayFirstDayOfWeek) ? days : [...days.slice(1), days[0]];
|
||||
return source.map((d, i) => (<span key={i}>{d}</span>));
|
||||
return source.map((day, i) => (<span key={i}>{day}</span>)); // eslint-disable-line
|
||||
}
|
||||
|
||||
renderDays() {
|
||||
return range(1, time.getDaysInMonth(this.props.viewDate) + 1).map(i => {
|
||||
return range(1, time.getDaysInMonth(this.props.viewDate) + 1).map((i) => {
|
||||
const date = new Date(this.props.viewDate.getFullYear(), this.props.viewDate.getMonth(), i);
|
||||
return (
|
||||
<CalendarDay
|
||||
|
@ -69,10 +69,12 @@ class Month extends Component {
|
|||
}
|
||||
|
||||
render() {
|
||||
const fullMonth = time.getFullMonth(this.props.viewDate, this.props.locale);
|
||||
const fullYear = this.props.viewDate.getFullYear();
|
||||
return (
|
||||
<div data-react-toolbox='month' className={this.props.theme.month}>
|
||||
<div data-react-toolbox="month" className={this.props.theme.month}>
|
||||
<span className={this.props.theme.title}>
|
||||
{time.getFullMonth(this.props.viewDate, this.props.locale)} {this.props.viewDate.getFullYear()}
|
||||
{fullMonth} {fullYear}
|
||||
</span>
|
||||
<div className={this.props.theme.week}>{this.renderWeeks()}</div>
|
||||
<div className={this.props.theme.days}>{this.renderDays()}</div>
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { DATE_PICKER } from '../identifiers.js';
|
||||
import events from '../utils/events.js';
|
||||
import time from '../utils/time.js';
|
||||
import { DATE_PICKER } from '../identifiers';
|
||||
import events from '../utils/events';
|
||||
import time from '../utils/time';
|
||||
|
||||
import InjectIconButton from '../button/IconButton.js';
|
||||
import InjectInput from '../input/Input.js';
|
||||
import InjectDialog from '../dialog/Dialog.js';
|
||||
import calendarFactory from './Calendar.js';
|
||||
import datePickerDialogFactory from './DatePickerDialog.js';
|
||||
import InjectIconButton from '../button/IconButton';
|
||||
import InjectInput from '../input/Input';
|
||||
import InjectDialog from '../dialog/Dialog';
|
||||
import calendarFactory from './Calendar';
|
||||
import datePickerDialogFactory from './DatePickerDialog';
|
||||
|
||||
const factory = (Input, DatePickerDialog) => {
|
||||
class DatePicker extends Component {
|
||||
|
@ -18,22 +18,22 @@ const factory = (Input, DatePickerDialog) => {
|
|||
autoOk: PropTypes.bool,
|
||||
cancelLabel: PropTypes.string,
|
||||
className: PropTypes.string,
|
||||
disabledDates: React.PropTypes.array,
|
||||
enabledDates: React.PropTypes.array,
|
||||
disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
|
||||
enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
|
||||
error: PropTypes.string,
|
||||
icon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
inputClassName: PropTypes.string,
|
||||
inputFormat: PropTypes.func,
|
||||
label: PropTypes.string,
|
||||
locale: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.object
|
||||
React.PropTypes.object,
|
||||
]),
|
||||
maxDate: PropTypes.object,
|
||||
minDate: PropTypes.object,
|
||||
maxDate: PropTypes.instanceOf(Date),
|
||||
minDate: PropTypes.instanceOf(Date),
|
||||
name: PropTypes.string,
|
||||
okLabel: PropTypes.string,
|
||||
onChange: PropTypes.func,
|
||||
|
@ -46,22 +46,22 @@ const factory = (Input, DatePickerDialog) => {
|
|||
sundayFirstDayOfWeek: React.PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
container: PropTypes.string,
|
||||
input: PropTypes.string
|
||||
input: PropTypes.string,
|
||||
}),
|
||||
value: PropTypes.oneOfType([
|
||||
PropTypes.instanceOf(Date),
|
||||
PropTypes.string
|
||||
])
|
||||
PropTypes.string,
|
||||
]),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
active: false,
|
||||
locale: 'en',
|
||||
sundayFirstDayOfWeek: false
|
||||
sundayFirstDayOfWeek: false,
|
||||
};
|
||||
|
||||
state = {
|
||||
active: this.props.active
|
||||
active: this.props.active,
|
||||
};
|
||||
|
||||
componentWillReceiveProps(nextProps) {
|
||||
|
@ -116,7 +116,7 @@ const factory = (Input, DatePickerDialog) => {
|
|||
const formattedDate = date === undefined ? '' : finalInputFormat(value, locale);
|
||||
|
||||
return (
|
||||
<div data-react-toolbox='date-picker' className={this.props.theme.container}>
|
||||
<div data-react-toolbox="date-picker" className={this.props.theme.container}>
|
||||
<Input
|
||||
{...others}
|
||||
className={classnames(this.props.theme.input, { [inputClassName]: inputClassName })}
|
||||
|
@ -129,7 +129,7 @@ const factory = (Input, DatePickerDialog) => {
|
|||
onKeyPress={this.handleInputKeyPress}
|
||||
onClick={this.handleInputClick}
|
||||
readOnly
|
||||
type='text'
|
||||
type="text"
|
||||
value={formattedDate}
|
||||
/>
|
||||
<DatePickerDialog
|
||||
|
@ -166,7 +166,7 @@ const DatePicker = factory(InjectInput, DatePickerDialog);
|
|||
|
||||
export default themr(DATE_PICKER)(DatePicker);
|
||||
export {
|
||||
DatePickerDialog as DatePickerDialog,
|
||||
factory as datePickerFactory
|
||||
DatePickerDialog,
|
||||
factory as datePickerFactory,
|
||||
};
|
||||
export { DatePicker };
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import time from '../utils/time.js';
|
||||
import time from '../utils/time';
|
||||
|
||||
const factory = (Dialog, Calendar) => {
|
||||
class CalendarDialog extends Component {
|
||||
|
@ -9,14 +9,14 @@ const factory = (Dialog, Calendar) => {
|
|||
autoOk: PropTypes.bool,
|
||||
cancelLabel: PropTypes.string,
|
||||
className: PropTypes.string,
|
||||
disabledDates: PropTypes.array,
|
||||
enabledDates: PropTypes.array,
|
||||
disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
|
||||
enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
|
||||
locale: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.object
|
||||
React.PropTypes.object,
|
||||
]),
|
||||
maxDate: PropTypes.object,
|
||||
minDate: PropTypes.object,
|
||||
maxDate: PropTypes.instanceOf(Date),
|
||||
minDate: PropTypes.instanceOf(Date),
|
||||
name: PropTypes.string,
|
||||
okLabel: PropTypes.string,
|
||||
onDismiss: PropTypes.func,
|
||||
|
@ -32,9 +32,9 @@ const factory = (Dialog, Calendar) => {
|
|||
header: PropTypes.string,
|
||||
monthsDisplay: PropTypes.string,
|
||||
year: PropTypes.string,
|
||||
yearsDisplay: PropTypes.string
|
||||
yearsDisplay: PropTypes.string,
|
||||
}),
|
||||
value: PropTypes.object
|
||||
value: PropTypes.instanceOf(Date),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -42,12 +42,12 @@ const factory = (Dialog, Calendar) => {
|
|||
cancelLabel: 'Cancel',
|
||||
className: '',
|
||||
okLabel: 'Ok',
|
||||
value: new Date()
|
||||
value: new Date(),
|
||||
};
|
||||
|
||||
state = {
|
||||
display: 'months',
|
||||
date: this.props.value
|
||||
date: this.props.value,
|
||||
};
|
||||
|
||||
componentWillMount() {
|
||||
|
@ -87,10 +87,16 @@ const factory = (Dialog, Calendar) => {
|
|||
}
|
||||
};
|
||||
|
||||
actions = [
|
||||
{ label: this.props.cancelLabel, className: this.props.theme.button, onClick: this.props.onDismiss },
|
||||
{ label: this.props.okLabel, className: this.props.theme.button, name: this.props.name, onClick: this.handleSelect }
|
||||
];
|
||||
actions = [{
|
||||
label: this.props.cancelLabel,
|
||||
className: this.props.theme.button,
|
||||
onClick: this.props.onDismiss,
|
||||
}, {
|
||||
label: this.props.okLabel,
|
||||
className: this.props.theme.button,
|
||||
name: this.props.name,
|
||||
onClick: this.handleSelect,
|
||||
}];
|
||||
|
||||
render() {
|
||||
const { theme } = this.props;
|
||||
|
@ -111,10 +117,10 @@ const factory = (Dialog, Calendar) => {
|
|||
type="custom"
|
||||
>
|
||||
<header className={headerClassName}>
|
||||
<span id='years' className={theme.year} onClick={this.handleSwitchDisplay}>
|
||||
<span id="years" className={theme.year} onClick={this.handleSwitchDisplay}>
|
||||
{this.state.date.getFullYear()}
|
||||
</span>
|
||||
<h3 id='months' className={theme.date} onClick={this.handleSwitchDisplay}>
|
||||
<h3 id="months" className={theme.date} onClick={this.handleSwitchDisplay}>
|
||||
{shortDayOfWeek}, {shortMonth} {date}
|
||||
</h3>
|
||||
</header>
|
||||
|
|
|
@ -1,75 +1,76 @@
|
|||
/* eslint-disable */
|
||||
import expect from 'expect';
|
||||
import theme from '../theme.css';
|
||||
import { DatePickerDialog } from '../DatePicker';
|
||||
import utils from '../../utils/testing';
|
||||
|
||||
describe('DatePickerDialog', function () {
|
||||
describe('#on mount', function () {
|
||||
it('passes value through to calendar if no maxDate/minDate specified', function () {
|
||||
describe('DatePickerDialog', () => {
|
||||
describe('#on mount', () => {
|
||||
it('passes value through to calendar if no maxDate/minDate specified', () => {
|
||||
const value = new Date(2016, 1, 1);
|
||||
const wrapper = utils.shallowRenderComponent(DatePickerDialog, { theme, value });
|
||||
expect(getDatePassedToCalendar(wrapper)).toBe(value);
|
||||
});
|
||||
|
||||
describe('when minDate but not maxDate specified', function () {
|
||||
describe('when minDate but not maxDate specified', () => {
|
||||
const minDate = new Date(2016, 1, 2);
|
||||
|
||||
it('passes through a value after minDate', function () {
|
||||
it('passes through a value after minDate', () => {
|
||||
const value = new Date(2016, 1, 3);
|
||||
const wrapper = utils.shallowRenderComponent(DatePickerDialog, { theme, value, minDate });
|
||||
expect(getDatePassedToCalendar(wrapper)).toBe(value);
|
||||
});
|
||||
|
||||
it('sanitises a value before minDate to minDate', function () {
|
||||
it('sanitises a value before minDate to minDate', () => {
|
||||
const wrapper = utils.shallowRenderComponent(DatePickerDialog, {
|
||||
theme, value: new Date(2016, 1, 1), minDate
|
||||
theme, value: new Date(2016, 1, 1), minDate,
|
||||
});
|
||||
expect(getDatePassedToCalendar(wrapper)).toBe(minDate);
|
||||
});
|
||||
});
|
||||
|
||||
describe('when maxDate but not minDate specified', function () {
|
||||
describe('when maxDate but not minDate specified', () => {
|
||||
const maxDate = new Date(2016, 1, 2);
|
||||
|
||||
it('passes through a value before maxDate', function () {
|
||||
it('passes through a value before maxDate', () => {
|
||||
const value = new Date(2016, 1, 1);
|
||||
const wrapper = utils.shallowRenderComponent(DatePickerDialog, { theme, value, maxDate });
|
||||
expect(getDatePassedToCalendar(wrapper)).toBe(value);
|
||||
});
|
||||
|
||||
it('sanitises a value after maxDate to maxDate', function () {
|
||||
it('sanitises a value after maxDate to maxDate', () => {
|
||||
const wrapper = utils.shallowRenderComponent(DatePickerDialog, {
|
||||
theme, value: new Date(2016, 1, 3), maxDate
|
||||
theme, value: new Date(2016, 1, 3), maxDate,
|
||||
});
|
||||
expect(getDatePassedToCalendar(wrapper)).toBe(maxDate);
|
||||
});
|
||||
});
|
||||
|
||||
describe('if both minDate and maxDate are set', function () {
|
||||
describe('if both minDate and maxDate are set', () => {
|
||||
const minDate = new Date(2016, 1, 2);
|
||||
const maxDate = new Date(2016, 1, 4);
|
||||
|
||||
it('sanitises value to minDate if value is before minDate', function () {
|
||||
it('sanitises value to minDate if value is before minDate', () => {
|
||||
const wrapper = utils.shallowRenderComponent(DatePickerDialog, {
|
||||
theme,
|
||||
value: new Date(2016, 1, 1),
|
||||
minDate,
|
||||
maxDate
|
||||
maxDate,
|
||||
});
|
||||
expect(getDatePassedToCalendar(wrapper)).toBe(minDate);
|
||||
});
|
||||
|
||||
it('sanitises value to maxDate if value is after maxDate', function () {
|
||||
it('sanitises value to maxDate if value is after maxDate', () => {
|
||||
const wrapper = utils.shallowRenderComponent(DatePickerDialog, {
|
||||
theme,
|
||||
value: new Date(2016, 1, 5),
|
||||
minDate,
|
||||
maxDate
|
||||
maxDate,
|
||||
});
|
||||
expect(getDatePassedToCalendar(wrapper)).toBe(maxDate);
|
||||
});
|
||||
|
||||
it('doesn\'t sanitise when value is between maxDate/minDate', function () {
|
||||
it('doesn\'t sanitise when value is between maxDate/minDate', () => {
|
||||
const value = new Date(2016, 1, 3);
|
||||
const wrapper = utils.shallowRenderComponent(DatePickerDialog, { theme, value, minDate, maxDate });
|
||||
expect(getDatePassedToCalendar(wrapper)).toBe(value);
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { DATE_PICKER, DIALOG } from '../identifiers.js';
|
||||
import { datePickerFactory } from './DatePicker.js';
|
||||
import datePickerDialogFactory from './DatePickerDialog.js';
|
||||
import calendarFactory from './Calendar.js';
|
||||
import { DATE_PICKER, DIALOG } from '../identifiers';
|
||||
import { datePickerFactory } from './DatePicker';
|
||||
import datePickerDialogFactory from './DatePickerDialog';
|
||||
import calendarFactory from './Calendar';
|
||||
|
||||
import { IconButton } from '../button';
|
||||
import Input from '../input';
|
||||
import Dialog from '../dialog';
|
||||
import { Input } from '../input';
|
||||
import { Dialog } from '../dialog';
|
||||
import theme from './theme.css';
|
||||
|
||||
const Calendar = calendarFactory(IconButton);
|
||||
|
|
|
@ -1,21 +1,22 @@
|
|||
/* eslint-disable jsx-a11y/aria-role */
|
||||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import classnames from 'classnames';
|
||||
import { DIALOG } from '../identifiers.js';
|
||||
import Portal from '../hoc/Portal.js';
|
||||
import ActivableRenderer from '../hoc/ActivableRenderer.js';
|
||||
import InjectButton from '../button/Button.js';
|
||||
import InjectOverlay from '../overlay/Overlay.js';
|
||||
import { DIALOG } from '../identifiers';
|
||||
import Portal from '../hoc/Portal';
|
||||
import ActivableRenderer from '../hoc/ActivableRenderer';
|
||||
import InjectButton from '../button/Button';
|
||||
import InjectOverlay from '../overlay/Overlay';
|
||||
|
||||
const factory = (Overlay, Button) => {
|
||||
const Dialog = (props) => {
|
||||
const actions = props.actions.map((action, idx) => {
|
||||
const className = classnames(props.theme.button, { [action.className]: action.className });
|
||||
return <Button key={idx} {...action} className={className} />;
|
||||
return <Button key={idx} {...action} className={className} />; // eslint-disable-line
|
||||
});
|
||||
|
||||
const className = classnames([props.theme.dialog, props.theme[props.type]], {
|
||||
[props.theme.active]: props.active
|
||||
[props.theme.active]: props.active,
|
||||
}, props.className);
|
||||
|
||||
return (
|
||||
|
@ -31,13 +32,13 @@ const factory = (Overlay, Button) => {
|
|||
theme={props.theme}
|
||||
themeNamespace="overlay"
|
||||
/>
|
||||
<div data-react-toolbox='dialog' className={className}>
|
||||
<section role='body' className={props.theme.body}>
|
||||
<div data-react-toolbox="dialog" className={className}>
|
||||
<section role="body" className={props.theme.body}>
|
||||
{props.title ? <h6 className={props.theme.title}>{props.title}</h6> : null}
|
||||
{props.children}
|
||||
</section>
|
||||
{actions.length
|
||||
? <nav role='navigation' className={props.theme.navigation}>
|
||||
? <nav role="navigation" className={props.theme.navigation}>
|
||||
{actions}
|
||||
</nav>
|
||||
: null
|
||||
|
@ -48,7 +49,11 @@ const factory = (Overlay, Button) => {
|
|||
};
|
||||
|
||||
Dialog.propTypes = {
|
||||
actions: PropTypes.array,
|
||||
actions: PropTypes.arrayOf(PropTypes.shape({
|
||||
className: PropTypes.string,
|
||||
label: PropTypes.string,
|
||||
children: PropTypes.node,
|
||||
})),
|
||||
active: PropTypes.bool,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
|
@ -65,16 +70,16 @@ const factory = (Overlay, Button) => {
|
|||
navigation: PropTypes.string,
|
||||
overlay: PropTypes.string,
|
||||
title: PropTypes.string,
|
||||
wrapper: PropTypes.string
|
||||
wrapper: PropTypes.string,
|
||||
}),
|
||||
title: PropTypes.string,
|
||||
type: PropTypes.string
|
||||
type: PropTypes.string,
|
||||
};
|
||||
|
||||
Dialog.defaultProps = {
|
||||
actions: [],
|
||||
active: false,
|
||||
type: 'normal'
|
||||
type: 'normal',
|
||||
};
|
||||
|
||||
return ActivableRenderer()(Dialog);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { DIALOG } from '../identifiers.js';
|
||||
import { dialogFactory } from './Dialog.js';
|
||||
import Overlay from '../overlay';
|
||||
import Button from '../button';
|
||||
import { DIALOG } from '../identifiers';
|
||||
import { dialogFactory } from './Dialog';
|
||||
import { Overlay } from '../overlay';
|
||||
import { Button } from '../button';
|
||||
import theme from './theme.css';
|
||||
|
||||
const Dialog = dialogFactory(Overlay, Button);
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import classnames from 'classnames';
|
||||
import Portal from '../hoc/Portal.js';
|
||||
import { DRAWER } from '../identifiers.js';
|
||||
import ActivableRenderer from '../hoc/ActivableRenderer.js';
|
||||
import InjectOverlay from '../overlay/Overlay.js';
|
||||
import Portal from '../hoc/Portal';
|
||||
import { DRAWER } from '../identifiers';
|
||||
import ActivableRenderer from '../hoc/ActivableRenderer';
|
||||
import InjectOverlay from '../overlay/Overlay';
|
||||
|
||||
const factory = (Overlay) => {
|
||||
const Drawer = ({
|
||||
|
@ -16,23 +16,21 @@ const factory = (Overlay) => {
|
|||
onEscKeyDown,
|
||||
theme,
|
||||
type,
|
||||
withOverlay
|
||||
withOverlay,
|
||||
}) => {
|
||||
const _className = classnames([theme.drawer, theme[type]], {
|
||||
[theme.active]: active
|
||||
[theme.active]: active,
|
||||
}, className);
|
||||
|
||||
const content = (
|
||||
<aside
|
||||
data-react-toolbox='drawer'
|
||||
className={_className}
|
||||
children={children}
|
||||
/>
|
||||
<aside data-react-toolbox="drawer" className={_className}>
|
||||
{children}
|
||||
</aside>
|
||||
);
|
||||
|
||||
return React.createElement(insideTree ? 'div' : Portal, {
|
||||
className: theme.wrapper,
|
||||
children: [
|
||||
return React.createElement(
|
||||
insideTree ? 'div' : Portal,
|
||||
{ className: theme.wrapper },
|
||||
withOverlay && (
|
||||
<Overlay
|
||||
active={active}
|
||||
|
@ -42,9 +40,8 @@ const factory = (Overlay) => {
|
|||
themeNamespace="overlay"
|
||||
/>
|
||||
),
|
||||
content
|
||||
]
|
||||
});
|
||||
content,
|
||||
);
|
||||
};
|
||||
|
||||
Drawer.propTypes = {
|
||||
|
@ -52,18 +49,18 @@ const factory = (Overlay) => {
|
|||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
insideTree: PropTypes.bool,
|
||||
onOverlayClick: PropTypes.func,
|
||||
onEscKeyDown: PropTypes.func,
|
||||
onOverlayClick: PropTypes.func,
|
||||
theme: PropTypes.shape({
|
||||
active: PropTypes.string,
|
||||
drawer: PropTypes.string,
|
||||
left: PropTypes.string,
|
||||
right: PropTypes.string
|
||||
right: PropTypes.string,
|
||||
}),
|
||||
type: PropTypes.oneOf([
|
||||
'left', 'right'
|
||||
'left', 'right',
|
||||
]),
|
||||
withOverlay: PropTypes.bool
|
||||
withOverlay: PropTypes.bool,
|
||||
};
|
||||
|
||||
Drawer.defaultProps = {
|
||||
|
@ -71,7 +68,7 @@ const factory = (Overlay) => {
|
|||
className: '',
|
||||
insideTree: false,
|
||||
type: 'left',
|
||||
withOverlay: true
|
||||
withOverlay: true,
|
||||
};
|
||||
|
||||
return ActivableRenderer()(Drawer);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { DRAWER } from '../identifiers.js';
|
||||
import { DRAWER } from '../identifiers';
|
||||
import { Overlay } from '../overlay';
|
||||
import { drawerFactory } from './Drawer.js';
|
||||
import { drawerFactory } from './Drawer';
|
||||
import theme from './theme.css';
|
||||
|
||||
const Drawer = drawerFactory(Overlay);
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
/* eslint-disable */
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { DROPDOWN } from '../identifiers.js';
|
||||
import InjectInput from '../input/Input.js';
|
||||
import events from '../utils/events.js';
|
||||
import { DROPDOWN } from '../identifiers';
|
||||
import InjectInput from '../input/Input';
|
||||
import events from '../utils/events';
|
||||
|
||||
const factory = (Input) => {
|
||||
class Dropdown extends Component {
|
||||
|
@ -21,7 +22,10 @@ const factory = (Input) => {
|
|||
onClick: PropTypes.func,
|
||||
onFocus: PropTypes.func,
|
||||
required: PropTypes.bool,
|
||||
source: PropTypes.array.isRequired,
|
||||
source: PropTypes.arrayOf(PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.object,
|
||||
])).isRequired,
|
||||
template: PropTypes.func,
|
||||
theme: PropTypes.shape({
|
||||
active: PropTypes.string,
|
||||
|
@ -36,12 +40,12 @@ const factory = (Input) => {
|
|||
templateValue: PropTypes.string,
|
||||
up: PropTypes.string,
|
||||
value: PropTypes.string,
|
||||
values: PropTypes.string
|
||||
values: PropTypes.string,
|
||||
}),
|
||||
value: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.number
|
||||
])
|
||||
PropTypes.number,
|
||||
]),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -49,12 +53,12 @@ const factory = (Input) => {
|
|||
className: '',
|
||||
allowBlank: true,
|
||||
disabled: false,
|
||||
required: false
|
||||
required: false,
|
||||
};
|
||||
|
||||
state = {
|
||||
active: false,
|
||||
up: false
|
||||
up: false,
|
||||
};
|
||||
|
||||
componentWillUpdate(nextProps, nextState) {
|
||||
|
@ -77,26 +81,24 @@ const factory = (Input) => {
|
|||
|
||||
getDocumentEvents = () => ({
|
||||
click: this.handleDocumentClick,
|
||||
touchend: this.handleDocumentClick
|
||||
touchend: this.handleDocumentClick,
|
||||
});
|
||||
|
||||
open = (event) => {
|
||||
const client = event.target.getBoundingClientRect();
|
||||
const screenHeight = window.innerHeight || document.documentElement.offsetHeight;
|
||||
const up = this.props.auto ? client.top > ((screenHeight / 2) + client.height) : false;
|
||||
if (this.inputNode) this.inputNode.blur();
|
||||
this.setState({active: true, up});
|
||||
getSelectedItem = () => {
|
||||
for (const item of this.props.source) {
|
||||
if (item.value === this.props.value) return item;
|
||||
}
|
||||
return !this.props.allowBlank
|
||||
? this.props.source[0]
|
||||
: undefined;
|
||||
};
|
||||
|
||||
close = () => {
|
||||
if (this.state.active) {
|
||||
this.setState({active: false});
|
||||
}
|
||||
}
|
||||
|
||||
handleDocumentClick = (event) => {
|
||||
if (this.state.active && !events.targetIsDescendant(event, ReactDOM.findDOMNode(this))) {
|
||||
this.setState({active: false});
|
||||
handleSelect = (item, event) => {
|
||||
if (this.props.onBlur) this.props.onBlur(event);
|
||||
if (!this.props.disabled && this.props.onChange) {
|
||||
if (this.props.name) event.target.name = this.props.name;
|
||||
this.props.onChange(item, event);
|
||||
this.close();
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -106,32 +108,44 @@ const factory = (Input) => {
|
|||
if (this.props.onClick) this.props.onClick(event);
|
||||
};
|
||||
|
||||
handleSelect = (item, event) => {
|
||||
if (this.props.onBlur) this.props.onBlur(event);
|
||||
if (!this.props.disabled && this.props.onChange) {
|
||||
if (this.props.name) {
|
||||
event.target.name = this.props.name;
|
||||
}
|
||||
this.props.onChange(item, event);
|
||||
this.close();
|
||||
handleDocumentClick = (event) => {
|
||||
if (this.state.active && !events.targetIsDescendant(event, ReactDOM.findDOMNode(this))) {
|
||||
this.setState({ active: false });
|
||||
}
|
||||
};
|
||||
|
||||
getSelectedItem = () => {
|
||||
for (const item of this.props.source) {
|
||||
if (item.value === this.props.value) return item;
|
||||
close = () => {
|
||||
if (this.state.active) {
|
||||
this.setState({ active: false });
|
||||
}
|
||||
if (!this.props.allowBlank) {
|
||||
return this.props.source[0];
|
||||
}
|
||||
|
||||
open = (event) => {
|
||||
const client = event.target.getBoundingClientRect();
|
||||
const screenHeight = window.innerHeight || document.documentElement.offsetHeight;
|
||||
const up = this.props.auto ? client.top > ((screenHeight / 2) + client.height) : false;
|
||||
if (this.inputNode) this.inputNode.blur();
|
||||
this.setState({ active: true, up });
|
||||
};
|
||||
|
||||
handleFocus = (event) => {
|
||||
event.stopPropagation();
|
||||
if (!this.props.disabled) this.open(event);
|
||||
if (this.props.onFocus) this.props.onFocus(event);
|
||||
};
|
||||
|
||||
handleBlur = (event) => {
|
||||
event.stopPropagation();
|
||||
if (this.state.active) this.close();
|
||||
if (this.props.onBlur) this.props.onBlur(event);
|
||||
}
|
||||
|
||||
renderTemplateValue(selected) {
|
||||
const { theme } = this.props;
|
||||
const className = classnames(theme.field, {
|
||||
[theme.errored]: this.props.error,
|
||||
[theme.disabled]: this.props.disabled,
|
||||
[theme.required]: this.props.required
|
||||
[theme.required]: this.props.required,
|
||||
});
|
||||
|
||||
return (
|
||||
|
@ -140,11 +154,12 @@ const factory = (Input) => {
|
|||
{this.props.template(selected)}
|
||||
</div>
|
||||
{this.props.label
|
||||
? <label className={theme.label}>
|
||||
? (
|
||||
<label htmlFor={this.props.name} className={theme.label}>
|
||||
{this.props.label}
|
||||
{this.props.required ? <span className={theme.required}> * </span> : null}
|
||||
</label>
|
||||
: null}
|
||||
) : null}
|
||||
{this.props.error ? <span className={theme.error}>{this.props.error}</span> : null}
|
||||
</div>
|
||||
);
|
||||
|
@ -154,27 +169,19 @@ const factory = (Input) => {
|
|||
const { theme } = this.props;
|
||||
const className = classnames({
|
||||
[theme.selected]: item.value === this.props.value,
|
||||
[theme.disabled]: item.disabled
|
||||
[theme.disabled]: item.disabled,
|
||||
});
|
||||
return (
|
||||
<li key={idx} className={className} onClick={!item.disabled ? this.handleSelect.bind(this, item.value) : null}>
|
||||
<li
|
||||
key={idx}
|
||||
className={className}
|
||||
onClick={!item.disabled && this.handleSelect.bind(this, item.value)}
|
||||
>
|
||||
{this.props.template ? this.props.template(item) : item.label}
|
||||
</li>
|
||||
);
|
||||
};
|
||||
|
||||
handleFocus = event => {
|
||||
event.stopPropagation();
|
||||
if (!this.props.disabled) this.open(event);
|
||||
if (this.props.onFocus) this.props.onFocus(event);
|
||||
};
|
||||
|
||||
handleBlur = event => {
|
||||
event.stopPropagation();
|
||||
if (this.state.active) this.close();
|
||||
if (this.props.onBlur) this.props.onBlur(event);
|
||||
}
|
||||
|
||||
render() {
|
||||
const {
|
||||
allowBlank, auto, required, onChange, onFocus, onBlur, // eslint-disable-line no-unused-vars
|
||||
|
@ -185,13 +192,13 @@ const factory = (Input) => {
|
|||
[theme.up]: this.state.up,
|
||||
[theme.active]: this.state.active,
|
||||
[theme.disabled]: this.props.disabled,
|
||||
[theme.required]: this.props.required
|
||||
[theme.required]: this.props.required,
|
||||
}, this.props.className);
|
||||
|
||||
return (
|
||||
<div
|
||||
className={className}
|
||||
data-react-toolbox='dropdown'
|
||||
data-react-toolbox="dropdown"
|
||||
onBlur={this.handleBlur}
|
||||
onFocus={this.handleFocus}
|
||||
>
|
||||
|
@ -202,14 +209,14 @@ const factory = (Input) => {
|
|||
onClick={this.handleClick}
|
||||
required={this.props.required}
|
||||
readOnly
|
||||
ref={node => { this.inputNode = node && node.getWrappedInstance(); }}
|
||||
ref={(node) => { this.inputNode = node && node.getWrappedInstance(); }}
|
||||
type={template && selected ? 'hidden' : null}
|
||||
theme={theme}
|
||||
themeNamespace="input"
|
||||
value={selected && selected.label ? selected.label : ''}
|
||||
/>
|
||||
{template && selected ? this.renderTemplateValue(selected) : null}
|
||||
<ul className={theme.values} ref='values'>
|
||||
<ul className={theme.values}>
|
||||
{source.map(this.renderValue)}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -1,29 +1,30 @@
|
|||
/* eslint-disable */
|
||||
import expect from 'expect';
|
||||
import React from 'react';
|
||||
import {
|
||||
renderIntoDocument,
|
||||
scryRenderedDOMComponentsWithClass,
|
||||
Simulate
|
||||
Simulate,
|
||||
} from 'react-addons-test-utils';
|
||||
import sinon from 'sinon';
|
||||
import theme from '../theme.css';
|
||||
import Dropdown from '../Dropdown';
|
||||
|
||||
|
||||
describe('Dropdown', function () {
|
||||
describe('#renderValue', function () {
|
||||
describe('Dropdown', () => {
|
||||
describe('#renderValue', () => {
|
||||
const source = [
|
||||
{ value: 'EN-gb', label: 'England' },
|
||||
{ value: 'ES-es', label: 'Spain', disabled: true },
|
||||
{ value: 'TH-th', label: 'Thailand', disabled: true },
|
||||
{ value: 'EN-en', label: 'USA'}
|
||||
{ value: 'EN-en', label: 'USA' },
|
||||
];
|
||||
it('renders dropdown item with disabled style', function () {
|
||||
it('renders dropdown item with disabled style', () => {
|
||||
const tree = renderIntoDocument(<Dropdown theme={theme} source={source} />);
|
||||
const disabled = scryRenderedDOMComponentsWithClass(tree, theme.disabled);
|
||||
expect(disabled.length).toEqual(2);
|
||||
});
|
||||
it('does not call onChange callback when disabled dorpdown item is clicked', function () {
|
||||
it('does not call onChange callback when disabled dorpdown item is clicked', () => {
|
||||
const spy = sinon.spy();
|
||||
const tree = renderIntoDocument(<Dropdown
|
||||
theme={theme}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { DROPDOWN } from '../identifiers.js';
|
||||
import { dropdownFactory } from './Dropdown.js';
|
||||
import { DROPDOWN } from '../identifiers';
|
||||
import { dropdownFactory } from './Dropdown';
|
||||
import { Input } from '../input';
|
||||
import theme from './theme.css';
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ import classnames from 'classnames';
|
|||
|
||||
const FontIcon = ({ alt, children, className, theme, value, ...other}) => ( // eslint-disable-line
|
||||
<span
|
||||
data-react-toolbox='font-icon'
|
||||
data-react-toolbox="font-icon"
|
||||
aria-label={alt}
|
||||
className={classnames({ 'material-icons': typeof value === 'string' || typeof children === 'string' }, className)}
|
||||
{...other}
|
||||
|
@ -15,18 +15,18 @@ const FontIcon = ({ alt, children, className, theme, value, ...other}) => ( // e
|
|||
|
||||
FontIcon.propTypes = {
|
||||
alt: PropTypes.string,
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
theme: PropTypes.object,
|
||||
theme: PropTypes.object, // eslint-disable-line
|
||||
value: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
])
|
||||
PropTypes.element,
|
||||
]),
|
||||
};
|
||||
|
||||
FontIcon.defaultProps = {
|
||||
alt: '',
|
||||
className: ''
|
||||
className: '',
|
||||
};
|
||||
|
||||
export default FontIcon;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import FontIcon from './FontIcon.js';
|
||||
import { FontIcon } from './FontIcon';
|
||||
|
||||
export default FontIcon;
|
||||
export { FontIcon };
|
||||
|
|
|
@ -1,86 +0,0 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import InjectAutocomplete from '../autocomplete/Autocomplete.js';
|
||||
import InjectButton from '../button/Button.js';
|
||||
import InjectCheckbox from '../checkbox/Checkbox.js';
|
||||
import InjectDatePicker from '../date_picker/DatePicker.js';
|
||||
import InjectDropdown from '../dropdown/Dropdown.js';
|
||||
import InjectInput from '../input/Input.js';
|
||||
import InjectRadioGroup from '../radio/RadioGroup.js';
|
||||
import InjectSlider from '../slider/Slider.js';
|
||||
import InjectSwitch from '../switch/Switch.js';
|
||||
import InjectTimePicker from '../time_picker/TimePicker.js';
|
||||
|
||||
const factory = (
|
||||
Autocomplete, Button, Checkbox, DatePicker, Dropdown,
|
||||
Input, RadioGroup, Slider, Switch, TimePicker
|
||||
) => {
|
||||
|
||||
const COMPONENTS = {
|
||||
'autocomplete': Autocomplete,
|
||||
'button': Button,
|
||||
'checkbox': Checkbox,
|
||||
'datepicker': DatePicker,
|
||||
'dropdown': Dropdown,
|
||||
'input': Input,
|
||||
'radioGroup': RadioGroup,
|
||||
'slider': Slider,
|
||||
'switch': Switch,
|
||||
'timepicker': TimePicker
|
||||
};
|
||||
|
||||
class Form extends Component {
|
||||
static propTypes = {
|
||||
attributes: PropTypes.array,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
model: PropTypes.object,
|
||||
onChange: PropTypes.func,
|
||||
onError: PropTypes.func,
|
||||
onSubmit: PropTypes.func,
|
||||
onValid: PropTypes.func,
|
||||
storage: PropTypes.string
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
attributes: [],
|
||||
className: ''
|
||||
};
|
||||
|
||||
onSubmit = (event) => {
|
||||
event.preventDefault();
|
||||
if (this.props.onSubmit) this.props.onSubmit(event);
|
||||
};
|
||||
|
||||
onChange = (field, value, event) => {
|
||||
if (this.props.onChange) this.props.onChange(field, value, event);
|
||||
};
|
||||
|
||||
renderFields () {
|
||||
return Object.keys(this.props.model).map((field, index) => {
|
||||
const properties = this.props.model[field];
|
||||
const Field = COMPONENTS[properties.kind.toLowerCase()];
|
||||
return <Field key={index} {...properties} onChange={this.onChange.bind(this, field)} />;
|
||||
});
|
||||
}
|
||||
|
||||
render () {
|
||||
return (
|
||||
<form data-react-toolbox='form' className={this.props.className} onSubmit={this.onSubmit}>
|
||||
{this.renderFields()}
|
||||
{this.props.children}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return Form;
|
||||
};
|
||||
|
||||
const Form = factory(
|
||||
InjectAutocomplete, InjectButton, InjectCheckbox, InjectDatePicker, InjectDropdown,
|
||||
InjectInput, InjectRadioGroup, InjectSlider, InjectSwitch, InjectTimePicker
|
||||
);
|
||||
|
||||
export default Form;
|
||||
export { factory as formFactory };
|
||||
export { Form };
|
|
@ -1,19 +0,0 @@
|
|||
import { formFactory } from './Form.js';
|
||||
import Autocomplete from '../autocomplete';
|
||||
import Button from '../button';
|
||||
import Checkbox from '../checkbox';
|
||||
import DatePicker from '../date_picker';
|
||||
import Dropdown from '../dropdown';
|
||||
import Input from '../input';
|
||||
import RadioGroup from '../radio';
|
||||
import Slider from '../slider';
|
||||
import Switch from '../switch';
|
||||
import TimePicker from '../time_picker';
|
||||
|
||||
const ThemedForm = formFactory(
|
||||
Autocomplete, Button, Checkbox, DatePicker, Dropdown,
|
||||
Input, RadioGroup, Slider, Switch, TimePicker
|
||||
);
|
||||
|
||||
export default ThemedForm;
|
||||
export { ThemedForm as Form };
|
|
@ -1,24 +0,0 @@
|
|||
# Form
|
||||
|
||||
```
|
||||
var Form = require('react-toolbox/components/form');
|
||||
var fields : [
|
||||
{ref: "name", label: "Your Name", required: true, storage: true},
|
||||
{ref: "description", multiline: true, label: "Description", value: "Doer"},
|
||||
{ref: "birthdate", type: "date", label: "Birthdate"}
|
||||
]
|
||||
|
||||
<Form attributes={fields} storage="my_toolbox_form" />
|
||||
```
|
||||
|
||||
## Properties
|
||||
|
||||
| Name | Type | Default | Description|
|
||||
|:- |:-: | :- |:-|
|
||||
| **attributes** | array | | Array of fields you want hold, fields can be instances of <Autocomplete>, <Button/>, <Dropdown>, <Input/> or <Switch/> |
|
||||
| **className** | String | | Set the class-styles of the Component.|
|
||||
| **onChange** | Function | | Dispatch callback when values of the component changes.|
|
||||
| **onError** | Function | | Dispatch callback when a required field is null or has incorrect type.|
|
||||
| **onSubmit** | Function | | Dispatch callback when user clicks on submit <Button/> |
|
||||
| **onValid** | Function | | Dispatch callback when all required fields are full-filled.|
|
||||
| **Storage** | String | | Sets a localStorage key for save all current field values.|
|
|
@ -4,17 +4,17 @@ const ActivableRendererFactory = (options = {delay: 500}) =>
|
|||
ActivableComponent => class ActivableRenderer extends Component {
|
||||
static propTypes = {
|
||||
active: PropTypes.bool.isRequired,
|
||||
children: PropTypes.any,
|
||||
delay: PropTypes.number
|
||||
children: PropTypes.node,
|
||||
delay: PropTypes.number,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
delay: options.delay
|
||||
delay: options.delay,
|
||||
}
|
||||
|
||||
state = {
|
||||
active: this.props.active,
|
||||
rendered: this.props.active
|
||||
rendered: this.props.active,
|
||||
};
|
||||
|
||||
componentWillReceiveProps(nextProps) {
|
||||
|
|
|
@ -3,15 +3,13 @@ import ReactDOM from 'react-dom';
|
|||
|
||||
class Portal extends Component {
|
||||
static propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
container: PropTypes.any,
|
||||
lockBody: PropTypes.bool
|
||||
container: PropTypes.node,
|
||||
}
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
lockBody: true
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -35,6 +33,50 @@ class Portal extends Component {
|
|||
this._unmountOverlayTarget();
|
||||
}
|
||||
|
||||
getMountNode() {
|
||||
return this._overlayTarget;
|
||||
}
|
||||
|
||||
getOverlayDOMNode() {
|
||||
if (!this.isMounted()) { // eslint-disable-line
|
||||
throw new Error('getOverlayDOMNode(): A component must be mounted to have a DOM node.');
|
||||
}
|
||||
|
||||
if (this._overlayInstance) {
|
||||
if (this._overlayInstance.getWrappedDOMNode) {
|
||||
return this._overlayInstance.getWrappedDOMNode();
|
||||
}
|
||||
return ReactDOM.findDOMNode(this._overlayInstance);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
_getOverlay() {
|
||||
if (!this.props.children) return null;
|
||||
return <div className={this.props.className}>{this.props.children}</div>;
|
||||
}
|
||||
|
||||
_renderOverlay() {
|
||||
const overlay = this._getOverlay();
|
||||
if (overlay !== null) {
|
||||
this._mountOverlayTarget();
|
||||
this._overlayInstance = ReactDOM.unstable_renderSubtreeIntoContainer(
|
||||
this, overlay, this._overlayTarget,
|
||||
);
|
||||
} else {
|
||||
this._unrenderOverlay();
|
||||
this._unmountOverlayTarget();
|
||||
}
|
||||
}
|
||||
|
||||
_unrenderOverlay() {
|
||||
if (this._overlayTarget) {
|
||||
ReactDOM.unmountComponentAtNode(this._overlayTarget);
|
||||
this._overlayInstance = null;
|
||||
}
|
||||
}
|
||||
|
||||
_mountOverlayTarget() {
|
||||
if (!this._overlayTarget) {
|
||||
this._overlayTarget = document.createElement('div');
|
||||
|
@ -51,51 +93,6 @@ class Portal extends Component {
|
|||
this._portalContainerNode = null;
|
||||
}
|
||||
|
||||
_getOverlay () {
|
||||
if (!this.props.children) return null;
|
||||
return <div className={this.props.className}>{this.props.children}</div>;
|
||||
}
|
||||
|
||||
_renderOverlay () {
|
||||
const overlay = this._getOverlay();
|
||||
if (overlay !== null) {
|
||||
this._mountOverlayTarget();
|
||||
this._overlayInstance = ReactDOM.unstable_renderSubtreeIntoContainer(
|
||||
this, overlay, this._overlayTarget
|
||||
);
|
||||
} else {
|
||||
this._unrenderOverlay();
|
||||
this._unmountOverlayTarget();
|
||||
}
|
||||
}
|
||||
|
||||
_unrenderOverlay () {
|
||||
if (this._overlayTarget) {
|
||||
ReactDOM.unmountComponentAtNode(this._overlayTarget);
|
||||
this._overlayInstance = null;
|
||||
}
|
||||
}
|
||||
|
||||
getMountNode () {
|
||||
return this._overlayTarget;
|
||||
}
|
||||
|
||||
getOverlayDOMNode () {
|
||||
if (!this.isMounted()) {
|
||||
throw new Error('getOverlayDOMNode(): A component must be mounted to have a DOM node.');
|
||||
}
|
||||
|
||||
if (this._overlayInstance) {
|
||||
if (this._overlayInstance.getWrappedDOMNode) {
|
||||
return this._overlayInstance.getWrappedDOMNode();
|
||||
} else {
|
||||
return ReactDOM.findDOMNode(this._overlayInstance);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
render() {
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -1,31 +1,31 @@
|
|||
import './utils/polyfills'; // Import polyfills for IE11
|
||||
|
||||
export { overrideComponentTypeChecker } from './utils/is-component-of-type';
|
||||
export AppBar from './app_bar';
|
||||
export Autocomplete from './autocomplete';
|
||||
export Avatar from './avatar';
|
||||
export { default as AppBar } from './app_bar';
|
||||
export { default as Autocomplete } from './autocomplete';
|
||||
export { default as Avatar } from './avatar';
|
||||
export * from './button';
|
||||
export * from './card';
|
||||
export Chip from './chip';
|
||||
export Checkbox from './checkbox';
|
||||
export DatePicker from './date_picker';
|
||||
export Dialog from './dialog';
|
||||
export Drawer from './drawer';
|
||||
export Dropdown from './dropdown';
|
||||
export FontIcon from './font_icon';
|
||||
export Form from './form';
|
||||
export Input from './input';
|
||||
export { default as Chip } from './chip';
|
||||
export { default as Checkbox } from './checkbox';
|
||||
export { default as DatePicker } from './date_picker';
|
||||
export { default as Dialog } from './dialog';
|
||||
export { default as Drawer } from './drawer';
|
||||
export { default as Dropdown } from './dropdown';
|
||||
export { default as FontIcon } from './font_icon';
|
||||
export { default as Input } from './input';
|
||||
export * from './layout';
|
||||
export Link from './link';
|
||||
export { default as Link } from './link';
|
||||
export * from './list';
|
||||
export * from './menu';
|
||||
export Navigation from './navigation';
|
||||
export ProgressBar from './progress_bar';
|
||||
export { default as Navigation } from './navigation';
|
||||
export { default as ProgressBar } from './progress_bar';
|
||||
export * from './radio';
|
||||
export Ripple from './ripple';
|
||||
export Slider from './slider';
|
||||
export Snackbar from './snackbar';
|
||||
export Switch from './switch';
|
||||
export Table from './table';
|
||||
export { default as Slider } from './slider';
|
||||
export { default as Snackbar } from './snackbar';
|
||||
export { default as Switch } from './switch';
|
||||
export { default as Table } from './table';
|
||||
export * from './tabs';
|
||||
export Tooltip from './tooltip';
|
||||
export TimePicker from './time_picker';
|
||||
export { default as TimePicker } from './time_picker';
|
||||
|
|
|
@ -1,57 +1,60 @@
|
|||
import React from 'react';
|
||||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { INPUT } from '../identifiers.js';
|
||||
import InjectedFontIcon from '../font_icon/FontIcon.js';
|
||||
import { INPUT } from '../identifiers';
|
||||
import InjectedFontIcon from '../font_icon/FontIcon';
|
||||
|
||||
const factory = (FontIcon) => {
|
||||
class Input extends React.Component {
|
||||
static propTypes = {
|
||||
children: React.PropTypes.any,
|
||||
className: React.PropTypes.string,
|
||||
disabled: React.PropTypes.bool,
|
||||
error: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.node
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
disabled: PropTypes.bool,
|
||||
error: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.node,
|
||||
]),
|
||||
floating: React.PropTypes.bool,
|
||||
hint: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.node
|
||||
floating: PropTypes.bool,
|
||||
hint: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.node,
|
||||
]),
|
||||
icon: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.element
|
||||
icon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element,
|
||||
]),
|
||||
label: React.PropTypes.oneOfType([
|
||||
React.PropTypes.string,
|
||||
React.PropTypes.node
|
||||
label: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.node,
|
||||
]),
|
||||
maxLength: React.PropTypes.number,
|
||||
multiline: React.PropTypes.bool,
|
||||
name: React.PropTypes.string,
|
||||
onBlur: React.PropTypes.func,
|
||||
onChange: React.PropTypes.func,
|
||||
onFocus: React.PropTypes.func,
|
||||
onKeyPress: React.PropTypes.func,
|
||||
required: React.PropTypes.bool,
|
||||
rows: React.PropTypes.number,
|
||||
theme: React.PropTypes.shape({
|
||||
bar: React.PropTypes.string,
|
||||
counter: React.PropTypes.string,
|
||||
disabled: React.PropTypes.string,
|
||||
error: React.PropTypes.string,
|
||||
errored: React.PropTypes.string,
|
||||
hidden: React.PropTypes.string,
|
||||
hint: React.PropTypes.string,
|
||||
icon: React.PropTypes.string,
|
||||
input: React.PropTypes.string,
|
||||
inputElement: React.PropTypes.string,
|
||||
required: React.PropTypes.string,
|
||||
withIcon: React.PropTypes.string
|
||||
maxLength: PropTypes.number,
|
||||
multiline: PropTypes.bool,
|
||||
name: PropTypes.string,
|
||||
onBlur: PropTypes.func,
|
||||
onChange: PropTypes.func,
|
||||
onFocus: PropTypes.func,
|
||||
onKeyPress: PropTypes.func,
|
||||
required: PropTypes.bool,
|
||||
rows: PropTypes.number,
|
||||
theme: PropTypes.shape({
|
||||
bar: PropTypes.string,
|
||||
counter: PropTypes.string,
|
||||
disabled: PropTypes.string,
|
||||
error: PropTypes.string,
|
||||
errored: PropTypes.string,
|
||||
hidden: PropTypes.string,
|
||||
hint: PropTypes.string,
|
||||
icon: PropTypes.string,
|
||||
input: PropTypes.string,
|
||||
inputElement: PropTypes.string,
|
||||
required: PropTypes.string,
|
||||
withIcon: PropTypes.string,
|
||||
}),
|
||||
type: React.PropTypes.string,
|
||||
value: React.PropTypes.any
|
||||
type: PropTypes.string,
|
||||
value: PropTypes.oneOfType([
|
||||
PropTypes.object,
|
||||
PropTypes.string,
|
||||
]),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -61,7 +64,7 @@ const factory = (FontIcon) => {
|
|||
floating: true,
|
||||
multiline: false,
|
||||
required: false,
|
||||
type: 'text'
|
||||
type: 'text',
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -103,7 +106,7 @@ const factory = (FontIcon) => {
|
|||
};
|
||||
|
||||
handleAutoresize = () => {
|
||||
const element = this.refs.input;
|
||||
const element = this.inputNode;
|
||||
const rows = this.props.rows;
|
||||
|
||||
if (typeof rows === 'number' && !isNaN(rows)) {
|
||||
|
@ -135,19 +138,20 @@ const factory = (FontIcon) => {
|
|||
if (!isReplacing && value.length === maxLength) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
return;
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
if (onKeyPress) onKeyPress(event);
|
||||
return undefined;
|
||||
};
|
||||
|
||||
blur() {
|
||||
this.refs.input.blur();
|
||||
this.inputNode.blur();
|
||||
}
|
||||
|
||||
focus() {
|
||||
this.refs.input.focus();
|
||||
this.inputNode.focus();
|
||||
}
|
||||
|
||||
render() {
|
||||
|
@ -161,25 +165,25 @@ const factory = (FontIcon) => {
|
|||
[theme.disabled]: disabled,
|
||||
[theme.errored]: error,
|
||||
[theme.hidden]: type === 'hidden',
|
||||
[theme.withIcon]: icon
|
||||
[theme.withIcon]: icon,
|
||||
}, this.props.className);
|
||||
|
||||
const valuePresent = value !== null
|
||||
&& value !== undefined
|
||||
&& value !== ''
|
||||
&& !(typeof value === Number && isNaN(value));
|
||||
&& !(typeof value === Number && isNaN(value)); // eslint-disable-line
|
||||
|
||||
const inputElementProps = {
|
||||
...others,
|
||||
className: classnames(theme.inputElement, { [theme.filled]: valuePresent }),
|
||||
onChange: this.handleChange,
|
||||
ref: 'input',
|
||||
ref: (node) => { this.inputNode = node; },
|
||||
role: 'input',
|
||||
name,
|
||||
disabled,
|
||||
required,
|
||||
type,
|
||||
value
|
||||
value,
|
||||
};
|
||||
if (!multiline) {
|
||||
inputElementProps.maxLength = maxLength;
|
||||
|
@ -190,12 +194,12 @@ const factory = (FontIcon) => {
|
|||
}
|
||||
|
||||
return (
|
||||
<div data-react-toolbox='input' className={className}>
|
||||
<div data-react-toolbox="input" className={className}>
|
||||
{React.createElement(multiline ? 'textarea' : 'input', inputElementProps)}
|
||||
{icon ? <FontIcon className={theme.icon} value={icon} /> : null}
|
||||
<span className={theme.bar} />
|
||||
{labelText
|
||||
? <label className={labelClassName}>
|
||||
? <label className={labelClassName} htmlFor={name}>
|
||||
{labelText}
|
||||
{required ? <span className={theme.required}> * </span> : null}
|
||||
</label>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { INPUT } from '../identifiers.js';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { inputFactory } from './Input.js';
|
||||
import FontIcon from '../font_icon/FontIcon.js';
|
||||
import { INPUT } from '../identifiers';
|
||||
import { inputFactory } from './Input';
|
||||
import { FontIcon } from '../font_icon/FontIcon';
|
||||
import theme from './theme.css';
|
||||
|
||||
const Input = inputFactory(FontIcon);
|
||||
|
|
|
@ -2,8 +2,8 @@ import React, { cloneElement, Component, PropTypes } from 'react';
|
|||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { getViewport } from '../utils/utils';
|
||||
import filterReactChildren from '../utils/filter-react-children.js';
|
||||
import isComponentOfType from '../utils/is-component-of-type.js';
|
||||
import filterReactChildren from '../utils/filter-react-children';
|
||||
import isComponentOfType from '../utils/is-component-of-type';
|
||||
import InjectAppBar from '../app_bar/AppBar';
|
||||
import InjectNavDrawer from './NavDrawer';
|
||||
import InjectSidebar from './Sidebar';
|
||||
|
@ -21,15 +21,23 @@ const factory = (AppBar, NavDrawer, Sidebar) => {
|
|||
static propTypes = {
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
theme: PropTypes.object
|
||||
theme: PropTypes.shape({
|
||||
appbarFixed: PropTypes.string,
|
||||
layout: PropTypes.string,
|
||||
layoutInner: PropTypes.string,
|
||||
navDrawerClipped: PropTypes.string,
|
||||
navDrawerPinned: PropTypes.string,
|
||||
sidebarClipped: PropTypes.string,
|
||||
sidebarPinned: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
className: ''
|
||||
className: '',
|
||||
};
|
||||
|
||||
state = {
|
||||
width: isBrowser() && getViewport().width
|
||||
width: isBrowser() && getViewport().width,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -45,7 +53,7 @@ const factory = (AppBar, NavDrawer, Sidebar) => {
|
|||
this.setState({ width: getViewport().width });
|
||||
}
|
||||
|
||||
isPinned = sideNav => {
|
||||
isPinned = (sideNav) => {
|
||||
if (sideNav) {
|
||||
const { permanentAt, pinned } = sideNav.props;
|
||||
const { width } = this.state;
|
||||
|
@ -69,17 +77,17 @@ const factory = (AppBar, NavDrawer, Sidebar) => {
|
|||
|
||||
const clonedAppBar = appBar && cloneElement(appBar, {
|
||||
theme,
|
||||
themeNamespace: 'appbar'
|
||||
themeNamespace: 'appbar',
|
||||
});
|
||||
|
||||
const clonedLeftSideNav = navDrawer && cloneElement(navDrawer, {
|
||||
clipped: navDrawerClipped,
|
||||
pinned: navDrawerPinned
|
||||
pinned: navDrawerPinned,
|
||||
});
|
||||
|
||||
const clonedRightSideNav = sidebar && cloneElement(sidebar, {
|
||||
clipped: sidebarClipped,
|
||||
pinned: sidebarPinned
|
||||
pinned: sidebarPinned,
|
||||
});
|
||||
|
||||
const _className = classnames(theme.layout,
|
||||
|
@ -88,7 +96,7 @@ const factory = (AppBar, NavDrawer, Sidebar) => {
|
|||
[theme.navDrawerClipped]: navDrawerClipped,
|
||||
[theme.sidebarPinned]: sidebarPinned,
|
||||
[theme.sidebarClipped]: sidebarClipped,
|
||||
[theme.appbarFixed]: appBarFixed
|
||||
[theme.appbarFixed]: appBarFixed,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
|
|
|
@ -4,7 +4,7 @@ import { themr } from 'react-css-themr';
|
|||
import InjectDrawer from '../drawer/Drawer';
|
||||
import { LAYOUT } from '../identifiers';
|
||||
|
||||
const factory = Drawer => {
|
||||
const factory = (Drawer) => {
|
||||
const NavDrawer = ({
|
||||
active,
|
||||
className,
|
||||
|
@ -16,7 +16,7 @@ const factory = Drawer => {
|
|||
}) => {
|
||||
const _className = classnames({
|
||||
[theme.pinned]: pinned,
|
||||
[theme.clipped]: clipped
|
||||
[theme.clipped]: clipped,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
|
@ -40,12 +40,15 @@ const factory = Drawer => {
|
|||
permanentAt: PropTypes.oneOf(['sm', 'smTablet', 'md', 'lg', 'lgTablet', 'xl', 'xxl', 'xxxl']),
|
||||
pinned: PropTypes.bool,
|
||||
right: PropTypes.bool,
|
||||
theme: PropTypes.object
|
||||
theme: PropTypes.shape({
|
||||
clipped: PropTypes.string,
|
||||
pinned: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
NavDrawer.defaultProps = {
|
||||
className: '',
|
||||
pinned: false
|
||||
pinned: false,
|
||||
};
|
||||
|
||||
return NavDrawer;
|
||||
|
|
|
@ -1,31 +1,29 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import cn from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LAYOUT } from '../identifiers.js';
|
||||
import { LAYOUT } from '../identifiers';
|
||||
|
||||
const Panel = ({ bodyScroll, children, className, theme, ...other }) => (
|
||||
<div
|
||||
{...other}
|
||||
data-react-toolbox='panel'
|
||||
className={classnames(theme.panel, {
|
||||
[theme.bodyScroll]: bodyScroll
|
||||
}, className)}
|
||||
children={children}
|
||||
/>
|
||||
const Panel = ({ bodyScroll, children, className, theme, ...other }) => {
|
||||
const _className = cn(theme.panel, { [theme.bodyScroll]: bodyScroll }, className);
|
||||
return (
|
||||
<div {...other} data-react-toolbox="panel" className={_className}>
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
Panel.propTypes = {
|
||||
bodyScroll: PropTypes.bool,
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
theme: PropTypes.shape({
|
||||
panel: PropTypes.string
|
||||
})
|
||||
panel: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
Panel.defaultProps = {
|
||||
bodyScroll: true,
|
||||
className: ''
|
||||
className: '',
|
||||
};
|
||||
|
||||
export default themr(LAYOUT)(Panel);
|
||||
|
|
|
@ -4,7 +4,7 @@ import { themr } from 'react-css-themr';
|
|||
import InjectDrawer from '../drawer/Drawer';
|
||||
import { LAYOUT } from '../identifiers';
|
||||
|
||||
const factory = Drawer => {
|
||||
const factory = (Drawer) => {
|
||||
const Sidebar = ({
|
||||
active,
|
||||
className,
|
||||
|
@ -16,7 +16,7 @@ const factory = Drawer => {
|
|||
}) => {
|
||||
const _className = classnames({
|
||||
[theme.pinned]: pinned,
|
||||
[theme.clipped]: clipped
|
||||
[theme.clipped]: clipped,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
|
@ -40,14 +40,17 @@ const factory = Drawer => {
|
|||
clipped: PropTypes.bool,
|
||||
permanentAt: PropTypes.oneOf(['sm', 'smTablet', 'md', 'lg', 'lgTablet', 'xl', 'xxl', 'xxxl']),
|
||||
pinned: PropTypes.bool,
|
||||
theme: PropTypes.object,
|
||||
width: PropTypes.oneOf([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 25, 33, 50, 66, 75, 100])
|
||||
theme: PropTypes.shape({
|
||||
clipped: PropTypes.string,
|
||||
pinned: PropTypes.string,
|
||||
}),
|
||||
width: PropTypes.oneOf([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 25, 33, 50, 66, 75, 100]),
|
||||
};
|
||||
|
||||
Sidebar.defaultProps = {
|
||||
className: '',
|
||||
pinned: false,
|
||||
right: false
|
||||
right: false,
|
||||
};
|
||||
|
||||
return Sidebar;
|
||||
|
|
|
@ -3,9 +3,9 @@ import { LAYOUT } from '../identifiers';
|
|||
import { layoutFactory } from './Layout';
|
||||
import { sidebarFactory } from './Sidebar';
|
||||
import { navDrawerFactory } from './NavDrawer';
|
||||
import Panel from './Panel';
|
||||
import AppBar from '../app_bar';
|
||||
import Drawer from '../drawer';
|
||||
import { Panel } from './Panel';
|
||||
import { AppBar } from '../app_bar';
|
||||
import { Drawer } from '../drawer';
|
||||
import theme from './theme.css';
|
||||
|
||||
const injectTheme = component => themr(LAYOUT, theme)(component);
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LINK } from '../identifiers.js';
|
||||
import FontIcon from '../font_icon/FontIcon.js';
|
||||
import { LINK } from '../identifiers';
|
||||
import { FontIcon } from '../font_icon/FontIcon';
|
||||
|
||||
const Link = ({ active, children, className, count, icon, label, theme, ...others }) => {
|
||||
const _className = classnames(theme.link, {
|
||||
[theme.active]: active
|
||||
[theme.active]: active,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
<a data-react-toolbox='link' className={_className} {...others}>
|
||||
<a data-react-toolbox="link" className={_className} {...others}>
|
||||
{icon ? <FontIcon className={theme.icon} value={icon} /> : null}
|
||||
{label ? <abbr>{label}</abbr> : null}
|
||||
{count && parseInt(count) !== 0 ? <small>{count}</small> : null}
|
||||
{count && parseInt(count, 10) !== 0 ? <small>{count}</small> : null}
|
||||
{children}
|
||||
</a>
|
||||
);
|
||||
|
@ -26,19 +26,19 @@ Link.propTypes = {
|
|||
count: PropTypes.number,
|
||||
icon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
label: PropTypes.string,
|
||||
theme: PropTypes.shape({
|
||||
active: PropTypes.string,
|
||||
icon: PropTypes.string,
|
||||
link: PropTypes.string
|
||||
})
|
||||
link: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
Link.defaultProps = {
|
||||
active: false,
|
||||
className: ''
|
||||
className: '',
|
||||
};
|
||||
|
||||
export default themr(LINK)(Link);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { LINK } from '../identifiers.js';
|
||||
import { Link } from './Link.js';
|
||||
import { LINK } from '../identifiers';
|
||||
import { Link } from './Link';
|
||||
import theme from './theme.css';
|
||||
|
||||
const ThemedLink = themr(LINK, theme)(Link);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import InjectListItem from './ListItem.js';
|
||||
import { LIST } from '../identifiers';
|
||||
import InjectListItem from './ListItem';
|
||||
|
||||
const mergeProp = (propName, child, parent) => (
|
||||
child[propName] !== undefined
|
||||
|
@ -15,17 +15,15 @@ const factory = (ListItem) => {
|
|||
static propTypes = {
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
ripple: PropTypes.bool,
|
||||
selectable: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
list: PropTypes.string
|
||||
})
|
||||
list: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
ripple: false,
|
||||
selectable: false
|
||||
selectable: false,
|
||||
};
|
||||
|
||||
renderItems() {
|
||||
|
@ -36,15 +34,14 @@ const factory = (ListItem) => {
|
|||
const selectable = mergeProp('selectable', item.props, this.props);
|
||||
const ripple = mergeProp('ripple', item.props, this.props);
|
||||
return React.cloneElement(item, { selectable, ripple });
|
||||
} else {
|
||||
return React.cloneElement(item);
|
||||
}
|
||||
return React.cloneElement(item);
|
||||
});
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<ul data-react-toolbox='list' className={classnames(this.props.theme.list, this.props.className)}>
|
||||
<ul data-react-toolbox="list" className={classnames(this.props.theme.list, this.props.className)}>
|
||||
{this.renderItems()}
|
||||
</ul>
|
||||
);
|
||||
|
|
|
@ -1,14 +1,25 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import InjectCheckbox from '../checkbox/Checkbox.js';
|
||||
import InjectListItemContent from './ListItemContent.js';
|
||||
import { LIST } from '../identifiers';
|
||||
import InjectCheckbox from '../checkbox/Checkbox';
|
||||
import InjectListItemContent from './ListItemContent';
|
||||
|
||||
const factory = (Checkbox, ListItemContent) => {
|
||||
const ListCheckbox = ({ caption, checked, className, disabled, legend, name, onBlur, onChange, onFocus, theme }) => {
|
||||
const ListCheckbox = ({
|
||||
caption,
|
||||
checked,
|
||||
className,
|
||||
disabled,
|
||||
legend,
|
||||
name,
|
||||
onBlur,
|
||||
onChange,
|
||||
onFocus,
|
||||
theme,
|
||||
}) => {
|
||||
const _className = classnames(theme.item, theme.checkboxItem, {
|
||||
[theme.disabled]: disabled
|
||||
[theme.disabled]: disabled,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
|
@ -41,13 +52,13 @@ const factory = (Checkbox, ListItemContent) => {
|
|||
checkbox: PropTypes.string,
|
||||
checkboxItem: PropTypes.string,
|
||||
disabled: PropTypes.string,
|
||||
item: PropTypes.string
|
||||
})
|
||||
item: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
ListCheckbox.defaultProps = {
|
||||
checked: false,
|
||||
disabled: false
|
||||
disabled: false,
|
||||
};
|
||||
|
||||
return ListCheckbox;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import { LIST } from '../identifiers';
|
||||
|
||||
const ListDivider = ({ inset, theme }) => (
|
||||
<hr className={inset ? `${theme.divider} ${theme.inset}` : theme.divider} />
|
||||
|
@ -10,12 +10,12 @@ ListDivider.propTypes = {
|
|||
inset: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
divider: PropTypes.string,
|
||||
inset: PropTypes.string
|
||||
})
|
||||
inset: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
ListDivider.defaultProps = {
|
||||
inset: false
|
||||
inset: false,
|
||||
};
|
||||
|
||||
export default themr(LIST)(ListDivider);
|
||||
|
|
|
@ -1,28 +1,31 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import InjectListItemContent from './ListItemContent.js';
|
||||
import InjectListItemLayout from './ListItemLayout.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import { LIST } from '../identifiers';
|
||||
import InjectListItemContent from './ListItemContent';
|
||||
import InjectListItemLayout from './ListItemLayout';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
|
||||
const factory = (ripple, ListItemLayout, ListItemContent) => {
|
||||
class ListItem extends Component {
|
||||
static propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
disabled: PropTypes.bool,
|
||||
hasRipple: PropTypes.bool,
|
||||
onClick: PropTypes.func,
|
||||
onMouseDown: PropTypes.func,
|
||||
onTouchStart: PropTypes.func,
|
||||
ripple: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
listItem: PropTypes.string
|
||||
listItem: PropTypes.string,
|
||||
}),
|
||||
to: PropTypes.string
|
||||
to: PropTypes.string,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
disabled: false,
|
||||
ripple: false
|
||||
ripple: false,
|
||||
};
|
||||
|
||||
handleClick = (event) => {
|
||||
|
@ -35,12 +38,12 @@ const factory = (ripple, ListItemLayout, ListItemContent) => {
|
|||
const children = {
|
||||
leftActions: [],
|
||||
rightActions: [],
|
||||
ignored: []
|
||||
ignored: [],
|
||||
};
|
||||
|
||||
React.Children.forEach(this.props.children, (child, i) => {
|
||||
if (!React.isValidElement(child)) {
|
||||
return;
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const { listItemIgnore, ...rest } = child.props;
|
||||
|
@ -48,21 +51,32 @@ const factory = (ripple, ListItemLayout, ListItemContent) => {
|
|||
|
||||
if (listItemIgnore) {
|
||||
children.ignored.push(strippedChild);
|
||||
return;
|
||||
return undefined;
|
||||
}
|
||||
if (child.type === ListItemContent) {
|
||||
children.itemContent = strippedChild;
|
||||
return;
|
||||
return undefined;
|
||||
}
|
||||
const bucket = children.itemContent ? 'rightActions' : 'leftActions';
|
||||
children[bucket].push({ ...strippedChild, key: i });
|
||||
return undefined;
|
||||
});
|
||||
|
||||
return children;
|
||||
}
|
||||
|
||||
render() {
|
||||
const {className, onMouseDown, onTouchStart, to, onClick, ripple: hasRipple, theme, ...other} = this.props; //eslint-disable-line no-unused-vars
|
||||
const {
|
||||
className,
|
||||
hasRipple, // eslint-disable-line no-unused-vars
|
||||
onClick, // eslint-disable-line no-unused-vars
|
||||
onMouseDown, // eslint-disable-line no-unused-vars
|
||||
onTouchStart, // eslint-disable-line no-unused-vars
|
||||
ripple:
|
||||
theme,
|
||||
to,
|
||||
...other
|
||||
} = this.props;
|
||||
const children = this.groupChildren();
|
||||
const content = <ListItemLayout theme={theme} {...children} {...other} />;
|
||||
return (
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import { LIST } from '../identifiers';
|
||||
|
||||
const ListItemAction = ({ action, theme }) => {
|
||||
const { onClick, onMouseDown } = action.props;
|
||||
|
@ -14,10 +14,10 @@ const ListItemAction = ({action, theme}) => {
|
|||
};
|
||||
|
||||
ListItemAction.propTypes = {
|
||||
action: PropTypes.object,
|
||||
action: PropTypes.node,
|
||||
theme: PropTypes.shape({
|
||||
itemAction: PropTypes.string
|
||||
})
|
||||
itemAction: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
export default themr(LIST)(ListItemAction);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import InjectListItemAction from './ListItemAction.js';
|
||||
import { LIST } from '../identifiers';
|
||||
import InjectListItemAction from './ListItemAction';
|
||||
|
||||
const factory = (ListItemAction) => {
|
||||
const ListItemActions = ({ type, children, theme }) => {
|
||||
|
@ -11,18 +11,20 @@ const factory = (ListItemAction) => {
|
|||
|
||||
return (
|
||||
<span className={theme[type]}>
|
||||
{validChildren.map((action, i) => <ListItemAction key={i} theme={theme} action={action} />)}
|
||||
{validChildren.map((action, i) => (
|
||||
<ListItemAction key={i} theme={theme} action={action} /> // eslint-disable-line
|
||||
))}
|
||||
</span>
|
||||
);
|
||||
};
|
||||
|
||||
ListItemActions.propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
theme: PropTypes.shape({
|
||||
left: PropTypes.string,
|
||||
right: PropTypes.string
|
||||
right: PropTypes.string,
|
||||
}),
|
||||
type: PropTypes.oneOf(['left', 'right'])
|
||||
type: PropTypes.oneOf(['left', 'right']),
|
||||
};
|
||||
|
||||
return ListItemActions;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import InjectListItemText from './ListItemText.js';
|
||||
import { LIST } from '../identifiers';
|
||||
import InjectListItemText from './ListItemText';
|
||||
|
||||
const types = ['auto', 'normal', 'large'];
|
||||
|
||||
|
@ -11,24 +11,24 @@ const factory = (ListItemText) => {
|
|||
static propTypes = {
|
||||
caption: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.node
|
||||
PropTypes.node,
|
||||
]),
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
legend: PropTypes.string,
|
||||
theme: PropTypes.shape({
|
||||
auto: PropTypes.string,
|
||||
itemContentRoot: PropTypes.string,
|
||||
large: PropTypes.string,
|
||||
normal: PropTypes.string
|
||||
normal: PropTypes.string,
|
||||
}),
|
||||
type: PropTypes.oneOf(types)
|
||||
type: PropTypes.oneOf(types),
|
||||
};
|
||||
|
||||
getType() {
|
||||
const { type, children, caption, legend } = this.props;
|
||||
|
||||
let count = React.Children.count(children);
|
||||
[caption, legend].forEach(s => { count += s ? 1 : 0; });
|
||||
[caption, legend].forEach((s) => { count += s ? 1 : 0; });
|
||||
const typeIndex = Math.min(count, types.length);
|
||||
|
||||
return type || types[typeIndex];
|
||||
|
@ -38,7 +38,7 @@ const factory = (ListItemText) => {
|
|||
const { children, caption, legend, theme } = this.props;
|
||||
const contentType = this.getType();
|
||||
const className = classnames(theme.itemContentRoot, {
|
||||
[theme[contentType]]: theme[contentType]
|
||||
[theme[contentType]]: theme[contentType],
|
||||
});
|
||||
|
||||
return (
|
||||
|
|
|
@ -1,36 +1,38 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import FontIcon from '../font_icon/FontIcon.js';
|
||||
import InjectAvatar from '../avatar/Avatar.js';
|
||||
import InjectListItemContent from './ListItemContent.js';
|
||||
import InjectListItemActions from './ListItemActions.js';
|
||||
import { LIST } from '../identifiers';
|
||||
import { FontIcon } from '../font_icon/FontIcon';
|
||||
import InjectAvatar from '../avatar/Avatar';
|
||||
import InjectListItemContent from './ListItemContent';
|
||||
import InjectListItemActions from './ListItemActions';
|
||||
|
||||
const factory = (Avatar, ListItemContent, ListItemActions) => {
|
||||
const ListItemLayout = (props) => {
|
||||
const className = classnames(props.theme.item, {
|
||||
[props.theme.disabled]: props.disabled,
|
||||
[props.theme.selectable]: props.selectable
|
||||
[props.theme.selectable]: props.selectable,
|
||||
}, props.className);
|
||||
|
||||
const leftActions = [
|
||||
props.leftIcon && <FontIcon value={props.leftIcon} key='leftIcon'/>,
|
||||
props.avatar && <Avatar image={props.avatar} key='avatar'/>,
|
||||
...props.leftActions
|
||||
props.leftIcon && <FontIcon value={props.leftIcon} key="leftIcon" />,
|
||||
props.avatar && <Avatar image={props.avatar} key="avatar" />,
|
||||
...props.leftActions,
|
||||
];
|
||||
const rightActions = [
|
||||
props.rightIcon && <FontIcon value={props.rightIcon} key='rightIcon'/>,
|
||||
...props.rightActions
|
||||
props.rightIcon && <FontIcon value={props.rightIcon} key="rightIcon" />,
|
||||
...props.rightActions,
|
||||
];
|
||||
const content = props.itemContent || <ListItemContent theme={props.theme} caption={props.caption} legend={props.legend} />;
|
||||
const emptyActions = (item) => !item[0] && !item[1] && !item[2];
|
||||
const emptyActions = item => !item[0] && !item[1] && !item[2];
|
||||
const content = props.itemContent || (
|
||||
<ListItemContent theme={props.theme} caption={props.caption} legend={props.legend} />
|
||||
);
|
||||
|
||||
return (
|
||||
<span className={className}>
|
||||
{!emptyActions(leftActions) > 0 && <ListItemActions type='left' theme={props.theme}>{leftActions}</ListItemActions>}
|
||||
{!emptyActions(leftActions) > 0 && <ListItemActions type="left" theme={props.theme}>{leftActions}</ListItemActions>}
|
||||
{content}
|
||||
{!emptyActions(rightActions) > 0 && <ListItemActions type='right' theme={props.theme}>{rightActions}</ListItemActions>}
|
||||
{!emptyActions(rightActions) > 0 && <ListItemActions type="right" theme={props.theme}>{rightActions}</ListItemActions>}
|
||||
</span>
|
||||
);
|
||||
};
|
||||
|
@ -38,36 +40,34 @@ const factory = (Avatar, ListItemContent, ListItemActions) => {
|
|||
ListItemLayout.propTypes = {
|
||||
avatar: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
caption: PropTypes.string,
|
||||
children: PropTypes.any,
|
||||
className: PropTypes.string,
|
||||
disabled: PropTypes.bool,
|
||||
itemContent: PropTypes.element,
|
||||
leftActions: PropTypes.array,
|
||||
leftActions: PropTypes.arrayOf(PropTypes.node),
|
||||
leftIcon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
legend: PropTypes.string,
|
||||
rightActions: PropTypes.array,
|
||||
rightActions: PropTypes.arrayOf(PropTypes.node),
|
||||
rightIcon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
selectable: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
disabled: PropTypes.string,
|
||||
item: PropTypes.string,
|
||||
selectable: PropTypes.string
|
||||
selectable: PropTypes.string,
|
||||
}),
|
||||
to: PropTypes.string
|
||||
};
|
||||
|
||||
ListItemLayout.defaultProps = {
|
||||
disabled: false,
|
||||
selectable: false
|
||||
selectable: false,
|
||||
};
|
||||
|
||||
return ListItemLayout;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import { LIST } from '../identifiers';
|
||||
|
||||
const ListItemText = ({ className, primary, children, theme, ...other }) => {
|
||||
const _className = classnames(theme.itemText, { [theme.primary]: primary }, className);
|
||||
|
@ -13,17 +13,17 @@ const ListItemText = ({className, primary, children, theme, ...other}) => {
|
|||
};
|
||||
|
||||
ListItemText.propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
primary: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
itemText: PropTypes.string,
|
||||
primary: PropTypes.string
|
||||
})
|
||||
primary: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
ListItemText.defaultProps = {
|
||||
primary: false
|
||||
primary: false,
|
||||
};
|
||||
|
||||
export default themr(LIST)(ListItemText);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import { LIST } from '../identifiers';
|
||||
|
||||
const ListSubHeader = ({ caption, className, theme }) => (
|
||||
<h5 className={classnames(theme.subheader, className)}>{caption}</h5>
|
||||
|
@ -10,11 +10,11 @@ const ListSubHeader = ({ caption, className, theme }) => (
|
|||
ListSubHeader.propTypes = {
|
||||
caption: PropTypes.string,
|
||||
className: PropTypes.string,
|
||||
theme: PropTypes.object
|
||||
theme: PropTypes.object, // eslint-disable-line
|
||||
};
|
||||
|
||||
ListSubHeader.defaultProps = {
|
||||
className: ''
|
||||
className: '',
|
||||
};
|
||||
|
||||
export default themr(LIST)(ListSubHeader);
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { LIST } from '../identifiers.js';
|
||||
import { LIST } from '../identifiers';
|
||||
import { Avatar } from '../avatar';
|
||||
import { Checkbox } from '../checkbox';
|
||||
import { ListItemText } from './ListItemText.js';
|
||||
import { ListItemAction } from './ListItemAction.js';
|
||||
import { ListSubHeader } from './ListSubHeader.js';
|
||||
import { ListDivider } from './ListDivider.js';
|
||||
import { listFactory } from './List.js';
|
||||
import { listItemFactory } from './ListItem.js';
|
||||
import { listCheckboxFactory } from './ListCheckbox.js';
|
||||
import { listItemActionsFactory } from './ListItemActions.js';
|
||||
import { listItemContentFactory } from './ListItemContent.js';
|
||||
import { listItemLayoutFactory } from './ListItemLayout.js';
|
||||
import { ListItemText } from './ListItemText';
|
||||
import { ListItemAction } from './ListItemAction';
|
||||
import { ListSubHeader } from './ListSubHeader';
|
||||
import { ListDivider } from './ListDivider';
|
||||
import { listFactory } from './List';
|
||||
import { listItemFactory } from './ListItem';
|
||||
import { listCheckboxFactory } from './ListCheckbox';
|
||||
import { listItemActionsFactory } from './ListItemActions';
|
||||
import { listItemContentFactory } from './ListItemContent';
|
||||
import { listItemLayoutFactory } from './ListItemLayout';
|
||||
import themedRippleFactory from '../ripple';
|
||||
import theme from './theme.css';
|
||||
|
||||
const applyTheme = (Component) => themr(LIST, theme)(Component);
|
||||
const applyTheme = Component => themr(LIST, theme)(Component);
|
||||
const ripple = themedRippleFactory({ centered: false, listItemIgnore: true });
|
||||
const ThemedListItemAction = applyTheme(ListItemAction);
|
||||
const ThemedListSubHeader = applyTheme(ListSubHeader);
|
||||
|
@ -23,9 +23,13 @@ const ThemedListItemText = applyTheme(ListItemText);
|
|||
const ThemedListDivider = applyTheme(ListDivider);
|
||||
const ThemedListItemContent = applyTheme(listItemContentFactory(ThemedListItemText));
|
||||
const ThemedListItemActions = applyTheme(listItemActionsFactory(ThemedListItemAction));
|
||||
const ThemedListItemLayout = applyTheme(listItemLayoutFactory(Avatar, ThemedListItemContent, ThemedListItemActions));
|
||||
const ThemedListItemLayout = applyTheme(
|
||||
listItemLayoutFactory(Avatar, ThemedListItemContent, ThemedListItemActions),
|
||||
);
|
||||
const ThemedListCheckbox = applyTheme(listCheckboxFactory(Checkbox, ThemedListItemContent));
|
||||
const ThemedListItem = applyTheme(listItemFactory(ripple, ThemedListItemLayout, ThemedListItemContent));
|
||||
const ThemedListItem = applyTheme(
|
||||
listItemFactory(ripple, ThemedListItemLayout, ThemedListItemContent),
|
||||
);
|
||||
const ThemedList = applyTheme(listFactory(ThemedListItem));
|
||||
|
||||
export { ThemedListItemActions as ListItemActions };
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { MENU } from '../identifiers.js';
|
||||
import InjectIconButton from '../button/IconButton.js';
|
||||
import InjectMenu from './Menu.js';
|
||||
import { MENU } from '../identifiers';
|
||||
import InjectIconButton from '../button/IconButton';
|
||||
import InjectMenu from './Menu';
|
||||
|
||||
const factory = (IconButton, Menu) => {
|
||||
class IconMenu extends Component {
|
||||
|
@ -12,7 +12,7 @@ const factory = (IconButton, Menu) => {
|
|||
className: PropTypes.string,
|
||||
icon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
iconRipple: PropTypes.bool,
|
||||
menuRipple: PropTypes.bool,
|
||||
|
@ -22,11 +22,11 @@ const factory = (IconButton, Menu) => {
|
|||
onShow: PropTypes.func,
|
||||
position: PropTypes.string,
|
||||
selectable: PropTypes.bool,
|
||||
selected: PropTypes.any,
|
||||
selected: PropTypes.node,
|
||||
theme: PropTypes.shape({
|
||||
icon: PropTypes.string,
|
||||
iconMenu: PropTypes.string
|
||||
})
|
||||
iconMenu: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -35,11 +35,11 @@ const factory = (IconButton, Menu) => {
|
|||
iconRipple: true,
|
||||
menuRipple: true,
|
||||
position: 'auto',
|
||||
selectable: false
|
||||
selectable: false,
|
||||
};
|
||||
|
||||
state = {
|
||||
active: false
|
||||
active: false,
|
||||
}
|
||||
|
||||
handleButtonClick = (event) => {
|
||||
|
|
|
@ -2,10 +2,10 @@ import React, { Component, PropTypes } from 'react';
|
|||
import ReactDOM from 'react-dom';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { MENU } from '../identifiers.js';
|
||||
import { MENU } from '../identifiers';
|
||||
import { events } from '../utils';
|
||||
import { getViewport } from '../utils/utils';
|
||||
import InjectMenuItem from './MenuItem.js';
|
||||
import InjectMenuItem from './MenuItem';
|
||||
|
||||
const POSITION = {
|
||||
AUTO: 'auto',
|
||||
|
@ -13,7 +13,7 @@ const POSITION = {
|
|||
TOP_LEFT: 'topLeft',
|
||||
TOP_RIGHT: 'topRight',
|
||||
BOTTOM_LEFT: 'bottomLeft',
|
||||
BOTTOM_RIGHT: 'bottomRight'
|
||||
BOTTOM_RIGHT: 'bottomRight',
|
||||
};
|
||||
|
||||
const factory = (MenuItem) => {
|
||||
|
@ -29,7 +29,7 @@ const factory = (MenuItem) => {
|
|||
position: PropTypes.oneOf(Object.keys(POSITION).map(key => POSITION[key])),
|
||||
ripple: PropTypes.bool,
|
||||
selectable: PropTypes.bool,
|
||||
selected: PropTypes.any,
|
||||
selected: PropTypes.node,
|
||||
theme: PropTypes.shape({
|
||||
active: PropTypes.string,
|
||||
bottomLeft: PropTypes.string,
|
||||
|
@ -40,8 +40,8 @@ const factory = (MenuItem) => {
|
|||
rippled: PropTypes.string,
|
||||
static: PropTypes.string,
|
||||
topLeft: PropTypes.string,
|
||||
topRight: PropTypes.string
|
||||
})
|
||||
topRight: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -49,17 +49,17 @@ const factory = (MenuItem) => {
|
|||
outline: true,
|
||||
position: POSITION.STATIC,
|
||||
ripple: true,
|
||||
selectable: true
|
||||
selectable: true,
|
||||
};
|
||||
|
||||
state = {
|
||||
active: this.props.active,
|
||||
rippled: false
|
||||
rippled: false,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
this.positionTimeoutHandle = setTimeout(() => {
|
||||
const { width, height } = this.refs.menu.getBoundingClientRect();
|
||||
const { width, height } = this.menuNode.getBoundingClientRect();
|
||||
const position = this.props.position === POSITION.AUTO
|
||||
? this.calculatePosition()
|
||||
: this.props.position;
|
||||
|
@ -108,7 +108,7 @@ const factory = (MenuItem) => {
|
|||
if (!this.state.active && nextState.active) {
|
||||
events.addEventsToDocument({
|
||||
click: this.handleDocumentClick,
|
||||
touchstart: this.handleDocumentClick
|
||||
touchstart: this.handleDocumentClick,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -118,7 +118,7 @@ const factory = (MenuItem) => {
|
|||
if (this.props.onHide) this.props.onHide();
|
||||
events.removeEventsFromDocument({
|
||||
click: this.handleDocumentClick,
|
||||
touchstart: this.handleDocumentClick
|
||||
touchstart: this.handleDocumentClick,
|
||||
});
|
||||
} else if (!prevState.active && this.state.active && this.props.onShow) {
|
||||
this.props.onShow();
|
||||
|
@ -129,38 +129,13 @@ const factory = (MenuItem) => {
|
|||
if (this.state.active) {
|
||||
events.removeEventsFromDocument({
|
||||
click: this.handleDocumentClick,
|
||||
touchstart: this.handleDocumentClick
|
||||
touchstart: this.handleDocumentClick,
|
||||
});
|
||||
}
|
||||
clearTimeout(this.positionTimeoutHandle);
|
||||
clearTimeout(this.activateTimeoutHandle);
|
||||
}
|
||||
|
||||
handleDocumentClick = (event) => {
|
||||
if (this.state.active && !events.targetIsDescendant(event, ReactDOM.findDOMNode(this))) {
|
||||
this.setState({active: false, rippled: false});
|
||||
}
|
||||
};
|
||||
|
||||
handleSelect = (item, event) => {
|
||||
const { value, onClick } = item.props;
|
||||
if (onClick) event.persist();
|
||||
this.setState({ active: false, rippled: this.props.ripple }, () => {
|
||||
if (onClick) onClick(event);
|
||||
if (this.props.onSelect) this.props.onSelect(value);
|
||||
});
|
||||
};
|
||||
|
||||
calculatePosition () {
|
||||
const parentNode = ReactDOM.findDOMNode(this).parentNode;
|
||||
if (!parentNode) return;
|
||||
const {top, left, height, width} = parentNode.getBoundingClientRect();
|
||||
const {height: wh, width: ww} = getViewport();
|
||||
const toTop = top < ((wh / 2) - height / 2);
|
||||
const toLeft = left < ((ww / 2) - width / 2);
|
||||
return `${toTop ? 'top' : 'bottom'}${toLeft ? 'Left' : 'Right'}`;
|
||||
}
|
||||
|
||||
getMenuStyle() {
|
||||
const { width, height, position } = this.state;
|
||||
if (position !== POSITION.STATIC) {
|
||||
|
@ -176,12 +151,48 @@ const factory = (MenuItem) => {
|
|||
return { clip: 'rect(0 0 0 0)' };
|
||||
}
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
|
||||
getRootStyle() {
|
||||
if (this.state.position !== POSITION.STATIC) {
|
||||
return { width: this.state.width, height: this.state.height };
|
||||
return this.state.position !== POSITION.STATIC
|
||||
? { width: this.state.width, height: this.state.height }
|
||||
: undefined;
|
||||
}
|
||||
|
||||
calculatePosition() {
|
||||
const parentNode = ReactDOM.findDOMNode(this).parentNode;
|
||||
if (!parentNode) return undefined;
|
||||
const { top, left, height, width } = parentNode.getBoundingClientRect();
|
||||
const { height: wh, width: ww } = getViewport();
|
||||
const toTop = top < ((wh / 2) - (height / 2));
|
||||
const toLeft = left < ((ww / 2) - (width / 2));
|
||||
return `${toTop ? 'top' : 'bottom'}${toLeft ? 'Left' : 'Right'}`;
|
||||
}
|
||||
|
||||
handleDocumentClick = (event) => {
|
||||
if (this.state.active && !events.targetIsDescendant(event, ReactDOM.findDOMNode(this))) {
|
||||
this.setState({ active: false, rippled: false });
|
||||
}
|
||||
};
|
||||
|
||||
handleSelect = (item, event) => {
|
||||
const { value, onClick } = item.props;
|
||||
if (onClick) event.persist();
|
||||
this.setState({ active: false, rippled: this.props.ripple }, () => {
|
||||
if (onClick) onClick(event);
|
||||
if (this.props.onSelect) this.props.onSelect(value);
|
||||
});
|
||||
};
|
||||
|
||||
show() {
|
||||
const { width, height } = this.menuNode.getBoundingClientRect();
|
||||
this.setState({ active: true, width, height });
|
||||
}
|
||||
|
||||
hide() {
|
||||
this.setState({ active: false });
|
||||
}
|
||||
|
||||
renderItems() {
|
||||
|
@ -190,36 +201,32 @@ const factory = (MenuItem) => {
|
|||
if (item.type === MenuItem) {
|
||||
return React.cloneElement(item, {
|
||||
ripple: item.props.ripple || this.props.ripple,
|
||||
selected: typeof item.props.value !== 'undefined' && this.props.selectable && item.props.value === this.props.selected,
|
||||
onClick: this.handleSelect.bind(this, item)
|
||||
selected: typeof item.props.value !== 'undefined'
|
||||
&& this.props.selectable
|
||||
&& item.props.value === this.props.selected,
|
||||
onClick: this.handleSelect.bind(this, item),
|
||||
});
|
||||
} else {
|
||||
}
|
||||
return React.cloneElement(item);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
show () {
|
||||
const { width, height } = this.refs.menu.getBoundingClientRect();
|
||||
this.setState({active: true, width, height});
|
||||
}
|
||||
|
||||
hide () {
|
||||
this.setState({active: false});
|
||||
}
|
||||
|
||||
render() {
|
||||
const { theme } = this.props;
|
||||
const outlineStyle = { width: this.state.width, height: this.state.height };
|
||||
const className = classnames([theme.menu, theme[this.state.position]], {
|
||||
[theme.active]: this.state.active,
|
||||
[theme.rippled]: this.state.rippled
|
||||
[theme.rippled]: this.state.rippled,
|
||||
}, this.props.className);
|
||||
|
||||
return (
|
||||
<div data-react-toolbox='menu' className={className} style={this.getRootStyle()}>
|
||||
<div data-react-toolbox="menu" className={className} style={this.getRootStyle()}>
|
||||
{this.props.outline ? <div className={theme.outline} style={outlineStyle} /> : null}
|
||||
<ul ref='menu' className={theme.menuInner} style={this.getMenuStyle()}>
|
||||
<ul
|
||||
ref={(node) => { this.menuNode = node; }}
|
||||
className={theme.menuInner}
|
||||
style={this.getMenuStyle()}
|
||||
>
|
||||
{this.renderItems()}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { MENU } from '../identifiers.js';
|
||||
import { MENU } from '../identifiers';
|
||||
|
||||
const MenuDivider = ({ theme }) => (
|
||||
<hr data-react-toolbox='menu-divider' className={theme.menuDivider}/>
|
||||
<hr data-react-toolbox="menu-divider" className={theme.menuDivider} />
|
||||
);
|
||||
|
||||
MenuDivider.propTypes = {
|
||||
theme: PropTypes.shape({
|
||||
menuDivider: PropTypes.string
|
||||
})
|
||||
menuDivider: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
export default themr(MENU)(MenuDivider);
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { MENU } from '../identifiers.js';
|
||||
import FontIcon from '../font_icon/FontIcon.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import { MENU } from '../identifiers';
|
||||
import { FontIcon } from '../font_icon/FontIcon';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
|
||||
const factory = (ripple) => {
|
||||
class MenuItem extends Component {
|
||||
static propTypes = {
|
||||
caption: PropTypes.string,
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
disabled: PropTypes.bool,
|
||||
icon: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
onClick: PropTypes.func,
|
||||
selected: PropTypes.bool,
|
||||
|
@ -25,14 +25,14 @@ const factory = (ripple) => {
|
|||
icon: PropTypes.string,
|
||||
menuItem: PropTypes.string,
|
||||
selected: PropTypes.string,
|
||||
shortcut: PropTypes.string
|
||||
})
|
||||
shortcut: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
disabled: false,
|
||||
selected: false
|
||||
selected: false,
|
||||
};
|
||||
|
||||
handleClick = (event) => {
|
||||
|
@ -42,14 +42,23 @@ const factory = (ripple) => {
|
|||
};
|
||||
|
||||
render() {
|
||||
const {icon, caption, children, shortcut, selected, disabled, theme, ...others} = this.props;
|
||||
const {
|
||||
caption,
|
||||
children,
|
||||
disabled,
|
||||
icon,
|
||||
selected,
|
||||
shortcut,
|
||||
theme,
|
||||
...others
|
||||
} = this.props;
|
||||
const className = classnames(theme.menuItem, {
|
||||
[theme.selected]: selected,
|
||||
[theme.disabled]: disabled
|
||||
[theme.disabled]: disabled,
|
||||
}, this.props.className);
|
||||
|
||||
return (
|
||||
<li {...others} data-react-toolbox='menu-item' className={className} onClick={this.handleClick}>
|
||||
<li {...others} data-react-toolbox="menu-item" className={className} onClick={this.handleClick}>
|
||||
{icon ? <FontIcon value={icon} className={theme.icon} /> : null}
|
||||
<span className={theme.caption}>{caption}</span>
|
||||
{shortcut ? <small className={theme.shortcut}>{shortcut}</small> : null}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/* eslint-disable */
|
||||
import expect from 'expect';
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
|
@ -5,9 +6,9 @@ import ReactTestUtils from 'react-addons-test-utils';
|
|||
import Menu from '../Menu';
|
||||
import MenuItem, { MenuItem as RawMenuItem } from '../MenuItem';
|
||||
|
||||
describe('MenuItem', function () {
|
||||
describe('#onClick', function () {
|
||||
it('passes to listener the event', function () {
|
||||
describe('MenuItem', () => {
|
||||
describe('#onClick', () => {
|
||||
it('passes to listener the event', () => {
|
||||
let listenerCalled = false;
|
||||
const handleClick = function (event) {
|
||||
listenerCalled = true;
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { MENU } from '../identifiers.js';
|
||||
import { MENU } from '../identifiers';
|
||||
import { IconButton } from '../button';
|
||||
import { MenuDivider } from './MenuDivider.js';
|
||||
import { menuItemFactory } from './MenuItem.js';
|
||||
import { menuFactory } from './Menu.js';
|
||||
import { iconMenuFactory } from './IconMenu.js';
|
||||
import { MenuDivider } from './MenuDivider';
|
||||
import { menuItemFactory } from './MenuItem';
|
||||
import { menuFactory } from './Menu';
|
||||
import { iconMenuFactory } from './IconMenu';
|
||||
import themedRippleFactory from '../ripple';
|
||||
import theme from './theme.css';
|
||||
|
||||
const applyTheme = (Component) => themr(MENU, theme)(Component);
|
||||
const applyTheme = Component => themr(MENU, theme)(Component);
|
||||
const ThemedMenuDivider = applyTheme(MenuDivider);
|
||||
const ThemedMenuItem = applyTheme(menuItemFactory(themedRippleFactory({})));
|
||||
const ThemedMenu = applyTheme(menuFactory(ThemedMenuItem));
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
import React, { PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { NAVIGATION } from '../identifiers.js';
|
||||
import InjectButton from '../button/Button.js';
|
||||
import InjectLink from '../link/Link.js';
|
||||
import { NAVIGATION } from '../identifiers';
|
||||
import InjectButton from '../button/Button';
|
||||
import InjectLink from '../link/Link';
|
||||
|
||||
const factory = (Button, Link) => {
|
||||
const Navigation = ({ actions, children, className, routes, theme, type }) => {
|
||||
const _className = classnames(theme[type], className);
|
||||
const buttons = actions.map((action, index) => {
|
||||
return <Button className={theme.button} key={index} {...action} />;
|
||||
});
|
||||
const buttons = actions.map((action, index) => (
|
||||
<Button className={theme.button} key={index} {...action} /> // eslint-disable-line
|
||||
));
|
||||
|
||||
const links = routes.map((route, index) => {
|
||||
return <Link className={theme.link} key={index} {...route} />;
|
||||
});
|
||||
const links = routes.map((route, index) => (
|
||||
<Link className={theme.link} key={index} {...route} /> // eslint-disable-line
|
||||
));
|
||||
|
||||
return (
|
||||
<nav data-react-toolbox='navigation' className={_className}>
|
||||
<nav data-react-toolbox="navigation" className={_className}>
|
||||
{links}
|
||||
{buttons}
|
||||
{children}
|
||||
|
@ -26,24 +26,24 @@ const factory = (Button, Link) => {
|
|||
};
|
||||
|
||||
Navigation.propTypes = {
|
||||
actions: PropTypes.array,
|
||||
actions: PropTypes.array, // eslint-disable-line
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
routes: PropTypes.array,
|
||||
routes: PropTypes.array, // eslint-disable-line
|
||||
theme: PropTypes.shape({
|
||||
button: PropTypes.string,
|
||||
horizontal: PropTypes.string,
|
||||
link: PropTypes.string,
|
||||
vertical: PropTypes.string
|
||||
vertical: PropTypes.string,
|
||||
}),
|
||||
type: PropTypes.oneOf(['vertical', 'horizontal'])
|
||||
type: PropTypes.oneOf(['vertical', 'horizontal']),
|
||||
};
|
||||
|
||||
Navigation.defaultProps = {
|
||||
actions: [],
|
||||
className: '',
|
||||
type: 'horizontal',
|
||||
routes: []
|
||||
routes: [],
|
||||
};
|
||||
|
||||
return Navigation;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { NAVIGATION } from '../identifiers.js';
|
||||
import { navigationFactory } from './Navigation.js';
|
||||
import { NAVIGATION } from '../identifiers';
|
||||
import { navigationFactory } from './Navigation';
|
||||
import { Button } from '../button';
|
||||
import { Link } from '../link';
|
||||
import theme from './theme.css';
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { OVERLAY } from '../identifiers.js';
|
||||
import { OVERLAY } from '../identifiers';
|
||||
|
||||
class Overlay extends Component {
|
||||
static propTypes = {
|
||||
|
@ -14,12 +14,12 @@ class Overlay extends Component {
|
|||
theme: PropTypes.shape({
|
||||
active: PropTypes.string,
|
||||
backdrop: PropTypes.string,
|
||||
overlay: PropTypes.string
|
||||
})
|
||||
overlay: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
lockScroll: true
|
||||
lockScroll: true,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -67,7 +67,7 @@ class Overlay extends Component {
|
|||
}
|
||||
}
|
||||
|
||||
handleClick = event => {
|
||||
handleClick = (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
if (this.props.onClick) {
|
||||
|
@ -82,7 +82,7 @@ class Overlay extends Component {
|
|||
{...other}
|
||||
onClick={this.handleClick}
|
||||
className={classnames(theme.overlay, {
|
||||
[theme.active]: active
|
||||
[theme.active]: active,
|
||||
}, className)}
|
||||
/>
|
||||
);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { OVERLAY } from '../identifiers.js';
|
||||
import { Overlay } from './Overlay.js';
|
||||
import { OVERLAY } from '../identifiers';
|
||||
import { Overlay } from './Overlay';
|
||||
import theme from './theme.css';
|
||||
|
||||
const ThemedOverlay = themr(OVERLAY, theme)(Overlay);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { PROGRESS_BAR } from '../identifiers.js';
|
||||
import prefixer from '../utils/prefixer.js';
|
||||
import { PROGRESS_BAR } from '../identifiers';
|
||||
import prefixer from '../utils/prefixer';
|
||||
|
||||
class ProgressBar extends Component {
|
||||
static propTypes = {
|
||||
|
@ -21,10 +21,10 @@ class ProgressBar extends Component {
|
|||
linear: PropTypes.string,
|
||||
multicolor: PropTypes.string,
|
||||
path: PropTypes.string,
|
||||
value: PropTypes.string
|
||||
value: PropTypes.string,
|
||||
}),
|
||||
type: PropTypes.oneOf(['linear', 'circular']),
|
||||
value: PropTypes.number
|
||||
value: PropTypes.number,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -35,7 +35,7 @@ class ProgressBar extends Component {
|
|||
mode: 'indeterminate',
|
||||
multicolor: false,
|
||||
type: 'linear',
|
||||
value: 0
|
||||
value: 0,
|
||||
};
|
||||
|
||||
calculateRatio(value) {
|
||||
|
@ -45,26 +45,25 @@ class ProgressBar extends Component {
|
|||
}
|
||||
|
||||
circularStyle() {
|
||||
if (this.props.mode !== 'indeterminate') {
|
||||
return {strokeDasharray: `${2 * Math.PI * 25 * this.calculateRatio(this.props.value)}, 400`};
|
||||
}
|
||||
return this.props.mode !== 'indeterminate'
|
||||
? { strokeDasharray: `${2 * Math.PI * 25 * this.calculateRatio(this.props.value)}, 400` }
|
||||
: undefined;
|
||||
}
|
||||
|
||||
linearStyle() {
|
||||
if (this.props.mode !== 'indeterminate') {
|
||||
return {
|
||||
buffer: prefixer({ transform: `scaleX(${this.calculateRatio(this.props.buffer)})` }),
|
||||
value: prefixer({transform: `scaleX(${this.calculateRatio(this.props.value)})`})
|
||||
value: prefixer({ transform: `scaleX(${this.calculateRatio(this.props.value)})` }),
|
||||
};
|
||||
} else {
|
||||
return {};
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
renderCircular() {
|
||||
return (
|
||||
<svg className={this.props.theme.circle} viewBox="0 0 60 60">
|
||||
<circle className={this.props.theme.path} style={this.circularStyle()} cx='30' cy='30' r='25' />
|
||||
<circle className={this.props.theme.path} style={this.circularStyle()} cx="30" cy="30" r="25" />
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
@ -73,8 +72,8 @@ class ProgressBar extends Component {
|
|||
const { buffer, value } = this.linearStyle();
|
||||
return (
|
||||
<div>
|
||||
<span ref='buffer' data-ref='buffer' className={this.props.theme.buffer} style={buffer}/>
|
||||
<span ref='value' data-ref='value' className={this.props.theme.value} style={value}/>
|
||||
<span data-ref="buffer" className={this.props.theme.buffer} style={buffer} />
|
||||
<span data-ref="value" className={this.props.theme.value} style={value} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
@ -83,13 +82,13 @@ class ProgressBar extends Component {
|
|||
const { className, disabled, max, min, mode, multicolor, type, theme, value } = this.props;
|
||||
const _className = classnames(theme[type], {
|
||||
[theme[mode]]: mode,
|
||||
[theme.multicolor]: multicolor
|
||||
[theme.multicolor]: multicolor,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
<div
|
||||
disabled={disabled}
|
||||
data-react-toolbox='progress-bar'
|
||||
data-react-toolbox="progress-bar"
|
||||
aria-valuenow={value}
|
||||
aria-valuemin={min}
|
||||
aria-valuemax={max}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/* eslint-disable */
|
||||
import React from 'react';
|
||||
import expect from 'expect';
|
||||
import TestUtils from 'react-addons-test-utils';
|
||||
|
@ -5,39 +6,43 @@ import ProgressBar, { ProgressBar as RawProgressBar } from '../ProgressBar';
|
|||
import theme from '../theme.css';
|
||||
import utils from '../../utils/testing';
|
||||
|
||||
describe('ProgressBar', function () {
|
||||
describe('ProgressBar', () => {
|
||||
let progressBar;
|
||||
|
||||
describe('#calculateRatio', function () {
|
||||
before(function () {
|
||||
describe('#calculateRatio', () => {
|
||||
before(() => {
|
||||
const tree = TestUtils.renderIntoDocument(<ProgressBar min={100} max={300} theme={theme} />);
|
||||
progressBar = TestUtils.findRenderedComponentWithType(tree, RawProgressBar);
|
||||
});
|
||||
|
||||
it('calculates the right ratio', function () {
|
||||
it('calculates the right ratio', () => {
|
||||
expect(progressBar.calculateRatio(150)).toEqual(0.25);
|
||||
});
|
||||
|
||||
it('gets 0 when value is less than min', function () {
|
||||
it('gets 0 when value is less than min', () => {
|
||||
expect(progressBar.calculateRatio(10)).toEqual(0);
|
||||
});
|
||||
|
||||
it('gets 1 when value is more than max', function () {
|
||||
it('gets 1 when value is more than max', () => {
|
||||
expect(progressBar.calculateRatio(400)).toEqual(1);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#render', function () {
|
||||
let buffer, value, wrapper, circle, strokeLength;
|
||||
describe('#render', () => {
|
||||
let buffer,
|
||||
value,
|
||||
wrapper,
|
||||
circle,
|
||||
strokeLength;
|
||||
|
||||
it('renders the value and buffer bars when it is linear', function () {
|
||||
it('renders the value and buffer bars when it is linear', () => {
|
||||
wrapper = utils.shallowRenderComponent(RawProgressBar, { theme }).props.children;
|
||||
expect(wrapper.props.children.length).toEqual(2);
|
||||
expect(wrapper.props.children[0].ref).toEqual('buffer');
|
||||
expect(wrapper.props.children[1].ref).toEqual('value');
|
||||
});
|
||||
|
||||
it('renders the value and buffer bars when it is linear', function () {
|
||||
it('renders the value and buffer bars when it is linear', () => {
|
||||
progressBar = utils.shallowRenderComponent(RawProgressBar, { mode: 'determinate', value: 30, buffer: 60, theme });
|
||||
buffer = (progressBar.props.children.props.children[0]);
|
||||
value = (progressBar.props.children.props.children[1]);
|
||||
|
@ -45,20 +50,20 @@ describe('ProgressBar', function () {
|
|||
expect(value.props.style.transform).toEqual(`scaleX(${0.3})`);
|
||||
});
|
||||
|
||||
it('renders the svg circle when it is circular', function () {
|
||||
it('renders the svg circle when it is circular', () => {
|
||||
progressBar = utils.shallowRenderComponent(RawProgressBar, { type: 'circular', theme });
|
||||
expect(progressBar.props.children.type).toEqual('svg');
|
||||
expect(progressBar.props.children.props.children.type).toEqual('circle');
|
||||
});
|
||||
|
||||
it('renders the proper circle length style when it is circular and determinate', function () {
|
||||
it('renders the proper circle length style when it is circular and determinate', () => {
|
||||
progressBar = utils.shallowRenderComponent(RawProgressBar, { type: 'circular', mode: 'determinate', value: 30, theme });
|
||||
circle = progressBar.props.children.props.children;
|
||||
strokeLength = 2 * Math.PI * circle.props.r * 0.3;
|
||||
expect(circle.props.style.strokeDasharray).toEqual(`${strokeLength}, 400`);
|
||||
});
|
||||
|
||||
it('contains mode and className in its className', function () {
|
||||
it('contains mode and className in its className', () => {
|
||||
progressBar = utils.shallowRenderComponent(RawProgressBar, { mode: 'determinate', className: 'tight', theme });
|
||||
expect(progressBar.props.className).toContain(theme.determinate);
|
||||
expect(progressBar.props.className).toContain(theme.tight);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { PROGRESS_BAR } from '../identifiers.js';
|
||||
import { ProgressBar } from './ProgressBar.js';
|
||||
import { PROGRESS_BAR } from '../identifiers';
|
||||
import { ProgressBar } from './ProgressBar';
|
||||
import theme from './theme.css';
|
||||
|
||||
const ThemedProgressBar = themr(PROGRESS_BAR, theme)(ProgressBar);
|
||||
|
|
|
@ -3,7 +3,7 @@ import React, { PropTypes } from 'react';
|
|||
const factory = (ripple) => {
|
||||
const Radio = ({ checked, onMouseDown, theme, ...other }) => (
|
||||
<div
|
||||
data-react-toolbox='radio'
|
||||
data-react-toolbox="radio"
|
||||
className={theme[checked ? 'radioChecked' : 'radio']}
|
||||
onMouseDown={onMouseDown}
|
||||
{...other}
|
||||
|
@ -12,13 +12,13 @@ const factory = (ripple) => {
|
|||
|
||||
Radio.propTypes = {
|
||||
checked: PropTypes.bool,
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
onMouseDown: PropTypes.func,
|
||||
theme: PropTypes.shape({
|
||||
radio: PropTypes.string,
|
||||
radioChecked: PropTypes.string,
|
||||
ripple: PropTypes.string
|
||||
})
|
||||
ripple: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
return ripple(Radio);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { RADIO } from '../identifiers.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import radioFactory from './Radio.js';
|
||||
import { RADIO } from '../identifiers';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
import radioFactory from './Radio';
|
||||
|
||||
const factory = (Radio) => {
|
||||
class RadioButton extends Component {
|
||||
|
@ -14,7 +14,7 @@ const factory = (Radio) => {
|
|||
disabled: PropTypes.bool,
|
||||
label: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.node
|
||||
PropTypes.node,
|
||||
]),
|
||||
name: PropTypes.string,
|
||||
onBlur: PropTypes.func,
|
||||
|
@ -26,15 +26,15 @@ const factory = (Radio) => {
|
|||
disabled: PropTypes.string,
|
||||
field: PropTypes.string,
|
||||
input: PropTypes.string,
|
||||
text: PropTypes.string
|
||||
text: PropTypes.string,
|
||||
}),
|
||||
value: PropTypes.any
|
||||
value: PropTypes.string,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
checked: false,
|
||||
className: '',
|
||||
disabled: false
|
||||
disabled: false,
|
||||
};
|
||||
|
||||
handleClick = (event) => {
|
||||
|
@ -44,20 +44,36 @@ const factory = (Radio) => {
|
|||
};
|
||||
|
||||
blur() {
|
||||
this.inputNode && this.inputNode.blur();
|
||||
if (this.inputNode) {
|
||||
this.inputNode.blur();
|
||||
}
|
||||
}
|
||||
|
||||
focus() {
|
||||
this.inputNode && this.inputNode.focus();
|
||||
if (this.inputNode) {
|
||||
this.inputNode.focus();
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
const { checked, children, className, disabled, label, name, onChange, // eslint-disable-line
|
||||
onMouseEnter, onMouseLeave, theme, ...others } = this.props;
|
||||
const {
|
||||
checked,
|
||||
children,
|
||||
className,
|
||||
disabled,
|
||||
label,
|
||||
name,
|
||||
onChange, // eslint-disable-line
|
||||
onMouseEnter,
|
||||
onMouseLeave,
|
||||
theme,
|
||||
...others
|
||||
} = this.props;
|
||||
const _className = classnames(theme[this.props.disabled ? 'disabled' : 'field'], className);
|
||||
return (
|
||||
<label
|
||||
data-react-toolbox='radio-button'
|
||||
htmlFor={name}
|
||||
data-react-toolbox="radio-button"
|
||||
className={_className}
|
||||
onMouseEnter={onMouseEnter}
|
||||
onMouseLeave={onMouseLeave}
|
||||
|
@ -70,8 +86,8 @@ const factory = (Radio) => {
|
|||
name={name}
|
||||
onChange={() => {}}
|
||||
onClick={this.handleClick}
|
||||
ref={node => { this.inputNode = node; }}
|
||||
type='radio'
|
||||
ref={(node) => { this.inputNode = node; }}
|
||||
type="radio"
|
||||
/>
|
||||
<Radio checked={checked} disabled={disabled} theme={theme} />
|
||||
{label ? <span className={theme.text}>{label}</span> : null}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { RADIO } from '../identifiers.js';
|
||||
import InjectRadioButton from './RadioButton.js';
|
||||
import { isComponentOfType } from '../utils/react.js';
|
||||
import { RADIO } from '../identifiers';
|
||||
import InjectRadioButton from './RadioButton';
|
||||
import { isComponentOfType } from '../utils/react';
|
||||
|
||||
const factory = (RadioButton) => {
|
||||
class RadioGroup extends Component {
|
||||
|
@ -10,14 +10,13 @@ const factory = (RadioButton) => {
|
|||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
disabled: PropTypes.bool,
|
||||
name: PropTypes.string,
|
||||
onChange: PropTypes.func,
|
||||
value: PropTypes.any
|
||||
value: PropTypes.string,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
disabled: false
|
||||
disabled: false,
|
||||
};
|
||||
|
||||
handleChange = (value) => {
|
||||
|
@ -31,14 +30,14 @@ const factory = (RadioButton) => {
|
|||
: React.cloneElement(child, {
|
||||
checked: child.props.value === this.props.value,
|
||||
disabled: this.props.disabled || child.props.disabled,
|
||||
onChange: this.handleChange.bind(this, child.props.value)
|
||||
onChange: this.handleChange.bind(this, child.props.value),
|
||||
})
|
||||
));
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div data-react-toolbox='radio-group' className={this.props.className}>
|
||||
<div data-react-toolbox="radio-group" className={this.props.className}>
|
||||
{this.renderRadioButtons()}
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { RADIO } from '../identifiers.js';
|
||||
import { RADIO } from '../identifiers';
|
||||
import themedRippleFactory from '../ripple';
|
||||
import radioFactory from './Radio.js';
|
||||
import { radioButtonFactory } from './RadioButton.js';
|
||||
import { radioGroupFactory } from './RadioGroup.js';
|
||||
import radioFactory from './Radio';
|
||||
import { radioButtonFactory } from './RadioButton';
|
||||
import { radioGroupFactory } from './RadioGroup';
|
||||
import theme from './theme.css';
|
||||
|
||||
const ThemedRadio = radioFactory(themedRippleFactory({ centered: true, spread: 2.6 }));
|
||||
|
|
|
@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
|
|||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import dissoc from 'ramda/src/dissoc';
|
||||
import { RIPPLE } from '../identifiers.js';
|
||||
import { RIPPLE } from '../identifiers';
|
||||
import events from '../utils/events';
|
||||
import prefixer from '../utils/prefixer';
|
||||
|
||||
|
@ -13,7 +13,7 @@ const defaults = {
|
|||
multiple: true,
|
||||
passthrough: true,
|
||||
spread: 2,
|
||||
theme: {}
|
||||
theme: {},
|
||||
};
|
||||
|
||||
const rippleFactory = (options = {}) => {
|
||||
|
@ -27,12 +27,14 @@ const rippleFactory = (options = {}) => {
|
|||
...props
|
||||
} = { ...defaults, ...options };
|
||||
|
||||
return ComposedComponent => {
|
||||
return (ComposedComponent) => {
|
||||
class RippledComponent extends Component {
|
||||
static propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
disabled: PropTypes.bool,
|
||||
onMouseDown: PropTypes.func,
|
||||
onRippleEnded: PropTypes.func,
|
||||
onTouchStart: PropTypes.func,
|
||||
ripple: PropTypes.bool,
|
||||
rippleCentered: PropTypes.bool,
|
||||
rippleClassName: PropTypes.string,
|
||||
|
@ -42,8 +44,8 @@ const rippleFactory = (options = {}) => {
|
|||
ripple: PropTypes.string,
|
||||
rippleActive: PropTypes.string,
|
||||
rippleRestarting: PropTypes.string,
|
||||
rippleWrapper: PropTypes.string
|
||||
})
|
||||
rippleWrapper: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -52,11 +54,11 @@ const rippleFactory = (options = {}) => {
|
|||
rippleCentered: defaultCentered,
|
||||
rippleClassName: defaultClassName,
|
||||
rippleMultiple: defaultMultiple,
|
||||
rippleSpread: defaultSpread
|
||||
rippleSpread: defaultSpread,
|
||||
};
|
||||
|
||||
state = {
|
||||
ripples: {}
|
||||
ripples: {},
|
||||
};
|
||||
|
||||
componentDidUpdate(prevProps, prevState) {
|
||||
|
@ -68,73 +70,11 @@ const rippleFactory = (options = {}) => {
|
|||
|
||||
componentWillUnmount() {
|
||||
// Remove document event listeners for ripple if they still exists
|
||||
Object.keys(this.state.ripples).forEach(key => {
|
||||
Object.keys(this.state.ripples).forEach((key) => {
|
||||
this.state.ripples[key].endRipple();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an event listener to the reference with given key so when the animation transition
|
||||
* ends we can be sure that it finished and it can be safely removed from the state.
|
||||
* This function is called whenever a new ripple is added to the component.
|
||||
*
|
||||
* @param {String} rippleKey Is the key of the ripple to add the event.
|
||||
*/
|
||||
addRippleRemoveEventListener (rippleKey) {
|
||||
const self = this;
|
||||
events.addEventListenerOnTransitionEnded(this.refs[rippleKey], function onOpacityEnd (e) {
|
||||
if (e.propertyName === 'opacity') {
|
||||
if (self.props.onRippleEnded) self.props.onRippleEnded(e);
|
||||
events.removeEventListenerOnTransitionEnded(self.refs[rippleKey], onOpacityEnd);
|
||||
self.setState({ ripples: dissoc(rippleKey, self.state.ripples) });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Start a ripple animation on an specific point with touch or mouse events. First
|
||||
* decides if the animation should trigger. If the ripple is multiple or there is no
|
||||
* ripple present, it creates a new key. If it's a simple ripple and already exists,
|
||||
* it just restarts the current ripple. The animation happens in two state changes
|
||||
* to allow triggering via css.
|
||||
*
|
||||
* @param {Number} x Coordinate X on the screen where animation should start
|
||||
* @param {Number} y Coordinate Y on the screen where animation should start
|
||||
* @param {Boolean} isTouch Use events from touch or mouse.
|
||||
*/
|
||||
animateRipple (x, y, isTouch) {
|
||||
if (this.rippleShouldTrigger(isTouch)) {
|
||||
const { top, left, width } = this.getDescriptor(x, y);
|
||||
const noRipplesActive = Object.keys(this.state.ripples).length === 0;
|
||||
const key = this.props.rippleMultiple || noRipplesActive ? this.getNextKey() : this.getLastKey();
|
||||
const endRipple = this.addRippleDeactivateEventListener(isTouch, key);
|
||||
const initialState = { active: false, restarting: true, top, left, width, endRipple };
|
||||
const runningState = { active: true, restarting: false };
|
||||
const ripples = {...this.state.ripples, [key]: initialState };
|
||||
this.setState({ ripples }, () => {
|
||||
if (this.refs[key]) this.refs[key].offsetWidth; //eslint-disable-line no-unused-expressions
|
||||
this.setState({ ripples: {
|
||||
...this.state.ripples,
|
||||
[key]: Object.assign({}, this.state.ripples[key], runningState)
|
||||
} });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if a ripple should start depending if its a touch event. For mobile both
|
||||
* touchStart and mouseDown are launched so in case is touch we should always trigger
|
||||
* but if its not we should check if a touch was already triggered to decide.
|
||||
*
|
||||
* @param {Boolean} isTouch True in case a touch event triggered the ripple false otherwise.
|
||||
* @return {Boolean} True in case the ripple should trigger or false if it shouldn't.
|
||||
*/
|
||||
rippleShouldTrigger (isTouch) {
|
||||
const shouldStart = isTouch ? true : !this.touchCache;
|
||||
this.touchCache = isTouch;
|
||||
return shouldStart;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find out a descriptor object for the ripple element being created depending on
|
||||
* the position where the it was triggered and the component's dimensions.
|
||||
|
@ -147,9 +87,9 @@ const rippleFactory = (options = {}) => {
|
|||
const { left, top, height, width } = ReactDOM.findDOMNode(this).getBoundingClientRect();
|
||||
const { rippleCentered: centered, rippleSpread: spread } = this.props;
|
||||
return {
|
||||
left: centered ? 0 : x - left - width / 2,
|
||||
top: centered ? 0 : y - top - height / 2,
|
||||
width: width * spread
|
||||
left: centered ? 0 : x - left - (width / 2),
|
||||
top: centered ? 0 : y - top - (height / 2),
|
||||
width: width * spread,
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -174,6 +114,78 @@ const rippleFactory = (options = {}) => {
|
|||
return `ripple${this.currentCount}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Variable to store the ripple references
|
||||
*/
|
||||
rippleNodes = {};
|
||||
|
||||
/**
|
||||
* Determine if a ripple should start depending if its a touch event. For mobile both
|
||||
* touchStart and mouseDown are launched so in case is touch we should always trigger
|
||||
* but if its not we should check if a touch was already triggered to decide.
|
||||
*
|
||||
* @param {Boolean} isTouch True in case a touch event triggered the ripple false otherwise.
|
||||
* @return {Boolean} True in case the ripple should trigger or false if it shouldn't.
|
||||
*/
|
||||
rippleShouldTrigger(isTouch) {
|
||||
const shouldStart = isTouch ? true : !this.touchCache;
|
||||
this.touchCache = isTouch;
|
||||
return shouldStart;
|
||||
}
|
||||
|
||||
/**
|
||||
* Start a ripple animation on an specific point with touch or mouse events. First
|
||||
* decides if the animation should trigger. If the ripple is multiple or there is no
|
||||
* ripple present, it creates a new key. If it's a simple ripple and already exists,
|
||||
* it just restarts the current ripple. The animation happens in two state changes
|
||||
* to allow triggering via css.
|
||||
*
|
||||
* @param {Number} x Coordinate X on the screen where animation should start
|
||||
* @param {Number} y Coordinate Y on the screen where animation should start
|
||||
* @param {Boolean} isTouch Use events from touch or mouse.
|
||||
*/
|
||||
animateRipple(x, y, isTouch) {
|
||||
if (this.rippleShouldTrigger(isTouch)) {
|
||||
const { top, left, width } = this.getDescriptor(x, y);
|
||||
const noRipplesActive = Object.keys(this.state.ripples).length === 0;
|
||||
const key = (this.props.rippleMultiple || noRipplesActive)
|
||||
? this.getNextKey()
|
||||
: this.getLastKey();
|
||||
const endRipple = this.addRippleDeactivateEventListener(isTouch, key);
|
||||
const initialState = { active: false, restarting: true, top, left, width, endRipple };
|
||||
const runningState = { active: true, restarting: false };
|
||||
const ripples = { ...this.state.ripples, [key]: initialState };
|
||||
this.setState({ ripples }, () => {
|
||||
if (this.rippleNodes[key]) this.rippleNodes[key].offsetWidth; // eslint-disable-line
|
||||
this.setState({ ripples: {
|
||||
...this.state.ripples,
|
||||
[key]: Object.assign({}, this.state.ripples[key], runningState),
|
||||
} });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an event listener to the reference with given key so when the animation transition
|
||||
* ends we can be sure that it finished and it can be safely removed from the state.
|
||||
* This function is called whenever a new ripple is added to the component.
|
||||
*
|
||||
* @param {String} rippleKey Is the key of the ripple to add the event.
|
||||
*/
|
||||
addRippleRemoveEventListener(rippleKey) {
|
||||
const self = this;
|
||||
const rippleNode = this.rippleNodes[rippleKey];
|
||||
events.addEventListenerOnTransitionEnded(rippleNode, function onOpacityEnd(e) {
|
||||
if (e.propertyName === 'opacity') {
|
||||
if (self.props.onRippleEnded) self.props.onRippleEnded(e);
|
||||
events.removeEventListenerOnTransitionEnded(self.rippleNodes[rippleKey], onOpacityEnd);
|
||||
// self.rippleNodes = dissoc(rippleKey, self.rippleNodes);
|
||||
delete self.rippleNodes[rippleKey];
|
||||
self.setState({ ripples: dissoc(rippleKey, self.state.ripples) });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an event listener to the document needed to deactivate a ripple and make it dissappear.
|
||||
* Deactivation can happen with a touchend or mouseup depending on the trigger type. The
|
||||
|
@ -181,7 +193,7 @@ const rippleFactory = (options = {}) => {
|
|||
*
|
||||
* @param {Boolean} isTouch True in case the trigger was a touch event false otherwise.
|
||||
* @param {String} rippleKey It's a key to identify the ripple that should be deactivated.
|
||||
* @return {Function} Callback function that deactivates the ripple and removes the event listener
|
||||
* @return {Function} Callback function that deactivates the ripple and removes the listener
|
||||
*/
|
||||
addRippleDeactivateEventListener(isTouch, rippleKey) {
|
||||
const eventType = isTouch ? 'touchend' : 'mouseup';
|
||||
|
@ -191,7 +203,7 @@ const rippleFactory = (options = {}) => {
|
|||
}
|
||||
|
||||
/**
|
||||
* Generates a function that can be called to deactivate a given ripple and remove its finishing
|
||||
* Generates a function that can be called to deactivate a ripple and remove its finishing
|
||||
* event listener. If is generated because we need to store it to be called on unmount in case
|
||||
* the ripple is still running.
|
||||
*
|
||||
|
@ -205,7 +217,7 @@ const rippleFactory = (options = {}) => {
|
|||
document.removeEventListener(eventType, endRipple);
|
||||
self.setState({ ripples: {
|
||||
...self.state.ripples,
|
||||
[rippleKey]: Object.assign({}, self.state.ripples[rippleKey], { active: false })
|
||||
[rippleKey]: Object.assign({}, self.state.ripples[rippleKey], { active: false }),
|
||||
} });
|
||||
};
|
||||
}
|
||||
|
@ -228,17 +240,16 @@ const rippleFactory = (options = {}) => {
|
|||
|
||||
renderRipple(key, className, { active, left, restarting, top, width }) {
|
||||
const scale = restarting ? 0 : 1;
|
||||
const transform = `translate3d(${-width / 2 + left}px, ${-width / 2 + top}px, 0) scale(${scale})`;
|
||||
const transform = `translate3d(${(-width / 2) + left}px, ${(-width / 2) + top}px, 0) scale(${scale})`;
|
||||
const _className = classnames(this.props.theme.ripple, {
|
||||
[this.props.theme.rippleActive]: active,
|
||||
[this.props.theme.rippleRestarting]: restarting
|
||||
[this.props.theme.rippleRestarting]: restarting,
|
||||
}, className);
|
||||
return (
|
||||
<span key={key} data-react-toolbox='ripple' className={this.props.theme.rippleWrapper} {...props}>
|
||||
<span key={key} data-react-toolbox="ripple" className={this.props.theme.rippleWrapper} {...props}>
|
||||
<span
|
||||
role='ripple'
|
||||
ref={key}
|
||||
className={_className}
|
||||
ref={(node) => { if (node) this.rippleNodes[key] = node; }}
|
||||
style={prefixer({ transform }, { width, height: width })}
|
||||
/>
|
||||
</span>
|
||||
|
@ -259,9 +270,17 @@ const rippleFactory = (options = {}) => {
|
|||
...other
|
||||
} = this.props;
|
||||
const { ripples } = this.state;
|
||||
const childRipples = Object.keys(ripples).map(key => this.renderRipple(key, rippleClassName, ripples[key]));
|
||||
const childProps = { onMouseDown: this.handleMouseDown, onTouchStart: this.handleTouchStart, ...other };
|
||||
const finalProps = defaultPassthrough ? { ...childProps, theme, disabled } : childProps;
|
||||
const childRipples = Object.keys(ripples).map(key =>
|
||||
this.renderRipple(key, rippleClassName, ripples[key]),
|
||||
);
|
||||
const childProps = {
|
||||
onMouseDown: this.handleMouseDown,
|
||||
onTouchStart: this.handleTouchStart,
|
||||
...other,
|
||||
};
|
||||
const finalProps = defaultPassthrough
|
||||
? { ...childProps, theme, disabled }
|
||||
: childProps;
|
||||
|
||||
return !ripple
|
||||
? React.createElement(ComposedComponent, finalProps, children)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import rippleFactory from './Ripple.js';
|
||||
import rippleFactory from './Ripple';
|
||||
import theme from './theme.css';
|
||||
|
||||
export default (options) => rippleFactory({ ...options, theme });
|
||||
export default options => rippleFactory({ ...options, theme });
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import classnames from 'classnames';
|
||||
import styleShape from 'react-style-proptype';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { round, range } from '../utils/utils';
|
||||
import { SLIDER } from '../identifiers.js';
|
||||
import events from '../utils/events.js';
|
||||
import InjectProgressBar from '../progress_bar/ProgressBar.js';
|
||||
import InjectInput from '../input/Input.js';
|
||||
import { SLIDER } from '../identifiers';
|
||||
import events from '../utils/events';
|
||||
import InjectProgressBar from '../progress_bar/ProgressBar';
|
||||
import InjectInput from '../input/Input';
|
||||
|
||||
const factory = (ProgressBar, Input) => {
|
||||
class Slider extends Component {
|
||||
|
@ -20,7 +21,7 @@ const factory = (ProgressBar, Input) => {
|
|||
pinned: PropTypes.bool,
|
||||
snaps: PropTypes.bool,
|
||||
step: PropTypes.number,
|
||||
style: PropTypes.object,
|
||||
style: styleShape,
|
||||
theme: PropTypes.shape({
|
||||
container: PropTypes.string,
|
||||
editable: PropTypes.string,
|
||||
|
@ -34,9 +35,9 @@ const factory = (ProgressBar, Input) => {
|
|||
ring: PropTypes.string,
|
||||
slider: PropTypes.string,
|
||||
snap: PropTypes.string,
|
||||
snaps: PropTypes.string
|
||||
snaps: PropTypes.string,
|
||||
}),
|
||||
value: PropTypes.number
|
||||
value: PropTypes.number,
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
|
@ -47,14 +48,14 @@ const factory = (ProgressBar, Input) => {
|
|||
pinned: false,
|
||||
snaps: false,
|
||||
step: 0.01,
|
||||
value: 0
|
||||
value: 0,
|
||||
};
|
||||
|
||||
state = {
|
||||
inputFocused: false,
|
||||
inputValue: null,
|
||||
sliderLength: 0,
|
||||
sliderStart: 0
|
||||
sliderStart: 0,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -79,10 +80,42 @@ const factory = (ProgressBar, Input) => {
|
|||
events.removeEventsFromDocument(this.getKeyboardEvents());
|
||||
}
|
||||
|
||||
getInput() {
|
||||
return this.inputNode && this.inputNode.getWrappedInstance
|
||||
? this.inputNode.getWrappedInstance()
|
||||
: this.inputNode;
|
||||
}
|
||||
|
||||
getKeyboardEvents() {
|
||||
return {
|
||||
keydown: this.handleKeyDown,
|
||||
};
|
||||
}
|
||||
|
||||
getMouseEventMap() {
|
||||
return {
|
||||
mousemove: this.handleMouseMove,
|
||||
mouseup: this.handleMouseUp,
|
||||
};
|
||||
}
|
||||
|
||||
getTouchEventMap() {
|
||||
return {
|
||||
touchmove: this.handleTouchMove,
|
||||
touchend: this.handleTouchEnd,
|
||||
};
|
||||
}
|
||||
|
||||
addToValue(increment) {
|
||||
let value = this.state.inputFocused ? parseFloat(this.state.inputValue) : this.props.value;
|
||||
value = this.trimValue(value + increment);
|
||||
if (value !== this.props.value) this.props.onChange(value);
|
||||
}
|
||||
|
||||
handleInputFocus = () => {
|
||||
this.setState({
|
||||
inputFocused: true,
|
||||
inputValue: this.valueForInput(this.props.value)
|
||||
inputValue: this.valueForInput(this.props.value),
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -120,7 +153,7 @@ const factory = (ProgressBar, Input) => {
|
|||
};
|
||||
|
||||
handleResize = (event, callback) => {
|
||||
const {left, right} = ReactDOM.findDOMNode(this.refs.progressbar).getBoundingClientRect();
|
||||
const { left, right } = ReactDOM.findDOMNode(this.progressbarNode).getBoundingClientRect();
|
||||
const cb = (callback) || (() => {});
|
||||
this.setState({ sliderStart: left, sliderLength: right - left }, cb);
|
||||
};
|
||||
|
@ -148,38 +181,6 @@ const factory = (ProgressBar, Input) => {
|
|||
events.pauseEvent(event);
|
||||
};
|
||||
|
||||
addToValue (increment) {
|
||||
let value = this.state.inputFocused ? parseFloat(this.state.inputValue) : this.props.value;
|
||||
value = this.trimValue(value + increment);
|
||||
if (value !== this.props.value) this.props.onChange(value);
|
||||
}
|
||||
|
||||
getInput () {
|
||||
return this.refs.input && this.refs.input.getWrappedInstance
|
||||
? this.refs.input.getWrappedInstance()
|
||||
: this.refs.input;
|
||||
}
|
||||
|
||||
getKeyboardEvents () {
|
||||
return {
|
||||
keydown: this.handleKeyDown
|
||||
};
|
||||
}
|
||||
|
||||
getMouseEventMap () {
|
||||
return {
|
||||
mousemove: this.handleMouseMove,
|
||||
mouseup: this.handleMouseUp
|
||||
};
|
||||
}
|
||||
|
||||
getTouchEventMap () {
|
||||
return {
|
||||
touchmove: this.handleTouchMove,
|
||||
touchend: this.handleTouchEnd
|
||||
};
|
||||
}
|
||||
|
||||
end(revents) {
|
||||
events.removeEventsFromDocument(revents);
|
||||
this.setState({ pressed: false });
|
||||
|
@ -187,8 +188,8 @@ const factory = (ProgressBar, Input) => {
|
|||
|
||||
knobOffset() {
|
||||
const { max, min } = this.props;
|
||||
const translated = this.state.sliderLength * (this.props.value - min) / (max - min);
|
||||
return translated * 100 / this.state.sliderLength;
|
||||
const translated = this.state.sliderLength * ((this.props.value - min) / (max - min));
|
||||
return (translated * 100) / this.state.sliderLength;
|
||||
}
|
||||
|
||||
move(position) {
|
||||
|
@ -199,8 +200,8 @@ const factory = (ProgressBar, Input) => {
|
|||
positionToValue(position) {
|
||||
const { sliderStart: start, sliderLength: length } = this.state;
|
||||
const { max, min, step } = this.props;
|
||||
const pos = (position.x - start) / length * (max - min);
|
||||
return this.trimValue(Math.round(pos / step) * step + min);
|
||||
const pos = ((position.x - start) / length) * (max - min);
|
||||
return this.trimValue((Math.round(pos / step) * step) + min);
|
||||
}
|
||||
|
||||
start(position) {
|
||||
|
@ -226,33 +227,32 @@ const factory = (ProgressBar, Input) => {
|
|||
}
|
||||
|
||||
renderSnaps() {
|
||||
if (this.props.snaps) {
|
||||
if (!this.props.snaps) return undefined;
|
||||
return (
|
||||
<div ref='snaps' className={this.props.theme.snaps}>
|
||||
{range(0, (this.props.max - this.props.min) / this.props.step).map(i => {
|
||||
return <div key={`span-${i}`} className={this.props.theme.snap} />;
|
||||
})}
|
||||
<div className={this.props.theme.snaps}>
|
||||
{range(0, (this.props.max - this.props.min) / this.props.step).map(i =>
|
||||
<div key={`span-${i}`} className={this.props.theme.snap} />,
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
renderInput() {
|
||||
if (this.props.editable) {
|
||||
const value = this.state.inputFocused ? this.state.inputValue : this.valueForInput(this.props.value);
|
||||
if (!this.props.editable) return undefined;
|
||||
return (
|
||||
<Input
|
||||
ref='input'
|
||||
ref={(node) => { this.inputNode = node; }}
|
||||
className={this.props.theme.input}
|
||||
disabled={this.props.disabled}
|
||||
onFocus={this.handleInputFocus}
|
||||
onChange={this.handleInputChange}
|
||||
onBlur={this.handleInputBlur}
|
||||
value={value}
|
||||
value={this.state.inputFocused
|
||||
? this.state.inputValue
|
||||
: this.valueForInput(this.props.value)}
|
||||
/>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
const { theme } = this.props;
|
||||
|
@ -262,43 +262,43 @@ const factory = (ProgressBar, Input) => {
|
|||
[theme.disabled]: this.props.disabled,
|
||||
[theme.pinned]: this.props.pinned,
|
||||
[theme.pressed]: this.state.pressed,
|
||||
[theme.ring]: this.props.value === this.props.min
|
||||
[theme.ring]: this.props.value === this.props.min,
|
||||
}, this.props.className);
|
||||
|
||||
return (
|
||||
<div
|
||||
className={className}
|
||||
disabled={this.props.disabled}
|
||||
data-react-toolbox='slider'
|
||||
data-react-toolbox="slider"
|
||||
onBlur={this.handleSliderBlur}
|
||||
onFocus={this.handleSliderFocus}
|
||||
style={this.props.style}
|
||||
tabIndex='0'
|
||||
tabIndex="0"
|
||||
>
|
||||
<div
|
||||
ref='slider'
|
||||
ref={(node) => { this.sliderNode = node; }}
|
||||
className={theme.container}
|
||||
onMouseDown={this.handleMouseDown}
|
||||
onTouchStart={this.handleTouchStart}
|
||||
>
|
||||
<div
|
||||
ref='knob'
|
||||
ref={(node) => { this.knobNode = node; }}
|
||||
className={theme.knob}
|
||||
onMouseDown={this.handleMouseDown}
|
||||
onTouchStart={this.handleTouchStart}
|
||||
style={knobStyles}
|
||||
>
|
||||
<div className={theme.innerknob} data-value={parseInt(this.props.value)}/>
|
||||
<div className={theme.innerknob} data-value={parseInt(this.props.value, 10)} />
|
||||
</div>
|
||||
|
||||
<div className={theme.progress}>
|
||||
<ProgressBar
|
||||
disabled={this.props.disabled}
|
||||
ref='progressbar'
|
||||
ref={(node) => { this.progressbarNode = node; }}
|
||||
className={theme.innerprogress}
|
||||
max={this.props.max}
|
||||
min={this.props.min}
|
||||
mode='determinate'
|
||||
mode="determinate"
|
||||
value={this.props.value}
|
||||
/>
|
||||
{this.renderSnaps()}
|
||||
|
|
|
@ -1,73 +1,77 @@
|
|||
/* eslint-disable */
|
||||
import React from 'react';
|
||||
import TestUtils from 'react-addons-test-utils';
|
||||
import sinon from 'sinon';
|
||||
import expect from 'expect';
|
||||
import { ProgressBar } from '../../progress_bar/ProgressBar.js';
|
||||
import Input, { Input as RawInput } from '../../input/Input.js';
|
||||
import Slider, { Slider as RawSlider } from '../Slider.js';
|
||||
import { ProgressBar } from '../../progress_bar/ProgressBar';
|
||||
import Input, { Input as RawInput } from '../../input/Input';
|
||||
import Slider, { Slider as RawSlider } from '../Slider';
|
||||
import utils from '../../utils/testing';
|
||||
import theme from '../theme.css';
|
||||
|
||||
describe('Slider', function () {
|
||||
let slider, progress, input, onChange;
|
||||
describe('Slider', () => {
|
||||
let slider,
|
||||
progress,
|
||||
input,
|
||||
onChange;
|
||||
|
||||
describe('#positionToValue', function () {
|
||||
before(function () {
|
||||
describe('#positionToValue', () => {
|
||||
before(() => {
|
||||
const tree = TestUtils.renderIntoDocument(<Slider min={-500} max={500} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
slider.setState({ sliderStart: 500, sliderLength: 100 });
|
||||
});
|
||||
|
||||
it('returns min when position is less than origin', function () {
|
||||
it('returns min when position is less than origin', () => {
|
||||
expect(slider.positionToValue({ x: 400 })).toEqual(-500);
|
||||
});
|
||||
|
||||
it('returns max when position is more and origin plus length', function () {
|
||||
it('returns max when position is more and origin plus length', () => {
|
||||
expect(slider.positionToValue({ x: 900 })).toEqual(500);
|
||||
});
|
||||
|
||||
it('returns the proper position when the position is inside slider', function () {
|
||||
it('returns the proper position when the position is inside slider', () => {
|
||||
expect(slider.positionToValue({ x: 520 })).toEqual(-300);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#trimValue', function () {
|
||||
before(function () {
|
||||
describe('#trimValue', () => {
|
||||
before(() => {
|
||||
const tree = TestUtils.renderIntoDocument(<Slider min={0} max={100} step={0.1} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
});
|
||||
|
||||
it('rounds to the proper number', function () {
|
||||
it('rounds to the proper number', () => {
|
||||
expect(slider.trimValue(57.16)).toEqual(57.2);
|
||||
expect(slider.trimValue(57.12)).toEqual(57.10);
|
||||
});
|
||||
|
||||
it('returns min if number is less than min', function () {
|
||||
it('returns min if number is less than min', () => {
|
||||
expect(slider.trimValue(-57.16)).toEqual(0);
|
||||
});
|
||||
|
||||
it('returns max if number is more than max', function () {
|
||||
it('returns max if number is more than max', () => {
|
||||
expect(slider.trimValue(257.16)).toEqual(100);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#valueForInput', function () {
|
||||
before(function () {
|
||||
describe('#valueForInput', () => {
|
||||
before(() => {
|
||||
const tree = TestUtils.renderIntoDocument(<Slider min={0} max={100} step={0.01} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
});
|
||||
|
||||
it('returns a fixed number when an integer is given', function () {
|
||||
it('returns a fixed number when an integer is given', () => {
|
||||
expect(slider.valueForInput(4)).toEqual('4.00');
|
||||
});
|
||||
|
||||
it('returns a fixed number when a float is given', function () {
|
||||
it('returns a fixed number when a float is given', () => {
|
||||
expect(slider.valueForInput(4.06)).toEqual('4.06');
|
||||
});
|
||||
});
|
||||
|
||||
describe('#knobOffset', function () {
|
||||
it('returns the corresponding offset for a given value and slider length/start', function () {
|
||||
describe('#knobOffset', () => {
|
||||
it('returns the corresponding offset for a given value and slider length/start', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Slider min={-500} max={500} value={-250} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
slider.setState({ sliderStart: 500, sliderLength: 100 });
|
||||
|
@ -75,8 +79,8 @@ describe('Slider', function () {
|
|||
});
|
||||
});
|
||||
|
||||
describe('#render', function () {
|
||||
it('contains a linear progress bar with proper properties', function () {
|
||||
describe('#render', () => {
|
||||
it('contains a linear progress bar with proper properties', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Slider min={100} max={1000} value={140} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
progress = TestUtils.findRenderedComponentWithType(slider, ProgressBar);
|
||||
|
@ -87,14 +91,14 @@ describe('Slider', function () {
|
|||
expect(progress.props.max).toEqual(1000);
|
||||
});
|
||||
|
||||
it('contains an input component if its editable', function () {
|
||||
it('contains an input component if its editable', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Slider editable value={130} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
input = TestUtils.findRenderedComponentWithType(slider, Input);
|
||||
expect(parseInt(input.props.value)).toEqual(slider.props.value);
|
||||
});
|
||||
|
||||
it('contains the proper number of snaps when snapped', function () {
|
||||
it('contains the proper number of snaps when snapped', () => {
|
||||
slider = utils.shallowRenderComponent(RawSlider, { editable: true, pinned: true, theme });
|
||||
expect(slider.props.className).toContain(theme.ring);
|
||||
expect(slider.props.className).toContain(theme.pinned);
|
||||
|
@ -103,8 +107,8 @@ describe('Slider', function () {
|
|||
});
|
||||
});
|
||||
|
||||
describe('#events', function () {
|
||||
beforeEach(function () {
|
||||
describe('#events', () => {
|
||||
beforeEach(() => {
|
||||
onChange = sinon.spy();
|
||||
const tree = TestUtils.renderIntoDocument(<Slider min={-500} max={500} onChange={onChange} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
|
@ -112,29 +116,29 @@ describe('Slider', function () {
|
|||
slider.handleResize = (event, callback) => { callback(); };
|
||||
});
|
||||
|
||||
it('sets pressed state when knob is clicked', function () {
|
||||
it('sets pressed state when knob is clicked', () => {
|
||||
TestUtils.Simulate.mouseDown(slider.refs.knob);
|
||||
expect(slider.state.pressed).toEqual(true);
|
||||
});
|
||||
|
||||
it('sets pressed state when knob is touched', function () {
|
||||
it('sets pressed state when knob is touched', () => {
|
||||
TestUtils.Simulate.touchStart(slider.refs.knob, { touches: [{ pageX: 200 }] });
|
||||
expect(slider.state.pressed).toEqual(true);
|
||||
});
|
||||
|
||||
it('sets a proper value when the slider is clicked', function () {
|
||||
it('sets a proper value when the slider is clicked', () => {
|
||||
TestUtils.Simulate.mouseDown(slider.refs.slider, { pageX: 200 });
|
||||
expect(onChange.called).toEqual(true);
|
||||
expect(onChange.getCall(0).args[0]).toEqual(-300);
|
||||
});
|
||||
|
||||
it('sets a proper value when the slider is touched', function () {
|
||||
it('sets a proper value when the slider is touched', () => {
|
||||
TestUtils.Simulate.touchStart(slider.refs.slider, { touches: [{ pageX: 200, pageY: 0 }] });
|
||||
expect(onChange.called).toEqual(true);
|
||||
expect(onChange.getCall(0).args[0]).toEqual(-300);
|
||||
});
|
||||
|
||||
it('changes input value when slider changes', function () {
|
||||
it('changes input value when slider changes', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Slider editable onChange={onChange} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
slider.setState({ sliderStart: 0, sliderLength: 1000 });
|
||||
|
@ -145,7 +149,7 @@ describe('Slider', function () {
|
|||
expect(onChange.getCall(0).args[0]).toEqual(90);
|
||||
});
|
||||
|
||||
it('changes its value when input is blurred', function () {
|
||||
it('changes its value when input is blurred', () => {
|
||||
const tree = TestUtils.renderIntoDocument(<Slider editable value={50} onChange={onChange} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
input = TestUtils.findRenderedComponentWithType(slider, RawInput);
|
||||
|
@ -155,7 +159,7 @@ describe('Slider', function () {
|
|||
expect(onChange.getCall(0).args[0]).toEqual(80);
|
||||
});
|
||||
|
||||
it('calls onChange callback when the value is changed', function () {
|
||||
it('calls onChange callback when the value is changed', () => {
|
||||
const onChangeSpy = sinon.spy();
|
||||
const tree = TestUtils.renderIntoDocument(<Slider onChange={onChangeSpy} />);
|
||||
slider = TestUtils.findRenderedComponentWithType(tree, RawSlider);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { SLIDER } from '../identifiers.js';
|
||||
import { SLIDER } from '../identifiers';
|
||||
import { ProgressBar } from '../progress_bar';
|
||||
import { Input } from '../input';
|
||||
import { sliderFactory } from './Slider.js';
|
||||
import { sliderFactory } from './Slider';
|
||||
import theme from './theme.css';
|
||||
|
||||
const ThemedSlider = themr(SLIDER, theme)(sliderFactory(ProgressBar, Input));
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { SNACKBAR } from '../identifiers.js';
|
||||
import ActivableRenderer from '../hoc/ActivableRenderer.js';
|
||||
import InjectButton from '../button/Button.js';
|
||||
import Portal from '../hoc/Portal.js';
|
||||
import { SNACKBAR } from '../identifiers';
|
||||
import ActivableRenderer from '../hoc/ActivableRenderer';
|
||||
import InjectButton from '../button/Button';
|
||||
import Portal from '../hoc/Portal';
|
||||
|
||||
const factory = (Button) => {
|
||||
class Snackbar extends Component {
|
||||
|
@ -15,7 +15,7 @@ const factory = (Button) => {
|
|||
className: PropTypes.string,
|
||||
label: PropTypes.oneOfType([
|
||||
PropTypes.string,
|
||||
PropTypes.element
|
||||
PropTypes.element,
|
||||
]),
|
||||
onClick: PropTypes.func,
|
||||
onTimeout: PropTypes.func,
|
||||
|
@ -26,10 +26,10 @@ const factory = (Button) => {
|
|||
cancel: PropTypes.string,
|
||||
label: PropTypes.string,
|
||||
snackbar: PropTypes.string,
|
||||
warning: PropTypes.string
|
||||
warning: PropTypes.string,
|
||||
}),
|
||||
timeout: PropTypes.number,
|
||||
type: PropTypes.oneOf([ 'accept', 'cancel', 'warning' ])
|
||||
type: PropTypes.oneOf(['accept', 'cancel', 'warning']),
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -48,7 +48,7 @@ const factory = (Button) => {
|
|||
clearTimeout(this.curTimeout);
|
||||
}
|
||||
|
||||
scheduleTimeout = props => {
|
||||
scheduleTimeout = (props) => {
|
||||
const { onTimeout, timeout } = props;
|
||||
if (this.curTimeout) clearTimeout(this.curTimeout);
|
||||
this.curTimeout = setTimeout(() => {
|
||||
|
@ -60,12 +60,12 @@ const factory = (Button) => {
|
|||
render() {
|
||||
const { action, active, children, label, onClick, theme, type } = this.props;
|
||||
const className = classnames([theme.snackbar, theme[type]], {
|
||||
[theme.active]: active
|
||||
[theme.active]: active,
|
||||
}, this.props.className);
|
||||
|
||||
return (
|
||||
<Portal className={theme.portal}>
|
||||
<div data-react-toolbox='snackbar' className={className}>
|
||||
<div data-react-toolbox="snackbar" className={className}>
|
||||
<span className={theme.label}>
|
||||
{label}
|
||||
{children}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { SNACKBAR } from '../identifiers.js';
|
||||
import { snackbarFactory } from './Snackbar.js';
|
||||
import { SNACKBAR } from '../identifiers';
|
||||
import { snackbarFactory } from './Snackbar';
|
||||
import { Button } from '../button';
|
||||
import theme from './theme.css';
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { SWITCH } from '../identifiers.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import thumbFactory from './Thumb.js';
|
||||
import { SWITCH } from '../identifiers';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
import thumbFactory from './Thumb';
|
||||
|
||||
const factory = (Thumb) => {
|
||||
class Switch extends Component {
|
||||
|
@ -25,14 +25,14 @@ const factory = (Thumb) => {
|
|||
on: PropTypes.string,
|
||||
ripple: PropTypes.string,
|
||||
text: PropTypes.string,
|
||||
thumb: PropTypes.string
|
||||
})
|
||||
thumb: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
checked: false,
|
||||
className: '',
|
||||
disabled: false
|
||||
disabled: false,
|
||||
};
|
||||
|
||||
handleToggle = (event) => {
|
||||
|
@ -43,26 +43,34 @@ const factory = (Thumb) => {
|
|||
};
|
||||
|
||||
blur() {
|
||||
this.refs.input.blur();
|
||||
this.inputNode.blur();
|
||||
}
|
||||
|
||||
focus() {
|
||||
this.refs.input.focus();
|
||||
this.inputNode.focus();
|
||||
}
|
||||
|
||||
render() {
|
||||
const { className, checked, ripple, disabled, onChange, theme, ...others } = this.props; //eslint-disable-line no-unused-vars
|
||||
const {
|
||||
checked,
|
||||
className,
|
||||
disabled,
|
||||
onChange, // eslint-disable-line no-unused-vars
|
||||
ripple,
|
||||
theme,
|
||||
...others
|
||||
} = this.props;
|
||||
const _className = classnames(theme[disabled ? 'disabled' : 'field'], className);
|
||||
return (
|
||||
<label data-react-toolbox='switch' className={_className}>
|
||||
<label data-react-toolbox="switch" className={_className} htmlFor={this.props.name}>
|
||||
<input
|
||||
{...others}
|
||||
checked={this.props.checked}
|
||||
className={theme.input}
|
||||
onClick={this.handleToggle}
|
||||
readOnly
|
||||
ref='input'
|
||||
type='checkbox'
|
||||
ref={(node) => { this.inputNode = node; }}
|
||||
type="checkbox"
|
||||
/>
|
||||
<span className={theme[checked ? 'on' : 'off']}>
|
||||
<Thumb disabled={this.props.disabled} theme={theme} ripple={ripple} />
|
||||
|
|
|
@ -2,15 +2,16 @@ import React, { PropTypes } from 'react';
|
|||
|
||||
const factory = (ripple) => {
|
||||
const Thumb = ({ onMouseDown, theme, ...other }) => (
|
||||
<span role='thumb' className={theme.thumb} onMouseDown={onMouseDown} {...other} />
|
||||
<span className={theme.thumb} onMouseDown={onMouseDown} {...other} />
|
||||
);
|
||||
|
||||
Thumb.propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
onMouseDown: PropTypes.func,
|
||||
theme: PropTypes.shape({
|
||||
ripple: PropTypes.string,
|
||||
thumb: PropTypes.string
|
||||
})
|
||||
thumb: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
return ripple(Thumb);
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { switchFactory } from './Switch.js';
|
||||
import { SWITCH } from '../identifiers.js';
|
||||
import thumbFactory from './Thumb.js';
|
||||
import { switchFactory } from './Switch';
|
||||
import { SWITCH } from '../identifiers';
|
||||
import thumbFactory from './Thumb';
|
||||
import themedRippleFactory from '../ripple';
|
||||
import theme from './theme.css';
|
||||
|
||||
const applyTheme = (Component) => themr(SWITCH, theme)(Component);
|
||||
const applyTheme = Component => themr(SWITCH, theme)(Component);
|
||||
const ripple = themedRippleFactory({ centered: true, spread: 2.6 });
|
||||
const ThemedThumb = applyTheme(thumbFactory(ripple));
|
||||
const ThemedSwitch = applyTheme(switchFactory(ThemedThumb));
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
import React, { PropTypes, Component, cloneElement } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import filterReactChildren from '../utils/filter-react-children.js';
|
||||
import isComponentOfType from '../utils/is-component-of-type.js';
|
||||
import { TABLE } from '../identifiers.js';
|
||||
import InjectTableHead from './TableHead.js';
|
||||
import InjectTableRow from './TableRow.js';
|
||||
import filterReactChildren from '../utils/filter-react-children';
|
||||
import isComponentOfType from '../utils/is-component-of-type';
|
||||
import { TABLE } from '../identifiers';
|
||||
import InjectTableHead from './TableHead';
|
||||
import InjectTableRow from './TableRow';
|
||||
|
||||
const factory = (TableHead, TableRow) => {
|
||||
const isTableHead = child => isComponentOfType(TableHead, child);
|
||||
|
@ -20,21 +20,21 @@ const factory = (TableHead, TableRow) => {
|
|||
selectable: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
head: PropTypes.string,
|
||||
table: PropTypes.string
|
||||
})
|
||||
table: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
multiSelectable: false,
|
||||
selectable: true
|
||||
selectable: true,
|
||||
};
|
||||
|
||||
getRowTuples = () => React.Children
|
||||
.toArray(filterReactChildren(this.props.children, isTableRow))
|
||||
.map((child, index) => [index, Boolean(child.props.selected)]);
|
||||
|
||||
handleHeadSelect = value => {
|
||||
handleHeadSelect = (value) => {
|
||||
if (this.props.onRowSelect) {
|
||||
this.props.onRowSelect(value
|
||||
? this.getRowTuples().map(item => item[0])
|
||||
|
@ -42,7 +42,7 @@ const factory = (TableHead, TableRow) => {
|
|||
}
|
||||
};
|
||||
|
||||
handleRowSelect = idx => {
|
||||
handleRowSelect = (idx) => {
|
||||
if (this.props.onRowSelect) {
|
||||
if (this.props.multiSelectable) {
|
||||
const current = this.getRowTuples().filter(item => item[1]).map(item => item[0]);
|
||||
|
@ -66,8 +66,8 @@ const factory = (TableHead, TableRow) => {
|
|||
selected,
|
||||
multiSelectable: this.props.multiSelectable,
|
||||
onSelect: this.handleHeadSelect,
|
||||
selectable: this.props.selectable
|
||||
})
|
||||
selectable: this.props.selectable,
|
||||
}),
|
||||
);
|
||||
};
|
||||
|
||||
|
@ -76,8 +76,8 @@ const factory = (TableHead, TableRow) => {
|
|||
(child, idx) => cloneElement(child, {
|
||||
idx,
|
||||
onSelect: this.handleRowSelect,
|
||||
selectable: this.props.selectable
|
||||
})
|
||||
selectable: this.props.selectable,
|
||||
}),
|
||||
);
|
||||
|
||||
render() {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { TABLE } from '../identifiers.js';
|
||||
import InjectFontIcon from '../font_icon/FontIcon.js';
|
||||
import { TABLE } from '../identifiers';
|
||||
import InjectFontIcon from '../font_icon/FontIcon';
|
||||
|
||||
const ASC = 'asc';
|
||||
const DESC = 'desc';
|
||||
|
@ -10,7 +10,7 @@ const DESC = 'desc';
|
|||
const factory = (FontIcon) => {
|
||||
class TableCell extends Component {
|
||||
static propTypes = {
|
||||
children: PropTypes.any,
|
||||
children: PropTypes.node,
|
||||
className: PropTypes.string,
|
||||
column: PropTypes.number,
|
||||
numeric: PropTypes.bool,
|
||||
|
@ -25,18 +25,18 @@ const factory = (FontIcon) => {
|
|||
rowCell: PropTypes.string,
|
||||
sorted: PropTypes.string,
|
||||
sortIcon: PropTypes.string,
|
||||
tableCell: PropTypes.string
|
||||
})
|
||||
tableCell: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
children: PropTypes.node,
|
||||
className: '',
|
||||
numeric: false,
|
||||
tagName: 'td'
|
||||
tagName: 'td',
|
||||
};
|
||||
|
||||
handleClick = event => {
|
||||
handleClick = (event) => {
|
||||
const { onClick, row, column } = this.props;
|
||||
if (onClick) onClick(event, column, row);
|
||||
}
|
||||
|
@ -58,23 +58,23 @@ const factory = (FontIcon) => {
|
|||
[theme.headCell]: tagName === 'th',
|
||||
[theme.rowCell]: tagName === 'td',
|
||||
[theme.sorted]: sorted,
|
||||
[theme.numeric]: numeric
|
||||
[theme.numeric]: numeric,
|
||||
}, className);
|
||||
|
||||
const props = {
|
||||
...other,
|
||||
className: _className,
|
||||
onClick: this.handleClick
|
||||
onClick: this.handleClick,
|
||||
};
|
||||
|
||||
return (
|
||||
React.createElement(tagName, props, [
|
||||
sorted && <FontIcon
|
||||
className={classnames(theme.sortIcon, { [theme.asc]: sorted === ASC })}
|
||||
key='icon'
|
||||
key="icon"
|
||||
value="arrow_downward"
|
||||
/>,
|
||||
children
|
||||
children,
|
||||
])
|
||||
);
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import React, { Component, PropTypes, cloneElement } from 'react';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { TABLE } from '../identifiers.js';
|
||||
import InjectCheckbox from '../checkbox/Checkbox.js';
|
||||
import InjectTableCell from './TableCell.js';
|
||||
import { TABLE } from '../identifiers';
|
||||
import InjectCheckbox from '../checkbox/Checkbox';
|
||||
import InjectTableCell from './TableCell';
|
||||
|
||||
const factory = (Checkbox, TableCell) => {
|
||||
class TableHead extends Component {
|
||||
|
@ -15,12 +15,12 @@ const factory = (Checkbox, TableCell) => {
|
|||
selectable: PropTypes.bool,
|
||||
selected: PropTypes.bool,
|
||||
theme: PropTypes.shape({
|
||||
checkboxCell: PropTypes.string
|
||||
})
|
||||
checkboxCell: PropTypes.string,
|
||||
}),
|
||||
}
|
||||
|
||||
static defaultProps = {
|
||||
displaySelect: true
|
||||
displaySelect: true,
|
||||
}
|
||||
|
||||
handleSelect = (value, event) => {
|
||||
|
@ -49,7 +49,7 @@ const factory = (Checkbox, TableCell) => {
|
|||
</TableCell>}
|
||||
{React.Children.map(children, (child, index) => cloneElement(child, {
|
||||
column: index,
|
||||
tagName: 'th'
|
||||
tagName: 'th',
|
||||
}))}
|
||||
</tr>
|
||||
);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { cloneElement, Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { TABLE } from '../identifiers.js';
|
||||
import InjectCheckbox from '../checkbox/Checkbox.js';
|
||||
import InjectTableCell from './TableCell.js';
|
||||
import { TABLE } from '../identifiers';
|
||||
import InjectCheckbox from '../checkbox/Checkbox';
|
||||
import InjectTableCell from './TableCell';
|
||||
|
||||
const factory = (Checkbox, TableCell) => {
|
||||
class TableRow extends Component {
|
||||
|
@ -17,11 +17,11 @@ const factory = (Checkbox, TableCell) => {
|
|||
theme: PropTypes.shape({
|
||||
checkboxCell: PropTypes.string,
|
||||
row: PropTypes.string,
|
||||
selected: PropTypes.string
|
||||
})
|
||||
selected: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
handleSelect = value => {
|
||||
handleSelect = (value) => {
|
||||
const { idx, onSelect } = this.props;
|
||||
if (onSelect) onSelect(idx, value);
|
||||
};
|
||||
|
@ -29,7 +29,7 @@ const factory = (Checkbox, TableCell) => {
|
|||
render() {
|
||||
const { children, className, selectable, idx, selected, theme, ...other } = this.props; // eslint-disable-line
|
||||
const _className = classnames(theme.row, {
|
||||
[theme.selected]: selectable && selected
|
||||
[theme.selected]: selectable && selected,
|
||||
}, className);
|
||||
return (
|
||||
<tr {...other} className={_className}>
|
||||
|
@ -38,7 +38,7 @@ const factory = (Checkbox, TableCell) => {
|
|||
</TableCell>}
|
||||
{React.Children.map(children, (child, index) => cloneElement(child, {
|
||||
column: index,
|
||||
tagName: 'td'
|
||||
tagName: 'td',
|
||||
}))}
|
||||
</tr>
|
||||
);
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
import { themr } from 'react-css-themr';
|
||||
import { TABLE } from '../identifiers.js';
|
||||
import { TABLE } from '../identifiers';
|
||||
import { Checkbox } from '../checkbox';
|
||||
import { FontIcon } from '../font_icon';
|
||||
|
||||
import { tableFactory } from './Table.js';
|
||||
import { tableHeadFactory } from './TableHead.js';
|
||||
import { tableRowFactory } from './TableRow.js';
|
||||
import { tableCellFactory } from './TableCell.js';
|
||||
import { tableFactory } from './Table';
|
||||
import { tableHeadFactory } from './TableHead';
|
||||
import { tableRowFactory } from './TableRow';
|
||||
import { tableCellFactory } from './TableCell';
|
||||
import theme from './theme.css';
|
||||
|
||||
const applyTheme = (Component) => themr(TABLE, theme)(Component);
|
||||
const applyTheme = Component => themr(TABLE, theme)(Component);
|
||||
const ThemedTableCell = applyTheme(tableCellFactory(FontIcon));
|
||||
const ThemedTableHead = applyTheme(tableHeadFactory(Checkbox, ThemedTableCell));
|
||||
const ThemedTableRow = applyTheme(tableRowFactory(Checkbox, ThemedTableCell));
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
import { FontIcon } from '../font_icon';
|
||||
import { themr } from 'react-css-themr';
|
||||
import { TABS } from '../identifiers.js';
|
||||
import rippleFactory from '../ripple/Ripple.js';
|
||||
import { FontIcon } from '../font_icon';
|
||||
import { TABS } from '../identifiers';
|
||||
import rippleFactory from '../ripple/Ripple';
|
||||
|
||||
const factory = (ripple) => {
|
||||
class Tab extends Component {
|
||||
|
@ -26,15 +26,15 @@ const factory = (ripple) => {
|
|||
label: PropTypes.string,
|
||||
rippleWrapper: PropTypes.string,
|
||||
withIcon: PropTypes.string,
|
||||
withText: PropTypes.string
|
||||
})
|
||||
withText: PropTypes.string,
|
||||
}),
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
active: false,
|
||||
className: '',
|
||||
disabled: false,
|
||||
hidden: false
|
||||
hidden: false,
|
||||
};
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
|
@ -60,15 +60,15 @@ const factory = (ripple) => {
|
|||
[theme.withText]: label,
|
||||
[theme.withIcon]: icon,
|
||||
[theme.disabled]: disabled,
|
||||
[activeClassName]: active
|
||||
[activeClassName]: active,
|
||||
}, className);
|
||||
|
||||
return (
|
||||
<label {...other} data-react-toolbox='tab' className={_className} onClick={this.handleClick}>
|
||||
<div {...other} data-react-toolbox="tab" className={_className} onClick={this.handleClick}>
|
||||
{icon && <FontIcon className={theme.icon} value={icon} />}
|
||||
{label}
|
||||
{children}
|
||||
</label>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue