use TimeProvider instead of Task.Delay for transitions

packages/Ignis.Components/IgnisComponentExtensions.cs

@@ -14,6 +14,8 @@ public static IServiceCollection AddIgnis(this IServiceCollection serviceCollect
  serviceCollection.AddTransient<FrameTracker>();
 
  serviceCollection.TryAddScoped<IContentRegistry, ContentRegistry>();
+
+ serviceCollection.TryAddSingleton<TimeProvider, IgnisTimeProvider>();
 
  return serviceCollection;
  }

packages/Ignis.Components/IgnisTimeProvider.cs

@@ -0,0 +1,5 @@
+namespace Ignis.Components;
+
+internal class IgnisTimeProvider : TimeProvider
+{
+}

packages/Ignis.Components/TimeProvider.cs

@@ -0,0 +1,11 @@
+namespace Ignis.Components;
+
+//TODO switch to System.TimeProvider when it's available
+// https://learn.microsoft.com/en-us/dotnet/api/system.timeprovider?view=net-8.0
+internal abstract class TimeProvider
+{
+ public virtual Timer CreateTimer(TimerCallback callback, object? state, TimeSpan dueTime, TimeSpan period)
+ {
+ return new Timer(callback, state, dueTime, period);
+ }
+}

packages/Tailwind/Ignis.Components.HeadlessUI/Dialog.cs

@@ -226,7 +226,7 @@ public void SetDescription(IDialogDescription description)
  /// <inheritdoc />
  public void CloseFromTransition(Action? continueWith = null)
  {
- CloseCore(continueWith, true);
+ CloseCore(continueWith, async: true);
  }
 
  /// <inheritdoc />

packages/Tailwind/Ignis.Components.HeadlessUI/Transition.cs

@@ -173,7 +173,7 @@ protected override void LeaveTransition(Action? continueWith = null)
  {
  _transitioningTo = false;
 
- WatchTransition(false, () =>
+ WatchTransition(isEnter: false, () =>
  {
  _show = false;
 

packages/Tailwind/Ignis.Components.HeadlessUI/TransitionBase.cs

@@ -33,7 +33,8 @@ public abstract class TransitionBase : IgnisComponentBase, ICssClass, IHandleAft
  {
  get
  {
- var originalClassString = AdditionalAttributes?.FirstOrDefault(a => string.Equals(a.Key, "class", StringComparison.OrdinalIgnoreCase));
+ var originalClassString = AdditionalAttributes?.FirstOrDefault(a =>
+ string.Equals(a.Key, "class", StringComparison.OrdinalIgnoreCase));
  return _state switch
  {
  TransitionState.Entering => $"{originalClassString?.Value} {Enter} {EnterFrom}".Trim(),
@@ -67,6 +68,8 @@ public abstract class TransitionBase : IgnisComponentBase, ICssClass, IHandleAft
  }
 
  [Inject] internal FrameTracker FrameTracker { get; set; } = null!;
+
+ [Inject] internal TimeProvider TimeProvider { get; set; } = null!;
 
  protected virtual void EnterTransition(Action? continueWith = null)
  {
@@ -77,16 +80,16 @@ protected virtual void EnterTransition(Action? continueWith = null)
  UpdateState(TransitionState.Entering, () =>
  {
  var (graceDuration, transitionDuration) = ParseDuration(Enter);
- _ = Task.Delay(graceDuration).ContinueWith(__ =>
+ using var timer = TimeProvider.CreateTimer(_ =>
  {
  UpdateState(TransitionState.Entered, () =>
  {
- _ = Task.Delay(transitionDuration).ContinueWith(_ =>
+ using var timer = TimeProvider.CreateTimer(_ =>
  {
  UpdateState(TransitionState.CanLeave, continueWith);
- });
+ }, state: null, transitionDuration, Timeout.InfiniteTimeSpan);
  });
- });
+ }, state: null, graceDuration, Timeout.InfiniteTimeSpan);
  });
  }
 
@@ -99,18 +102,18 @@ protected virtual void LeaveTransition(Action? continueWith = null)
  UpdateState(TransitionState.Leaving, () =>
  {
  var (graceDuration, transitionDuration) = ParseDuration(Leave);
- _ = Task.Delay(graceDuration).ContinueWith(__ =>
+ using var timer = TimeProvider.CreateTimer(_ =>
  {
  UpdateState(TransitionState.Left, () =>
  {
- _ = Task.Delay(transitionDuration).ContinueWith(_ =>
+ using var timer = TimeProvider.CreateTimer(_ =>
  {
  RenderContent = false;
 
  UpdateState(TransitionState.CanEnter, continueWith);
- });
+ }, state: null, transitionDuration, Timeout.InfiniteTimeSpan);
  });
- });
+ }, state: null, graceDuration, Timeout.InfiniteTimeSpan);
  });
  }
 
@@ -133,12 +136,12 @@ public virtual Task OnAfterRenderAsync()
  return Task.CompletedTask;
  }
 
- private static (int, int) ParseDuration(string? classString)
+ private static (TimeSpan, TimeSpan) ParseDuration(string? classString)
  {
  var durationClass = classString?.Split(' ')
  .Select(v => v.Trim().Split(':')[v.Trim().Split(':').Length - 1])
  .FirstOrDefault(v => v.StartsWith("duration-", StringComparison.Ordinal));
- if (durationClass == null) return (0, 0);
+ if (durationClass == null) return (TimeSpan.Zero, TimeSpan.Zero);
 
  var factor = 1;
 
@@ -156,15 +159,16 @@ private static (int, int) ParseDuration(string? classString)
  durationString = durationString[..^1];
  factor = 1000;
  }
- else return (0, 0);
+ else return (TimeSpan.Zero, TimeSpan.Zero);
  }
 
  var duration = int.Parse(durationString, CultureInfo.InvariantCulture) * factor;
- if (duration <= 0) return (0, 0);
+ if (duration <= 0) return (TimeSpan.Zero, TimeSpan.Zero);
 
  return duration < TransitionGraceDuration
- ? (0, duration)
- : (TransitionGraceDuration, duration - TransitionGraceDuration);
+ ? (TimeSpan.Zero, TimeSpan.FromMilliseconds(duration))
+ : (TimeSpan.FromMilliseconds(TransitionGraceDuration),
+ TimeSpan.FromMilliseconds(duration - TransitionGraceDuration));
  }
 
  private enum TransitionState