choice prompt parity

libraries/botbuilder-dialogs/src/dialogContext.ts

@@ -188,10 +188,16 @@ export class DialogContext {
                 (promptOrOptions as Activity).type !== undefined) ||
             typeof promptOrOptions === 'string'
         ) {
-            options = { prompt: promptOrOptions as string | Partial<Activity>, choices: choices };
+            options = { prompt: promptOrOptions as string | Partial<Activity> };
         } else {
             options = { ...promptOrOptions as PromptOptions };
         }
+
+        if (choices) 
+        {
+            options.choices = choices;
+        }
+
         return this.beginDialog(dialogId, options);
     }
 

libraries/botbuilder-dialogs/src/prompts/choicePrompt.ts

@@ -80,10 +80,11 @@ export class ChoicePrompt extends Prompt<FoundChoice> {
         const choices: any[] = (this.style === ListStyle.suggestedAction ? ChoiceFactory.toChoices(options.choices) : options.choices) || [];
         const channelId: string = context.activity.channelId;
         const choiceOptions: ChoiceFactoryOptions = this.choiceOptions || ChoicePrompt.defaultChoiceOptions[locale];
+        const choiceStyle: ListStyle = options.style || this.style;
         if (isRetry && options.retryPrompt) {
-            prompt = this.appendChoices(options.retryPrompt, channelId, choices, this.style, choiceOptions);
+            prompt = this.appendChoices(options.retryPrompt, channelId, choices, choiceStyle, choiceOptions);
         } else {
-            prompt = this.appendChoices(options.prompt, channelId, choices, this.style, choiceOptions);
+            prompt = this.appendChoices(options.prompt, channelId, choices, choiceStyle, choiceOptions);
         }
 
         // Send prompt

libraries/botbuilder-dialogs/src/prompts/prompt.ts

@@ -65,6 +65,12 @@ export interface PromptOptions {
      */
     choices?: (string | Choice)[];
 
+    /**
+     * (Optional) Property that can be used to override or set the value of ChoicePrompt.Style
+     * when the prompt is executed using DialogContext.prompt.
+     */
+    style?: ListStyle
+
     /**
      * (Optional) Additional validation rules to pass the prompts validator routine.
      */

libraries/botbuilder-dialogs/tests/choicePrompt.test.js

@@ -324,6 +324,62 @@ describe('ChoicePrompt', function () {
             .assertReply('Please choose a color.');
     });
 
+    it('should render choices if PromptOptions & choices are passed into DialogContext.prompt()', async function() {
+        const adapter = new TestAdapter(async (turnContext) => {
+            const dc = await dialogs.createContext(turnContext);
+
+            const results = await dc.continueDialog();
+            if (results.status === DialogTurnStatus.empty) {
+                await dc.prompt('prompt', { prompt: 'Please choose a color.', style: ListStyle.inline }, stringChoices);
+            } else if (results.status === DialogTurnStatus.complete) {
+                const selectedChoice = results.result;
+                await turnContext.sendActivity(selectedChoice.value);
+            }
+            await convoState.saveChanges(turnContext);
+        });
+        const convoState = new ConversationState(new MemoryStorage());
+
+        const dialogState = convoState.createProperty('dialogState');
+        const dialogs = new DialogSet(dialogState);
+        const choicePrompt = new ChoicePrompt('prompt');
+        choicePrompt.style = ListStyle.none;
+
+        dialogs.add(choicePrompt);
+
+        await adapter.send('Hello')
+            .assertReply('Please choose a color. (1) red, (2) green, or (3) blue')
+            .send(answerMessage)
+            .assertReply('red');
+    });
+
+    it('should send a prompt and choices if they are passed in via third argument in dc.prompt().', async function () {
+        const adapter = new TestAdapter(async (turnContext) => {
+            const dc = await dialogs.createContext(turnContext);
+
+            const results = await dc.continueDialog();
+            if (results.status === DialogTurnStatus.empty) {
+                await dc.prompt('prompt', { prompt: 'Please choose a color.' }, stringChoices);
+            } else if (results.status === DialogTurnStatus.complete) {
+                const selectedChoice = results.result;
+                await turnContext.sendActivity(selectedChoice.value);
+            }
+            await convoState.saveChanges(turnContext);
+        });
+        const convoState = new ConversationState(new MemoryStorage());
+
+        const dialogState = convoState.createProperty('dialogState');
+        const dialogs = new DialogSet(dialogState);
+        const choicePrompt = new ChoicePrompt('prompt');
+        choicePrompt.style = ListStyle.none;
+
+        dialogs.add(choicePrompt);
+
+        await adapter.send('Hello')
+            .assertReply('Please choose a color.')
+            .send(answerMessage)
+            .assertReply('red');
+    });
+
     it('should not recognize if choices are not passed in.', async function () {
         const adapter = new TestAdapter(async (turnContext) => {
             const dc = await dialogs.createContext(turnContext);