Skip to content

Commit 0fa1cc8

Browse files
committed
globally safe clipPath #2
1 parent fa84c68 commit 0fa1cc8

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/traces/table/plot.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
8383
.attr('height', function(d) {return d.height;});
8484

8585
tableControlView
86-
.each(function(d) {Drawing.setClipUrl(tableControlView, scrollAreaBottomClipKey(gd, d));});
86+
.each(function(d) {Drawing.setClipUrl(d3.select(this), scrollAreaBottomClipKey(gd, d));});
8787

8888
var yColumn = tableControlView.selectAll('.yColumn')
8989
.data(function(vm) {return vm.columns;}, gup.keyFun);
@@ -134,7 +134,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
134134
})
135135
);
136136

137-
yColumn.attr('clip-path', function(d) {return 'url(#columnBoundaryClippath_' + d.calcdata.key + '_' + d.specIndex + ')';});
137+
yColumn.each(function(d) {Drawing.setClipUrl(d3.select(this), columnBoundaryClipKey(gd, d));});
138138

139139
var columnBlock = yColumn.selectAll('.columnBlock')
140140
.data(splitData.splitToPanels, gup.keyFun);
@@ -207,7 +207,7 @@ module.exports = function plot(gd, wrappedTraceHolders) {
207207
.classed('columnBoundaryClippath', true);
208208

209209
columnBoundaryClippath
210-
.attr('id', function(d) {return 'columnBoundaryClippath_' + d.calcdata.key + '_' + d.specIndex;});
210+
.attr('id', function(d) {return columnBoundaryClipKey(gd, d);});
211211

212212
var columnBoundaryRect = columnBoundaryClippath.selectAll('.columnBoundaryRect')
213213
.data(gup.repeat, gup.keyFun);
@@ -230,6 +230,10 @@ function scrollAreaBottomClipKey(gd, d) {
230230
return 'clip' + gd._fullLayout._uid + '_scrollAreaBottomClip_' + d.key;
231231
}
232232

233+
function columnBoundaryClipKey(gd, d) {
234+
return 'clip' + gd._fullLayout._uid + '_columnBoundaryClippath_' + d.calcdata.key + '_' + d.specIndex;
235+
}
236+
233237
function flatData(selection) {
234238
return [].concat.apply([], selection.map(function(g) {return g;}))
235239
.map(function(g) {return g.__data__;});

0 commit comments

Comments
 (0)