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

Refactor internal frame tracking & time handling #29

Merged
merged 19 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
use TimeProvider instead of Task.Delay
  • Loading branch information
DavidVollmers committed Sep 29, 2023
commit 64e768dca50c3c62a034396bc880e03d5c16fe50
2 changes: 1 addition & 1 deletion packages/Ignis.Components/IgnisComponentExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static IServiceCollection AddIgnis(this IServiceCollection serviceCollect
serviceCollection.AddTransient<FrameTracker>();

serviceCollection.TryAddScoped<IContentRegistry, ContentRegistry>();

serviceCollection.TryAddSingleton<TimeProvider, IgnisTimeProvider>();

return serviceCollection;
Expand Down
21 changes: 16 additions & 5 deletions packages/Tailwind/Ignis.Components.HeadlessUI/TransitionBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ 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)
Expand All @@ -79,13 +79,18 @@ protected virtual void EnterTransition(Action? continueWith = null)

UpdateState(TransitionState.Entering, () =>
{
Timer timer = null!;
var (graceDuration, transitionDuration) = ParseDuration(Enter);
using var timer = TimeProvider.CreateTimer(_ =>
timer = TimeProvider.CreateTimer(_ =>
{
// ReSharper disable once AccessToModifiedClosure
timer.Dispose();
UpdateState(TransitionState.Entered, () =>
{
using var timer = TimeProvider.CreateTimer(_ =>
timer = TimeProvider.CreateTimer(_ =>
{
// ReSharper disable once AccessToModifiedClosure
timer.Dispose();
UpdateState(TransitionState.CanLeave, continueWith);
}, state: null, transitionDuration, Timeout.InfiniteTimeSpan);
});
Expand All @@ -101,13 +106,19 @@ protected virtual void LeaveTransition(Action? continueWith = null)

UpdateState(TransitionState.Leaving, () =>
{
Timer timer = null!;
var (graceDuration, transitionDuration) = ParseDuration(Leave);
using var timer = TimeProvider.CreateTimer(_ =>
timer = TimeProvider.CreateTimer(_ =>
{
// ReSharper disable once AccessToModifiedClosure
timer.Dispose();
UpdateState(TransitionState.Left, () =>
{
using var timer = TimeProvider.CreateTimer(_ =>
timer = TimeProvider.CreateTimer(_ =>
{
// ReSharper disable once AccessToModifiedClosure
timer.Dispose();

RenderContent = false;

UpdateState(TransitionState.CanEnter, continueWith);
Expand Down