From 19bc46481f2c794397b91f55b5a4ec191a4b95b1 Mon Sep 17 00:00:00 2001 From: hwiem <40487668+hwiem@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:46:32 +0100 Subject: [PATCH] feat(refs DPLAN-3217): allow disabling secondary button (1068) * feat(refs DPLAN-3217, #AB15115): allow disabling secondary button if disabled is set to true, both buttons should be disabled * docs(refs DPLAN-3217, #AB15115): add changelog entry --- CHANGELOG.md | 4 ++++ src/components/DpButtonRow/DpButtonRow.vue | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc2822b54..bd9467056 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ Since v0.0.10, this Changelog is formatted according to the [Common Changelog][c ### Added - ([#1050](https://github.com/demos-europe/demosplan-ui/pull/1050)) DpCheckbox: add additional type to 'selected' prop ([@sakutademos](https://github.com/sakutademos) +### Changed + +-([#1068](https://github.com/demos-europe/demosplan-ui/pull/1068)) DpButtonRow: also disable secondary button if 'disabled' is set to true ([@hwiem](https://github.com/hwiem)) + ## v0.3.34 - 2024-10-09 ### Added diff --git a/src/components/DpButtonRow/DpButtonRow.vue b/src/components/DpButtonRow/DpButtonRow.vue index 443027fa6..cd2a2de1e 100644 --- a/src/components/DpButtonRow/DpButtonRow.vue +++ b/src/components/DpButtonRow/DpButtonRow.vue @@ -14,6 +14,7 @@ v-if="secondary" color="secondary" :data-cy="`${dataCy}:abortButton`" + :disabled="disabled" :href="href" :text="secondaryText" :variant="variant"