fix build warnings & refactor transition

DavidVollmers · Nov 26, 2023 · 4f507c9 · 4f507c9
1 parent ece8662
commit 4f507c9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/packages/Tailwind/Ignis.Components.HeadlessUI/Dialog.cs b/packages/Tailwind/Ignis.Components.HeadlessUI/Dialog.cs
@@ -210,7 +210,7 @@ public void Close(Action? continueWith = null)
 
         if (Transition != null)
         {
-            Transition.Leave(() => CloseCore(continueWith, async: true));
+            Transition.LeaveTransition(() => CloseCore(continueWith, async: true));
             return;
         }
 

diff --git a/packages/Tailwind/Ignis.Components.HeadlessUI/OpenCloseWithTransitionComponentBase.cs b/packages/Tailwind/Ignis.Components.HeadlessUI/OpenCloseWithTransitionComponentBase.cs
@@ -40,7 +40,7 @@ public void Open(Action? continueWith = null)
         _ = IsOpenChanged.InvokeAsync(_isOpen = true);
 
         if (Transition != null)
-            FrameTracker.ExecuteOnNextFrame(this, () => Transition.Enter(() => OnAfterOpen(continueWith)));
+            FrameTracker.ExecuteOnNextFrame(this, () => Transition.EnterTransition(() => OnAfterOpen(continueWith)));
         else if (continueWith != null) FrameTracker.ExecuteOnNextFrame(this, () => OnAfterOpen(continueWith));
 
         Update();
@@ -64,7 +64,7 @@ public void Close(Action? continueWith = null)
 
         if (Transition != null)
         {
-            Transition.Leave(() => CloseCore(continueWith, async: true));
+            Transition.LeaveTransition(() => CloseCore(continueWith, async: true));
             return;
         }
 

diff --git a/packages/Tailwind/Ignis.Components.HeadlessUI/RadioGroup.cs b/packages/Tailwind/Ignis.Components.HeadlessUI/RadioGroup.cs
@@ -40,7 +40,7 @@ public RadioGroupOption<T>? ActiveOption
     }
 
     /// <inheritdoc />
-    public IAriaComponentPart Label { get; set; }
+    public IAriaComponentPart? Label { get; set; }
 
     /// <inheritdoc />
     public string Id { get; } = "ignis-hui-radiogroup-" + Guid.NewGuid().ToString("N");

diff --git a/packages/Tailwind/Ignis.Components.HeadlessUI/Transition.cs b/packages/Tailwind/Ignis.Components.HeadlessUI/Transition.cs
@@ -116,26 +116,16 @@ protected internal override void Update(bool async = false)
         base.Update(async);
     }
 
-    public void Leave(Action? continueWith = null)
-    {
-        LeaveTransition(continueWith);
-    }
-
-    public void Enter(Action? continueWith)
-    {
-        EnterTransition(continueWith);
-    }
-
     /// <inheritdoc />
-    protected override void EnterTransition(Action? continueWith = null)
+    public override void EnterTransition(Action? continueWith = null)
     {
         _transitioningTo = _show = true;
 
         WatchTransition(isEnter: true, continueWith);
     }
 
     /// <inheritdoc />
-    protected override void LeaveTransition(Action? continueWith = null)
+    public override void LeaveTransition(Action? continueWith = null)
     {
         _transitioningTo = false;
 

diff --git a/packages/Tailwind/Ignis.Components.HeadlessUI/TransitionBase.cs b/packages/Tailwind/Ignis.Components.HeadlessUI/TransitionBase.cs
@@ -77,7 +77,7 @@ protected TransitionBase(Type asComponent) : base(asComponent)
     {
     }
 
-    protected virtual void EnterTransition(Action? continueWith = null)
+    public virtual void EnterTransition(Action? continueWith = null)
     {
         if (_state != TransitionState.Default && _state != TransitionState.CanEnter) return;
 
@@ -104,7 +104,7 @@ protected virtual void EnterTransition(Action? continueWith = null)
         });
     }
 
-    protected virtual void LeaveTransition(Action? continueWith = null)
+    public virtual void LeaveTransition(Action? continueWith = null)
     {
         if (_state != TransitionState.Default && _state != TransitionState.CanLeave) return;
 

diff --git a/tests/Ignis.Tests.Components.Reactivity/SilentBinding.razor b/tests/Ignis.Tests.Components.Reactivity/SilentBinding.razor
@@ -14,7 +14,7 @@
 {
     private readonly ReactiveReference<string?> _binding;
 
-    private string _text = "Hello World!";
+    private string? _text = "Hello World!";
 
     public SilentBinding()
     {