diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js index 59285010b53..9a9befd848a 100644 --- a/src/controllers/controller.doughnut.js +++ b/src/controllers/controller.doughnut.js @@ -76,7 +76,7 @@ export default class DoughnutController extends DatasetController { static descriptors = { _scriptable: (name) => name !== 'spacing', - _indexable: (name) => name !== 'spacing' && !name.startsWith('borderDash') && !name.startsWith('hoverBorderDash'), + _indexable: (name) => name !== 'spacing' && !name.startsWith('borderDash'), }; /** diff --git a/src/elements/element.arc.ts b/src/elements/element.arc.ts index dff28b62a47..72609036011 100644 --- a/src/elements/element.arc.ts +++ b/src/elements/element.arc.ts @@ -284,7 +284,7 @@ export default class ArcElement extends Element { static descriptors = { _scriptable: true, - _indexable: (name) => name !== 'borderDash' + _indexable: (name) => !name.startsWith('borderDash') }; circumference: number; diff --git a/test/fixtures/controller.doughnut/borderDash/hover.js b/test/fixtures/controller.doughnut/borderDash/hover.js new file mode 100644 index 00000000000..1f846e9dd45 --- /dev/null +++ b/test/fixtures/controller.doughnut/borderDash/hover.js @@ -0,0 +1,43 @@ +module.exports = { + config: { + type: 'polarArea', + data: { + labels: [0, 1, 2, 3, 4, 5], + datasets: [ + { + // option in dataset + data: [5, 2, 4, 7, 6, 8], + borderAlign: 'inner', + borderColor: 'black' + }, + ] + }, + options: { + events: [], + elements: { + arc: { + backgroundColor: 'transparent', + borderWidth: 1, + hoverBorderDash: [3, 3] + } + }, + scales: { + r: { + display: false + } + } + } + }, + options: { + canvas: { + height: 256, + width: 512 + }, + run(chart) { + chart.setActiveElements([ + {datasetIndex: 0, index: 0}, {datasetIndex: 0, index: 3} + ]); + chart.update(); + } + } +}; diff --git a/test/fixtures/controller.doughnut/borderDash/hover.png b/test/fixtures/controller.doughnut/borderDash/hover.png new file mode 100644 index 00000000000..d7476c921e2 Binary files /dev/null and b/test/fixtures/controller.doughnut/borderDash/hover.png differ diff --git a/test/fixtures/controller.polarArea/borderDash/hover.js b/test/fixtures/controller.polarArea/borderDash/hover.js new file mode 100644 index 00000000000..1f846e9dd45 --- /dev/null +++ b/test/fixtures/controller.polarArea/borderDash/hover.js @@ -0,0 +1,43 @@ +module.exports = { + config: { + type: 'polarArea', + data: { + labels: [0, 1, 2, 3, 4, 5], + datasets: [ + { + // option in dataset + data: [5, 2, 4, 7, 6, 8], + borderAlign: 'inner', + borderColor: 'black' + }, + ] + }, + options: { + events: [], + elements: { + arc: { + backgroundColor: 'transparent', + borderWidth: 1, + hoverBorderDash: [3, 3] + } + }, + scales: { + r: { + display: false + } + } + } + }, + options: { + canvas: { + height: 256, + width: 512 + }, + run(chart) { + chart.setActiveElements([ + {datasetIndex: 0, index: 0}, {datasetIndex: 0, index: 3} + ]); + chart.update(); + } + } +}; diff --git a/test/fixtures/controller.polarArea/borderDash/hover.png b/test/fixtures/controller.polarArea/borderDash/hover.png new file mode 100644 index 00000000000..d7476c921e2 Binary files /dev/null and b/test/fixtures/controller.polarArea/borderDash/hover.png differ