Latest build

old
Javi Velasco 2016-09-27 00:00:47 +02:00
parent 390e7694db
commit f34f3788fd
10 changed files with 32 additions and 22 deletions

View File

@ -17,9 +17,9 @@ var _reactCssThemr = require('react-css-themr');
var _identifiers = require('../identifiers.js');
var _FontIcon = require('../font_icon/FontIcon.js');
var _IconButton = require('../button/IconButton.js');
var _FontIcon2 = _interopRequireDefault(_FontIcon);
var _IconButton2 = _interopRequireDefault(_IconButton);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@ -27,7 +27,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
var factory = function factory(FontIcon) {
var factory = function factory(IconButton) {
var AppBar = function AppBar(_ref) {
var _classnames;
@ -46,20 +46,22 @@ var factory = function factory(FontIcon) {
return _react2.default.createElement(
'header',
{ className: className, 'data-react-toolbox': 'app-bar' },
leftIcon && _react2.default.createElement(FontIcon, {
leftIcon && _react2.default.createElement(IconButton, {
inverse: true,
className: (0, _classnames3.default)(theme.leftIcon),
onClick: onLeftIconClick,
value: leftIcon }),
icon: leftIcon }),
title && _react2.default.createElement(
'h1',
{ className: (0, _classnames3.default)(theme.title) },
title
),
children,
rightIcon && _react2.default.createElement(FontIcon, {
rightIcon && _react2.default.createElement(IconButton, {
inverse: true,
className: (0, _classnames3.default)(theme.rightIcon),
onClick: onRightIconClick,
value: rightIcon })
icon: rightIcon })
);
};
@ -92,7 +94,7 @@ var factory = function factory(FontIcon) {
return AppBar;
};
var AppBar = factory(_FontIcon2.default);
exports.default = (0, _reactCssThemr.themr)(_identifiers.APP_BAR, null)(AppBar);
var AppBar = factory(_IconButton2.default);
exports.default = (0, _reactCssThemr.themr)(_identifiers.APP_BAR)(AppBar);
exports.appBarFactory = factory;
exports.AppBar = AppBar;

View File

@ -11,9 +11,7 @@ var _identifiers = require('../identifiers.js');
var _AppBar = require('./AppBar.js');
var _FontIcon = require('../font_icon/FontIcon.js');
var _FontIcon2 = _interopRequireDefault(_FontIcon);
var _button = require('../button');
var _theme = require('./theme.scss');
@ -21,7 +19,7 @@ var _theme2 = _interopRequireDefault(_theme);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var AppBar = (0, _AppBar.appBarFactory)(_FontIcon2.default);
var AppBar = (0, _AppBar.appBarFactory)(_button.IconButton);
var ThemedAppBar = (0, _reactCssThemr.themr)(_identifiers.APP_BAR, _theme2.default)(AppBar);
exports.default = ThemedAppBar;

View File

@ -47,13 +47,11 @@
}
.leftIcon {
padding: 1.2 * $unit 1.2 * $unit 1.2 * $unit 0;
text-align: left;
margin-left: -1.2 * $unit;
}
.rightIcon {
padding: 1.2 * $unit 0 1.2 * $unit 1.2 * $unit;
margin-left: auto;
text-align: right;
margin-right: -1.2 * $unit;
}
}

View File

@ -88,11 +88,13 @@ var factory = function factory(Chip, Input) {
});
}, _this.handleQueryBlur = function () {
if (_this.state.focus) _this.setState({ focus: false });
if (_this.props.onBlur) _this.props.onBlur();
}, _this.handleQueryChange = function (value) {
_this.setState({ query: value, showAllSuggestions: false });
}, _this.handleQueryFocus = function () {
_this.refs.suggestions.scrollTop = 0;
_this.setState({ active: '', focus: true });
if (_this.props.onFocus) _this.props.onFocus();
}, _this.handleQueryKeyDown = function (event) {
// Clear query when pressing backspace and showing all suggestions.
var shouldClearQuery = event.which === 8 && _this.props.showSuggestionsWhenValueIsSet && _this.state.showAllSuggestions;
@ -441,7 +443,9 @@ var factory = function factory(Chip, Input) {
error: _react.PropTypes.string,
label: _react.PropTypes.string,
multiple: _react.PropTypes.bool,
onBlur: _react.PropTypes.func,
onChange: _react.PropTypes.func,
onFocus: _react.PropTypes.func,
selectedPosition: _react.PropTypes.oneOf(['above', 'below']),
showSuggestionsWhenValueIsSet: _react.PropTypes.bool,
source: _react.PropTypes.any,

View File

@ -47,7 +47,7 @@ var factory = function factory(Avatar) {
return _react2.default.createElement(
'div',
_extends({ className: classes }, other),
typeof avatar === 'string' ? _react2.default.createElement(Avatar, { image: avatar }) : avatar,
typeof avatar === 'string' ? _react2.default.createElement(Avatar, { image: avatar, theme: theme }) : avatar,
_react2.default.createElement(
'div',
null,

View File

@ -21,7 +21,7 @@ $calendar-primary-contrast-color: $calendar-primary-contrast !default;
$calendar-primary-hover-color: rgba($calendar-primary, .21) !default;
$calendar-arrows-color: $palette-grey-600 !default;
$calendar-arrows-font-size: 2 * $unit !default;
$calendar-year-font-size: 2.4 !default;
$calendar-year-font-size: 2.4 * $unit !default;
$calendar-day-font-size: 1.3 * $unit !default;
$calendar-day-disable-opacity: 0.25 !default;
$calendar-row-height: 3 * $unit !default;

View File

@ -101,6 +101,7 @@
cursor: pointer;
&.active {
font-size: $calendar-year-font-size;
font-weight: $font-weight-semi-bold;
color: $calendar-primary-color;
}
}

View File

@ -54,7 +54,7 @@ var Overlay = function (_Component) {
key: 'componentWillUpdate',
value: function componentWillUpdate(nextProps) {
if (nextProps.active && !this.props.active) document.body.style.overflow = 'hidden';
if (!nextProps.active && this.props.active) document.body.style.overflow = null;
if (!nextProps.active && this.props.active) document.body.style.overflow = '';
}
}, {
key: 'componentDidUpdate',
@ -66,7 +66,7 @@ var Overlay = function (_Component) {
}, {
key: 'componentWillUnmount',
value: function componentWillUnmount() {
document.body.style.overflow = null;
document.body.style.overflow = '';
if (this.escKeyListener) {
document.body.removeEventListener('keydown', this.handleEscKey);
this.escKeyListener = null;

View File

@ -276,7 +276,7 @@ var tooltipFactory = function tooltipFactory() {
tooltipActive: _react.PropTypes.string,
tooltipWrapper: _react.PropTypes.string
}),
tooltip: _react.PropTypes.string,
tooltip: _react.PropTypes.oneOfType([_react.PropTypes.string, _react.PropTypes.node]),
tooltipDelay: _react.PropTypes.number,
tooltipHideOnClick: _react.PropTypes.bool,
tooltipPosition: _react.PropTypes.oneOf(Object.keys(POSITION).map(function (key) {

View File

@ -115,6 +115,13 @@ var dateLocales = {
weekdays: 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
weekdaysShort: 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
weekdaysLetter: []
},
ru: {
months: 'Январь_Февраль_Март_Апрель_Май_Июнь_Июльy_Август_Сентябрь_Октябрь_Ноябрь_Декабрь'.split('_'),
monthsShort: 'Янв_Фев_Мар_Апр_Май_Июн_Июл_Авг_Сен_Окт_Ноя_Дек'.split('_'),
weekdays: 'Воскресеньеонедельник_Вторник_Средаетверг_Пятница_Суббота'.split('_'),
weekdaysShort: 'Вс_Пн_Вт_Ср_Чт_Пт_Сб'.split('_'),
weekdaysLetter: []
}
};
var time = {