Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
295 changes: 295 additions & 0 deletions dist/plot-schema.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions draftlogs/7673_add.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Add support for dashed marker lines in scatter plots [[#7673](https://github.com/plotly/plotly.js/pull/7673)]
1 change: 1 addition & 0 deletions src/components/legend/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ module.exports = function style(s, gd, legend) {
dEdit.mo = boundVal('marker.opacity', Lib.mean, [0.2, 1]);
dEdit.mlc = boundVal('marker.line.color', pickFirst);
dEdit.mlw = boundVal('marker.line.width', Lib.mean, [0, 5], CST_MARKER_LINE_WIDTH);
dEdit.mld = boundVal('marker.line.dash', pickFirst);
tEdit.marker = {
sizeref: 1,
sizemin: 1,
Expand Down
1 change: 1 addition & 0 deletions src/traces/scatter/arrays_to_calcdata.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ module.exports = function arraysToCalcdata(cd, trace) {
if(marker.line) {
Lib.mergeArray(markerLine.color, cd, 'mlc');
Lib.mergeArrayCastPositive(markerLine.width, cd, 'mlw');
Lib.mergeArray(markerLine.dash, cd, 'mld');
}

var markerGradient = marker.gradient;
Expand Down
4 changes: 4 additions & 0 deletions src/traces/scatter/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,10 @@ module.exports = {
anim: true,
description: 'Sets the width (in px) of the lines bounding the marker points.'
},
dash: extendFlat({}, dash, {
arrayOk: true,
editType: 'style'
}),
editType: 'calc'
},
colorScaleAttrs('marker.line', { anim: true })
Expand Down
1 change: 1 addition & 0 deletions src/traces/scatter/marker_defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout
}

coerce('marker.line.width', isBubble ? 1 : 0);
coerce('marker.line.dash');
}

if(isBubble) {
Expand Down
3 changes: 2 additions & 1 deletion src/traces/scatter3d/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ var attrs = (module.exports = overrideAll(

line: extendFlat(
{
width: extendFlat({}, scatterMarkerLineAttrs.width, { arrayOk: false })
width: extendFlat({}, scatterMarkerLineAttrs.width, { arrayOk: false }),
dash: extendFlat({}, scatterMarkerLineAttrs.dash, { arrayOk: false })
},
colorAttributes('marker.line')
)
Expand Down
1 change: 1 addition & 0 deletions src/traces/scattercarpet/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ module.exports = {
line: extendFlat(
{
width: scatterMarkerLineAttrs.width,
dash: scatterMarkerLineAttrs.dash,
editType: 'calc'
},
colorScaleAttrs('marker.line')
Expand Down
3 changes: 2 additions & 1 deletion src/traces/scattergeo/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ module.exports = overrideAll(
colorbar: scatterMarkerAttrs.colorbar,
line: extendFlat(
{
width: scatterMarkerLineAttrs.width
width: scatterMarkerLineAttrs.width,
dash: scatterMarkerLineAttrs.dash
},
colorAttributes('marker.line')
),
Expand Down
3 changes: 2 additions & 1 deletion src/traces/scattergl/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ var attrs = (module.exports = overrideAll(
opacity: scatterMarkerAttrs.opacity,
colorbar: scatterMarkerAttrs.colorbar,
line: extendFlat({}, colorScaleAttrs('marker.line'), {
width: scatterMarkerLineAttrs.width
width: scatterMarkerLineAttrs.width,
dash: scatterMarkerLineAttrs.dash
})
}),
connectgaps: scatterAttrs.connectgaps,
Expand Down
1 change: 1 addition & 0 deletions src/traces/scatterternary/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ module.exports = {
line: extendFlat(
{
width: scatterMarkerLineAttrs.width,
dash: scatterMarkerLineAttrs.dash,
editType: 'calc'
},
colorScaleAttrs('marker.line')
Expand Down
1 change: 1 addition & 0 deletions src/traces/splom/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var scatterMarkerLineAttrs = scatterMarkerAttrs.line;

var markerLineAttrs = extendFlat(colorScaleAttrs('marker.line', { editTypeOverride: 'calc' }), {
width: extendFlat({}, scatterMarkerLineAttrs.width, { editType: 'calc' }),
dash: extendFlat({}, scatterMarkerLineAttrs.dash, { editType: 'calc' }),
editType: 'calc'
});

Expand Down
195 changes: 195 additions & 0 deletions test/plot-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -60613,6 +60613,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "style",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -63938,6 +63958,21 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": false,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "calc",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -65817,6 +65852,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "style",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -68123,6 +68178,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "calc",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -70511,6 +70586,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "calc",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -75980,6 +76075,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "style",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -78226,6 +78341,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "calc",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -80482,6 +80617,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "style",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -82800,6 +82955,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "style",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down Expand Up @@ -85016,6 +85191,26 @@
"editType": "none",
"valType": "string"
},
"dash": {
"arrayOk": true,
"description": "Sets the dash style of lines. Set to a dash type string (*solid*, *dot*, *dash*, *longdash*, *dashdot*, or *longdashdot*) or a dash length list in px (eg *5px,10px,2px,2px*).",
"dflt": "solid",
"editType": "calc",
"valType": "string",
"values": [
"solid",
"dot",
"dash",
"longdash",
"dashdot",
"longdashdot"
]
},
"dashsrc": {
"description": "Sets the source reference on Chart Studio Cloud for `dash`.",
"editType": "none",
"valType": "string"
},
"editType": "calc",
"reversescale": {
"description": "Reverses the color mapping if true. Has an effect only if in `marker.line.color` is set to a numerical array. If true, `marker.line.cmin` will correspond to the last color in the array and `marker.line.cmax` will correspond to the first color.",
Expand Down