From d12dfb92a67b04b64bfbe94d98c828f304676086 Mon Sep 17 00:00:00 2001 From: hond Date: Tue, 20 Oct 2020 10:02:37 +0800 Subject: [PATCH 1/2] Ignore the null or empty result of the OutputFormat in TextInput --- .../tests/resources/ActionTests/Action_TextInput.test.dialog | 5 +++-- libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/botbuilder-dialogs-adaptive-testing/tests/resources/ActionTests/Action_TextInput.test.dialog b/libraries/botbuilder-dialogs-adaptive-testing/tests/resources/ActionTests/Action_TextInput.test.dialog index 95e2e2b22e..b620c9697a 100644 --- a/libraries/botbuilder-dialogs-adaptive-testing/tests/resources/ActionTests/Action_TextInput.test.dialog +++ b/libraries/botbuilder-dialogs-adaptive-testing/tests/resources/ActionTests/Action_TextInput.test.dialog @@ -30,7 +30,8 @@ "unrecognizedPrompt": "How should I call you?", "validations": [ "length(this.value) > 3" - ] + ], + "outputFormat": "" }, { "$kind": "Microsoft.SendActivity", @@ -80,4 +81,4 @@ "text": "Hello Carlos, nice to meet you!" } ] -} \ No newline at end of file +} diff --git a/libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts b/libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts index 28b3489f87..f00a28092d 100644 --- a/libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts +++ b/libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts @@ -37,7 +37,9 @@ export class TextInput extends InputDialog implements TextInputConfiguration { if (this.outputFormat) { const value = this.outputFormat.getValue(dc.state); - input = value.toString(); + if (value && value.trim()) { + input = value.toString(); + } } // Save formated value and ensure length > 0 From 3e410549e73d587a85cf0bde168a613b58cc7bf9 Mon Sep 17 00:00:00 2001 From: hond Date: Wed, 21 Oct 2020 09:39:02 +0800 Subject: [PATCH 2/2] remove the redundant cast --- libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts b/libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts index f00a28092d..0d2be23ef4 100644 --- a/libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts +++ b/libraries/botbuilder-dialogs-adaptive/src/input/textInput.ts @@ -38,7 +38,7 @@ export class TextInput extends InputDialog implements TextInputConfiguration { if (this.outputFormat) { const value = this.outputFormat.getValue(dc.state); if (value && value.trim()) { - input = value.toString(); + input = value; } }