From 64a1377d64618fa880b332f8a693e1c7f1a321f7 Mon Sep 17 00:00:00 2001 From: Jonas Metzener Date: Mon, 21 Feb 2022 18:59:54 +0100 Subject: [PATCH] fix(select): pass prompt argument down to input component --- addon/components/validated-input.hbs | 1 + addon/components/validated-input/-themes/uikit/render.hbs | 1 + addon/components/validated-input/render.hbs | 1 + tests/dummy/app/templates/docs/components/validated-input.md | 2 +- tests/dummy/app/templates/index.hbs | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addon/components/validated-input.hbs b/addon/components/validated-input.hbs index 9c1c2c23..e2f67c05 100644 --- a/addon/components/validated-input.hbs +++ b/addon/components/validated-input.hbs @@ -48,6 +48,7 @@ @isInvalid={{this.isInvalid}} @placeholder={{@placeholder}} @class={{@class}} + @prompt={{@prompt}} @promptIsSelectable={{@promptIsSelectable}} @optionLabelPath={{@optionLabelPath}} @optionValuePath={{@optionValuePath}} diff --git a/addon/components/validated-input/-themes/uikit/render.hbs b/addon/components/validated-input/-themes/uikit/render.hbs index 4a5c86f1..dcae87b3 100644 --- a/addon/components/validated-input/-themes/uikit/render.hbs +++ b/addon/components/validated-input/-themes/uikit/render.hbs @@ -18,6 +18,7 @@ @options={{@options}} @optionTargetPath={{@optionTargetPath}} @optionValuePath={{@optionValuePath}} + @prompt={{@prompt}} @promptIsSelectable={{@promptIsSelectable}} @setDirty={{@setDirty}} @update={{@update}} diff --git a/addon/components/validated-input/render.hbs b/addon/components/validated-input/render.hbs index baa725be..9e8b74ea 100644 --- a/addon/components/validated-input/render.hbs +++ b/addon/components/validated-input/render.hbs @@ -17,6 +17,7 @@ @options={{@options}} @optionTargetPath={{@optionTargetPath}} @optionValuePath={{@optionValuePath}} + @prompt={{@prompt}} @promptIsSelectable={{@promptIsSelectable}} @setDirty={{@setDirty}} @update={{@update}} diff --git a/tests/dummy/app/templates/docs/components/validated-input.md b/tests/dummy/app/templates/docs/components/validated-input.md index fd9bd91e..f489594d 100644 --- a/tests/dummy/app/templates/docs/components/validated-input.md +++ b/tests/dummy/app/templates/docs/components/validated-input.md @@ -118,7 +118,7 @@ The select element also supports the following options: name = 'country' value = 'Germany' options = (array 'USA' 'Switzerland' 'Germany' 'Spain' 'India') - includeBlank = 'Please choose...' + prompt = 'Please choose...' promptIsSelectable = true }} {{/validated-form}} diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs index b3ec3a00..52041d10 100644 --- a/tests/dummy/app/templates/index.hbs +++ b/tests/dummy/app/templates/index.hbs @@ -65,7 +65,7 @@ @type="select" @label="Country" @name="country" - @includeBlank="Select a country" + @prompt="Select a country" @options={{this.countries}} @value={{@model.country}} @required={{true}}