Skip to content
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.

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

x:Bind to event in ResourceDictionary (backport #14737) #14759

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 8, 2023

This is an automatic backport of pull request #14737 done by Mergify.
Cherry-pick of 09e3a0f has failed:

On branch mergify/bp/release/stable/5.0/pr-14737
Your branch is ahead of 'origin/release/stable/5.0' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 09e3a0ff14.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.UI/UI/Xaml/IFrameworkElement.cs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Currently we were propagating FindName to the Content view, even if it was "overriden" by the ContentTemplate, which then could result in StackOverflow

(cherry picked from commit 09e3a0f)

# Conflicts:
#	src/Uno.UI/UI/Xaml/IFrameworkElement.cs
(cherry picked from commit 54318f1)
(cherry picked from commit a9bac3f)
@mergify mergify bot added the conflicts label Dec 8, 2023
@mergify mergify bot mentioned this pull request Dec 8, 2023
6 tasks
@github-actions github-actions bot added area/code-generation Categorizes an issue or PR as relevant to code generation area/automation Categorizes an issue or PR as relevant to project automation labels Dec 8, 2023
@unodevops
Copy link
Contributor

🤖 Your docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-14759/index.html

@nventive-devops
Copy link
Contributor

The build 104856 found UI Test snapshots differences: android-28-net7: 0, android-28-net7-Snap: 64, ios: 65, ios-Snap: 513, skia-gtk-screenshots: 21, skia-wpf-screenshots: 18, wasm: 30, wasm-automated-net7.0-UWP-Benchmarks: 0, wasm-automated-net7.0-UWP-Default: 35, wasm-automated-net7.0-UWP-RuntimeTests: 0, wasm-automated-net7.0-WinUI-RuntimeTests: 1

Details
  • android-28-net7: 0 changed over 1

  • android-28-net7-Snap: 64 changed over 1048

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_FromStream_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_FromStream
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Icons_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Icons
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • ListView_ListView_With_ListViews_Count_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • Default_UITests_Toolkit_ElevatedView_Dimensions_UITests_Toolkit_ElevatedView_Dimensions
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_NoSize_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_NoSize
    • ListView_ListViewLarge_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewLarge
    • ListView_ListViewResizableText_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListViewResizableText
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavPage_MUXControlsTestApp_NavigationViewTopNavPage
    • Path_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_FillRule_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_FillRule
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • NavigationView_NavigationView_BasicNavigation_SamplesApp_Samples_Windows_UI_Xaml_Controls_NavigationViewTests_NavigationView_BasicNavigation
    • TextBlock_TextBlockMultilineInStarStackPanel_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockMultilineInStarStackPanel
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Formats_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Formats
    • ListView_ListViewSnapPointsMandatorySingle_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSnapPointsMandatorySingle
    • ListView_ListViewVariableHeightComplexTemplate_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewVariableHeightComplexTemplate
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressBar_WinUIProgressBarPage_UITests_Microsoft_UI_Xaml_Controls_ProgressBar_WinUIProgressBarPage
    • TextBlock_TextBoxSizeChanging_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBoxSizeChanging
    • ListView_HorizontalListView_Templates_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListView_Templates
  • ios: 65 changed over 267

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Expanded_State
    • ListView_ExpandableItem_ExpandMultipleItems_Initial_State
    • ListView_ExpandableItem_ExpandMultipleItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Initial_State
    • ListView_ObservableCollection_Creation_Count_Scrolled2
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • FocusManager_FocusDirection_Down_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_FocusDirection
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Collapsed_State
    • ListView_ListViewVariableItemHeightLong_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewVariableItemHeightLong
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • Keyboard_Textbox_NoScrollViewer_Validation_2_-_Remove_Focus_on_placeholderTextTextBox
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_Collapsed_State
    • ListView_ExpandableItem_ExpandSingleItem_Initial_State
    • ListView_ExpandableItem_ExpandSingleItem_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item
    • Check_ListView_Swallows_Measure_before_scroll
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Collapsed_State
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • ListView_ExpandableItem_ExpandMultipleItems_Expanded_State
    • ListView_SelectedItem_Both_Selection_Changed
    • ScrollViewer_WhenSync_RunNormalAndCompletesWithNonIntermediate_UITests_Shared_Windows_UI_Xaml_Controls_ScrollViewerTests_ScrollViewer_UpdatesMode
  • ios-Snap: 513 changed over 1039

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Border_Border_Simple_No_Background_With_Content_Border_With_Background_Uno_UI_Samples_UITests_BorderTestsControl_Border_Simple_No_Background_With_Content_Border_With_Background
    • Brushes_ImageBrushChangingCornerRadius_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushChangingCornerRadius
    • ComboBox_ComboBox_PlaceholderText_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_PlaceholderText
    • DragAndDrop_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_ListView_Custom_States_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_ListView_Custom_States
    • DragAndDrop_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_TreeView_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_TreeView
    • Focus_FocusManagerTest_Uno_UI_Samples_Content_UITests_FocusTests_FocusManagerTest
    • Focus_GetFocus_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • Gesture_Recognizer_VisualStates_ListViewItem_UITests_Shared_Windows_UI_Input_VisualStatesTests_ListViewItem
    • Gesture_Recognizer_VisualStates_TextBox_UITests_Shared_Windows_UI_Input_VisualStatesTests_TextBox_VisualStates
    • Grid_Grid_left_column_Auto_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_left_column_Auto
    • Grid_Grid_with_UserControl_HorizonalAlignment_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_UserControl_HorizonalAlignment
    • Grid_Grid_with_UserControl_VerticalAlignment_Fixed_Height_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_UserControl_VerticalAlignment_Fixed_Height
    • ListView_ListViewGroupedEmptyHeader_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedEmptyHeader
    • ListView_ListViewGroupedEmpty_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedEmpty
    • ListView_ListViewGroupedLargeLegacy_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedLargeLegacy
    • ListView_ListViewGroupedLarge_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedLarge
    • ListView_ListViewLegacy_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewLegacy
    • ListView_ListViewMarginTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewMarginTest
    • ListView_ListViewResizableText_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListViewResizableText
    • ListView_ListViewResizable_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewResizable
  • skia-gtk-screenshots: 21 changed over 1136

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView-ListViewSelectedItems.png
    • DragAndDrop-DragDrop_TestPage.png
    • PipsPager-PipsPagerExamples.png
    • Pickers-CalendarView_Theming.png
    • MediaPlayerElement-MediaPlayerElement_Stretch_Fill.png
    • MediaPlayerElement-Mini player.png
    • MediaPlayerElement-Using .3gp.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • Image-ImageSourceStream.png
    • MUX-NavigationViewRS4Page.png
    • Transform-TransformToVisual_Translate2d.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • WinUI-PipsPagerExamples.png
    • Windows.UI.Composition-CompositionMaskBrush.png
    • Windows.UI.Composition-CompositionVisualSurface.png
  • skia-wpf-screenshots: 18 changed over 1136

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Image-ImageSourceStream.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • Brushes-Ellipse.png
    • Progress-ProgressRingHeightTest.png
    • PipsPager-PipsPagerExamples.png
    • Pickers-CalendarView_Theming.png
    • Automation-AutomationProperties_Name.png
    • ListView-ListViewSelectedItems.png
    • TabView-TabViewPage.png
    • Windows.UI.Composition-CompositionMaskBrush.png
    • Windows.UI.Composition-CompositionVisualSurface.png
    • Windows.UI.Composition-RedirectVisual.png
    • WinUI-PipsPagerExamples.png
  • wasm: 30 changed over 1044

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Stretch_Fill
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_3gp_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Avi_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Flv_Extension
    • UITests.Windows_UI_ViewManagement.ApplicationViewSizing
    • UITests.Uno_Web.Http.CookieManagerTests
    • Uno.UI.Samples.Content.UITests.CommandBar.CommandBar_With_Long_Sentences
    • initial_state
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems
    • UITests.Windows_UI_Xaml_Controls.CalendarView.CalendarView_Theming
    • UITests.Windows_Media.MediaPlayerTests
    • UITests.Windows_UI_Xaml.UIElementTests.UIElement_MeasureDirtyPath
    • MUXControlsTestApp.SwipeControlPage2
    • UITests.Windows_UI_Xaml_Controls.ProgressRing.WindowsProgressRing_GH1220
    • MUXControlsTestApp.NavigationViewTopNavPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRingPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_CustomSources
    • MUXControlsTestApp.NavigationViewMenuItemStretchPage
    • SamplesApp.Samples.NavigationViewSample.NavigationViewSample
  • wasm-automated-net7.0-UWP-Benchmarks: 0 changed over 1

  • wasm-automated-net7.0-UWP-Default: 35 changed over 1937

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • MediaPlayerElement_Using_mov_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mov_Extension
    • MediaPlayerElement_Using_mp3_Audio_only_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mp3_Extension
    • MediaPlayerElement_Using_ogg_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Ogg_Extension
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • MediaPlayerElement_MediaPlayerElement_Stretch_Fill_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Stretch_Fill
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • MediaPlayerElement_Using_3gp_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_3gp_Extension
    • MediaPlayerElement_Using_avi_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Avi_Extension
    • MediaPlayerElement_Using_flv_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Flv_Extension
    • MediaPlayerElement_Using_mkv_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mkv_Extension
    • Image_UniformToFill100x100_Uno_UI_Samples_UITests_ImageTestsControl_UniformToFill100x100
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_CustomSources_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_CustomSources
  • wasm-automated-net7.0-UWP-RuntimeTests: 0 changed over 1

  • wasm-automated-net7.0-WinUI-RuntimeTests: 1 changed over 1

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • RunRuntimeTests_SamplesApp_Samples_UnitTests_UnitTestsPage

@jeromelaban jeromelaban merged commit d108af5 into release/stable/5.0 Dec 11, 2023
82 of 85 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.0/pr-14737 branch December 11, 2023 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/automation Categorizes an issue or PR as relevant to project automation area/code-generation Categorizes an issue or PR as relevant to code generation conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants