-
Notifications
You must be signed in to change notification settings - Fork 742
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15672 from ramezgerges/deferloadstrategy
fix: DeferLoadStrategy should work even if no visibility is set
- Loading branch information
Showing
40 changed files
with
988 additions
and
261 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...ourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Given_LazyLoading.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| using System.Collections.Immutable; | ||
| using Microsoft.CodeAnalysis.Testing; | ||
| using Uno.UI.SourceGenerators.Tests.Verifiers; | ||
|
|
||
| namespace Uno.UI.SourceGenerators.Tests.XamlCodeGeneratorTests; | ||
|
|
||
| using Verify = XamlSourceGeneratorVerifier; | ||
|
|
||
| [TestClass] | ||
| public class Given_LazyLoading | ||
| { | ||
| [TestMethod] | ||
| public async Task When_DeferLoadStrategy_No_Visibility_Set() | ||
| { | ||
| var xamlFile = new XamlFile("MainPage.xaml", | ||
| """ | ||
| <Page | ||
| x:Class="TestRepro.MainPage" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| mc:Ignorable="d"> | ||
| <StackPanel> | ||
| <TextBlock Text="Immediate content"/> | ||
| <Border x:Name="LazyLoadedBorder" x:DeferLoadStrategy="Lazy"> | ||
| <TextBlock Text="Lazy Content" /> | ||
| </Border> | ||
| </StackPanel> | ||
| </Page> | ||
| """); | ||
|
|
||
| var test = new Verify.Test(xamlFile) | ||
| { | ||
| TestState = | ||
| { | ||
| Sources = | ||
| { | ||
| """ | ||
| using System; | ||
| using Microsoft.UI.Xaml; | ||
| using Microsoft.UI.Xaml.Controls; | ||
| namespace TestRepro | ||
| { | ||
| public sealed partial class MainPage : Page | ||
| { | ||
| public MainPage() | ||
| { | ||
| this.InitializeComponent(); | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| } | ||
| }, | ||
| ReferenceAssemblies = ReferenceAssemblies.Net.Net70.AddPackages(ImmutableArray.Create(new PackageIdentity("Uno.WinUI", "5.0.118"))), | ||
| DisableBuildReferences = true, | ||
| }.AddGeneratedSources(); | ||
|
|
||
| await test.RunAsync(); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public async Task When_xLoad_Child_Has_xBind() | ||
| { | ||
| var xamlFile = new XamlFile("MainPage.xaml", | ||
| """ | ||
| <Page | ||
| x:Class="TestRepro.MainPage" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| mc:Ignorable="d"> | ||
| <ContentControl x:Name="topLevelContent" x:FieldModifier="public" x:Load="false"> | ||
| <TextBlock x:Name="innerTextBlock" x:FieldModifier="public" Text="{x:Bind InnerText, Mode=OneWay}" /> | ||
| </ContentControl> | ||
| </Page> | ||
| """); | ||
|
|
||
| var test = new Verify.Test(xamlFile) | ||
| { | ||
| TestState = | ||
| { | ||
| Sources = | ||
| { | ||
| """ | ||
| using System; | ||
| using Microsoft.UI.Xaml; | ||
| using Microsoft.UI.Xaml.Controls; | ||
| namespace TestRepro | ||
| { | ||
| public sealed partial class MainPage : Page | ||
| { | ||
| public MainPage() | ||
| { | ||
| this.InitializeComponent(); | ||
| } | ||
| public string InnerText | ||
| { | ||
| get { return (string)GetValue(InnerTextProperty); } | ||
| set { SetValue(InnerTextProperty, value); } | ||
| } | ||
| public static readonly DependencyProperty InnerTextProperty = | ||
| DependencyProperty.Register("InnerText", typeof(string), typeof(MainPage), new PropertyMetadata("My inner text")); | ||
| } | ||
| } | ||
| """ | ||
| } | ||
| }, | ||
| ReferenceAssemblies = ReferenceAssemblies.Net.Net70.AddPackages(ImmutableArray.Create(new PackageIdentity("Uno.WinUI", "5.0.118"))), | ||
| DisableBuildReferences = true, | ||
| }.AddGeneratedSources(); | ||
|
|
||
| await test.RunAsync(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
...ators.Tests/XamlCodeGeneratorTests/Out/WDLSNVS/XamlCodeGenerator_GlobalStaticResources.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // <autogenerated /> | ||
| namespace MyProject | ||
| { | ||
| /// <summary> | ||
| /// Contains all the static resources defined for the application | ||
| /// </summary> | ||
| public sealed partial class GlobalStaticResources | ||
| { | ||
| static bool _initialized; | ||
| private static bool _stylesRegistered; | ||
| private static bool _dictionariesRegistered; | ||
| internal static global::Uno.UI.Xaml.XamlParseContext __ParseContext_ { get; } = new global::Uno.UI.Xaml.XamlParseContext() | ||
| { | ||
| AssemblyName = "TestProject", | ||
| } | ||
| ; | ||
|
|
||
| static GlobalStaticResources() | ||
| { | ||
| Initialize(); | ||
| } | ||
| public static void Initialize() | ||
| { | ||
| if (!_initialized) | ||
| { | ||
| _initialized = true; | ||
| global::Uno.UI.GlobalStaticResources.Initialize(); | ||
| global::Uno.UI.Toolkit.GlobalStaticResources.Initialize(); | ||
| global::Uno.UI.GlobalStaticResources.RegisterDefaultStyles(); | ||
| global::Uno.UI.Toolkit.GlobalStaticResources.RegisterDefaultStyles(); | ||
| global::Uno.UI.GlobalStaticResources.RegisterResourceDictionariesBySource(); | ||
| global::Uno.UI.Toolkit.GlobalStaticResources.RegisterResourceDictionariesBySource(); | ||
| } | ||
| } | ||
| public static void RegisterDefaultStyles() | ||
| { | ||
| if(!_stylesRegistered) | ||
| { | ||
| _stylesRegistered = true; | ||
| RegisterDefaultStyles_MainPage_d6cd66944958ced0c513e0a04797b51d(); | ||
| } | ||
| } | ||
| // Register ResourceDictionaries using ms-appx:/// syntax, this is called for external resources | ||
| public static void RegisterResourceDictionariesBySource() | ||
| { | ||
| if(!_dictionariesRegistered) | ||
| { | ||
| _dictionariesRegistered = true; | ||
| } | ||
| } | ||
| // Register ResourceDictionaries using ms-resource:/// syntax, this is called for local resources | ||
| internal static void RegisterResourceDictionariesBySourceLocal() | ||
| { | ||
| } | ||
| static partial void RegisterDefaultStyles_MainPage_d6cd66944958ced0c513e0a04797b51d(); | ||
|
|
||
| } | ||
| } |
2 changes: 2 additions & 0 deletions
2
...ators.Tests/XamlCodeGeneratorTests/Out/WDLSNVS/XamlCodeGenerator_LocalizationResources.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // <auto-generated /> | ||
| [assembly: global::System.Reflection.AssemblyMetadata("UnoHasLocalizationResources", "False")] |
Oops, something went wrong.