diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue index ddb81b531..2c4152cfa 100644 --- a/src/common-components/funnel-footer/funnel-footer.vue +++ b/src/common-components/funnel-footer/funnel-footer.vue @@ -9,6 +9,7 @@ :buttonText="buttonText" loaderColor="white" :class="isForwardActionDisabled && 'form-test-invalid'" + :aria-disabled="isForwardActionDisabled" :isDisabled="isForwardActionDisabled" @click-event="buttonClick" data-bs-target="#footerModal" @@ -84,7 +85,6 @@ export default { }; }, buttonClick() { - if (this.isForwardActionDisabled) { return false } //prevent keyboard input after button click document.onkeydown = function (e) { return false; diff --git a/src/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js index 0389fe1bf..2f0b4c72e 100644 --- a/src/ux-components/button-main/button-main.spec.js +++ b/src/ux-components/button-main/button-main.spec.js @@ -19,6 +19,21 @@ describe("buttonMain.vue", () => { expect(button.attributes("class")).toContain("btn-primary"); }); + it("Should return aria-disabled state", async () => { + // Act + const wrapper = shallowMount(buttonMain, setupMocks({ + propsData: { + isDisabled: true, + }, + })); + + // Assert + const button = wrapper.find("button"); + + // Expect + expect(button.attributes()["aria-disabled"]).toEqual("true"); + }); + it("Should return loader color", async () => { // Act const wrapper = shallowMount(buttonMain, setupMocks({ diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue index 345dbbe0f..8396351f8 100644 --- a/src/ux-components/button-main/button-main.vue +++ b/src/ux-components/button-main/button-main.vue @@ -1,5 +1,6 @@