@makechart/bar 0.0.7 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # Change Logs
2
2
 
3
+ ## v0.0.8
4
+
5
+ - support subset presentation: `partial` draws a second layer inside each bar showing how
6
+ much of it is selected, filled with the grey of the bar's own color rather than another
7
+ palette entry
8
+ - sync selection back from a filter: `mod.filter` moves the brush to the incoming range.
9
+ it leaves the brush alone when the current box already covers the same bands, so a host
10
+ that re-applies the selection on every render no longer snaps the box the user just dragged
11
+ - dim legend items instead of removing them when `cfg.legend.subset.mode` is `dim`
12
+ - fix bug: `mod.filter` moved the brush on `g.view` instead of `g.brush`, throwing
13
+ `Cannot read properties of undefined ( reading 'extent' )`
14
+ - fix bug: the far edge of a re-applied range landed exactly on a band boundary, where
15
+ `Math.floor` counts it into the next band — the selection grew by one bar per round trip
16
+ - fix bug: tip never appeared while brush was enabled. the brush overlay covers the plot
17
+ area and takes every hover, so the accessor only ever saw the overlay; it now hit-tests
18
+ with `elementsFromPoint` to find the bar under the pointer
19
+
20
+
3
21
  ## v0.0.7
4
22
 
5
23
  - separate percent calculation from raw in tooltip and validate value before using
