Merge branch 'master' into update-react

Author: BookOfGreg

README.md

@@ -127,6 +127,15 @@ Component File Name | `react_component` call
 `app/javascript/components/SampleComponent.js` | `react_component("SampleComponent")`
 `app/javascript/components/SampleComponent.js.jsx` | Has to be renamed to SampleComponent.jsx, then use `react_component("SampleComponent")`
 
+### Typescript support
+
+If you want to use React-Rails with Typescript, simply run the installer and add @types:
+```
+$ bundle exec rails webpacker:install:typescript
+$ yarn add @types/react @types/react-dom
+```
+
+Doing this will allow React-Rails to support the .tsx extension. 
 
 ## Use with Asset Pipeline
 

lib/react/rails/controller_renderer.rb

@@ -28,7 +28,7 @@ def initialize(options={})
       # @return [String] HTML for `component_name` with `options[:props]`
       def call(component_name, options, &block)
         props = options.fetch(:props, {})
-        options = default_options.merge(options.slice(:data, :aria, :tag, :class, :id, :prerender))
+        options = default_options.merge(options.slice(:data, :aria, :tag, :class, :id, :prerender, :camelize_props))
         react_component(component_name, props, options, &block)
       end
 

test/dummy_sprockets/app/controllers/server_controller.rb

@@ -16,6 +16,14 @@ def inline_component_prerender_false
     render(component_options.merge(prerender: false))
   end
 
+  def inline_component_with_camelize_props_prerender_true
+    render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true
+  end
+
+  def inline_component_with_camelize_props_prerender_false
+    render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true, prerender: false
+  end
+
   private
 
   def component_options

test/dummy_sprockets/config/routes.rb

@@ -6,6 +6,8 @@
       get :console_example
       get :inline_component_prerender_true
       get :inline_component_prerender_false
+      get :inline_component_with_camelize_props_prerender_true
+      get :inline_component_with_camelize_props_prerender_false
     end
   end
 

test/dummy_webpacker1/app/controllers/server_controller.rb

@@ -16,6 +16,14 @@ def inline_component_prerender_false
     render(component_options.merge(prerender: false))
   end
 
+  def inline_component_with_camelize_props_prerender_true
+    render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true
+  end
+
+  def inline_component_with_camelize_props_prerender_false
+    render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true, prerender: false
+  end
+
   private
 
   def component_options

test/dummy_webpacker1/config/routes.rb

@@ -5,6 +5,8 @@
       get :console_example
       get :inline_component_prerender_true
       get :inline_component_prerender_false
+      get :inline_component_with_camelize_props_prerender_true
+      get :inline_component_with_camelize_props_prerender_false
     end
   end
 

test/dummy_webpacker2/app/controllers/server_controller.rb

@@ -16,6 +16,14 @@ def inline_component_prerender_false
     render(component_options.merge(prerender: false))
   end
 
+  def inline_component_with_camelize_props_prerender_true
+    render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true
+  end
+
+  def inline_component_with_camelize_props_prerender_false
+    render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true, prerender: false
+  end
+
   private
 
   def component_options

test/dummy_webpacker2/config/routes.rb

@@ -5,6 +5,8 @@
       get :console_example
       get :inline_component_prerender_true
       get :inline_component_prerender_false
+      get :inline_component_with_camelize_props_prerender_true
+      get :inline_component_with_camelize_props_prerender_false
     end
   end
 

test/dummy_webpacker3/app/controllers/server_controller.rb

@@ -16,6 +16,14 @@ def inline_component_prerender_false
     render(component_options.merge(prerender: false))
   end
 
+  def inline_component_with_camelize_props_prerender_true
+    render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true
+  end
+
+  def inline_component_with_camelize_props_prerender_false
+    render component: 'TodoList', props: { test_camelize_props: true, todos: ['dummy'] }, camelize_props: true, prerender: false
+  end
+
   private
 
   def component_options

test/dummy_webpacker3/config/routes.rb

@@ -5,6 +5,8 @@
       get :console_example
       get :inline_component_prerender_true
       get :inline_component_prerender_false
+      get :inline_component_with_camelize_props_prerender_true
+      get :inline_component_with_camelize_props_prerender_false
     end
   end