simplify ReactScript and optional features

KurtGokhan · KurtGokhan · commit 959691959024 · 2021-03-06T17:55:33.000+03:00
diff --git a/Editor/Drawers/ReactScriptDrawer.cs b/Editor/Drawers/ReactScriptDrawer.cs
@@ -12,7 +12,6 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
         {
             var x = position.x;
             var width = position.width;
-            var watchWidth = 60;
             var source = property.FindPropertyRelative("ScriptSource");
             position.y += 2;
             position.height = 18;
@@ -21,26 +20,13 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             position.y += 20;
             position.height = 18;
 
-            var watchable = IsWatchable(source);
-
-            if (watchable) position.width = position.width - watchWidth;
-
             if ((int)ScriptSource.TextAsset == source.intValue)
                 EditorGUI.PropertyField(position, property.FindPropertyRelative("SourceAsset"));
             else if ((int)ScriptSource.Text == source.intValue)
                 EditorGUI.PropertyField(position, property.FindPropertyRelative("SourceText"));
             else
                 EditorGUI.PropertyField(position, property.FindPropertyRelative("SourcePath"));
 
-            if (watchable)
-            {
-                position.x = position.width + x;
-                position.width = watchWidth;
-                var watch = property.FindPropertyRelative("Watch");
-                watch.boolValue = EditorGUI.ToggleLeft(position, "Watch", watch.boolValue);
-            }
-
-
             var useDevServer = property.FindPropertyRelative("UseDevServer");
             position.x = x;
             position.width = width;
@@ -57,11 +43,5 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
         {
             return 64;
         }
-
-        bool IsWatchable(SerializedProperty sourceProperty)
-        {
-            var val = sourceProperty.intValue;
-            return (int)ScriptSource.TextAsset == val || (int)ScriptSource.File == val || (int)ScriptSource.Resource == val;
-        }
     }
 }
