introduce ITimer interface

packages/Ignis.Components/ITimer.cs

@@ -0,0 +1,7 @@
+namespace Ignis.Components;
+
+//TODO switch to System.Threading.ITimer when it's available
+// https://learn.microsoft.com/en-us/dotnet/api/system.threading.itimer?view=net-8.0
+internal interface ITimer : IDisposable
+{
+}

packages/Ignis.Components/IgnisComponentExtensions.cs

@@ -15,7 +15,7 @@ public static IServiceCollection AddIgnis(this IServiceCollection serviceCollect
 
  serviceCollection.TryAddScoped<IContentRegistry, ContentRegistry>();
 
- serviceCollection.TryAddSingleton<TimeProvider, IgnisTimeProvider>();
+ serviceCollection.TryAddSingleton<TimeProvider, TimeProviderImplementation>();
 
  return serviceCollection;
  }

packages/Ignis.Components/TimeProvider.cs

@@ -1,11 +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)
+ public virtual ITimer CreateTimer(TimerCallback callback, object? state, TimeSpan dueTime, TimeSpan period)
  {
- return new Timer(callback, state, dueTime, period);
+ return new TimerImplementation(callback, state, dueTime, period);
  }
 }

packages/Ignis.Components/TimeProviderImplementation.cs

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

packages/Ignis.Components/TimerImplementation.cs

@@ -0,0 +1,16 @@
+namespace Ignis.Components;
+
+internal class TimerImplementation : ITimer
+{
+ private readonly Timer _timer;
+
+ public TimerImplementation(TimerCallback callback, object? state, TimeSpan dueTime, TimeSpan period)
+ {
+ _timer = new Timer(callback, state, dueTime, period);
+ }
+
+ public void Dispose()
+ {
+ _timer.Dispose();
+ }
+}

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

@@ -79,7 +79,7 @@ protected virtual void EnterTransition(Action? continueWith = null)
 
  UpdateState(TransitionState.Entering, () =>
  {
- Timer timer = null!;
+ ITimer timer = null!;
  var (graceDuration, transitionDuration) = ParseDuration(Enter);
  timer = TimeProvider.CreateTimer(_ =>
  {
@@ -106,7 +106,7 @@ protected virtual void LeaveTransition(Action? continueWith = null)
 
  UpdateState(TransitionState.Leaving, () =>
  {
- Timer timer = null!;
+ ITimer timer = null!;
  var (graceDuration, transitionDuration) = ParseDuration(Leave);
  timer = TimeProvider.CreateTimer(_ =>
  {

tests/Ignis.Tests.Common/TestTimeProvider.cs

@@ -4,8 +4,9 @@ namespace Ignis.Tests.Common;
 
 internal class TestTimeProvider : TimeProvider
 {
- public override Timer CreateTimer(TimerCallback callback, object? state, TimeSpan dueTime, TimeSpan period)
+ public override ITimer CreateTimer(TimerCallback callback, object? state, TimeSpan dueTime, TimeSpan period)
  {
- return base.CreateTimer(callback, state, TimeSpan.Zero, Timeout.InfiniteTimeSpan);
+ callback(state);
+ return new TestTimer();
  }
 }

tests/Ignis.Tests.Common/TestTimer.cs

@@ -0,0 +1,14 @@
+using Ignis.Components;
+
+namespace Ignis.Tests.Common;
+
+internal class TestTimer : ITimer
+{
+ public TestTimer()
+ {
+ }
+
+ public void Dispose()
+ {
+ }
+}

tests/Ignis.Tests.Components.HeadlessUI/DialogTests.razor

@@ -137,12 +137,10 @@
  var transition = cut.FindComponent<Transition>();
  transition.SetParametersAndRender(p => { p.Add(x => x.Show, true); });
 
- await Task.Delay(100);
-
- var transitions = cut.FindAll($"#{transitionId}");
+ var transitions = cut.WaitForElements($"#{transitionId}");
  Assert.Single(transitions);
 
- var dialogs = cut.FindAll($"#{dialogId}");
+ var dialogs = cut.WaitForElements($"#{dialogId}");
  Assert.Single(dialogs);
 
  var dialogDiv = dialogs.Single();
@@ -183,9 +181,7 @@
  var transition = cut.FindComponent<Transition>();
  transition.SetParametersAndRender(p => { p.Add(x => x.Show, true); });
 
- await Task.Delay(400);
-
- var transitions = cut.FindAll($"#{transitionId}");
+ var transitions = cut.WaitForElements($"#{transitionId}");
  Assert.Single(transitions);
 
  var dialogs = cut.FindAll($"#{dialogId}");
@@ -203,14 +199,11 @@
 
  transition.SetParametersAndRender(p => { p.Add(x => x.Show, false); });
 
- await Task.Delay(300);
-
+ cut.WaitForState(() => cut.FindAll($"#{dialogId}").Count == 0);
+ 
  transitions = cut.FindAll($"#{transitionId}");
  Assert.Single(transitions);
-
- dialogs = cut.FindAll($"#{dialogId}");
- Assert.Empty(dialogs);
-
+
  transitionDiv = transitions.Single();
  outletDiv = cut.Find($"#{outletId}");
  var transitionChildDivs = cut.FindAll($"#{transitionChildId}");