@@ -21,6 +21,20 @@ var scatterLineAttrs = scatterAttrs.line;
21
21
var scatterMarkerAttrs = scatterAttrs . marker ;
22
22
var scatterMarkerLineAttrs = scatterMarkerAttrs . line ;
23
23
24
+ var lineAttrs = extendFlat ( {
25
+ width : scatterLineAttrs . width ,
26
+ dash : {
27
+ valType : 'enumerated' ,
28
+ values : Object . keys ( DASHES ) ,
29
+ dflt : 'solid' ,
30
+ role : 'style' ,
31
+ description : 'Sets the dash style of the lines.'
32
+ }
33
+ } , colorAttributes ( 'line' ) ) ;
34
+ // not yet implemented
35
+ delete lineAttrs . showscale ;
36
+ delete lineAttrs . colorbar ;
37
+
24
38
function makeProjectionAttr ( axLetter ) {
25
39
return {
26
40
show : {
@@ -107,19 +121,10 @@ var attrs = module.exports = overrideAll({
107
121
y : makeProjectionAttr ( 'y' ) ,
108
122
z : makeProjectionAttr ( 'z' )
109
123
} ,
124
+
110
125
connectgaps : scatterAttrs . connectgaps ,
111
- line : extendFlat ( {
112
- width : scatterLineAttrs . width ,
113
- dash : {
114
- valType : 'enumerated' ,
115
- values : Object . keys ( DASHES ) ,
116
- dflt : 'solid' ,
117
- role : 'style' ,
118
- description : 'Sets the dash style of the lines.'
119
- }
120
- } ,
121
- colorAttributes ( 'line' )
122
- ) ,
126
+ line : lineAttrs ,
127
+
123
128
marker : extendFlat ( { // Parity with scatter.js?
124
129
symbol : {
125
130
valType : 'enumerated' ,
@@ -155,8 +160,12 @@ var attrs = module.exports = overrideAll({
155
160
colorAttributes ( 'marker' )
156
161
) ,
157
162
158
- textposition : extendFlat ( { } , scatterAttrs . textposition , { dflt : 'top center' } ) ,
159
- textfont : scatterAttrs . textfont ,
163
+ textposition : extendFlat ( { } , scatterAttrs . textposition , { dflt : 'top center' , arrayOk : false } ) ,
164
+ textfont : {
165
+ color : scatterAttrs . textfont . color ,
166
+ size : scatterAttrs . textfont . size ,
167
+ family : extendFlat ( { } , scatterAttrs . textfont . family , { arrayOk : false } )
168
+ } ,
160
169
161
170
hoverinfo : extendFlat ( { } , baseAttrs . hoverinfo )
162
171
} , 'calc' , 'nested' ) ;
0 commit comments