Pass IReactSiteConfiguration as parameter for ReactComponent ctor

Author: BartAdv

src/React.Tests/Core/ReactComponentTest.cs

@@ -21,7 +21,7 @@ public void RenderHtmlShouldThrowExceptionIfComponentDoesNotExist()
 		{
 			var environment = new Mock<IReactEnvironment>();
 			environment.Setup(x => x.Execute<bool>("typeof Foo !== 'undefined'")).Returns(false);
-			var component = new ReactComponent(environment.Object, "Foo", "container");
+			var component = new ReactComponent(environment.Object, null, "Foo", "container");
 
 			Assert.Throws<ReactInvalidComponentException>(() =>
 			{
@@ -34,8 +34,9 @@ public void RenderHtmlShouldCallRenderComponent()
 		{
 			var environment = new Mock<IReactEnvironment>();
 			environment.Setup(x => x.Execute<bool>("typeof Foo !== 'undefined'")).Returns(true);
+			var config = new Mock<IReactSiteConfiguration>();
 
-			var component = new ReactComponent(environment.Object, "Foo", "container")
+			var component = new ReactComponent(environment.Object, config.Object, "Foo", "container")
 			{
 				Props = new { hello = "World" }
 			};
@@ -51,8 +52,9 @@ public void RenderHtmlShouldWrapComponentInDiv()
 			environment.Setup(x => x.Execute<bool>("typeof Foo !== 'undefined'")).Returns(true);
 			environment.Setup(x => x.Execute<string>(@"React.renderToString(Foo({""hello"":""World""}))"))
 				.Returns("[HTML]");
+			var config = new Mock<IReactSiteConfiguration>();
 
-			var component = new ReactComponent(environment.Object, "Foo", "container")
+			var component = new ReactComponent(environment.Object, config.Object, "Foo", "container")
 			{
 				Props = new { hello = "World" }
 			};
@@ -65,8 +67,9 @@ public void RenderHtmlShouldWrapComponentInDiv()
 		public void RenderJavaScriptShouldCallRenderComponent()
 		{
 			var environment = new Mock<IReactEnvironment>();
+			var config = new Mock<IReactSiteConfiguration>();
 
-			var component = new ReactComponent(environment.Object, "Foo", "container")
+			var component = new ReactComponent(environment.Object, config.Object, "Foo", "container")
 			{
 				Props = new { hello = "World" }
 			};

src/React/IReactEnvironment.cs

@@ -107,10 +107,5 @@ public interface IReactEnvironment
 		/// Gets the JSX Transformer for this environment.
 		/// </summary>
 		IJsxTransformer JsxTransformer { get; }
-
-		/// <summary>
-		/// Gets the global site configuration.
-		/// </summary>
-		IReactSiteConfiguration Configuration { get; }
 	}
 }

src/React/IReactSiteConfiguration.cs

@@ -45,9 +45,9 @@ public interface IReactSiteConfiguration
 		IReactSiteConfiguration SetUseHarmony(bool useHarmony);
 
 		/// <summary>
-		/// Gets the configuration for json serializer.
+		/// Gets or sets the configuration for JSON serializer.
 		/// </summary>
-		JsonSerializerSettings JsonSerializerSettings { get; }
+		JsonSerializerSettings JsonSerializerSettings { get; set; }
 
 		/// <summary>
 		/// Sets the configuration for json serializer.

src/React/ReactComponent.cs

@@ -32,6 +32,11 @@ public class ReactComponent : IReactComponent
 		/// </summary>
 		private readonly IReactEnvironment _environment;
 
+		/// <summary>
+		/// Global site configuration
+		/// </summary>
+		private readonly IReactSiteConfiguration _configuration;
+
 		/// <summary>
 		/// Name of the component
 		/// </summary>
@@ -51,12 +56,14 @@ public class ReactComponent : IReactComponent
 		/// Initializes a new instance of the <see cref="ReactComponent"/> class.
 		/// </summary>
 		/// <param name="environment">The environment.</param>
+		/// <param name="configuration">Site-wide configuration.</param>
 		/// <param name="componentName">Name of the component.</param>
 		/// <param name="containerId">The ID of the container DIV for this component</param>
-		public ReactComponent(IReactEnvironment environment, string componentName, string containerId)
+		public ReactComponent(IReactEnvironment environment, IReactSiteConfiguration configuration, string componentName, string containerId)
 		{
 			EnsureComponentNameValid(componentName);
 			_environment = environment;
+			_configuration = configuration;
 			_componentName = componentName;
 			_containerId = containerId;
 		}
@@ -103,7 +110,7 @@ public string RenderJavaScript()
 			return string.Format(
 				"React.render({0}, document.getElementById({1}))",
 				GetComponentInitialiser(),
-				JsonConvert.SerializeObject(_containerId, _environment.Configuration.JsonSerializerSettings)
+				JsonConvert.SerializeObject(_containerId, _configuration.JsonSerializerSettings) // SerializeObject accepts null settings
 			);
 		}
 
@@ -133,7 +140,7 @@ private void EnsureComponentExists()
 		/// <returns>JavaScript for component initialisation</returns>
 		private string GetComponentInitialiser()
 		{
-			var encodedProps = JsonConvert.SerializeObject(Props, _environment.Configuration.JsonSerializerSettings);
+			var encodedProps = JsonConvert.SerializeObject(Props, _configuration.JsonSerializerSettings); // SerializeObject accepts null settings
 			return string.Format(
 				"{0}({1})",
 				_componentName,

src/React/ReactEnvironment.cs

@@ -268,7 +268,7 @@ public IReactComponent CreateComponent<T>(string componentName, T props)
 			EnsureUserScriptsLoaded();
 			_maxContainerId++;
 			var containerId = string.Format(CONTAINER_ELEMENT_NAME, _maxContainerId);
-			var component = new ReactComponent(this, componentName, containerId)
+			var component = new ReactComponent(this, _config, componentName, containerId)
 			{
 				Props = props
 			};

src/React/ReactSiteConfiguration.cs

@@ -33,8 +33,6 @@ static ReactSiteConfiguration()
 		/// </summary>
 		private readonly IList<string> _scriptFiles = new List<string>();
 
-		private JsonSerializerSettings _jsonSerializerSettings;
-
 		/// <summary>
 		/// Adds a script to the list of scripts that are executed. This should be called for all
 		/// React components and their dependencies.
@@ -74,11 +72,12 @@ public IReactSiteConfiguration SetUseHarmony(bool useHarmony)
 		}
 
 		/// <summary>
-		/// Gets the configuration for json serializer.
+		/// Gets or sets the configuration for JSON serializer.
 		/// </summary>
 		public JsonSerializerSettings JsonSerializerSettings
 		{
-			get { return _jsonSerializerSettings; }
+			get;
+			set;
 		}
 
 		/// <summary>
@@ -91,7 +90,7 @@ public JsonSerializerSettings JsonSerializerSettings
 		/// </remarks>
 		public IReactSiteConfiguration SetJsonSerializerSettings(JsonSerializerSettings settings)
 		{
-			_jsonSerializerSettings = settings;
+			JsonSerializerSettings = settings;
 			return this;
 		}
 	}