@@ -20,10 +20,6 @@ var splitData = require('./data_split_helpers');
20
20
21
21
module . exports = function plot ( gd , wrappedTraceHolders ) {
22
22
23
- if ( c . clipView ) {
24
- gd . _fullLayout . _paper . attr ( 'height' , 2000 ) ;
25
- }
26
-
27
23
var table = gd . _fullLayout . _paper . selectAll ( '.table' )
28
24
. data ( wrappedTraceHolders . map ( function ( wrappedTraceHolder ) {
29
25
var traceHolder = gup . unwrap ( wrappedTraceHolder ) ;
@@ -42,7 +38,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
42
38
. style ( 'left' , 0 )
43
39
. style ( 'overflow' , 'visible' )
44
40
. style ( 'shape-rendering' , 'crispEdges' )
45
- . style ( 'pointer-events' , 'all' ) ; // todo restore 'none'
41
+ . style ( 'pointer-events' , 'all' ) ;
46
42
47
43
table
48
44
. attr ( 'width' , function ( d ) { return d . width + d . size . l + d . size . r ; } )
@@ -86,9 +82,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
86
82
. attr ( 'width' , function ( d ) { return d . width ; } )
87
83
. attr ( 'height' , function ( d ) { return d . height ; } ) ;
88
84
89
- if ( ! c . clipView ) {
90
- tableControlView . attr ( 'clip-path' , function ( d ) { return 'url(#scrollAreaBottomClip_' + d . key + ')' ; } ) ;
91
- }
85
+ tableControlView . attr ( 'clip-path' , function ( d ) { return 'url(#scrollAreaBottomClip_' + d . key + ')' ; } ) ;
92
86
93
87
var yColumn = tableControlView . selectAll ( '.yColumn' )
94
88
. data ( function ( vm ) { return vm . columns ; } , gup . keyFun ) ;
@@ -139,9 +133,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
139
133
} )
140
134
) ;
141
135
142
- if ( ! c . clipView ) {
143
- yColumn . attr ( 'clip-path' , function ( d ) { return 'url(#columnBoundaryClippath_' + d . calcdata . key + '_' + d . specIndex + ')' ; } ) ;
144
- }
136
+ yColumn . attr ( 'clip-path' , function ( d ) { return 'url(#columnBoundaryClippath_' + d . calcdata . key + '_' + d . specIndex + ')' ; } ) ;
145
137
146
138
var columnBlock = yColumn . selectAll ( '.columnBlock' )
147
139
. data ( splitData . splitToPanels , gup . keyFun ) ;
@@ -180,7 +172,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
180
172
. data ( gup . repeat , gup . keyFun ) ;
181
173
182
174
scrollAreaClip . enter ( )
183
- . append ( c . clipView ? 'g' : 'clipPath' )
175
+ . append ( 'clipPath' )
184
176
. classed ( 'scrollAreaClip' , true )
185
177
. attr ( 'id' , function ( d ) { return 'scrollAreaBottomClip_' + d . key ; } ) ;
186
178
@@ -192,10 +184,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
192
184
. classed ( 'scrollAreaClipRect' , true )
193
185
. attr ( 'x' , - c . overdrag )
194
186
. attr ( 'y' , - c . uplift )
195
- . attr ( 'stroke' , 'orange' )
196
- . attr ( 'stroke-width' , 2 )
197
- . attr ( 'fill' , 'none' )
198
- . style ( 'pointer-events' , 'stroke' ) ;
187
+ . attr ( 'fill' , 'none' ) ;
199
188
200
189
scrollAreaClipRect
201
190
. attr ( 'width' , function ( d ) { return d . width + 2 * c . overdrag ; } )
@@ -213,7 +202,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
213
202
214
203
// SVG spec doesn't mandate wrapping into a <defs> and doesn't seem to cause a speed difference
215
204
columnBoundaryClippath . enter ( )
216
- . append ( c . clipView ? 'g' : 'clipPath' )
205
+ . append ( 'clipPath' )
217
206
. classed ( 'columnBoundaryClippath' , true ) ;
218
207
219
208
columnBoundaryClippath
@@ -227,8 +216,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
227
216
. classed ( 'columnBoundaryRect' , true )
228
217
. attr ( 'fill' , 'none' )
229
218
. attr ( 'stroke' , 'magenta' )
230
- . attr ( 'stroke-width' , 2 )
231
- . style ( 'pointer-events' , 'stroke' ) ;
219
+ . attr ( 'stroke-width' , 2 ) ;
232
220
233
221
columnBoundaryRect
234
222
. attr ( 'width' , function ( d ) { return d . columnWidth ; } )
@@ -328,10 +316,9 @@ function renderScrollbarKit(tableControlView, gd) {
328
316
scrollbarCaptureZone . enter ( )
329
317
. append ( 'line' )
330
318
. classed ( 'scrollbarCaptureZone' , true )
331
- . attr ( 'stroke' , 'red ' )
319
+ . attr ( 'stroke' , 'rgba(0,0,0,0.01) ' )
332
320
. attr ( 'stroke-width' , c . scrollbarCaptureWidth )
333
321
. attr ( 'stroke-linecap' , 'butt' )
334
- . attr ( 'stroke-opacity' , c . clipView ? 0.5 : 0 )
335
322
. attr ( 'y1' , 0 )
336
323
. on ( 'mousedown' , function ( d ) {
337
324
var y = d3 . event . y ;
@@ -477,9 +464,7 @@ function sizeAndStyleRect(cellRect) {
477
464
. attr ( 'width' , function ( d ) { return d . column . columnWidth ; } )
478
465
. attr ( 'stroke-width' , function ( d ) { return d . cellBorderWidth ; } )
479
466
. attr ( 'stroke' , function ( d ) {
480
- return c . clipView ?
481
- ( { header : 'blue' , cells1 : 'red' , cells2 : 'green' } ) [ d . column . key ] :
482
- gridPick ( d . calcdata . cells . line . color , d . column . specIndex , d . rowNumber ) ;
467
+ return gridPick ( d . calcdata . cells . line . color , d . column . specIndex , d . rowNumber ) ;
483
468
} )
484
469
. attr ( 'fill' , function ( d ) {
485
470
return d . calcdata . cells . fill ? gridPick ( d . calcdata . cells . fill . color , d . column . specIndex , d . rowNumber ) : 'none' ;
0 commit comments