@@ -108,7 +108,7 @@ module.exports = function plot(gd, calcdata) {
108
108
var getter = function ( dd ) { return ( d === dd ? d3 . event . x : dd . x ) + dd . columnWidth / 2 ; } ;
109
109
d . x = Math . max ( - c . overdrag , Math . min ( d . calcdata . width + c . overdrag - d . columnWidth , d3 . event . x ) ) ;
110
110
111
- var sortableColumns = flatData ( yColumn ) . filter ( function ( dd ) { return dd . calcdata . key === d . calcdata . key } ) ;
111
+ var sortableColumns = flatData ( yColumn ) . filter ( function ( dd ) { return dd . calcdata . key === d . calcdata . key ; } ) ;
112
112
var newOrder = sortableColumns . sort ( function ( a , b ) { return getter ( a ) - getter ( b ) ; } ) ;
113
113
newOrder . forEach ( function ( dd , i ) {
114
114
dd . xIndex = i ;
@@ -135,7 +135,7 @@ module.exports = function plot(gd, calcdata) {
135
135
) ;
136
136
137
137
if ( ! c . clipView ) {
138
- yColumn . attr ( 'clip-path' , function ( d ) { return 'url(#columnBoundaryClippath_' + d . specIndex + ')' ; } ) ;
138
+ yColumn . attr ( 'clip-path' , function ( d ) { return 'url(#columnBoundaryClippath_' + d . calcdata . key + '_' + d . specIndex + ')' ; } ) ;
139
139
}
140
140
141
141
var columnBlock = yColumn . selectAll ( '.columnBlock' )
@@ -212,7 +212,7 @@ module.exports = function plot(gd, calcdata) {
212
212
. classed ( 'columnBoundaryClippath' , true ) ;
213
213
214
214
columnBoundaryClippath
215
- . attr ( 'id' , function ( d ) { return 'columnBoundaryClippath_' + d . specIndex ; } ) ;
215
+ . attr ( 'id' , function ( d ) { return 'columnBoundaryClippath_' + d . calcdata . key + '_' + d . specIndex ; } ) ;
216
216
217
217
var columnBoundaryRect = columnBoundaryClippath . selectAll ( '.columnBoundaryRect' )
218
218
. data ( gup . repeat , gup . keyFun ) ;
@@ -234,7 +234,7 @@ module.exports = function plot(gd, calcdata) {
234
234
235
235
function flatData ( selection ) {
236
236
return [ ] . concat . apply ( [ ] , selection . map ( function ( g ) { return g ; } ) )
237
- . map ( function ( g ) { return g . __data__ } ) ;
237
+ . map ( function ( g ) { return g . __data__ ; } ) ;
238
238
}
239
239
240
240
function renderScrollbarKit ( tableControlView , gd ) {
@@ -736,7 +736,6 @@ function updateBlockYPosition(gd, cellsColumnBlock, tableControlView) {
736
736
cellsColumnBlock
737
737
. attr ( 'transform' , function ( d ) {
738
738
var yTranslate = firstRowAnchor ( d . rowBlocks , d . page ) - d . scrollY ;
739
- //console.log(d.scrollY, Math.round(yTranslate))
740
739
return 'translate(0 ' + yTranslate + ')' ;
741
740
} ) ;
742
741
@@ -752,7 +751,7 @@ function makeDragRow(gd, allTableControlView, optionalMultiplier, optionalPositi
752
751
return function dragRow ( eventD ) {
753
752
// may come from whicever DOM event target: drag, wheel, bar... eventD corresponds to event target
754
753
var d = eventD . calcdata ? eventD . calcdata : eventD ;
755
- var tableControlView = allTableControlView . filter ( function ( dd ) { return d . key === dd . key ; } )
754
+ var tableControlView = allTableControlView . filter ( function ( dd ) { return d . key === dd . key ; } ) ;
756
755
var multiplier = optionalMultiplier || d . scrollbarState . dragMultiplier ;
757
756
d . scrollY = optionalPosition === void ( 0 ) ? d . scrollY + multiplier * d3 . event . dy : optionalPosition ;
758
757
var cellsColumnBlock = tableControlView . selectAll ( '.yColumn' ) . selectAll ( '.columnBlock' ) . filter ( cellsBlock ) ;
0 commit comments