Skip to content

[UWP] Fix inline actions not getting inputs #4266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
almedina-ms merged 3 commits into from
Jul 1, 2020
Merged

[UWP] Fix inline actions not getting inputs #4266

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7ceacd
Fix inline actions not validating inputs
almedina-ms Jun 30, 2020
79b34bd
Updated specs
invalid-email-address Jul 1, 2020
6e877c5
Merge branch 'feature/inputEvolution' into user/almedina-ms/IE_UWP_Fi…
almedina-ms Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions source/uwp/Renderer/lib/ActionHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,13 @@ namespace AdaptiveNamespace::ActionHelpers
return;
}

if (actionType == ABI::AdaptiveNamespace::ActionType::Submit)
{
ComPtr<IAdaptiveSubmitAction> submitAction;
THROW_IF_FAILED(localInlineAction.As(&submitAction));
THROW_IF_FAILED(renderContext->LinkSubmitActionToCard(submitAction.Get(), renderArgs));
}

// Create a grid to hold the text box and the action button
ComPtr<IGridStatics> gridStatics;
THROW_IF_FAILED(GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_Xaml_Controls_Grid).Get(), &gridStatics));
Expand Down
5 changes: 2 additions & 3 deletions specs/elements/AdaptiveCard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
| **actions** | `Action[]` | No | The Actions to show in the card's action bar. | 1.0 |
| **selectAction** | `ISelectAction` | No | An Action that will be invoked when the card is tapped or selected. `Action.ShowCard` is not supported. | 1.1 |
| **fallbackText** | `string` | No | Text shown when the client doesn't support the version specified (may contain markdown). | 1.0 |
| **backgroundImage** | `BackgroundImage`, `uri` | No | Specifies the background image of the card. Acceptable formats are PNG, JPEG, and GIF | 1.2, 1.0 |
| **backgroundImage** | `BackgroundImage`, `uri` | No | Specifies the background image of the card. | 1.2, 1.0 |
| **minHeight** | `string` | No | Specifies the minimum height of the card. | 1.2 |
| **speak** | `string` | No | Specifies what should be spoken for this entire card. This is simple text or SSML fragment. | 1.0 |
| **lang** | `string` | No | The 2-letter ISO-639-1 language used in the card. Used to localize any date/time functions. | 1.0 |
| **showRequiredInputHints** | `boolean` | No, default: `true` | True if required fields should be visually indicated | 1.3 |
| **verticalContentAlignment** | `VerticalContentAlignment` | No | Defines how the content should be aligned vertically within the container. Only relevant for fixed-height cards, or cards with a `minHeight` specified. | 1.1 |
| **$schema** | `uri` | No | The Adaptive Card schema. | 1.0 |

Expand Down Expand Up @@ -71,7 +70,7 @@ An Action that will be invoked when the card is tapped or selected. `Action.Show

## backgroundImage

Specifies the background image of the card. Acceptable formats are PNG, JPEG, and GIF
Specifies the background image of the card.

* **Type**: `BackgroundImage`, `uri`
* **Version** : 1.2, 1.0
Expand Down
2 changes: 1 addition & 1 deletion specs/elements/Input.Text.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
| **maxLength** | `number` | No | Hint of maximum length characters to collect (may be ignored by some clients). | 1.0 |
| **placeholder** | `string` | No | Description of the input desired. Displayed when no text has been input. | 1.0 |
| **regex** | `string` | No | Regular expression indicating the required format of this text input. | 1.0 |
| **style** | `TextInputStyle` | No | | 1.0 |
| **style** | `TextInputStyle` | No | Style hint for text input. | 1.0 |
| **inlineAction** | `ISelectAction` | No | The inline action for the input. Typically displayed to the right of the input. It is strongly recommended to provide an icon on the action (which will be displayed instead of the title of the action). | 1.2 |
| **value** | `string` | No | The initial value for this field. | 1.0 |

Expand Down