Compare commits

..
3 Commits
Author SHA1 Message Date
Benjy Cui fac5a1b9f3 bump 5.1.1 2016-09-12 11:33:18 +08:00
Benjy Cui 1b8e27e613 bump 5.1.0 2016-09-12 11:28:41 +08:00
Benjy Cui e438757a64 feat: support tooltipPrefixcls 2016-09-12 11:26:48 +08:00
3 changed files with 10 additions and 3 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "rc-slider", "name": "rc-slider",
"version": "5.0.0", "version": "5.1.1",
"description": "slider ui component for react", "description": "slider ui component for react",
"keywords": [ "keywords": [
"react", "react",
+3 -1
View File
@@ -25,6 +25,7 @@ export default class Handle extends React.Component {
render() { render() {
const { const {
prefixCls, prefixCls,
tooltipPrefixCls,
className, className,
tipTransitionName, tipTransitionName,
tipFormatter, tipFormatter,
@@ -51,7 +52,7 @@ export default class Handle extends React.Component {
const isTooltipVisible = dragging || this.state.isTooltipVisible; const isTooltipVisible = dragging || this.state.isTooltipVisible;
return ( return (
<Tooltip <Tooltip
prefixCls={`${prefixCls}-tooltip`} prefixCls={tooltipPrefixCls || `${prefixCls}-tooltip`}
placement="top" placement="top"
visible={isTooltipVisible} visible={isTooltipVisible}
overlay={<span>{tipFormatter(value)}</span>} overlay={<span>{tipFormatter(value)}</span>}
@@ -66,6 +67,7 @@ export default class Handle extends React.Component {
Handle.propTypes = { Handle.propTypes = {
prefixCls: React.PropTypes.string, prefixCls: React.PropTypes.string,
tooltipPrefixCls: React.PropTypes.string,
className: React.PropTypes.string, className: React.PropTypes.string,
vertical: React.PropTypes.bool, vertical: React.PropTypes.bool,
offset: React.PropTypes.number, offset: React.PropTypes.number,
+6 -1
View File
@@ -45,7 +45,9 @@ class Slider extends React.Component {
recent = bounds.length - 1; recent = bounds.length - 1;
} }
if (process.env.NODE_ENV !== 'production' && (max - min) % step !== 0) { if (process.env.NODE_ENV !== 'production' &&
step && Math.floor(step) === step &&
(max - min) % step !== 0) {
warning( warning(
false, false,
'Slider[max] - Slider[min] (%s) should be a multiple of Slider[step] (%s)', 'Slider[max] - Slider[min] (%s) should be a multiple of Slider[step] (%s)',
@@ -410,6 +412,7 @@ class Slider extends React.Component {
const { const {
className, className,
prefixCls, prefixCls,
tooltipPrefixCls,
disabled, disabled,
vertical, vertical,
dots, dots,
@@ -440,6 +443,7 @@ class Slider extends React.Component {
const commonHandleProps = { const commonHandleProps = {
prefixCls, prefixCls,
tooltipPrefixCls,
noTip: isNoTip, noTip: isNoTip,
tipTransitionName, tipTransitionName,
tipFormatter, tipFormatter,
@@ -515,6 +519,7 @@ Slider.propTypes = {
included: React.PropTypes.bool, included: React.PropTypes.bool,
className: React.PropTypes.string, className: React.PropTypes.string,
prefixCls: React.PropTypes.string, prefixCls: React.PropTypes.string,
tooltipPrefixCls: React.PropTypes.string,
disabled: React.PropTypes.bool, disabled: React.PropTypes.bool,
children: React.PropTypes.any, children: React.PropTypes.any,
onBeforeChange: React.PropTypes.func, onBeforeChange: React.PropTypes.func,