diff --git a/Editor/ReactUnity.Editor.asmdef b/Editor/ReactUnity.Editor.asmdef
@@ -1,6 +1,6 @@
 {
     "name": "ReactUnity.Editor",
-    "rootNamespace": "",
+    "rootNamespace": "ReactUnity.Editor",
     "references": [
         "GUID:ed4a920eac98dc342ba18a6baa202849",
         "GUID:6055be8ebefd69e48b49212b09b47b2f",
diff --git a/Runtime/Core/ReactScript.cs b/Runtime/Core/ReactScript.cs
@@ -1,3 +1,4 @@
+using ReactUnity.Interop;
 using System;
 using System.Collections;
 using UnityEngine;
@@ -14,28 +15,17 @@ public class ReactScript
         public string SourceText;
         public string ResourcesPath;
 
-#pragma warning disable CS0414
-        [SerializeField]
-        [Tooltip(@"Editor only. Watches file for changes and refreshes the view on change.
-Can be enabled outside the editor by adding define symbol REACT_WATCH_OUTSIDE_EDITOR to build.")]
-        private bool Watch = false;
-#pragma warning restore CS0414
-
         public bool UseDevServer = true;
         public string DevServer = "http://localhost:3000";
         static string DevServerFilename = "";
         public string DevServerFile => DevServer + DevServerFilename;
 
-        private bool SourceIsTextAsset => ScriptSource == ScriptSource.TextAsset;
-        private bool SourceIsPath => ScriptSource != ScriptSource.TextAsset && ScriptSource != ScriptSource.Text;
-        private bool SourceIsText => ScriptSource == ScriptSource.Text;
-        private bool SourceIsWatchable => ScriptSource != ScriptSource.Url && ScriptSource != ScriptSource.Text;
 
         public string SourceLocation
         {
             get
             {
-#if UNITY_EDITOR
+#if UNITY_EDITOR || REACT_DEV_SERVER_API
                 if (UseDevServer && !string.IsNullOrWhiteSpace(DevServer)) return DevServerFile;
 #endif
                 return GetResolvedSourcePath();
@@ -56,47 +46,28 @@ public string GetResolvedSourcePath()
             return path;
         }
 
-#if UNITY_EDITOR || REACT_WATCH_OUTSIDE_EDITOR
-        IDisposable StartWatching(Action<string, bool> callback)
-        {
-            string path = GetResolvedSourcePath();
-            if (string.IsNullOrWhiteSpace(path)) return null;
-
-            return DetectChanges.WatchFileSystem(path, x => callback(System.IO.File.ReadAllText(path), false));
-        }
-#endif
-
         public IDisposable GetScript(Action<string, bool> callback, bool useDevServer = true, bool disableWarnings = false)
         {
-#if UNITY_EDITOR
+#if UNITY_EDITOR || REACT_DEV_SERVER_API
             if (useDevServer && UseDevServer && !string.IsNullOrWhiteSpace(DevServer))
             {
                 var request = UnityEngine.Networking.UnityWebRequest.Get(DevServerFile);
 
-                if (Application.isPlaying) return new Interop.MainThreadDispatcher.CoroutineHandle(
-                    Interop.MainThreadDispatcher.StartDeferred(WatchWebRequest(request, callback, err =>
-                    {
-                        Debug.LogWarning("DevServer seems to be unaccessible. Falling back to the original script.");
-                        GetScript(callback, false);
-                    }, true)));
-                else return new Interop.EditorDispatcher.CoroutineHandle(
-                    Interop.EditorDispatcher.StartDeferred(WatchWebRequest(request, callback, err =>
-                    {
-                        Debug.LogWarning("DevServer seems to be unaccessible. Falling back to the original script.");
-                        GetScript(callback, false);
-                    }, true)));
+                return new AdaptiveDispatcher.CoroutineHandle(
+                    AdaptiveDispatcher.StartDeferred(
+                        WatchWebRequest(request, callback, err =>
+                        {
+                            Debug.LogWarning("DevServer seems to be unaccessible. Falling back to the original script.");
+                            GetScript(callback, false);
+                        }, true)));
             }
 #endif
 
             switch (ScriptSource)
             {
                 case ScriptSource.TextAsset:
                     if (!SourceAsset) callback(null, false);
-#if UNITY_EDITOR
-                    else callback(System.IO.File.ReadAllText(UnityEditor.AssetDatabase.GetAssetPath(SourceAsset)), false);
-#else
                     else callback(SourceAsset.text, false);
-#endif
                     break;
                 case ScriptSource.File:
 #if UNITY_EDITOR || REACT_FILE_API
@@ -115,10 +86,8 @@ public IDisposable GetScript(Action<string, bool> callback, bool useDevServer =
 #endif
                     var request = UnityEngine.Networking.UnityWebRequest.Get(SourcePath);
 
-                    if (Application.isPlaying) return new Interop.MainThreadDispatcher.CoroutineHandle(
-                        Interop.MainThreadDispatcher.StartDeferred(WatchWebRequest(request, callback)));
-                    else return new Interop.EditorDispatcher.CoroutineHandle(
-                        Interop.EditorDispatcher.StartDeferred(WatchWebRequest(request, callback)));
+                    return new AdaptiveDispatcher.CoroutineHandle(
+                        AdaptiveDispatcher.StartDeferred(WatchWebRequest(request, callback)));
 #else
                     throw new Exception("REACT_URL_API must be defined to use Url API outside the editor. Add REACT_URL_API to build symbols to use this feature.");
 #endif
@@ -135,13 +104,10 @@ public IDisposable GetScript(Action<string, bool> callback, bool useDevServer =
                     break;
             }
 
-#if UNITY_EDITOR || REACT_WATCH_OUTSIDE_EDITOR
-            if (Watch && SourceIsWatchable) return StartWatching(callback);
-#endif
             return null;
         }
 
-#if UNITY_EDITOR || REACT_URL_API
+#if UNITY_EDITOR || REACT_URL_API || REACT_DEV_SERVER_API
         private IEnumerator WatchWebRequest(
             UnityEngine.Networking.UnityWebRequest request,
             Action<string, bool> callback,
@@ -166,24 +132,4 @@ public enum ScriptSource
         Resource = 3,
         Text = 4,
     }
-
-
-#if UNITY_EDITOR || REACT_WATCH_OUTSIDE_EDITOR
-    public class DetectChanges
-    {
-        public static IDisposable WatchFileSystem(string path, Action<string> callback)
-        {
-            System.IO.FileSystemWatcher fileSystemWatcher = new System.IO.FileSystemWatcher();
-
-            fileSystemWatcher.Path = System.IO.Path.GetDirectoryName(path);
-            fileSystemWatcher.Filter = System.IO.Path.GetFileName(path);
-            fileSystemWatcher.NotifyFilter = System.IO.NotifyFilters.LastWrite | System.IO.NotifyFilters.Size;
-
-            fileSystemWatcher.Changed += (x, y) => callback(y.FullPath);
-            fileSystemWatcher.EnableRaisingEvents = true;
-
-            return fileSystemWatcher;
-        }
-    }
-#endif
 }
diff --git a/Runtime/Core/ReactUnityRunner.cs b/Runtime/Core/ReactUnityRunner.cs
@@ -137,7 +137,7 @@ void CreateLocation(Jint.Engine engine, ReactScript script)
             var location = new DomProxies.Location(script.SourceLocation, context.OnRestart);
             engine.SetValue("location", location);
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR || REACT_DEV_SERVER_API
             engine.SetValue("ctx", context);
             engine.SetValue("oldWebSocket", typeof(WebSocketProxy));
             engine.Execute(@"WebSocket = function() { return new oldWebSocket(ctx, ...arguments); }");
diff --git a/Runtime/Helpers/FeatureGuards.cs b/Runtime/Helpers/FeatureGuards.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ReactUnity.Helpers
+{
+    internal static class FeatureGuards
+    {
+        private static bool? vectorGraphics;
+
+        public static bool VectorGraphics
+        {
+            get
+            {
+                if (vectorGraphics.HasValue) return vectorGraphics.Value;
+#if !REACT_VECTOR_GRAPHICS
+                Debug.LogError("To use the 'borderRadius' feature, 'Unity.VectorGraphics' package must be installed.");
+                vectorGraphics = false;
+#elif UNITY_WEBGL
+                Debug.LogError("'borderRadius' feature cannot be used in WebGL builds.");
+                vectorGraphics = false;
+#else
+                if (!Application.isPlaying)
+                {
+                    vectorGraphics = false;
+                    Debug.LogError("'borderRadius' feature cannot be used in Editor mode.");
+                }
+                else
+                {
+                    vectorGraphics = true;
+                }
+#endif
+
+                return vectorGraphics.Value;
+            }
+        }
+    }
+}
diff --git a/Runtime/Helpers/FeatureGuards.cs.meta b/Runtime/Helpers/FeatureGuards.cs.meta
diff --git a/Runtime/Interop/AdaptiveDispatcher.cs b/Runtime/Interop/AdaptiveDispatcher.cs
@@ -8,6 +8,20 @@ namespace ReactUnity.Interop
 {
     public class AdaptiveDispatcher : MonoBehaviour
     {
+        public class CoroutineHandle : IDisposable
+        {
+            public int Handle { get; }
+            public CoroutineHandle(int handle)
+            {
+                Handle = handle;
+            }
+
+            public void Dispose()
+            {
+                StopDeferred(Handle);
+            }
+        }
+
         private static bool Playing;
 
         public static void Initialize()
diff --git a/Runtime/ReactUnity.asmdef b/Runtime/ReactUnity.asmdef
@@ -1,6 +1,6 @@
 {
     "name": "ReactUnity",
-    "rootNamespace": "",
+    "rootNamespace": "ReactUnity",
     "references": [
         "GUID:6055be8ebefd69e48b49212b09b47b2f",
         "GUID:68550284b645f4b9894995579f34290a",
diff --git a/Runtime/Styling/BorderGraphic.cs b/Runtime/Styling/BorderGraphic.cs
@@ -1,22 +1,18 @@
+using ReactUnity.Helpers;
 using System.Collections.Generic;
+using UnityEngine;
 #if !(!REACT_VECTOR_GRAPHICS || UNITY_WEBGL)
 using Unity.VectorGraphics;
 #endif
-using UnityEngine;
 
 namespace ReactUnity.Styling
 {
     public static class BorderGraphic
     {
         public static Dictionary<int, Sprite> SpriteCache = new Dictionary<int, Sprite>();
 
-#if !REACT_VECTOR_GRAPHICS || UNITY_WEBGL
-        private static bool ShowVectorGraphicsMessage = true;
-#endif
-
         static public Sprite CreateBorderSprite(int borderRadius)
         {
-            if (!Application.isPlaying) return null;
             borderRadius = Mathf.Max(borderRadius, 0);
             if (SpriteCache.ContainsKey(borderRadius)) return SpriteCache[borderRadius];
 
@@ -31,13 +27,9 @@ static public Sprite CreateBorderSprite(int borderRadius)
                     Sprite.Create(smallTexture, new Rect(0, 0, 4, 4), Vector2.one / 2, 1, 0, SpriteMeshType.FullRect, Vector4.one);
             }
 
+            if (!FeatureGuards.VectorGraphics) return null;
 
 #if !REACT_VECTOR_GRAPHICS || UNITY_WEBGL
-            if (ShowVectorGraphicsMessage)
-            {
-                Debug.LogError("To use the 'borderRadius' feeature, 'Unity.VectorGraphics' package must be installed.");
-                ShowVectorGraphicsMessage = false;
-            }
             return null;
 #else
             var svg = new Scene() { Root = new SceneNode() { Shapes = new List<Shape>() } };

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ReactUnity.Editor",`
`3`		`- "rootNamespace": "",`
	`3`	`+ "rootNamespace": "ReactUnity.Editor",`
`4`	`4`	`"references": [`
`5`	`5`	`"GUID:ed4a920eac98dc342ba18a6baa202849",`
`6`	`6`	`"GUID:6055be8ebefd69e48b49212b09b47b2f",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ReactUnity",`
`3`		`- "rootNamespace": "",`
	`3`	`+ "rootNamespace": "ReactUnity",`
`4`	`4`	`"references": [`
`5`	`5`	`"GUID:6055be8ebefd69e48b49212b09b47b2f",`
`6`	`6`	`"GUID:68550284b645f4b9894995579f34290a",`