CoderGamester
diff --git a/‎Editor/NonDrawingViewEditor.cs‎
Lines changed: 20 additions & 8 deletions b/‎Editor/NonDrawingViewEditor.cs‎
Lines changed: 20 additions & 8 deletions
@@ -1,7 +1,8 @@
 using GameLovers.UiService.Views;
 using UnityEditor;
 using UnityEditor.UI;
-using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
 
 // ReSharper disable once CheckNamespace
 
@@ -13,14 +14,25 @@ namespace GameLoversEditor.UiService
 	[CanEditMultipleObjects, CustomEditor(typeof(NonDrawingView), false)]
 	public class NonDrawingViewEditor : GraphicEditor
 	{
-		public override void OnInspectorGUI ()
+		public override VisualElement CreateInspectorGUI()
 		{
-			serializedObject.Update();
-			EditorGUILayout.PropertyField(m_Script, new GUILayoutOption[0]);
-			
-			// skipping AppearanceControlsGUI
-			RaycastControlsGUI();
-			serializedObject.ApplyModifiedProperties();
+			var root = new VisualElement();
+
+			// Add script field
+			var scriptField = new PropertyField(serializedObject.FindProperty("m_Script"));
+			scriptField.SetEnabled(false);
+			root.Add(scriptField);
+
+			// Add raycast controls using IMGUI container since it's from base class
+			var raycastContainer = new IMGUIContainer(() =>
+			{
+				serializedObject.Update();
+				RaycastControlsGUI();
+				serializedObject.ApplyModifiedProperties();
+			});
+			root.Add(raycastContainer);
+
+			return root;
 		}
 	}
 }