From 34944d9e6a4a83e6c1b0e5ae09788f52d694efdb Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Thu, 7 Mar 2024 09:57:36 -0700 Subject: [PATCH 1/9] Schemas, readme, example --- README.md | 2 ++ example.json | 1 + properties.schema | 20 ++++++++++++++++++++ schema/article.schema.json | 9 +++++++++ schema/block.schema.json | 9 +++++++++ 5 files changed, 41 insertions(+) diff --git a/README.md b/README.md index 5313933..0f474b2 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,8 @@ The attributes listed below are properly formatted as JSON in [*example.json*](h >>**text** (string): Defines the default button text. The default is `"Continue"`. +>>**textLocked** (string): Defines the default button text when the button is locked. If not set, `text` will be used. + >>**ariaLabel** (string): Defines the default button aria label. The default is `""`. >>**startText** (string): Defines the first item button text when set on the article with **\_onChildren** set to `true`. The default is `"Begin"`. diff --git a/example.json b/example.json index 812755c..e305f13 100644 --- a/example.json +++ b/example.json @@ -25,6 +25,7 @@ "_className": "", "_hasIcon": false, "text": "Continue", + "textLocked": "", "ariaLabel": "", "startText": "Begin", "startAriaLabel": "", diff --git a/properties.schema b/properties.schema index b524a95..280529e 100644 --- a/properties.schema +++ b/properties.schema @@ -206,6 +206,16 @@ "validators": [], "translatable": true }, + "textLocked": { + "type": "string", + "required": false, + "default": "", + "title": "Button Text when locked", + "inputType": "Text", + "validators": [], + "translatable": true, + "help": "This text can be shown before the Trickle has been unlocked" + }, "ariaLabel": { "type": "string", "required": false, @@ -441,6 +451,16 @@ "validators": [], "translatable": true }, + "textLocked": { + "type": "string", + "required": false, + "default": "", + "title": "Button Text when locked", + "inputType": "Text", + "validators": [], + "translatable": true, + "help": "This text can be shown before the Trickle has been unlocked" + }, "ariaLabel": { "type": "string", "required": false, diff --git a/schema/article.schema.json b/schema/article.schema.json index 7c9c2d4..e02a015 100644 --- a/schema/article.schema.json +++ b/schema/article.schema.json @@ -126,6 +126,15 @@ "translatable": true } }, + "textLocked": { + "type": "string", + "title": "Button text when locked", + "default": "", + "description": "This text can be shown before the Trickle has been unlocked", + "_adapt": { + "translatable": true + } + }, "ariaLabel": { "type": "string", "title": "Default button ARIA label", diff --git a/schema/block.schema.json b/schema/block.schema.json index 00ae6bb..9361359 100644 --- a/schema/block.schema.json +++ b/schema/block.schema.json @@ -121,6 +121,15 @@ "translatable": true } }, + "textLocked": { + "type": "string", + "title": "Button text when locked", + "default": "", + "description": "This text can be shown before the Trickle has been unlocked", + "_adapt": { + "translatable": true + } + }, "ariaLabel": { "type": "string", "title": "Default button ARIA label", From d18de151d35a2d16bcf6403a57c040b8e97894b8 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Thu, 7 Mar 2024 10:33:53 -0700 Subject: [PATCH 2/9] Add aria label locked --- README.md | 4 +++- example.json | 1 + properties.schema | 20 ++++++++++++++++++++ schema/article.schema.json | 9 +++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f474b2..97e8aea 100644 --- a/README.md +++ b/README.md @@ -70,10 +70,12 @@ The attributes listed below are properly formatted as JSON in [*example.json*](h >>**text** (string): Defines the default button text. The default is `"Continue"`. ->>**textLocked** (string): Defines the default button text when the button is locked. If not set, `text` will be used. +>>**textLocked** (string): Defines the default button text when the button is locked. If not set, `text`, `startText`, or `finalText` will be used. `_styleBeforeCompletion` must be set to `visible`. The default is `""`. >>**ariaLabel** (string): Defines the default button aria label. The default is `""`. +>>**ariaLabelLocked** (string): Defines the button aria label when using `textLocked`. The default is `""`. + >>**startText** (string): Defines the first item button text when set on the article with **\_onChildren** set to `true`. The default is `"Begin"`. >>**startAriaLabel** (string): Defines the first item button aria label when set on the article with **\_onChildren** set to `true`. The default is `""`. diff --git a/example.json b/example.json index e305f13..e8d6b23 100644 --- a/example.json +++ b/example.json @@ -27,6 +27,7 @@ "text": "Continue", "textLocked": "", "ariaLabel": "", + "ariaLabelLocked": "", "startText": "Begin", "startAriaLabel": "", "finalText": "Finish", diff --git a/properties.schema b/properties.schema index 280529e..69d5d02 100644 --- a/properties.schema +++ b/properties.schema @@ -225,6 +225,16 @@ "validators": [], "translatable": true }, + "ariaLabelLocked": { + "type": "string", + "required": false, + "default": "", + "title": "Button Aria Label when locked", + "inputType": "Text", + "validators": [], + "translatable": true, + "help": "The aria label when 'Button Text when locked' is set" + }, "startText": { "type": "string", "required": false, @@ -470,6 +480,16 @@ "validators": [], "translatable": true }, + "ariaLabelLocked": { + "type": "string", + "required": false, + "default": "Continue", + "title": "Button Aria Label when locked", + "inputType": "Text", + "validators": [], + "translatable": true, + "help": "The aria label when 'Button Text when locked' is set" + }, "startText": { "type": "string", "required": false, diff --git a/schema/article.schema.json b/schema/article.schema.json index e02a015..60f835c 100644 --- a/schema/article.schema.json +++ b/schema/article.schema.json @@ -143,6 +143,15 @@ "translatable": true } }, + "ariaLabelLocked": { + "type": "string", + "title": "Button ARIA label when locked", + "default": "", + "description": "The aria label when 'Button text when locked' is set", + "_adapt": { + "translatable": true + } + }, "startText": { "type": "string", "title": "First button text", From ff3e0aaa69f90e1a2ba9e2f4cb27d919f6a14390 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Thu, 7 Mar 2024 10:45:44 -0700 Subject: [PATCH 3/9] Checked for locked button text --- js/TrickleButtonModel.js | 5 +++++ js/TrickleButtonView.js | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/js/TrickleButtonModel.js b/js/TrickleButtonModel.js index abc4611..623a531 100644 --- a/js/TrickleButtonModel.js +++ b/js/TrickleButtonModel.js @@ -118,6 +118,7 @@ export default class TrickleButtonModel extends ComponentModel { if (!trickleConfig) return; let isStart = false; let isFinal = false; + const isLocked = this.get('_isButtonDisabled'); if (trickleConfig._onChildren) { const parentId = parentModel.get('_id'); const trickleParent = getModelContainer(parentModel); @@ -132,11 +133,15 @@ export default class TrickleButtonModel extends ComponentModel { trickleConfig._button.startText : (isFinal && trickleConfig._button.finalText) ? trickleConfig._button.finalText : + (isLocked && trickleConfig._button.textLocked) ? + trickleConfig._button.textLocked : trickleConfig._button.text; const ariaLabel = (isStart && trickleConfig._button.startAriaLabel) ? trickleConfig._button.startAriaLabel : (isFinal && trickleConfig._button.finalAriaLabel) ? trickleConfig._button.finalAriaLabel : + (isLocked && trickleConfig._button.ariaLabelLocked) ? + trickleConfig._button.ariaLabelLocked : trickleConfig._button.ariaLabel; this.set({ buttonText: text, diff --git a/js/TrickleButtonView.js b/js/TrickleButtonView.js index 1022a95..97e39dc 100644 --- a/js/TrickleButtonView.js +++ b/js/TrickleButtonView.js @@ -32,8 +32,8 @@ class TrickleButtonView extends ComponentView { this.openPopupCount = 0; this.isAwaitingPopupClose = false; this.wasButtonClicked = false; - this.model.calculateButtonText(); this.calculateButtonState(); + this.model.calculateButtonText(); this.setupEventListeners(); this.render(); if (!this.model.isEnabled()) { @@ -131,6 +131,7 @@ class TrickleButtonView extends ComponentView { const isButtonLocked = (this.model.get('_isButtonVisible')) && isButtonDisabled; $button.toggleClass('is-locked', isButtonLocked); const $buttonText = this.$('.js-trickle-btn-text'); + this.model.calculateButtonText(); const text = this.model.get('buttonText'); const ariaLabel = this.model.get('buttonAriaLabel'); $buttonText.html(text); From 290d95a7f4bc9cf4db99daddec55825151052f88 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Thu, 7 Mar 2024 11:05:18 -0700 Subject: [PATCH 4/9] Add ariaLabelLocked to block schema --- schema/block.schema.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/schema/block.schema.json b/schema/block.schema.json index 9361359..fbd0171 100644 --- a/schema/block.schema.json +++ b/schema/block.schema.json @@ -138,6 +138,15 @@ "translatable": true } }, + "ariaLabelLocked": { + "type": "string", + "title": "Button ARIA label when locked", + "default": "", + "description": "The aria label when 'Button text when locked' is set", + "_adapt": { + "translatable": true + } + }, "startText": { "type": "string", "title": "First button text", From 3eeef9d06ebfa782f81ec6f21935dd3a545f905d Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Fri, 8 Mar 2024 12:18:37 -0700 Subject: [PATCH 5/9] Rename new fields --- README.md | 4 ++-- example.json | 4 ++-- js/TrickleButtonModel.js | 8 ++++---- properties.schema | 24 ++++++++++++------------ schema/article.schema.json | 12 ++++++------ schema/block.schema.json | 12 ++++++------ 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 97e8aea..02826ca 100644 --- a/README.md +++ b/README.md @@ -70,11 +70,11 @@ The attributes listed below are properly formatted as JSON in [*example.json*](h >>**text** (string): Defines the default button text. The default is `"Continue"`. ->>**textLocked** (string): Defines the default button text when the button is locked. If not set, `text`, `startText`, or `finalText` will be used. `_styleBeforeCompletion` must be set to `visible`. The default is `""`. +>>**disabledText** (string): Defines the default button text when the button is disabled. If not set, `text`, `startText`, or `finalText` will be used. `_styleBeforeCompletion` must be set to `visible`. The default is `""`. >>**ariaLabel** (string): Defines the default button aria label. The default is `""`. ->>**ariaLabelLocked** (string): Defines the button aria label when using `textLocked`. The default is `""`. +>>**disabledAriaLabel** (string): Defines the button aria label when using `disabledText`. The default is `""`. >>**startText** (string): Defines the first item button text when set on the article with **\_onChildren** set to `true`. The default is `"Begin"`. diff --git a/example.json b/example.json index e8d6b23..bf7b5dc 100644 --- a/example.json +++ b/example.json @@ -25,9 +25,9 @@ "_className": "", "_hasIcon": false, "text": "Continue", - "textLocked": "", + "disabledText": "", "ariaLabel": "", - "ariaLabelLocked": "", + "disabledAriaLabel": "", "startText": "Begin", "startAriaLabel": "", "finalText": "Finish", diff --git a/js/TrickleButtonModel.js b/js/TrickleButtonModel.js index 623a531..1cff7c9 100644 --- a/js/TrickleButtonModel.js +++ b/js/TrickleButtonModel.js @@ -133,15 +133,15 @@ export default class TrickleButtonModel extends ComponentModel { trickleConfig._button.startText : (isFinal && trickleConfig._button.finalText) ? trickleConfig._button.finalText : - (isLocked && trickleConfig._button.textLocked) ? - trickleConfig._button.textLocked : + (isLocked && trickleConfig._button.disabledText) ? + trickleConfig._button.disabledText : trickleConfig._button.text; const ariaLabel = (isStart && trickleConfig._button.startAriaLabel) ? trickleConfig._button.startAriaLabel : (isFinal && trickleConfig._button.finalAriaLabel) ? trickleConfig._button.finalAriaLabel : - (isLocked && trickleConfig._button.ariaLabelLocked) ? - trickleConfig._button.ariaLabelLocked : + (isLocked && trickleConfig._button.disabledAriaLabel) ? + trickleConfig._button.disabledAriaLabel : trickleConfig._button.ariaLabel; this.set({ buttonText: text, diff --git a/properties.schema b/properties.schema index 69d5d02..16a8cb8 100644 --- a/properties.schema +++ b/properties.schema @@ -206,15 +206,15 @@ "validators": [], "translatable": true }, - "textLocked": { + "disabledText": { "type": "string", "required": false, "default": "", - "title": "Button Text when locked", + "title": "Button Text when disabled", "inputType": "Text", "validators": [], "translatable": true, - "help": "This text can be shown before the Trickle has been unlocked" + "help": "This text can be shown while the button is disabled" }, "ariaLabel": { "type": "string", @@ -225,15 +225,15 @@ "validators": [], "translatable": true }, - "ariaLabelLocked": { + "disabledAriaLabel": { "type": "string", "required": false, "default": "", - "title": "Button Aria Label when locked", + "title": "Button Aria Label when disabled", "inputType": "Text", "validators": [], "translatable": true, - "help": "The aria label when 'Button Text when locked' is set" + "help": "The aria label when 'Button Text when disabled' is set" }, "startText": { "type": "string", @@ -461,15 +461,15 @@ "validators": [], "translatable": true }, - "textLocked": { + "disabledText": { "type": "string", "required": false, "default": "", - "title": "Button Text when locked", + "title": "Button Text when disabled", "inputType": "Text", "validators": [], "translatable": true, - "help": "This text can be shown before the Trickle has been unlocked" + "help": "This text can be shown while the button is disabled" }, "ariaLabel": { "type": "string", @@ -480,15 +480,15 @@ "validators": [], "translatable": true }, - "ariaLabelLocked": { + "disabledAriaLabel": { "type": "string", "required": false, "default": "Continue", - "title": "Button Aria Label when locked", + "title": "Button Aria Label when disabled", "inputType": "Text", "validators": [], "translatable": true, - "help": "The aria label when 'Button Text when locked' is set" + "help": "The aria label when 'Button Text when disabled' is set" }, "startText": { "type": "string", diff --git a/schema/article.schema.json b/schema/article.schema.json index 60f835c..efd4c92 100644 --- a/schema/article.schema.json +++ b/schema/article.schema.json @@ -126,11 +126,11 @@ "translatable": true } }, - "textLocked": { + "disabledText": { "type": "string", - "title": "Button text when locked", + "title": "Button text when disabled", "default": "", - "description": "This text can be shown before the Trickle has been unlocked", + "description": "This text can be shown while the button is disabled", "_adapt": { "translatable": true } @@ -143,11 +143,11 @@ "translatable": true } }, - "ariaLabelLocked": { + "disabledAriaLabel": { "type": "string", - "title": "Button ARIA label when locked", + "title": "Button ARIA label when disabled", "default": "", - "description": "The aria label when 'Button text when locked' is set", + "description": "The aria label when 'Button text when disabled' is set", "_adapt": { "translatable": true } diff --git a/schema/block.schema.json b/schema/block.schema.json index fbd0171..a4e8b10 100644 --- a/schema/block.schema.json +++ b/schema/block.schema.json @@ -121,11 +121,11 @@ "translatable": true } }, - "textLocked": { + "disabledText": { "type": "string", - "title": "Button text when locked", + "title": "Button text when disabled", "default": "", - "description": "This text can be shown before the Trickle has been unlocked", + "description": "This text can be shown while the button is disabled", "_adapt": { "translatable": true } @@ -138,11 +138,11 @@ "translatable": true } }, - "ariaLabelLocked": { + "disabledAriaLabel": { "type": "string", - "title": "Button ARIA label when locked", + "title": "Button ARIA label when disabled", "default": "", - "description": "The aria label when 'Button text when locked' is set", + "description": "The aria label when 'Button text when disabled' is set", "_adapt": { "translatable": true } From 11e5797b981beb44df26aa1d40d2331f8a587ccc Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Fri, 8 Mar 2024 12:21:55 -0700 Subject: [PATCH 6/9] Move disabled text to highest precedence --- js/TrickleButtonModel.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/js/TrickleButtonModel.js b/js/TrickleButtonModel.js index 1cff7c9..af5d21a 100644 --- a/js/TrickleButtonModel.js +++ b/js/TrickleButtonModel.js @@ -118,7 +118,7 @@ export default class TrickleButtonModel extends ComponentModel { if (!trickleConfig) return; let isStart = false; let isFinal = false; - const isLocked = this.get('_isButtonDisabled'); + const isDisabled = this.get('_isButtonDisabled'); if (trickleConfig._onChildren) { const parentId = parentModel.get('_id'); const trickleParent = getModelContainer(parentModel); @@ -129,20 +129,22 @@ export default class TrickleButtonModel extends ComponentModel { isStart = (index === 0); isFinal = (index === trickleSiblings.length - 1 && !trickleParent.get('_canRequestChild')); } - const text = (isStart && trickleConfig._button.startText) ? + const text = (isDisabled && trickleConfig._button.disabledText) ? + trickleConfig._button.disabledText : + (isStart && trickleConfig._button.startText) ? trickleConfig._button.startText : (isFinal && trickleConfig._button.finalText) ? - trickleConfig._button.finalText : - (isLocked && trickleConfig._button.disabledText) ? - trickleConfig._button.disabledText : - trickleConfig._button.text; - const ariaLabel = (isStart && trickleConfig._button.startAriaLabel) ? + trickleConfig._button.finalText : + trickleConfig._button.text; + + const ariaLabel = (isDisabled && trickleConfig._button.disabledAriaLabel) ? + trickleConfig._button.disabledAriaLabel : + (isStart && trickleConfig._button.startAriaLabel) ? trickleConfig._button.startAriaLabel : (isFinal && trickleConfig._button.finalAriaLabel) ? - trickleConfig._button.finalAriaLabel : - (isLocked && trickleConfig._button.disabledAriaLabel) ? - trickleConfig._button.disabledAriaLabel : - trickleConfig._button.ariaLabel; + trickleConfig._button.finalAriaLabel : + trickleConfig._button.ariaLabel; + this.set({ buttonText: text, buttonAriaLabel: ariaLabel From 87419b30b59c3cad816b2d78e9a3a442f96da962 Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Mon, 11 Mar 2024 08:19:57 -0600 Subject: [PATCH 7/9] Readme update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02826ca..1353403 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ The attributes listed below are properly formatted as JSON in [*example.json*](h >>**text** (string): Defines the default button text. The default is `"Continue"`. ->>**disabledText** (string): Defines the default button text when the button is disabled. If not set, `text`, `startText`, or `finalText` will be used. `_styleBeforeCompletion` must be set to `visible`. The default is `""`. +>>**disabledText** (string): Defines the default button text when the button is disabled. If not set, `finalText`, `startText` or `text` will be used in that order. `_styleBeforeCompletion` must be set to `visible` so that the button is shown while disabled. The default is `""`. >>**ariaLabel** (string): Defines the default button aria label. The default is `""`. From b21fbdaba66024a17d2f6f1845f8c64f8c72e62d Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Mon, 18 Mar 2024 11:01:29 -0600 Subject: [PATCH 8/9] Group disabledText and disabledAriaLabel in schemas and documentation --- README.md | 4 ++-- example.json | 2 +- properties.schema | 36 ++++++++++++++++++------------------ schema/article.schema.json | 14 +++++++------- schema/block.schema.json | 14 +++++++------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 1353403..0acdf64 100644 --- a/README.md +++ b/README.md @@ -70,10 +70,10 @@ The attributes listed below are properly formatted as JSON in [*example.json*](h >>**text** (string): Defines the default button text. The default is `"Continue"`. ->>**disabledText** (string): Defines the default button text when the button is disabled. If not set, `finalText`, `startText` or `text` will be used in that order. `_styleBeforeCompletion` must be set to `visible` so that the button is shown while disabled. The default is `""`. - >>**ariaLabel** (string): Defines the default button aria label. The default is `""`. +>>**disabledText** (string): Defines the default button text when the button is disabled. If not set, `finalText`, `startText` or `text` will be used in that order. `_styleBeforeCompletion` must be set to `visible` so that the button is shown while disabled. The default is `""`. + >>**disabledAriaLabel** (string): Defines the button aria label when using `disabledText`. The default is `""`. >>**startText** (string): Defines the first item button text when set on the article with **\_onChildren** set to `true`. The default is `"Begin"`. diff --git a/example.json b/example.json index bf7b5dc..8a219b7 100644 --- a/example.json +++ b/example.json @@ -25,8 +25,8 @@ "_className": "", "_hasIcon": false, "text": "Continue", - "disabledText": "", "ariaLabel": "", + "disabledText": "", "disabledAriaLabel": "", "startText": "Begin", "startAriaLabel": "", diff --git a/properties.schema b/properties.schema index 16a8cb8..f900e33 100644 --- a/properties.schema +++ b/properties.schema @@ -206,24 +206,24 @@ "validators": [], "translatable": true }, - "disabledText": { + "ariaLabel": { "type": "string", "required": false, - "default": "", - "title": "Button Text when disabled", + "default": "Continue", + "title": "Button Aria Label", "inputType": "Text", "validators": [], - "translatable": true, - "help": "This text can be shown while the button is disabled" + "translatable": true }, - "ariaLabel": { + "disabledText": { "type": "string", "required": false, - "default": "Continue", - "title": "Button Aria Label", + "default": "", + "title": "Button Text when disabled", "inputType": "Text", "validators": [], - "translatable": true + "translatable": true, + "help": "This text can be shown while the button is disabled" }, "disabledAriaLabel": { "type": "string", @@ -461,24 +461,24 @@ "validators": [], "translatable": true }, - "disabledText": { + "ariaLabel": { "type": "string", "required": false, - "default": "", - "title": "Button Text when disabled", + "default": "Continue", + "title": "Button Aria Label", "inputType": "Text", "validators": [], - "translatable": true, - "help": "This text can be shown while the button is disabled" + "translatable": true }, - "ariaLabel": { + "disabledText": { "type": "string", "required": false, - "default": "Continue", - "title": "Button Aria Label", + "default": "", + "title": "Button Text when disabled", "inputType": "Text", "validators": [], - "translatable": true + "translatable": true, + "help": "This text can be shown while the button is disabled" }, "disabledAriaLabel": { "type": "string", diff --git a/schema/article.schema.json b/schema/article.schema.json index efd4c92..824c718 100644 --- a/schema/article.schema.json +++ b/schema/article.schema.json @@ -126,19 +126,19 @@ "translatable": true } }, - "disabledText": { + "ariaLabel": { "type": "string", - "title": "Button text when disabled", - "default": "", - "description": "This text can be shown while the button is disabled", + "title": "Default button ARIA label", + "default": "Continue", "_adapt": { "translatable": true } }, - "ariaLabel": { + "disabledText": { "type": "string", - "title": "Default button ARIA label", - "default": "Continue", + "title": "Button text when disabled", + "default": "", + "description": "This text can be shown while the button is disabled", "_adapt": { "translatable": true } diff --git a/schema/block.schema.json b/schema/block.schema.json index a4e8b10..b1ec7c6 100644 --- a/schema/block.schema.json +++ b/schema/block.schema.json @@ -121,19 +121,19 @@ "translatable": true } }, - "disabledText": { + "ariaLabel": { "type": "string", - "title": "Button text when disabled", - "default": "", - "description": "This text can be shown while the button is disabled", + "title": "Default button ARIA label", + "default": "Continue", "_adapt": { "translatable": true } }, - "ariaLabel": { + "disabledText": { "type": "string", - "title": "Default button ARIA label", - "default": "Continue", + "title": "Button text when disabled", + "default": "", + "description": "This text can be shown while the button is disabled", "_adapt": { "translatable": true } From f627fa19072b02f800ce7c4958957770ed94955b Mon Sep 17 00:00:00 2001 From: Brad Simpson Date: Mon, 18 Mar 2024 11:08:33 -0600 Subject: [PATCH 9/9] Readme: Fix precedence order of text --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0acdf64..a364999 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ The attributes listed below are properly formatted as JSON in [*example.json*](h >>**ariaLabel** (string): Defines the default button aria label. The default is `""`. ->>**disabledText** (string): Defines the default button text when the button is disabled. If not set, `finalText`, `startText` or `text` will be used in that order. `_styleBeforeCompletion` must be set to `visible` so that the button is shown while disabled. The default is `""`. +>>**disabledText** (string): Defines the default button text when the button is disabled. If not set, `startText`, `finalText` or `text` will be used in that order. `_styleBeforeCompletion` must be set to `visible` so that the button is shown while disabled. The default is `""`. >>**disabledAriaLabel** (string): Defines the button aria label when using `disabledText`. The default is `""`.