Skip to content

[UWP] Sync release branch with main #8317

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
anna-dingler merged 7 commits into from
Feb 22, 2023
Merged

[UWP] Sync release branch with main #8317

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1e0f72a
Switch to gotFocus (#8148) (#8150)
anna-dingler Dec 16, 2022
61db685
Update custom.props
jwoo-msft Dec 16, 2022
0593d95
[UWP] Update custom.props for object model release (#8225)
anna-dingler Jan 13, 2023
90b97be
[UWP Renderer] Add a null check to inline action rendering (#8228)
anna-dingler Jan 13, 2023
2000d3a
[UWP][Infra] Update nuget files for release (#6576) (#8240)
anna-dingler Jan 18, 2023
703ac91
Resolve merge conflicts
anna-dingler Feb 21, 2023
63702fa
Merge branch 'main' into anna/syncMain
anna-dingler Feb 22, 2023
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
8 changes: 7 additions & 1 deletion source/uwp/SharedRenderer/lib/AdaptiveTextInputRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,14 @@ namespace winrt::AdaptiveCards::Rendering::Xaml_Rendering::implementation
bool isMultiline = adaptiveTextInput.IsMultiline();
winrt::TextInputStyle style = adaptiveTextInput.TextInputStyle();
isMultiline &= style != winrt::TextInputStyle::Password;
textBoxParentContainer = ::AdaptiveCards::Rendering::Xaml_Rendering::ActionHelpers::HandleInlineAction(
auto textBoxWithInlineAction = ::AdaptiveCards::Rendering::Xaml_Rendering::ActionHelpers::HandleInlineAction(
renderContext, renderArgs, inputUIElement, textBoxParentContainer, isMultiline, inlineAction);

// If the inlineAction is ShowCard, textBoxWithInlineAction will be null and we should not update the parent container
if (textBoxWithInlineAction)
{
textBoxParentContainer = textBoxWithInlineAction;
}
}

if (!adaptiveTextInput.IsMultiline())
Expand Down