package/index.html CHANGED
@@ -1 +1 @@
1
- <div><style type="text/css">[data-name=xaxis]{font-size:.8em}[data-name=yaxis]{font-size:.8em}.pdl-layout>div[data-type=layout]{display:grid;grid-template-columns:fit-content(2em) 1fr fit-content(10em);grid-template-rows:1fr fit-content(1em);padding:0 .5em}.pdl-layout>div[data-type=layout]>.pdl-cell[data-name=legend]{grid-column:3;grid-row:1/span 2;padding-left:1em}.pdl-layout.legend-bottom>div[data-type=layout]{grid-template-columns:2em 1fr;grid-template-rows:1fr fit-content(2em) fit-content(3em)}.pdl-layout.legend-bottom>div[data-type=layout] .pdl-cell[data-name=legend]{padding-top:1em;grid-column:1/span 2;grid-row:3}</style><script type="@plotdb/block">var mod;module.exports={pkg:{name:"bar",version:"0.0.1",extend:{name:"@makechart/base"},dependencies:[],i18n:{"zh-TW":{size:"長度"}}},init:function(t){var e,i,n,r;e=t.root,i=t.context,n=t.t,r=t.pubsub;return r.fire("init",{mod:mod({context:i,t:n})})}};mod=function(t){var e,i,n,S,r,s;e=t.context,i=t.t;n=e.chart,S=e.d3,r=e.debounce;return{sample:function(){var r;r=["apple","banana","peach","orange"];return{raw:[0,1,2,3,4,5,6,7,8,9,10].map(function(t){var e,i,n;e={name:"Y"+(1995+t)};for(i=0;i<=3;++i){n=i;e[r[n]]=(10*Math.random()).toFixed(1)}return e}),binding:{size:[0,1,2,3].map(function(t){return{key:r[t],unit:"KG"}}),name:{key:"name"}}}},config:(s=import$({legend:import$({},n.utils.config.preset.legend),xaxis:JSON.parse(JSON.stringify(n.utils.config.preset.axis)),yaxis:JSON.parse(JSON.stringify(n.utils.config.preset.axis))},n.utils.config.preset["default"]),s.sort={enabled:{type:"boolean",default:false},dir:{type:"choice",values:["asc","desc"],default:"asc"},dimension:{type:"choice",values:["name","size"],default:"size"}},s.type={type:"choice",values:["bar","column"],default:"column"},s.brush={enabled:{type:"boolean",default:true}},s.multiple={type:"choice",values:["stack","group"],default:"stack"},s.percent={type:"boolean",default:false},s.dancing={type:"boolean",default:true},s.gap={type:"number",default:2,min:0,max:100,step:1},s),dimension:{size:{type:"R",multiple:true,name:"size"},name:{type:"NCO",name:"name"}},init:function(){var e,i,t,h=this;this.tint=e=new n.utils.tint;this.svg.addEventListener("click",function(t){var e,i;e=t.target;while(e!==h.svg){if(!e){return}if(!(e.classList&&e.classList.contains("pdl-cell"))){e=e.parentNode;continue}if(e.getAttribute("data-name")==="view"){break}else{return}}if(!h.cfg.dancing||h.cfg.percent){return}i=h.alignIdx||0;for(;;){h.alignIdx=((h.alignIdx||0)+1)%(h.binding.size.length+1);if(h.legend.isSelected(h.alignIdx)||h.alignIdx===i){break}}h.resize();return h.render()});this.g=Object.fromEntries(["view","xaxis","yaxis","legend"].map(function(t){return[t,S.select(h.layout.getGroup(t))]}));this.g.subview=this.g.view.append("g");this.g.brush=this.g.view.append("g");this.brushs={x:S.brushX(),y:S.brushY()};this.brushType=function(){if(h.cfg.type==="bar"){return"y"}else{return"x"}};this.range="null";i=r(150,function(t){var n,e,r,s,i,a;if(!h.cfg.brush.enabled){return}n=t.selection;if((e=JSON.stringify(n))===h.range){return}else{h.range=e}if(!n){return h.filter({name:undefined},true)}else{r=h.scale[h.brushType()].domain();s=h.scale[h.brushType()].bandwidth();if(h.brushType()==="x"){n=n.map(function(t){var e,i,n;return(e=(n=Math.floor(t/s))>0?n:0)<(i=r.length-1)?e:i});i=function(){var t,e,i=[];for(t=n[0],e=n[1];t<=e;++t){i.push(t)}return i}().map(function(t){return r[t]})}else{a=h.layout.getBox("view");n=n.map(function(t){var e,i,n;return(e=(n=Math.floor((a.height-t)/s))>0?n:0)<(i=r.length-1)?e:i});i=function(){var t,e,i=[];for(t=n[1],e=n[0];t<=e;++t){i.push(t)}return i}().map(function(t){return r[t]})}return h.filter({name:{type:"index",value:i}},true)}});this.brushs.x.on("end",function(t){if(h.brushType()==="x"){return i(t)}});this.brushs.x.on("brush",function(t){if(h.brushType()==="x"){return i(t)}});this.brushs.y.on("end",function(t){if(h.brushType()==="y"){return i(t)}});this.brushs.y.on("brush",function(t){if(h.brushType()==="y"){return i(t)}});this.scale=t={};this.yaxis=new n.utils.axis({layout:this.layout,name:"yaxis",direction:"left"});this.xaxis=new n.utils.axis({layout:this.layout,name:"xaxis",direction:"bottom"});this.legend=new n.utils.legend({layout:this.layout,name:"legend",root:this.root,shape:function(t){return S.select(this).attr("fill",e.get(t.text||t.key))}});this.legend.on("select",function(){h.bind();h.resize();return h.render()});return this.tip=new n.utils.tip({root:this.root,accessor:function(t){var e,i,n,r,s,a,u,l;e=t.evt;if(!(e.target&&(i=S.select(e.target).datum()))){return null}if((n=i.type)==="overlay"||n==="selection"||n==="s"){return}r=!h.cfg.percent?"":isNaN(i.percent)?"(-%)":"("+(i.percent*100).toFixed(1)+"%)";s=isNaN(i.raw)?"-":(a=((n=h.cfg)!=null?(u=n[h.type==="column"?"yaxis":"xaxis"])!=null?(l=u.label)!=null?l.format:void 8:void 8:void 8)||".2s",S.format(a)(i.raw)+""+(i.unit||""));return{name:i.name||"",group:i.group||"",value:s,valueAlt:r}},range:function(){return h.layout.getNode("view").getBoundingClientRect()}})},destroy:function(){if(this.tip){return this.tip.destroy()}},filter:function(t,e){var i=this;e==null&&(e=false);this.render();if(e){return}return this.brush.move(this.g.view,t.name?t.name.map(function(t){return i.scale[i.brushType()](t)}):null)},parse:function(){this.data.map(function(t){return t.size=t.size.map(function(t){if(isNaN(t)){return 0}else{return t}})});return this.alignIdx=undefined},resize:function(){var i,r,t,e,n,s,a,u,l,h,o,c,f,d,g,p,m=this;this.root.querySelector(".pdl-layout").classList.toggle("legend-bottom",this.cfg.legend.position==="bottom");this.type=this.cfg.type||"column";this.brush=this.brushs[this.brushType()];this.legend.config(this.cfg.legend);this.legend.data(function(){var t,e=[];for(t=this.binding.size.length-1;t>=0;--t){i=t;e.push({key:i,text:this.binding.size[i].name||this.binding.size[i].key})}return e}.call(this));this.layout.update(false);this.maxPerGroup=this.binding.size.filter(function(t,e){return m.legend.isSelected(e)}).map(function(t,e){return Math.max.apply(Math,m.data.map(function(t){return t.size[e]}))});if(this.cfg.alignIdx&&!this.alignIdx){this.alignIdx=this.cfg.alignIdx}r=(t=this.cfg.percent?0:this.alignIdx||0)<(e=this.binding.size.length)?t:e;this.baseOffset=this.data.map(function(i){return function(){var t,e,i=[];for(t=0,e=r;t<e;++t){i.push(t)}return i}().reduce(function(t,e){return t+(!m.legend.isSelected(e)?0:i.size[e])},0)||[0]});this.delta=n=Math.max.apply(Math,this.baseOffset);if(this.cfg.multiple==="stack"){if(this.cfg.percent){s=1}else{s=Math.max.apply(Math,this.data.map(function(n){return function(){var t,e,i=[];for(t=r,e=n.size.length;t<e;++t){i.push(t)}return i}().reduce(function(t,e){return t+(!m.legend.isSelected(e)?0:n.size[e])},0)}))+(n||0)}}else if(this.cfg.multiple==="group"){s=Math.max.apply(Math,this.data.map(function(t){return Math.max.apply(Math,t.size.filter(function(t,e){return m.legend.isSelected(e)}))}))}else if(this.cfg.multiple==="split"){s=this.maxPerGroup.reduce(function(t,e){return t+e},0)}this.order=this.data.map(function(t,e){return{key:t._idx,idx:e,name:t.name}});this.data.map(function(t,e){return t.sum=t.size.filter(function(t,e){return m.legend.isSelected(e)}).reduce(function(t,e){return t+e},0)});if(((t=this.cfg).sort||(t.sort={})).enabled){this.order.sort(function(t,e){var i,n,r,s,a;i=m.cfg.sort.dimension==="size"?m.data[t.idx].sum-m.data[e.idx].sum:(n=m.data[t.idx].name,r=m.data[e.idx].name,n=isNaN(+n)?n:+n,r=isNaN(+r)?r:+r,n>r?1:n<r?-1:0);return(!(s=m.cfg.sort.dir==="asc")!==!(a=m.cfg.type==="bar")&&(s||a)?1:-1)*i})}if(this.cfg.palette){this.tint.set(this.cfg.palette)}this.layout.update(false);a=this.layout.getBox("view");if(this.type==="column"){t=this.scale;t.y=S.scaleLinear().domain([0,s]).range([a.height,0]);t.x=S.scaleBand().domain(this.order.map(function(t){return t.name||t.key})).range([0,a.width]);u=(t=Math.ceil(this.layout.getBox("yaxis").height/40))>2?t:2;l=this.cfg.bump?function(){var t,e,i,n=[];for(t=1,e=(i=this.parsed.length||1)>1?i:1;t<=e;++t){n.push(t)}return n}.call(this):this.scale.y.ticks((t=((e=this.cfg).yaxis||(e.yaxis={})).tick.count||4)<u?t:u);this.yaxis.config(this.cfg.yaxis);h=this.binding.size[0]||{};if(this.binding.size.length>1){this.yaxis.caption(h.unit?h.unit+"":"")}else{this.yaxis.caption((h.name||h.key||"")+(h.unit?"("+h.unit+")":""))}this.yaxis.ticks(l);this.yaxis.scale(this.scale.y);this.xaxis.config(this.cfg.xaxis);this.xaxis.ticks(this.data.map(function(t){return t.name}));this.xaxis.scale(this.scale.x);this.xaxis.caption((o=this.binding.name)?(o.name||o.key||"")+(o.unit?"("+this.binding.name.unit+")":""):"")}else{t=this.scale;t.x=S.scaleLinear().domain([0,s]).range([a.width,0]);t.y=S.scaleBand().domain(this.order.map(function(t){return t.name||t.key})).range([0,a.height]);u=(t=Math.ceil(this.layout.getBox("xaxis").width/80))>2?t:2;c=this.cfg.bump?function(){var t,e,i,n=[];for(t=1,e=(i=this.parsed.length||1)>1?i:1;t<=e;++t){n.push(t)}return n}.call(this):this.scale.x.ticks((t=((e=this.cfg).xaxis||(e.xaxis={})).tick.count||4)<u?t:u);this.xaxis.config(this.cfg.xaxis);h=this.binding.size[0]||{};if(this.binding.size.length>1){this.xaxis.caption(h.unit?h.unit+"":"")}else{this.xaxis.caption((h.name||h.key||"")+(h.unit?"("+h.unit+")":""))}this.xaxis.ticks(c);this.xaxis.scale(this.scale.x);this.yaxis.config(this.cfg.yaxis);this.yaxis.ticks(this.data.map(function(t){return t.name}));this.yaxis.scale(this.scale.y);this.yaxis.caption((o=this.binding.name)?(o.name||o.key||"")+(o.unit?"("+this.binding.name.unit+")":""):"")}for(f=0;f<2;++f){i=f;this.layout.update(false);a=this.layout.getBox("view");t=[a.width,a.height],d=t[0],g=t[1];this.tint.set(this.cfg.palette);p=this.cfg.dotSize||3;this.scale.x.range([0,d-p]);this.scale.y.range([g,p]);this.xaxis.render();this.yaxis.render()}a=this.layout.getBox("view");if(this.brushType()==="x"){return this.brush.extent([[0,1],[a.width,a.height-2]])}else{return this.brush.extent([[1,0],[a.width-2,a.height]])}},render:function(){var p,m,t,x,y,b,v,w,z,k,M,N,e,i,n=this;p=this.binding,m=this.scale,t=this.range,x=this.delta,y=this.baseOffset,b=this.maxPerGroup,v=this.cfg,w=this.tint,z=this.data,k=this.type,M=this.legend;N=this.cfg.gap;N<=(e=(this.type==="column"?m.x.bandwidth():m.y.bandwidth())-1)||(N=e);i=this.g.subview.selectAll("g.bar").data(this.data);i.exit().remove();i.enter().append("g").attr("class","bar").attr("transform",function(t,e){if(n.type==="column"){return"translate("+m.x(t.name)+",0)"}else{return"translate(0,"+m.y(t.name)+")"}});this.g.subview.selectAll("g.bar").transition().duration(350).attr("transform",function(t,e){if(n.type==="column"){return"translate("+m.x(t.name)+",0)"}else{return"translate(0,"+m.y(t.name)+")"}});this.g.subview.selectAll("g.bar").each(function(r,i){var t,n,e,s,a,u,l,h,o,c,f,d,g;t=[[],0],n=t[0],e=t[1];e=x-y[i];s=1;if(v.percent===true){s=(t=r.size.filter(function(t,e){return M.isSelected(e)}).reduce(function(t,e){return t+e},0))>1?t:1}for(a=0,u=r.size.length;a<u;++a){l=a;h=r.size[l];o=l;if(!M.isSelected(o)){continue}n.push(c={raw:h,percent:h/s,size:h/s,offset:e/s,key:o,group:r.name,name:p.size[o].name||p.size[o].key,unit:p.size[o].unit||"",order:n.length});c._raw=import$({},c);if(v.multiple==="split"){e+=b[l]}else if(v.multiple==="stack"){e+=h}}f=S.select(this).selectAll("rect").data(n,function(t,e){return t.key});f.exit().each(function(t,e){return t._removing=true});f.exit().transition().delay(150).remove();d=f.enter().append("rect");d.attr("class",function(){return"data"});if(k==="column"){d.attr("width",function(t,e){var i;return(i=m.x.bandwidth()-2)>1?i:1})}if(k==="column"){d.attr("y",function(t,e){return m.y(0)})}if(k!=="column"){d.attr("height",function(t,e){var i;return(i=m.y.bandwidth()-2)>1?i:1})}if(k!=="column"){d.attr("x",function(t,e){return m.x(0)})}g=S.select(this).selectAll("rect").transition().duration(350).call(function(t){var e;if(v.multiple!=="group"){return}e=t;if(k==="column"){e.attr("x",function(t,e){return N/2+t.order*(m.x.bandwidth()-N)/n.length})}if(k==="column"){e.attr("width",function(t,e){return(m.x.bandwidth()-N)/n.length})}if(k==="column"){e.attr("y",function(t,e){return Math.round(Math.min(m.y(0),m.y(t.size)))})}if(k!=="column"){e.attr("y",function(t,e){return N/2+t.order*(m.y.bandwidth()-N)/n.length})}if(k!=="column"){e.attr("height",function(t,e){return(m.y.bandwidth()-N)/n.length})}if(k!=="column"){e.attr("x",function(t,e){return Math.round(Math.min(m.x(0),m.x(t.size)))})}return e}).call(function(t){var e;if(v.multiple!=="stack"){return}e=t;if(k==="column"){e.attr("x",N/2)}if(k==="column"){e.attr("width",function(t,e){return m.x.bandwidth()-N})}if(k==="column"){e.attr("y",function(t,e){if(t._removing){return m.y(t.offset+t.size/2)}return Math.round(Math.min(m.y(t.offset),m.y(t.offset+t.size)))})}if(k!=="column"){e.attr("y",N/2)}if(k!=="column"){e.attr("height",function(t,e){return m.y.bandwidth()-N})}if(k!=="column"){e.attr("x",function(t,e){if(t._removing){return m.x(t.offset+t.size/2)}return Math.round(Math.min(m.x(t.offset),m.x(t.offset+t.size)))})}return e});if(k==="column"){g.attr("height",function(t,e){if(t._removing){return 0}else{return Math.round(Math.abs(m.y(0)-m.y(t.size)))}})}else{g.attr("width",function(t,e){if(t._removing){return 0}else{return Math.round(Math.abs(m.x(0)-m.x(t.size)))}})}return g.attr("fill",function(t,e){return w.get(t.name,v.colorVariant?i/z.length-.5:0)}).attr("fill-opacity",function(t,e){var i,n;if(!(p.name&&(i=p.name.filter))){return 1}if(!(n=i.value)){return 1}if(in$(r.name,n)){return 1}else{return.2}})});if(this.cfg.brush.enabled){this.g.brush.style("display","block");this.g.brush.call(this.brush)}else{this.g.brush.style("display","none")}this.g.brush.selectAll("rect.selection").attr("shape-rendering","auto");this.legend.render();this.yaxis.render();return this.xaxis.render()},tick:function(){}}};function import$(t,e){var i={}.hasOwnProperty;for(var n in e)if(i.call(e,n))t[n]=e[n];return t}function in$(t,e){var i=-1,n=e.length>>>0;while(++i<n)if(t===e[i])return true;return false}</script><div plug="layout"><div class="pdl-layout"><div data-type="layout"><div class="pdl-cell" data-name="yaxis">&nbsp;</div><div class="pdl-cell" data-name="view"></div><div class="pdl-cell"></div><div class="pdl-cell" data-name="xaxis">&nbsp;</div><div class="pdl-cell" data-name="legend">&nbsp;</div></div><div data-type="render"></div></div></div></div>
1
+ <div><style type="text/css">[data-name=xaxis]{font-size:.8em}[data-name=yaxis]{font-size:.8em}.pdl-layout>div[data-type=layout]{display:grid;grid-template-columns:fit-content(2em) 1fr fit-content(10em);grid-template-rows:1fr fit-content(1em);padding:0 .5em}.pdl-layout>div[data-type=layout]>.pdl-cell[data-name=legend]{grid-column:3;grid-row:1/span 2;padding-left:1em}.pdl-layout.legend-bottom>div[data-type=layout]{grid-template-columns:2em 1fr;grid-template-rows:1fr fit-content(2em) fit-content(3em)}.pdl-layout.legend-bottom>div[data-type=layout] .pdl-cell[data-name=legend]{padding-top:1em;grid-column:1/span 2;grid-row:3}</style><script type="@plotdb/block">var mod;module.exports={pkg:{name:"bar",version:"0.0.1",extend:{name:"@makechart/base"},dependencies:[],i18n:{"zh-TW":{size:"長度"}}},init:function(t){var e,i,n,r;e=t.root,i=t.context,n=t.t,r=t.pubsub;return r.fire("init",{mod:mod({context:i,t:n})})}};mod=function(t){var e,i,n,_,r,s;e=t.context,i=t.t;n=e.chart,_=e.d3,r=e.debounce;return{sample:function(){var r;r=["apple","banana","peach","orange"];return{raw:[0,1,2,3,4,5,6,7,8,9,10].map(function(t){var e,i,n;e={name:"Y"+(1995+t)};for(i=0;i<=3;++i){n=i;e[r[n]]=(10*Math.random()).toFixed(1)}return e}),binding:{size:[0,1,2,3].map(function(t){return{key:r[t],unit:"KG"}}),name:{key:"name"}}}},config:(s=import$({legend:import$({},n.utils.config.preset.legend),xaxis:JSON.parse(JSON.stringify(n.utils.config.preset.axis)),yaxis:JSON.parse(JSON.stringify(n.utils.config.preset.axis))},n.utils.config.preset["default"]),s.sort={enabled:{type:"boolean",default:false},dir:{type:"choice",values:["asc","desc"],default:"asc"},dimension:{type:"choice",values:["name","size"],default:"size"}},s.type={type:"choice",values:["bar","column"],default:"column"},s.brush={enabled:{type:"boolean",default:true}},s.multiple={type:"choice",values:["stack","group"],default:"stack"},s.percent={type:"boolean",default:false},s.dancing={type:"boolean",default:true},s.gap={type:"number",default:2,min:0,max:100,step:1},s),dimension:{size:{type:"R",multiple:true,name:"size"},name:{type:"NCO",name:"name"}},init:function(){var e,i,t,d=this;this.tint=e=new n.utils.tint;this.svg.addEventListener("click",function(t){var e,i;e=t.target;while(e!==d.svg){if(!e){return}if(!(e.classList&&e.classList.contains("pdl-cell"))){e=e.parentNode;continue}if(e.getAttribute("data-name")==="view"){break}else{return}}if(!d.cfg.dancing||d.cfg.percent){return}i=d.alignIdx||0;for(;;){d.alignIdx=((d.alignIdx||0)+1)%(d.binding.size.length+1);if(d.legend.isVisible(d.alignIdx)||d.alignIdx===i){break}}d.resize();return d.render()});this.g=Object.fromEntries(["view","xaxis","yaxis","legend"].map(function(t){return[t,_.select(d.layout.getGroup(t))]}));this.g.subview=this.g.view.append("g");this.g.brush=this.g.view.append("g");this.brushs={x:_.brushX(),y:_.brushY()};this.brushType=function(){if(d.cfg.type==="bar"){return"y"}else{return"x"}};this.range="null";i=r(150,function(t){var n,e,r,s,i,a;if(!d.cfg.brush.enabled){return}n=t.selection;if((e=JSON.stringify(n))===d.range){return}else{d.range=e}if(!n){return d.filter({name:undefined},true)}else{r=d.scale[d.brushType()].domain();s=d.scale[d.brushType()].bandwidth();if(d.brushType()==="x"){n=n.map(function(t){var e,i,n;return(e=(n=Math.floor(t/s))>0?n:0)<(i=r.length-1)?e:i});i=function(){var t,e,i=[];for(t=n[0],e=n[1];t<=e;++t){i.push(t)}return i}().map(function(t){return r[t]})}else{a=d.layout.getBox("view");n=n.map(function(t){var e,i,n;return(e=(n=Math.floor((a.height-t)/s))>0?n:0)<(i=r.length-1)?e:i});i=function(){var t,e,i=[];for(t=n[1],e=n[0];t<=e;++t){i.push(t)}return i}().map(function(t){return r[t]})}return d.filter({name:{type:"index",value:i}},true)}});this.brushs.x.on("end",function(t){if(d.brushType()==="x"){return i(t)}});this.brushs.x.on("brush",function(t){if(d.brushType()==="x"){return i(t)}});this.brushs.y.on("end",function(t){if(d.brushType()==="y"){return i(t)}});this.brushs.y.on("brush",function(t){if(d.brushType()==="y"){return i(t)}});this.scale=t={};this.yaxis=new n.utils.axis({layout:this.layout,name:"yaxis",direction:"left"});this.xaxis=new n.utils.axis({layout:this.layout,name:"xaxis",direction:"bottom"});this.legend=new n.utils.legend({layout:this.layout,name:"legend",root:this.root,shape:function(t){return _.select(this).attr("fill",e.get(t.text||t.key))}});this.legend.on("select",function(){d.bind();d.resize();return d.render()});return this.tip=new n.utils.tip({root:this.root,accessor:function(t){var e,i,n,r,s,a,u,l,h,o,c,f;e=t.evt;if(!(e.target&&(i=_.select(e.target).datum()))){return null}if(((n=i.type)==="overlay"||n==="selection"||n==="s")&&e.clientX!=null){i=null;for(r=0,s=(n=document.elementsFromPoint(e.clientX,e.clientY)).length;r<s;++r){a=n[r];u=_.select(a).datum();if(!u||((l=u.type)==="overlay"||l==="selection"||l==="s")){continue}if(!(u.raw!=null)){continue}i=u;break}}if(!i){return null}if((n=i.type)==="overlay"||n==="selection"||n==="s"){return}h=!d.cfg.percent?"":isNaN(i.percent)?"(-%)":"("+(i.percent*100).toFixed(1)+"%)";o=isNaN(i.raw)?"-":(c=((n=d.cfg)!=null?(l=n[d.type==="column"?"yaxis":"xaxis"])!=null?(f=l.label)!=null?f.format:void 8:void 8:void 8)||".2s",_.format(c)(i.raw)+""+(i.unit||""));return{name:i.name||"",group:i.group||"",value:o,valueAlt:h}},range:function(){return d.layout.getNode("view").getBoundingClientRect()}})},destroy:function(){if(this.tip){return this.tip.destroy()}},filter:function(t,e){var i,n,r,s,a,u,l,h,o,c,f,d,g,m=this;e==null&&(e=false);this.render();if(e){return}if(!this.brush||!(i=this.g.brush.node())||!i.__brush){return}n=(t||{}).name;if(Array.isArray(n)){return this.brush.move(this.g.brush,n.map(function(t){return m.scale[m.brushType()](t)}))}r=this.scale[this.brushType()];if(!r||!r.domain){return}s=(n||{}).value||[];a=r.domain();u=s.map(function(t){return a.indexOf(t)}).filter(function(t){return t>=0});if(!u.length){return this.brush.move(this.g.brush,null)}l=[Math.min.apply(Math,u),Math.max.apply(Math,u)],h=l[0],o=l[1];c=r.bandwidth();if(f=_.brushSelection(i)){d=this.brushType()==="x"?f.map(function(t){var e,i,n;return(e=(n=Math.floor(t/c))>0?n:0)<(i=a.length-1)?e:i}):(g=this.layout.getBox("view"),f.map(function(t){var e,i,n;return(e=(n=Math.floor((g.height-t)/c))>0?n:0)<(i=a.length-1)?e:i}));if(Math.min.apply(Math,d)===h&&Math.max.apply(Math,d)===o){return}}if(this.brushType()==="x"){return this.brush.move(this.g.brush,[h*c,(o+1)*c-1])}else{g=this.layout.getBox("view");return this.brush.move(this.g.brush,[g.height-(o+1)*c+1,g.height-h*c])}},parse:function(){this.data.map(function(t){return t.size=t.size.map(function(t){if(isNaN(t)){return 0}else{return t}})});return this.alignIdx=undefined},resize:function(){var i,r,t,e,n,s,a,u,l,h,o,c,f,d,g,m,p=this;this.root.querySelector(".pdl-layout").classList.toggle("legend-bottom",this.cfg.legend.position==="bottom");this.type=this.cfg.type||"column";this.brush=this.brushs[this.brushType()];this.legend.config(this.cfg.legend);this.legend.data(function(){var t,e=[];for(t=this.binding.size.length-1;t>=0;--t){i=t;e.push({key:i,text:this.binding.size[i].name||this.binding.size[i].key})}return e}.call(this));this.layout.update(false);this.maxPerGroup=this.binding.size.filter(function(t,e){return p.legend.isVisible(e)}).map(function(t,e){return Math.max.apply(Math,p.data.map(function(t){return t.size[e]}))});if(this.cfg.alignIdx&&!this.alignIdx){this.alignIdx=this.cfg.alignIdx}r=(t=this.cfg.percent?0:this.alignIdx||0)<(e=this.binding.size.length)?t:e;this.baseOffset=this.data.map(function(i){return function(){var t,e,i=[];for(t=0,e=r;t<e;++t){i.push(t)}return i}().reduce(function(t,e){return t+(!p.legend.isVisible(e)?0:i.size[e])},0)||[0]});this.delta=n=Math.max.apply(Math,this.baseOffset);if(this.cfg.multiple==="stack"){if(this.cfg.percent){s=1}else{s=Math.max.apply(Math,this.data.map(function(n){return function(){var t,e,i=[];for(t=r,e=n.size.length;t<e;++t){i.push(t)}return i}().reduce(function(t,e){return t+(!p.legend.isVisible(e)?0:n.size[e])},0)}))+(n||0)}}else if(this.cfg.multiple==="group"){s=Math.max.apply(Math,this.data.map(function(t){return Math.max.apply(Math,t.size.filter(function(t,e){return p.legend.isVisible(e)}))}))}else if(this.cfg.multiple==="split"){s=this.maxPerGroup.reduce(function(t,e){return t+e},0)}this.order=this.data.map(function(t,e){return{key:t._idx,idx:e,name:t.name}});this.data.map(function(t,e){return t.sum=t.size.filter(function(t,e){return p.legend.isVisible(e)}).reduce(function(t,e){return t+e},0)});if(((t=this.cfg).sort||(t.sort={})).enabled){this.order.sort(function(t,e){var i,n,r,s,a;i=p.cfg.sort.dimension==="size"?p.data[t.idx].sum-p.data[e.idx].sum:(n=p.data[t.idx].name,r=p.data[e.idx].name,n=isNaN(+n)?n:+n,r=isNaN(+r)?r:+r,n>r?1:n<r?-1:0);return(!(s=p.cfg.sort.dir==="asc")!==!(a=p.cfg.type==="bar")&&(s||a)?1:-1)*i})}if(this.cfg.palette){this.tint.set(this.cfg.palette)}this.layout.update(false);a=this.layout.getBox("view");if(this.type==="column"){t=this.scale;t.y=_.scaleLinear().domain([0,s]).range([a.height,0]);t.x=_.scaleBand().domain(this.order.map(function(t){return t.name||t.key})).range([0,a.width]);u=(t=Math.ceil(this.layout.getBox("yaxis").height/40))>2?t:2;l=this.cfg.bump?function(){var t,e,i,n=[];for(t=1,e=(i=this.parsed.length||1)>1?i:1;t<=e;++t){n.push(t)}return n}.call(this):this.scale.y.ticks((t=((e=this.cfg).yaxis||(e.yaxis={})).tick.count||4)<u?t:u);this.yaxis.config(this.cfg.yaxis);h=this.binding.size[0]||{};if(this.binding.size.length>1){this.yaxis.caption(h.unit?h.unit+"":"")}else{this.yaxis.caption((h.name||h.key||"")+(h.unit?"("+h.unit+")":""))}this.yaxis.ticks(l);this.yaxis.scale(this.scale.y);this.xaxis.config(this.cfg.xaxis);this.xaxis.ticks(this.data.map(function(t){return t.name}));this.xaxis.scale(this.scale.x);this.xaxis.caption((o=this.binding.name)?(o.name||o.key||"")+(o.unit?"("+this.binding.name.unit+")":""):"")}else{t=this.scale;t.x=_.scaleLinear().domain([0,s]).range([a.width,0]);t.y=_.scaleBand().domain(this.order.map(function(t){return t.name||t.key})).range([0,a.height]);u=(t=Math.ceil(this.layout.getBox("xaxis").width/80))>2?t:2;c=this.cfg.bump?function(){var t,e,i,n=[];for(t=1,e=(i=this.parsed.length||1)>1?i:1;t<=e;++t){n.push(t)}return n}.call(this):this.scale.x.ticks((t=((e=this.cfg).xaxis||(e.xaxis={})).tick.count||4)<u?t:u);this.xaxis.config(this.cfg.xaxis);h=this.binding.size[0]||{};if(this.binding.size.length>1){this.xaxis.caption(h.unit?h.unit+"":"")}else{this.xaxis.caption((h.name||h.key||"")+(h.unit?"("+h.unit+")":""))}this.xaxis.ticks(c);this.xaxis.scale(this.scale.x);this.yaxis.config(this.cfg.yaxis);this.yaxis.ticks(this.data.map(function(t){return t.name}));this.yaxis.scale(this.scale.y);this.yaxis.caption((o=this.binding.name)?(o.name||o.key||"")+(o.unit?"("+this.binding.name.unit+")":""):"")}for(f=0;f<2;++f){i=f;this.layout.update(false);a=this.layout.getBox("view");t=[a.width,a.height],d=t[0],g=t[1];this.tint.set(this.cfg.palette);m=this.cfg.dotSize||3;this.scale.x.range([0,d-m]);this.scale.y.range([g,m]);this.xaxis.render();this.yaxis.render()}a=this.layout.getBox("view");if(this.brushType()==="x"){return this.brush.extent([[0,1],[a.width,a.height-2]])}else{return this.brush.extent([[1,0],[a.width-2,a.height]])}},render:function(){var v,w,t,M,z,k,N,T,A,O,B,I,S,V,e,i,n=this;v=this.binding,w=this.scale,t=this.range,M=this.delta,z=this.baseOffset,k=this.maxPerGroup,N=this.cfg,T=this.tint,A=this.data,O=this.type,B=this.legend;I=this;S=this.subset.mode()==="partial";V=this.cfg.gap;V<=(e=(this.type==="column"?w.x.bandwidth():w.y.bandwidth())-1)||(V=e);i=this.g.subview.selectAll("g.bar").data(this.data);i.exit().remove();i.enter().append("g").attr("class","bar").attr("transform",function(t,e){if(n.type==="column"){return"translate("+w.x(t.name)+",0)"}else{return"translate(0,"+w.y(t.name)+")"}});this.g.subview.selectAll("g.bar").transition().duration(350).attr("transform",function(t,e){if(n.type==="column"){return"translate("+w.x(t.name)+",0)"}else{return"translate(0,"+w.y(t.name)+")"}});this.g.subview.selectAll("g.bar").each(function(s,e){var t,i,n,r,a,u,l,h,o,c,f,d,g,m,p,y,x,b;t=[[],0],i=t[0],n=t[1];n=M-z[e];r=1;if(N.percent===true){r=(t=s.size.filter(function(t,e){return B.isVisible(e)}).reduce(function(t,e){return t+e},0))>1?t:1}for(a=0,u=s.size.length;a<u;++a){l=a;h=s.size[l];o=l;if(!B.isVisible(o)){continue}i.push(c={raw:h,percent:h/r,size:h/r,offset:n/r,key:o,group:s.name,name:v.size[o].name||v.size[o].key,unit:v.size[o].unit||"",order:i.length,subset:s.subset?((s.subset.size||[])[l]||0)/r:null,dimmed:!B.isSelected(o)});c._raw=import$({},c);if(N.multiple==="split"){n+=k[l]}else if(N.multiple==="stack"){n+=h}}f=_.select(this).selectAll("rect.data").data(i,function(t,e){return t.key});f.exit().each(function(t,e){return t._removing=true});f.exit().transition().delay(150).remove();d=f.enter().append("rect");d.attr("class",function(){return"data"});if(O==="column"){d.attr("width",function(t,e){var i;return(i=w.x.bandwidth()-2)>1?i:1})}if(O==="column"){d.attr("y",function(t,e){return w.y(0)})}if(O!=="column"){d.attr("height",function(t,e){var i;return(i=w.y.bandwidth()-2)>1?i:1})}if(O!=="column"){d.attr("x",function(t,e){return w.x(0)})}g=_.select(this).selectAll("rect.data").transition().duration(350).call(function(t){var e;if(N.multiple!=="group"){return}e=t;if(O==="column"){e.attr("x",function(t,e){return V/2+t.order*(w.x.bandwidth()-V)/i.length})}if(O==="column"){e.attr("width",function(t,e){return(w.x.bandwidth()-V)/i.length})}if(O==="column"){e.attr("y",function(t,e){return Math.round(Math.min(w.y(0),w.y(t.size)))})}if(O!=="column"){e.attr("y",function(t,e){return V/2+t.order*(w.y.bandwidth()-V)/i.length})}if(O!=="column"){e.attr("height",function(t,e){return(w.y.bandwidth()-V)/i.length})}if(O!=="column"){e.attr("x",function(t,e){return Math.round(Math.min(w.x(0),w.x(t.size)))})}return e}).call(function(t){var e;if(N.multiple!=="stack"){return}e=t;if(O==="column"){e.attr("x",V/2)}if(O==="column"){e.attr("width",function(t,e){return w.x.bandwidth()-V})}if(O==="column"){e.attr("y",function(t,e){if(t._removing){return w.y(t.offset+t.size/2)}return Math.round(Math.min(w.y(t.offset),w.y(t.offset+t.size)))})}if(O!=="column"){e.attr("y",V/2)}if(O!=="column"){e.attr("height",function(t,e){return w.y.bandwidth()-V})}if(O!=="column"){e.attr("x",function(t,e){if(t._removing){return w.x(t.offset+t.size/2)}return Math.round(Math.min(w.x(t.offset),w.x(t.offset+t.size)))})}return e});if(O==="column"){g.attr("height",function(t,e){if(t._removing){return 0}else{return Math.round(Math.abs(w.y(0)-w.y(t.size)))}})}else{g.attr("width",function(t,e){if(t._removing){return 0}else{return Math.round(Math.abs(w.x(0)-w.x(t.size)))}})}m=function(t){return T.get(t.name,N.colorVariant?e/A.length-.5:0)};g.attr("fill",function(t,e){if(!t.dimmed&&S&&t.subset!=null){return I.subset.color(m(t))}else{return m(t)}}).attr("fill-opacity",function(t,e){var i,n,r;if(t.dimmed){return B.opacity()}if(S){return 1}if(!(v.name&&(i=v.name.filter))){return 1}if(!(n=i.value)){return 1}if(in$(s.name,n)){return 1}else{return(r=((N.common||{}).subset||{}).opacity)!=null?r:.2}});p=!S?[]:i.filter(function(t){return t.subset!=null&&!t.dimmed});y=_.select(this).selectAll("rect.subset").data(p,function(t,e){return t.key});y.exit().remove();x=y.enter().append("rect");x.attr("class","subset");x.attr("pointer-events","none");if(O==="column"){x.attr("width",function(t,e){var i;return(i=w.x.bandwidth()-2)>1?i:1})}if(O==="column"){x.attr("y",function(t,e){return w.y(0)})}if(O!=="column"){x.attr("height",function(t,e){var i;return(i=w.y.bandwidth()-2)>1?i:1})}if(O!=="column"){x.attr("x",function(t,e){return w.x(0)})}b=_.select(this).selectAll("rect.subset").transition().duration(350).call(function(t){var e;if(N.multiple!=="group"){return}e=t;if(O==="column"){e.attr("x",function(t,e){return V/2+t.order*(w.x.bandwidth()-V)/i.length})}if(O==="column"){e.attr("width",function(t,e){return(w.x.bandwidth()-V)/i.length})}if(O==="column"){e.attr("y",function(t,e){return Math.round(Math.min(w.y(0),w.y(t.subset)))})}if(O!=="column"){e.attr("y",function(t,e){return V/2+t.order*(w.y.bandwidth()-V)/i.length})}if(O!=="column"){e.attr("height",function(t,e){return(w.y.bandwidth()-V)/i.length})}if(O!=="column"){e.attr("x",function(t,e){return Math.round(Math.min(w.x(0),w.x(t.subset)))})}return e}).call(function(t){var e;if(N.multiple!=="stack"){return}e=t;if(O==="column"){e.attr("x",V/2)}if(O==="column"){e.attr("width",function(t,e){return w.x.bandwidth()-V})}if(O==="column"){e.attr("y",function(t,e){return Math.round(Math.min(w.y(t.offset),w.y(t.offset+t.subset)))})}if(O!=="column"){e.attr("y",V/2)}if(O!=="column"){e.attr("height",function(t,e){return w.y.bandwidth()-V})}if(O!=="column"){e.attr("x",function(t,e){return Math.round(Math.min(w.x(t.offset),w.x(t.offset+t.subset)))})}return e});if(O==="column"){b.attr("height",function(t,e){return Math.round(Math.abs(w.y(0)-w.y(t.subset)))})}else{b.attr("width",function(t,e){return Math.round(Math.abs(w.x(0)-w.x(t.subset)))})}return b.attr("fill",function(t,e){return m(t)})});if(this.cfg.brush.enabled){this.g.brush.style("display","block");this.g.brush.call(this.brush)}else{this.g.brush.style("display","none")}this.g.brush.selectAll("rect.selection").attr("shape-rendering","auto");this.legend.render();this.yaxis.render();return this.xaxis.render()},tick:function(){}}};function import$(t,e){var i={}.hasOwnProperty;for(var n in e)if(i.call(e,n))t[n]=e[n];return t}function in$(t,e){var i=-1,n=e.length>>>0;while(++i<n)if(t===e[i])return true;return false}</script><div plug="layout"><div class="pdl-layout"><div data-type="layout"><div class="pdl-cell" data-name="yaxis">&nbsp;</div><div class="pdl-cell" data-name="view"></div><div class="pdl-cell"></div><div class="pdl-cell" data-name="xaxis">&nbsp;</div><div class="pdl-cell" data-name="legend">&nbsp;</div></div><div data-type="render"></div></div></div></div>
package/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@makechart/bar","version":"0.0.7","description":"","scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"zbryikt","license":"MIT","dependencies":{"@plotdb/srcbuild":"^0.0.69","fedep":"1.6.0","livescript":"^1.6.0"}}
1
+ {"name":"@makechart/bar","version":"0.0.8","description":"","scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"keywords":[],"author":"zbryikt","license":"MIT","dependencies":{"@plotdb/srcbuild":"^0.0.69","fedep":"1.6.0","livescript":"^1.6.0"}}