Skip to content

7.1 Refresh#153

Merged
jeromelaban merged 326 commits intounofrom
dev/jela/7-1-refresh
Sep 9, 2021
Merged

7.1 Refresh#153
jeromelaban merged 326 commits intounofrom
dev/jela/7-1-refresh

Conversation

@jeromelaban
Copy link
Copy Markdown
Member

ArchieCoder and others added 30 commits August 5, 2021 13:27
…vior.cs

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
…nizingTextBox.Properties.cs

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
…diog/shorterExpressionStrings

Generate shorter expression animation strings from ExpressionNode
michael-hawker and others added 11 commits September 2, 2021 15:30
…lick-fix

Improving ComboBoxColumn behavior to prevent triple click behavior
…zingtextbox-header-fix

Fix TokenizingTextBox header to behave like normal text control headers
…#4206)

<!-- 🚨 Please Do Not skip any instructions and information mentioned below as they are all required and essential to evaluate and test the PR. By fulfilling all the required information you will be able to reduce the volume of questions and most likely help merge the PR faster 🚨 -->

<!-- 👉 It is imperative to resolve ONE ISSUE PER PR and avoid making multiple changes unless the changes interrelate with each other --> 

<!-- 📝 Please always keep the "☑️ Allow edits by maintainers" button checked in the Pull Request Template as it increases collaboration with the Toolkit maintainers by permitting commits to your PR branch (only) created from your fork. This can let us quickly make fixes for minor typos or forgotten StyleCop issues during review without needing to wait on you doing extra work. Let us help you help us! 🎉 -->

### Note: This is a copy of the previously reviewed work with a new branch name
## Fixes CommunityToolkit#2493
<!-- Add the relevant issue number after the "#" mentioned above (for ex: "## Fixes CommunityToolkit#1234") which will automatically close the issue once the PR is merged. -->

<!-- Add a brief overview here of the feature/bug & fix. -->
This prevents DataGrid from assuming focus should be reset back to itself when a control inside DataGridTemplateColumn gains focus. This is my first WCT PR, so please go easy on me 😆 
## PR Type
What kind of change does this PR introduce?
<!-- Please uncomment one or more options below that apply to this PR. -->
Bugfix 
<!-- - -->
<!-- - Feature -->
<!-- - Code style update (formatting) -->
<!-- - Refactoring (no functional changes, no api changes) -->
<!-- - Build or CI related changes -->
<!-- - Documentation content changes -->
<!-- - Sample app changes -->
<!-- - Other... Please describe: -->


## What is the current behavior?
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
Trying to open a control like CalendarDatePicker from within a DataGridTemplateColumn doesn't work, as there is specific behavior to detect when DataGrid loses focus and return it. This doesn't make much sense for controls which require focus to function properly.

## What is the new behavior?
<!-- Describe how was this issue resolved or changed? -->
When the DataGrid loses focus, we now specifically detect if the editing column is a DataGridTemplateColumn and alter the behavior to accommodate this.

## PR Checklist

Please check if your PR fulfills the following requirements:

- [x] Tested code with current [supported SDKs](../readme.md#supported)
- [ ] Pull Request has been submitted to the documentation repository [instructions](..\contributing.md#docs). Link: <!-- docs PR link -->
- [ ] Sample in sample app has been added / updated (for bug fixes / features)
    - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets)
- [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc...
- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
- [x] Contains **NO** breaking changes

<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
     Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. -->


## Other information
I'm unsure if this is the *best* way to do this, but it makes the most sense given how DataGrid already has the capability to detect the editing element and column type.
Additional context before branch rename: CommunityToolkit#4206
Related: unoplatform/uno#6543
…st-winui-version

UITests: Remove ref to incorrect version of winui
…-toolkit-sg

Fix and enable MVVM Toolkit source generator unit tests
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Sep 7, 2021

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 10 committers have signed the CLA.

✅ robloo
✅ michael-hawker
✅ duke7553
✅ jeromelaban
❌ huynhsontung
❌ COM8
❌ msftbot[bot]
❌ RosarioPulella
❌ bolyb
❌ Sergio0694
You have signed the CLA already but the status is still pending? Let us recheck it.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Sep 9, 2021

Azure Static Web Apps: Your stage site is ready! Visit it here: https://mango-dune-09a561f0f-153.eastus2.azurestaticapps.net

@github-actions
Copy link
Copy Markdown

github-actions bot commented Sep 9, 2021

Azure Static Web Apps: Your stage site is ready! Visit it here: https://mango-dune-09a561f0f-153.eastus2.azurestaticapps.net

@github-actions
Copy link
Copy Markdown

github-actions bot commented Sep 9, 2021

Azure Static Web Apps: Your stage site is ready! Visit it here: https://mango-dune-09a561f0f-153.eastus2.azurestaticapps.net

@jeromelaban jeromelaban merged commit 15261a7 into uno Sep 9, 2021
@jeromelaban jeromelaban deleted the dev/jela/7-1-refresh branch September 9, 2021 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CalendarDatePicker][WASM] Using a CalendarDatePicker in a DataGrid column doesn't commit selected date