From 794e6de5ccf064b507bd3f6a224dfa42c18b5b26 Mon Sep 17 00:00:00 2001 From: David Chin Date: Tue, 19 Apr 2016 22:45:53 +1000 Subject: [PATCH] Release v0.7.0 --- bower.json | 2 +- dist/react-input-range.js | 15 ++++++++++++++- dist/react-input-range.min.js | 2 +- package.json | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 58af814..abee78f 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,7 @@ "dist/react-input-range.js", "dist/react-input-range.css" ], - "version": "0.6.2", + "version": "0.7.0", "description": "React component for inputting numeric values within a range", "homepage": "https://github.com/davidchin/react-input-range", "authors": [ diff --git a/dist/react-input-range.js b/dist/react-input-range.js index 794fc39..6267ef2 100644 --- a/dist/react-input-range.js +++ b/dist/react-input-range.js @@ -47,8 +47,10 @@ var _propTypes = require('./propTypes'); var internals = new WeakMap(); var KeyCode = { + DOWN_ARROW: 40, LEFT_ARROW: 37, - RIGHT_ARROW: 39 + RIGHT_ARROW: 39, + UP_ARROW: 38 }; function isWithinRange(inputRange, values) { @@ -152,6 +154,8 @@ function renderSliders(inputRange) { } var slider = _react2['default'].createElement(_Slider2['default'], { + ariaLabelledby: inputRange.props.ariaLabelledby, + ariaControls: inputRange.props.ariaControls, classNames: classNames, key: key, maxValue: maxValue, @@ -316,10 +320,14 @@ var InputRange = (function (_React$Component) { switch (event.keyCode) { case KeyCode.LEFT_ARROW: + case KeyCode.DOWN_ARROW: + event.preventDefault(); this.decrementValue(key); break; case KeyCode.RIGHT_ARROW: + case KeyCode.UP_ARROW: + event.preventDefault(); this.incrementValue(key); break; @@ -334,6 +342,8 @@ var InputRange = (function (_React$Component) { return; } + event.preventDefault(); + var key = getKeyByPosition(this, position); this.updatePosition(key, position); @@ -485,6 +495,7 @@ exports['default'] = InputRange; InputRange.propTypes = { ariaLabelledby: _react2['default'].PropTypes.string, + ariaControls: _react2['default'].PropTypes.string, classNames: _react2['default'].PropTypes.objectOf(_react2['default'].PropTypes.string), defaultValue: _propTypes.maxMinValuePropType, disabled: _react2['default'].PropTypes.bool, @@ -704,6 +715,7 @@ var Slider = (function (_React$Component) { ), _react2['default'].createElement('a', { 'aria-labelledby': this.props.ariaLabelledby, + 'aria-controls': this.props.ariaControls, 'aria-valuemax': this.props.maxValue, 'aria-valuemin': this.props.minValue, 'aria-valuenow': this.props.value, @@ -726,6 +738,7 @@ exports['default'] = Slider; Slider.propTypes = { ariaLabelledby: _react2['default'].PropTypes.string, + ariaControls: _react2['default'].PropTypes.string, classNames: _react2['default'].PropTypes.objectOf(_react2['default'].PropTypes.string), maxValue: _react2['default'].PropTypes.number, minValue: _react2['default'].PropTypes.number, diff --git a/dist/react-input-range.min.js b/dist/react-input-range.min.js index 8bd5328..fa26133 100644 --- a/dist/react-input-range.min.js +++ b/dist/react-input-range.min.js @@ -1 +1 @@ -!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.InputRange=e()}}(function(){return function e(t,n,a){function r(u,i){if(!n[u]){if(!t[u]){var l="function"==typeof require&&require;if(!i&&l)return l(u,!0);if(o)return o(u,!0);var s=new Error("Cannot find module '"+u+"'");throw s.code="MODULE_NOT_FOUND",s}var p=n[u]={exports:{}};t[u][0].call(p.exports,function(e){var n=t[u][1][e];return r(n?n:e)},p,p.exports,e,t,n,a)}return n[u].exports}for(var o="function"==typeof require&&require,u=0;u=n.minValue&&t.max<=n.maxValue&&t.min=n.minValue&&t.max<=n.maxValue}function l(e,t){var n=e.props,a=R["default"].valuesFromProps(e);return(0,_.length)(t.min,a.min)>=n.step||(0,_.length)(t.max,a.max)>=n.step}function s(e,t){return i(e,t)&&l(e,t)}function p(e){var t=e.refs.inputRange.ownerDocument;return t}function f(e){var t=e.props;return t.disabled?t.classNames.component+" is-disabled":t.classNames.component}function c(e,t){return t===e.refs.sliderMin?"min":"max"}function d(e){return e.isMultiValue?["min","max"]:["max"]}function h(e,t){var n=R["default"].valuesFromProps(e),a=R["default"].positionsFromValues(e,n);if(e.isMultiValue){var r=(0,_.distanceTo)(t,a.min),o=(0,_.distanceTo)(t,a.max);if(o>r)return"min"}return"max"}function v(e){var t=e.props.classNames,n=[],a=d(e),r=R["default"].valuesFromProps(e),o=R["default"].percentagesFromValues(e,r),u=!0,i=!1,l=void 0;try{for(var s,p=a[Symbol.iterator]();!(u=(s=p.next()).done);u=!0){var f=s.value,c=r[f],h=o[f],v="slider"+(0,_.captialize)(f),m=e.props,y=m.maxValue,b=m.minValue;"min"===f?y=r.max:b=r.min;var w=g["default"].createElement(T["default"],{classNames:t,key:f,maxValue:y,minValue:b,onSliderKeyDown:e.handleSliderKeyDown,onSliderMouseMove:e.handleSliderMouseMove,percentage:h,ref:v,type:f,value:c});n.push(w)}}catch(M){i=!0,l=M}finally{try{!u&&p["return"]&&p["return"]()}finally{if(i)throw l}}return n}function m(e){var t=[],n=d(e),a=!0,r=!1,o=void 0;try{for(var u,i=n[Symbol.iterator]();!(a=(u=i.next()).done);a=!0){var l=u.value,s=e.isMultiValue?""+e.props.name+(0,_.captialize)(l):e.props.name;g["default"].createElement("input",{type:"hidden",name:s})}}catch(p){r=!0,o=p}finally{try{!a&&i["return"]&&i["return"]()}finally{if(r)throw o}}return t}Object.defineProperty(n,"__esModule",{value:!0});var y=function(){function e(e,t){for(var n=0;n=t?new Error("`minValue` must be smaller than `maxValue`"):n>=t?new Error("`maxValue` must be larger than `minValue`"):n>a||a>t?new Error("`value` must be within `minValue` and `maxValue`"):void 0:new Error("`value` or `defaultValue` must be a number or an array")}Object.defineProperty(n,"__esModule",{value:!0}),n.maxMinValuePropType=a;var r=e("./util")},{"./util":7}],7:[function(e,t,n){"use strict";function a(e,t,n){return Math.min(Math.max(e,t),n)}function r(){return Object.assign.apply(Object,arguments)}function o(e,t){return e.indexOf(t)>-1}function u(e,t){var n=Object.keys(e),a={};return n.forEach(function(n){o(t,n)||(a[n]=e[n])}),a}function i(e){return e.charAt(0).toUpperCase()+e.slice(1)}function l(e,t){return Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2))}function s(e,t){return Math.abs(e-t)}function p(e){return"number"==typeof e}function f(e){return null!==e&&"object"==typeof e}function c(e){return void 0!==e&&null!==e}function d(e){return e?Array.isArray(e)?0===e.length:0===Object.keys(e).length:!0}function h(e,t){if(!Array.isArray(e))return!1;for(var n=0,a=e.length;a>n;n++)if(!t(e[n]))return!1;return!0}function v(e,t,n){if(!f(e))return!1;for(var a=n||Object.keys(e),r=0,o=a.length;o>r;r++){var u=a[r];if(!t(e[u]))return!1}return!0}function m(e,t){e.forEach(function(e){t[e]=t[e].bind(t)})}Object.defineProperty(n,"__esModule",{value:!0}),n["default"]={arrayOf:h,autobind:m,captialize:i,clamp:a,distanceTo:l,extend:r,isDefined:c,isEmpty:d,isNumber:p,isObject:f,length:s,objectOf:v,omit:u},t.exports=n["default"]},{}],8:[function(e,t,n){"use strict";function a(e,t){var n=e.trackClientRect.width,a=t.x/n;return a||0}function r(e,t){var n=a(e,t),r=e.props.maxValue-e.props.minValue,o=e.props.minValue+r*n;return o}function o(e){var t=arguments.length<=1||void 0===arguments[1]?e:arguments[1],n=t.props;return function(){if(e.isMultiValue){var t=n.value;return((0,c.isEmpty)(t)||!(0,c.objectOf)(t,c.isNumber))&&(t=n.defaultValue),Object.create(t)}var a=(0,c.isNumber)(n.value)?n.value:n.defaultValue;return{min:n.minValue,max:a}}()}function u(e,t){var n=(0,c.clamp)(t,e.props.minValue,e.props.maxValue),a=e.props.maxValue-e.props.minValue,r=(n-e.props.minValue)/a;return r||0}function i(e,t){var n={min:u(e,t.min),max:u(e,t.max)};return n}function l(e,t){var n=e.trackClientRect.width,a=u(e,t),r=a*n;return{x:r,y:0}}function s(e,t){var n={min:l(e,t.min),max:l(e,t.max)};return n}function p(e,t){var n=e.trackClientRect,a=n.width,r=t.touches?t.touches[0]:t,o=r.clientX,u={x:(0,c.clamp)(o-n.left,0,a),y:0};return u}function f(e,t){return Math.round(t/e.props.step)*e.props.step}Object.defineProperty(n,"__esModule",{value:!0});var c=e("./util");n["default"]={percentageFromPosition:a,percentageFromValue:u,percentagesFromValues:i,positionFromEvent:p,positionFromValue:l,positionsFromValues:s,stepValueFromValue:f,valueFromPosition:r,valuesFromProps:o},t.exports=n["default"]},{"./util":7}],9:[function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(n,"__esModule",{value:!0});var r=e("./InputRange"),o=a(r);n["default"]=o["default"],t.exports=n["default"]},{"./InputRange":1}]},{},[9])(9)}); \ No newline at end of file +!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.InputRange=e()}}(function(){return function e(t,n,a){function r(u,i){if(!n[u]){if(!t[u]){var l="function"==typeof require&&require;if(!i&&l)return l(u,!0);if(o)return o(u,!0);var s=new Error("Cannot find module '"+u+"'");throw s.code="MODULE_NOT_FOUND",s}var p=n[u]={exports:{}};t[u][0].call(p.exports,function(e){var n=t[u][1][e];return r(n?n:e)},p,p.exports,e,t,n,a)}return n[u].exports}for(var o="function"==typeof require&&require,u=0;u=n.minValue&&t.max<=n.maxValue&&t.min=n.minValue&&t.max<=n.maxValue}function l(e,t){var n=e.props,a=j["default"].valuesFromProps(e);return(0,_.length)(t.min,a.min)>=n.step||(0,_.length)(t.max,a.max)>=n.step}function s(e,t){return i(e,t)&&l(e,t)}function p(e){var t=e.refs.inputRange.ownerDocument;return t}function f(e){var t=e.props;return t.disabled?t.classNames.component+" is-disabled":t.classNames.component}function c(e,t){return t===e.refs.sliderMin?"min":"max"}function d(e){return e.isMultiValue?["min","max"]:["max"]}function h(e,t){var n=j["default"].valuesFromProps(e),a=j["default"].positionsFromValues(e,n);if(e.isMultiValue){var r=(0,_.distanceTo)(t,a.min),o=(0,_.distanceTo)(t,a.max);if(o>r)return"min"}return"max"}function v(e){var t=e.props.classNames,n=[],a=d(e),r=j["default"].valuesFromProps(e),o=j["default"].percentagesFromValues(e,r),u=!0,i=!1,l=void 0;try{for(var s,p=a[Symbol.iterator]();!(u=(s=p.next()).done);u=!0){var f=s.value,c=r[f],h=o[f],v="slider"+(0,_.captialize)(f),m=e.props,y=m.maxValue,b=m.minValue;"min"===f?y=r.max:b=r.min;var w=g["default"].createElement(T["default"],{ariaLabelledby:e.props.ariaLabelledby,ariaControls:e.props.ariaControls,classNames:t,key:f,maxValue:y,minValue:b,onSliderKeyDown:e.handleSliderKeyDown,onSliderMouseMove:e.handleSliderMouseMove,percentage:h,ref:v,type:f,value:c});n.push(w)}}catch(M){i=!0,l=M}finally{try{!u&&p["return"]&&p["return"]()}finally{if(i)throw l}}return n}function m(e){var t=[],n=d(e),a=!0,r=!1,o=void 0;try{for(var u,i=n[Symbol.iterator]();!(a=(u=i.next()).done);a=!0){var l=u.value,s=e.isMultiValue?""+e.props.name+(0,_.captialize)(l):e.props.name;g["default"].createElement("input",{type:"hidden",name:s})}}catch(p){r=!0,o=p}finally{try{!a&&i["return"]&&i["return"]()}finally{if(r)throw o}}return t}Object.defineProperty(n,"__esModule",{value:!0});var y=function(){function e(e,t){for(var n=0;n=t?new Error("`minValue` must be smaller than `maxValue`"):n>=t?new Error("`maxValue` must be larger than `minValue`"):n>a||a>t?new Error("`value` must be within `minValue` and `maxValue`"):void 0:new Error("`value` or `defaultValue` must be a number or an array")}Object.defineProperty(n,"__esModule",{value:!0}),n.maxMinValuePropType=a;var r=e("./util")},{"./util":7}],7:[function(e,t,n){"use strict";function a(e,t,n){return Math.min(Math.max(e,t),n)}function r(){return Object.assign.apply(Object,arguments)}function o(e,t){return e.indexOf(t)>-1}function u(e,t){var n=Object.keys(e),a={};return n.forEach(function(n){o(t,n)||(a[n]=e[n])}),a}function i(e){return e.charAt(0).toUpperCase()+e.slice(1)}function l(e,t){return Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2))}function s(e,t){return Math.abs(e-t)}function p(e){return"number"==typeof e}function f(e){return null!==e&&"object"==typeof e}function c(e){return void 0!==e&&null!==e}function d(e){return e?Array.isArray(e)?0===e.length:0===Object.keys(e).length:!0}function h(e,t){if(!Array.isArray(e))return!1;for(var n=0,a=e.length;a>n;n++)if(!t(e[n]))return!1;return!0}function v(e,t,n){if(!f(e))return!1;for(var a=n||Object.keys(e),r=0,o=a.length;o>r;r++){var u=a[r];if(!t(e[u]))return!1}return!0}function m(e,t){e.forEach(function(e){t[e]=t[e].bind(t)})}Object.defineProperty(n,"__esModule",{value:!0}),n["default"]={arrayOf:h,autobind:m,captialize:i,clamp:a,distanceTo:l,extend:r,isDefined:c,isEmpty:d,isNumber:p,isObject:f,length:s,objectOf:v,omit:u},t.exports=n["default"]},{}],8:[function(e,t,n){"use strict";function a(e,t){var n=e.trackClientRect.width,a=t.x/n;return a||0}function r(e,t){var n=a(e,t),r=e.props.maxValue-e.props.minValue,o=e.props.minValue+r*n;return o}function o(e){var t=arguments.length<=1||void 0===arguments[1]?e:arguments[1],n=t.props;return function(){if(e.isMultiValue){var t=n.value;return!(0,c.isEmpty)(t)&&(0,c.objectOf)(t,c.isNumber)||(t=n.defaultValue),Object.create(t)}var a=(0,c.isNumber)(n.value)?n.value:n.defaultValue;return{min:n.minValue,max:a}}()}function u(e,t){var n=(0,c.clamp)(t,e.props.minValue,e.props.maxValue),a=e.props.maxValue-e.props.minValue,r=(n-e.props.minValue)/a;return r||0}function i(e,t){var n={min:u(e,t.min),max:u(e,t.max)};return n}function l(e,t){var n=e.trackClientRect.width,a=u(e,t),r=a*n;return{x:r,y:0}}function s(e,t){var n={min:l(e,t.min),max:l(e,t.max)};return n}function p(e,t){var n=e.trackClientRect,a=n.width,r=t.touches?t.touches[0]:t,o=r.clientX,u={x:(0,c.clamp)(o-n.left,0,a),y:0};return u}function f(e,t){return Math.round(t/e.props.step)*e.props.step}Object.defineProperty(n,"__esModule",{value:!0});var c=e("./util");n["default"]={percentageFromPosition:a,percentageFromValue:u,percentagesFromValues:i,positionFromEvent:p,positionFromValue:l,positionsFromValues:s,stepValueFromValue:f,valueFromPosition:r,valuesFromProps:o},t.exports=n["default"]},{"./util":7}],9:[function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(n,"__esModule",{value:!0});var r=e("./InputRange"),o=a(r);n["default"]=o["default"],t.exports=n["default"]},{"./InputRange":1}]},{},[9])(9)}); \ No newline at end of file diff --git a/package.json b/package.json index 7be51b6..6535d7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-input-range", - "version": "0.6.2", + "version": "0.7.0", "description": "React component for inputting numeric values within a range", "keywords": [ "react",