Merge pull request #2081 from unoplatform/dev/dr/miscsFixes

fix: [MVUX] misc fixes
unoplatform · Dec 4, 2023 · d640576 · d640576
2 parents cf96ace + 6d84e76
commit d640576
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/build/ci/.azure-pipelines.Packages.yml b/build/ci/.azure-pipelines.Packages.yml
@@ -44,7 +44,7 @@ jobs:
       msbuildLocationMethod: location
       msbuildLocation: $(MSBUILDPATH)
       msbuildArchitecture: x86
-      msbuildArguments: /r /m /v:m /p:Configuration=Release "/p:PackageOutputPath=$(build.artifactstagingdirectory)\nuget" "/p:PackageVersion=%GITVERSION_FullSemVer%" "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /detailedsummary /bl:$(build.artifactstagingdirectory)/uno-extensions.binlog
+      msbuildArguments: /r /m /v:m /p:Configuration=Release "/p:PackageOutputPath=$(build.artifactstagingdirectory)\nuget" "/p:PackageVersion=$(GitVersion.FullSemVer)" "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /detailedsummary /bl:$(build.artifactstagingdirectory)/uno-extensions.binlog
       clean: false
       maximumCpuCount: true
       restoreNugetPackages: false

diff --git a/src/Uno.Extensions.Reactive.UI/Presentation/Bindings/Collections/Facets/PaginationFacet.cs b/src/Uno.Extensions.Reactive.UI/Presentation/Bindings/Collections/Facets/PaginationFacet.cs
@@ -16,12 +16,14 @@ internal class PaginationFacet : IDisposable
 
 		private readonly CancellationTokenSource _ct = new();
 		private readonly IPaginationService? _service;
+		private readonly IBindableCollectionViewSource _source;
 		private readonly CollectionChangedFacet _changed;
 		private readonly BindableCollectionExtendedProperties _properties;
 
 		public PaginationFacet(IBindableCollectionViewSource source, CollectionChangedFacet changed, BindableCollectionExtendedProperties properties)
 		{
 			_service = source.GetService(typeof(IPaginationService)) as IPaginationService;
+			_source = source;
 			_changed = changed;
 			_properties = properties;
 
@@ -59,7 +61,7 @@ private void OnServiceStateChanged(object? sender, EventArgs _)
 			{
 				_properties.HasMoreItems = HasMoreItems = svc.HasMoreItems;
 				_properties.IsLoadingMoreItems = svc.IsLoadingMoreItems;
-				_changed.PropertyChanged(nameof(HasMoreItems));
+				_source.Dispatcher?.TryEnqueue(() => _changed.PropertyChanged(nameof(HasMoreItems)));
 			}
 			else
 			{

diff --git a/src/Uno.Extensions.Reactive.UI/View/FeedView.xaml b/src/Uno.Extensions.Reactive.UI/View/FeedView.xaml
@@ -74,7 +74,7 @@
 							</VisualStateGroup>
 							<VisualStateGroup x:Name="ProgressGroup">
 								<VisualStateGroup.Transitions>
-									<VisualTransition To="Indeterminate">
+									<VisualTransition From="NoProgress" To="Indeterminate">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames
 												Storyboard.TargetName="ProgressRoot"
@@ -99,12 +99,17 @@
 												Duration="0:0:0.100" />
 										</Storyboard>
 									</VisualTransition>
-									<VisualTransition From="Indeterminate">
+									<VisualTransition From="Indeterminate" To="NoProgress">
 										<Storyboard>
+											<ObjectAnimationUsingKeyFrames
+												Storyboard.TargetName="ProgressRoot"
+												Storyboard.TargetProperty="Visibility">
+												<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+												<DiscreteObjectKeyFrame KeyTime="0:0:0.100" Value="Collapsed" />
+											</ObjectAnimationUsingKeyFrames>
 											<DoubleAnimation
 												Storyboard.TargetName="ProgressPresenter"
 												Storyboard.TargetProperty="Opacity"
-												From="1"
 												To="0"
 												Duration="0:0:0.100" />
 										</Storyboard>
@@ -113,8 +118,8 @@
 								<VisualState x:Name="NoProgress" />
 								<VisualState x:Name="Indeterminate">
 									<VisualState.Setters>
-										<Setter Target="DataRoot.Visibility" Value="Collapsed" />
-										<Setter Target="ErrorRoot.Visibility" Value="Collapsed" />
+										<Setter Target="DataRoot.Opacity" Value="0" />
+										<Setter Target="ErrorRoot.Opacity" Value="0" />
 										<Setter Target="ProgressRoot.Visibility" Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>

diff --git a/src/Uno.Extensions.Reactive/Sources/PaginatedListFeed.cs b/src/Uno.Extensions.Reactive/Sources/PaginatedListFeed.cs
@@ -40,6 +40,8 @@ public IAsyncEnumerable<Message<IImmutableList<TItem>>> GetSource(SourceContext
 
 		async ValueTask Load(TokenSet<RefreshToken>? refresh, CancellationToken ct)
 		{
+			refreshRequests.MoveNext();
+
 			var cursor = _firstPage;
 			var pageInfo = new PaginationInfo { HasMoreItems = true };
 			var isFirstPage = true;
@@ -71,7 +73,6 @@ async ValueTask Load(TokenSet<RefreshToken>? refresh, CancellationToken ct)
 
 				// Prepare the next token we will process
 				pageRequests.MoveNext();
-				refreshRequests.MoveNext();
 				isFirstPage = false;
 			}
 		}