From a43419c3280c2b4e772f1f2a54c203e2fa77418d Mon Sep 17 00:00:00 2001 From: stockiNail Date: Mon, 13 Feb 2023 10:44:50 +0100 Subject: [PATCH] Remove useless check for hover option in the indexable definition --- src/controllers/controller.doughnut.js | 2 +- src/elements/element.arc.ts | 2 +- .../controller.doughnut/borderDash/hover.js | 43 ++++++++++++++++++ .../controller.doughnut/borderDash/hover.png | Bin 0 -> 10976 bytes .../controller.polarArea/borderDash/hover.js | 43 ++++++++++++++++++ .../controller.polarArea/borderDash/hover.png | Bin 0 -> 10976 bytes 6 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 test/fixtures/controller.doughnut/borderDash/hover.js create mode 100644 test/fixtures/controller.doughnut/borderDash/hover.png create mode 100644 test/fixtures/controller.polarArea/borderDash/hover.js create mode 100644 test/fixtures/controller.polarArea/borderDash/hover.png 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 0000000000000000000000000000000000000000..d7476c921e275affdb396559a03333df032ed706 GIT binary patch literal 10976 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d7476c921e275affdb396559a03333df032ed706 GIT binary patch literal 10976 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 literal 0 HcmV?d00001