good to go

catmando · catmando · commit 48f65118cdf0 · 2017-03-06T21:38:54.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,10 @@ Whitespace conventions:
 - `React::Server` is provided as a module wrapping the original `ReactDOMServer` API, require `react/server` to use it. (#186)
 - `React::Config` is introduced, `environment` is the only config option provided for now. See [#204](https://github.com/ruby-hyperloop/hyper-react/issues/204) for usage details.
 
+### Changed
+
+- State syntax is now consistent with Hyperloop::Store, old syntax is deprecated. (#209, #97)
+
 ### Deprecated
 
 - Current ref callback behavior is deprecated. Require `"react/ref_callback"` to get the updated behavior. (#188)
@@ -34,10 +38,15 @@ Whitespace conventions:
 ### Removed
 
 - `react-latest` & `react-v1x` is removed. Use `react/react-source-browser` or `react/react-source-server` instead.
+- Support for Ruby < 2.0 is removed. (#201)
 
 ### Fixed
 
 - [NativeLibrary] Passing native JS object as props will raise exception. (#195)
+- Returns better error message if result of rendering block is not suitable (#207)
+- Batch all state changes and execute *after* rendering cycle (#206, #178)  (Code is now moved to Hyper::Store)  
+  You can revert to the old behavior by defining the `React::State::ALWAYS_UPDATE_STATE_AFTER_RENDER = false`
+- Memory Leak in render context fixed (#192)
 
 
 ## [0.11.0] - 2016-12-13
diff --git a/lib/react/rendering_context.rb b/lib/react/rendering_context.rb
@@ -4,6 +4,8 @@ class << self
       attr_accessor :waiting_on_resources
 
       def render(name, *args, &block)
+        was_outer_most = !@not_outer_most
+        @not_outer_most = true
         remove_nodes_from_args(args)
         @buffer ||= [] unless @buffer
         if block
@@ -31,6 +33,8 @@ def render(name, *args, &block)
         @buffer << element
         self.waiting_on_resources = nil
         element
+      ensure
+        @not_outer_most = @buffer = nil if was_outer_most
       end
 
       def build
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -46,6 +46,13 @@ def self.inherited(child)
     end
   end
 
+  module React
+    class State
+      # this messes with lots of tests, these tests will be retested in the new hyper-component gem tests
+      ALWAYS_UPDATE_STATE_AFTER_RENDER = false
+    end
+  end
+
   module Opal
     module RSpec
       module AsyncHelpers
