From 3379f4bc9edfeff8e498b68c8de9e1270e939bad Mon Sep 17 00:00:00 2001 From: Suraj Shrestha Date: Sun, 24 Oct 2021 12:18:02 -0400 Subject: [PATCH 1/2] bug fix: y value out of range --- build/index.js | 2 +- src/MiniChart.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/index.js b/build/index.js index 6f557b8..fd0b253 100644 --- a/build/index.js +++ b/build/index.js @@ -1 +1 @@ -module.exports=function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(1);Object.defineProperty(t,"default",{enumerable:!0,get:function(){return function(e){return e&&e.__esModule?e:{default:e}}(r).default}})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;ne.points[a].x-o){i=a;break}i>=0&&e.setState({aIdx:i})},e.handleMouseLeave=function(){e.setState({aIdx:-1})},e.points=[],e.state={aIdx:-1},e}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,o.default.Component),r(t,[{key:"render",value:function(){var e=this.props,t=e.dataSet,n=e.width,r=e.height,i=e.strokeColor,a=e.strokeWidth,u=e.padding,s=e.activePointRadius,l=e.activePointColor,c=e.labelFontSize,f=Math.max(Math.ceil(a/2),s),p=t.length,d=p>0?t.reduce(function(e,t){return Math.max(e,t)}):0,h=p>0?t.reduce(function(e,t){return Math.min(e,t)}):0,y=(""+u).indexOf("%")>=0?parseInt(u)/100*r:u,b=t.map(function(e){return r-(Math.round(e/(d-h)*(r-2*y))+2*y)});this.points=[];for(var v=0;v=0?o.default.createElement("circle",{fill:l,cx:this.points[this.state.aIdx].x,cy:this.points[this.state.aIdx].y,r:s}):"",P=this.state.aIdx>=0?o.default.createElement("span",{style:{fontSize:c,border:"1px solid #ddd",lineHeight:"1.2",padding:"0 "+c/5+"px",borderRadius:1,transform:"translateX(-50%)",backgroundColor:"rgba(255,255,255, 0.8)",color:i,position:"absolute",userSelect:"none",top:this.points[this.state.aIdx].y-1.3*c-s,left:this.points[this.state.aIdx].x}},this.props.dataSet[this.state.aIdx]):"";return o.default.createElement("div",{style:{display:"inline-block",position:"relative"},onMouseLeave:this.handleMouseLeave},o.default.createElement("svg",{onMouseMove:this.handleMouseMove,style:{transition:"all 0.3s",display:"block"},width:n,height:r,xmlns:"http://www.w3.org/2000/svg",preserveAspectRatio:"none",viewBox:_},g,O),P)}}]),t}();u.defaultProps={dataSet:[],width:200,height:50,strokeColor:"#039BE5",strokeWidth:2,padding:"15%",activePointRadius:3,labelFontSize:11,activePointColor:"#039BE5"},u.propTypes={dataSet:i.default.array,width:i.default.number,height:i.default.number,strokeColor:i.default.string,strokeWidth:i.default.number,padding:i.default.string,activePointRadius:i.default.number,activePointColor:i.default.string,labelFontSize:i.default.number},t.default=u},function(e,t){e.exports=require("react")},function(e,t,n){e.exports=n(4)()},function(e,t,n){"use strict";var r=n(5);function o(){}e.exports=function(){function e(e,t,n,o,i,a){if(a!==r){var u=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw u.name="Invariant Violation",u}}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=o,n.PropTypes=n,n}},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"}]); \ No newline at end of file +module.exports=function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(1);Object.defineProperty(t,"default",{enumerable:!0,get:function(){return function(e){return e&&e.__esModule?e:{default:e}}(o).default}})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=function(){function e(e,t){for(var n=0;ne.points[a].x-r){i=a;break}i>=0&&e.setState({aIdx:i})},e.handleMouseLeave=function(){e.setState({aIdx:-1})},e.points=[],e.state={aIdx:-1},e}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,r.default.Component),o(t,[{key:"render",value:function(){var e=this.props,t=e.dataSet,n=e.width,o=e.height,i=e.strokeColor,a=e.strokeWidth,s=e.padding,u=e.activePointRadius,l=e.activePointColor,c=e.labelFontSize,p=Math.max(Math.ceil(a/2),u),f=t.length,d=f>0?t.reduce(function(e,t){return Math.max(e,t)}):0;console.log("printing dataSet",t);var h=f>0?t.reduce(function(e,t){return Math.min(e,t)}):0,y=(""+s).indexOf("%")>=0?parseInt(s)/100*o:s,b=t.map(function(e){return o-(Math.round((e-h)/(d-h)*(o-2*y))+y)});console.log("printing max - min",d,h),console.log("printing height - paddingNum",o,y),console.log("printing pointsY",b),this.points=[];for(var v=0;v=0?r.default.createElement("circle",{fill:l,cx:this.points[this.state.aIdx].x,cy:this.points[this.state.aIdx].y,r:u}):"",P=this.state.aIdx>=0?r.default.createElement("span",{style:{fontSize:c,border:"1px solid #ddd",lineHeight:"1.2",padding:"0 "+c/5+"px",borderRadius:1,transform:"translateX(-50%)",backgroundColor:"rgba(255,255,255, 0.8)",color:i,position:"absolute",userSelect:"none",top:this.points[this.state.aIdx].y-1.3*c-u,left:this.points[this.state.aIdx].x}},this.props.dataSet[this.state.aIdx]):"";return r.default.createElement("div",{style:{display:"inline-block",position:"relative"},onMouseLeave:this.handleMouseLeave},r.default.createElement("svg",{onMouseMove:this.handleMouseMove,style:{transition:"all 0.3s",display:"block"},width:n,height:o,xmlns:"http://www.w3.org/2000/svg",preserveAspectRatio:"none",viewBox:_},x,O),P)}}]),t}();s.defaultProps={dataSet:[],width:200,height:50,strokeColor:"#039BE5",strokeWidth:2,padding:"15%",activePointRadius:3,labelFontSize:11,activePointColor:"#039BE5"},s.propTypes={dataSet:i.default.array,width:i.default.number,height:i.default.number,strokeColor:i.default.string,strokeWidth:i.default.number,padding:i.default.string,activePointRadius:i.default.number,activePointColor:i.default.string,labelFontSize:i.default.number},t.default=s},function(e,t){e.exports=require("react")},function(e,t,n){e.exports=n(4)()},function(e,t,n){"use strict";var o=n(5);function r(){}e.exports=function(){function e(e,t,n,r,i,a){if(a!==o){var s=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw s.name="Invariant Violation",s}}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=r,n.PropTypes=n,n}},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"}]); \ No newline at end of file diff --git a/src/MiniChart.js b/src/MiniChart.js index 3f22612..5b0cb73 100644 --- a/src/MiniChart.js +++ b/src/MiniChart.js @@ -55,7 +55,7 @@ class MiniChart extends React.Component { const paddingNum = `${padding}`.indexOf('%') >= 0 ? (parseInt(padding) / 100) * height : padding; const pointsY = dataSet.map(function (val) { - return (height) - (Math.round((val / (max - min)) * (height - paddingNum * 2)) + paddingNum * 2); + return height - (Math.round((( val - min) / (max - min)) * (height - paddingNum * 2)) + paddingNum); }); this.points = []; From 061bda86915caf876bbbba6145fe096901a2d59a Mon Sep 17 00:00:00 2001 From: Suraj Shrestha Date: Thu, 28 Oct 2021 19:28:46 -0400 Subject: [PATCH 2/2] rebuilding to remove some console logs --- build/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/index.js b/build/index.js index fd0b253..2cd270a 100644 --- a/build/index.js +++ b/build/index.js @@ -1 +1 @@ -module.exports=function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n(1);Object.defineProperty(t,"default",{enumerable:!0,get:function(){return function(e){return e&&e.__esModule?e:{default:e}}(o).default}})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=function(){function e(e,t){for(var n=0;ne.points[a].x-r){i=a;break}i>=0&&e.setState({aIdx:i})},e.handleMouseLeave=function(){e.setState({aIdx:-1})},e.points=[],e.state={aIdx:-1},e}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,r.default.Component),o(t,[{key:"render",value:function(){var e=this.props,t=e.dataSet,n=e.width,o=e.height,i=e.strokeColor,a=e.strokeWidth,s=e.padding,u=e.activePointRadius,l=e.activePointColor,c=e.labelFontSize,p=Math.max(Math.ceil(a/2),u),f=t.length,d=f>0?t.reduce(function(e,t){return Math.max(e,t)}):0;console.log("printing dataSet",t);var h=f>0?t.reduce(function(e,t){return Math.min(e,t)}):0,y=(""+s).indexOf("%")>=0?parseInt(s)/100*o:s,b=t.map(function(e){return o-(Math.round((e-h)/(d-h)*(o-2*y))+y)});console.log("printing max - min",d,h),console.log("printing height - paddingNum",o,y),console.log("printing pointsY",b),this.points=[];for(var v=0;v=0?r.default.createElement("circle",{fill:l,cx:this.points[this.state.aIdx].x,cy:this.points[this.state.aIdx].y,r:u}):"",P=this.state.aIdx>=0?r.default.createElement("span",{style:{fontSize:c,border:"1px solid #ddd",lineHeight:"1.2",padding:"0 "+c/5+"px",borderRadius:1,transform:"translateX(-50%)",backgroundColor:"rgba(255,255,255, 0.8)",color:i,position:"absolute",userSelect:"none",top:this.points[this.state.aIdx].y-1.3*c-u,left:this.points[this.state.aIdx].x}},this.props.dataSet[this.state.aIdx]):"";return r.default.createElement("div",{style:{display:"inline-block",position:"relative"},onMouseLeave:this.handleMouseLeave},r.default.createElement("svg",{onMouseMove:this.handleMouseMove,style:{transition:"all 0.3s",display:"block"},width:n,height:o,xmlns:"http://www.w3.org/2000/svg",preserveAspectRatio:"none",viewBox:_},x,O),P)}}]),t}();s.defaultProps={dataSet:[],width:200,height:50,strokeColor:"#039BE5",strokeWidth:2,padding:"15%",activePointRadius:3,labelFontSize:11,activePointColor:"#039BE5"},s.propTypes={dataSet:i.default.array,width:i.default.number,height:i.default.number,strokeColor:i.default.string,strokeWidth:i.default.number,padding:i.default.string,activePointRadius:i.default.number,activePointColor:i.default.string,labelFontSize:i.default.number},t.default=s},function(e,t){e.exports=require("react")},function(e,t,n){e.exports=n(4)()},function(e,t,n){"use strict";var o=n(5);function r(){}e.exports=function(){function e(e,t,n,r,i,a){if(a!==o){var s=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw s.name="Invariant Violation",s}}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=r,n.PropTypes=n,n}},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"}]); \ No newline at end of file +module.exports=function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(1);Object.defineProperty(t,"default",{enumerable:!0,get:function(){return function(e){return e&&e.__esModule?e:{default:e}}(r).default}})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;ne.points[a].x-o){i=a;break}i>=0&&e.setState({aIdx:i})},e.handleMouseLeave=function(){e.setState({aIdx:-1})},e.points=[],e.state={aIdx:-1},e}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,o.default.Component),r(t,[{key:"render",value:function(){var e=this.props,t=e.dataSet,n=e.width,r=e.height,i=e.strokeColor,a=e.strokeWidth,u=e.padding,s=e.activePointRadius,l=e.activePointColor,c=e.labelFontSize,f=Math.max(Math.ceil(a/2),s),p=t.length,d=p>0?t.reduce(function(e,t){return Math.max(e,t)}):0,h=p>0?t.reduce(function(e,t){return Math.min(e,t)}):0,y=(""+u).indexOf("%")>=0?parseInt(u)/100*r:u,b=t.map(function(e){return r-(Math.round((e-h)/(d-h)*(r-2*y))+y)});this.points=[];for(var v=0;v=0?o.default.createElement("circle",{fill:l,cx:this.points[this.state.aIdx].x,cy:this.points[this.state.aIdx].y,r:s}):"",P=this.state.aIdx>=0?o.default.createElement("span",{style:{fontSize:c,border:"1px solid #ddd",lineHeight:"1.2",padding:"0 "+c/5+"px",borderRadius:1,transform:"translateX(-50%)",backgroundColor:"rgba(255,255,255, 0.8)",color:i,position:"absolute",userSelect:"none",top:this.points[this.state.aIdx].y-1.3*c-s,left:this.points[this.state.aIdx].x}},this.props.dataSet[this.state.aIdx]):"";return o.default.createElement("div",{style:{display:"inline-block",position:"relative"},onMouseLeave:this.handleMouseLeave},o.default.createElement("svg",{onMouseMove:this.handleMouseMove,style:{transition:"all 0.3s",display:"block"},width:n,height:r,xmlns:"http://www.w3.org/2000/svg",preserveAspectRatio:"none",viewBox:_},g,O),P)}}]),t}();u.defaultProps={dataSet:[],width:200,height:50,strokeColor:"#039BE5",strokeWidth:2,padding:"15%",activePointRadius:3,labelFontSize:11,activePointColor:"#039BE5"},u.propTypes={dataSet:i.default.array,width:i.default.number,height:i.default.number,strokeColor:i.default.string,strokeWidth:i.default.number,padding:i.default.string,activePointRadius:i.default.number,activePointColor:i.default.string,labelFontSize:i.default.number},t.default=u},function(e,t){e.exports=require("react")},function(e,t,n){e.exports=n(4)()},function(e,t,n){"use strict";var r=n(5);function o(){}e.exports=function(){function e(e,t,n,o,i,a){if(a!==r){var u=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw u.name="Invariant Violation",u}}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=o,n.PropTypes=n,n}},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"}]); \ No newline at end of file