1

Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using BITKit.Mod;
+using BITKit.StateMachine;
 using Cysharp.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Serialization;
@@ -18,7 +19,7 @@ using Debug = UnityEngine.Debug;
 
 namespace BITKit.UX
 {
-	public abstract class UIToolKitPanel : IUXPanel,IDisposable
+	public abstract class UIToolKitPanel :StateAsync, IUXPanel,IDisposable
 	{
 		public const string USSEntry = "transition_entry";
 		public const string USSEntryAsync = "transition_entry_async";
@@ -115,7 +116,7 @@ namespace BITKit.UX
 			//WaitUtilTransitionCompleted = new();
 		}
 
-		protected static readonly InputActionGroup InputActionGroup = new()
+		protected readonly InputActionGroup InputActionGroup = new()
 		{
 			allowGlobalActivation = false,
 			Source = nameof(UIToolKitPanel)
@@ -137,13 +138,12 @@ namespace BITKit.UX
 		}
 		protected virtual void OnPanelEntry(){}
 		protected virtual void OnPanelExit(){}
-
-		void IEntryElement.Entry()
+		public override void OnStateEntry(IState old)
 		{
 			InputActionGroup.allowInput.AddElement(this);
 			OnEntry?.Invoke();
 		}
-		async UniTask IEntryElement.EntryAsync()
+		public override async UniTask OnStateEntryAsync(IState old)
 		{
 			await InitializeAsync();
 
@@ -193,6 +193,12 @@ namespace BITKit.UX
 	        await UniTask.SwitchToMainThread();
 
 	        RootVisualElement.AddToClassList(USSEntered);
+	        
+	        OnPanelEntry();
+	        OnEntryCompleted?.Invoke();
+	        
+	        RootVisualElement.RemoveFromClassList(USSEntry);
+	        RootVisualElement.RemoveFromClassList(USSEntryAsync);
 		}
 		private void OnTransitionEnd<TChangeEvent>(TChangeEvent evt)
 		{
@@ -203,22 +209,15 @@ namespace BITKit.UX
         {
 	        return UniTask.CompletedTask;
         }
-        void IEntryElement.Entered()
-        {
-	        OnPanelEntry();
-	        OnEntryCompleted?.Invoke();
-	        
-	        RootVisualElement.RemoveFromClassList(USSEntry);
-	        RootVisualElement.RemoveFromClassList(USSEntryAsync);
-        }
 
-        void IEntryElement.Exit()
+		public override void OnStateExit(IState old, IState newState)
 		{
 			OnPanelExit();
 			InputActionGroup.allowInput.RemoveElement(this);
 			OnExit?.Invoke();
 		}
-		async UniTask IEntryElement.ExitAsync()
+
+		public override async UniTask OnStateExitAsync(IState old, IState newState)
 		{
 			RootVisualElement?.RemoveFromClassList(USSEntered);
 			await UniTask.NextFrame();
@@ -244,9 +243,6 @@ namespace BITKit.UX
 			{
 			}
 
-		}
-        void IEntryElement.Exited()
-		{
 			RootVisualElement?.RemoveFromClassList(USSExit);
 			RootVisualElement?.RemoveFromClassList(USSExitAsync);
 			RootVisualElement?.AddToClassList(USSExited);
@@ -275,6 +271,7 @@ namespace BITKit.UX
 
 		public virtual void Dispose()
 		{
+			InputActionGroup.Dispose();
 			RootVisualElement?.RemoveFromHierarchy();
 			IsDisposed = true;
 		}

Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolkitSubPanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using BITKit.StateMachine;
 using Cysharp.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using UnityEngine;
@@ -67,43 +68,6 @@ namespace BITKit.UX
         {  UXUtils.Inject(this,Panel.Root as VisualElement);
   
         }
-
-        bool IEntryElement.IsEntered
-        {
-            get => Panel.IsEntered;
-            set => Panel.IsEntered = value;
-        }
-
-        void IEntryElement.Entry()
-        {
-            Panel.Entry();
-        }
-
-        UniTask IEntryElement.EntryAsync()
-        {
-            return Panel.EntryAsync();
-        }
-
-        void IEntryElement.Entered()
-        {
-            Panel.Entered();
-        }
-
-        void IEntryElement.Exit()
-        {
-            Panel.Exit();
-        }
-
-        UniTask IEntryElement.ExitAsync()
-        {
-            return Panel.ExitAsync();
-        }
-
-        void IEntryElement.Exited()
-        {
-            Panel.Exited();
-        }
-
         bool IUXPanel.IsWindow => Panel.IsWindow;
 
         string IUXPanel.Index => Panel.Index;
@@ -136,6 +100,58 @@ namespace BITKit.UX
         {
             Panel.OnTick(deltaTime);
         }
+
+        public bool Enabled
+        {
+            get => Panel.Enabled;
+            set => Panel.Enabled = value;
+        }
+
+        public void Initialize()
+        {
+            Panel.Initialize();
+        }
+
+        public void OnStateEntry(IState old)
+        {
+            Panel.OnStateEntry(old);
+        }
+
+        public void OnStateUpdate(float deltaTime)
+        {
+            Panel.OnStateUpdate(deltaTime);
+        }
+
+        public void OnStateExit(IState old, IState newState)
+        {
+            Panel.OnStateExit(old, newState);
+        }
+
+        public int Identifier
+        {
+            get => Panel.Identifier;
+            set => Panel.Identifier = value;
+        }
+
+        public UniTask InitializeAsync()
+        {
+            return Panel.InitializeAsync();
+        }
+
+        public UniTask OnStateEntryAsync(IState old)
+        {
+            return Panel.OnStateEntryAsync(old);
+        }
+
+        public UniTask OnStateUpdateAsync(float deltaTime)
+        {
+            return Panel.OnStateUpdateAsync(deltaTime);
+        }
+
+        public UniTask OnStateExitAsync(IState old, IState newState)
+        {
+            return Panel.OnStateExitAsync(old, newState);
+        }
     }
 
 }