moved children, react_wrapper, and mounted_components method

catmando · catmando · commit 6e9723da1b4d · 2018-10-19T15:10:38.000-04:00
diff --git a/ruby/hyper-component/lib/hyper-component.rb b/ruby/hyper-component/lib/hyper-component.rb
@@ -10,7 +10,7 @@
   require 'hyperstack/state/observer'
   require 'react/validator'
   require 'react/element'
-  require 'react/api'
+  require 'hyperstack/internal/component/react_wrapper'
   require 'react/component'
   #require 'react/component/dsl_instance_methods'
   require 'hyperstack/internal/component/should_component_update'
diff --git a/ruby/hyper-component/lib/hyperstack/component/children.rb b/ruby/hyper-component/lib/hyperstack/component/children.rb
@@ -22,7 +22,7 @@ def each(&block)
         %x{
           React.Children.forEach(#{@children}, function(context){
             #{
-              element = Hyperstack::Component::Element.new(`context`)
+              element = Element.new(`context`)
               block.call(element)
               collection << element
             }
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/class_methods.rb b/ruby/hyper-component/lib/hyperstack/internal/component/class_methods.rb
@@ -149,13 +149,13 @@ def export_component(opts = {})
           first_name = export_name.first
           Native(`Opal.global`)[first_name] = add_item_to_tree(
             Native(`Opal.global`)[first_name],
-            [Hyperstack::Component::Internal::ReactWrapper.create_native_react_class(self)] + export_name[1..-1].reverse
+            [ReactWrapper.create_native_react_class(self)] + export_name[1..-1].reverse
           ).to_n
         end
 
         def imports(component_name)
-          Hyperstack::Component::Internal::ReactWrapper.import_native_component(
-            self, Hyperstack::Component::Internal::ReactWrapper.eval_native_react_component(component_name)
+          ReactWrapper.import_native_component(
+            self, ReactWrapper.eval_native_react_component(component_name)
           )
           define_method(:render) {} # define a dummy render method - will never be called...
         rescue Exception => e # rubocop:disable Lint/RescueException : we need to catch everything!
@@ -177,7 +177,15 @@ def add_item_to_tree(current_tree, new_item)
         end
 
         def to_n
-          Hyperstack::Component::Internal::ReactWrapper.class_eval('@@component_classes')[self]
+          ReactWrapper.class_eval('@@component_classes')[self]
+        end
+
+        def force_update!
+          components = Component.mounted_components.to_a
+          components.each do |comp|
+            next unless Component.mounted_components.include? comp
+            comp.force_update!
+          end
         end
       end
     end
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/instance_methods.rb b/ruby/hyper-component/lib/hyperstack/internal/component/instance_methods.rb
@@ -1,4 +1,4 @@
-require "react/children"
+require "hyperstack/component/children"
 
 module Hyperstack
   module Internal
@@ -49,7 +49,7 @@ def set_or_replace_state_or_prop(state_or_prop, method, &block)
           `var state_prop_n = #{state_or_prop.shallow_to_n}`
           # the state object is initalized when the ruby component is instantiated
           # this is detected by self.native.__opalInstanceInitializedState
-          # which is set in the native component constructor in react/api.rb
+          # which is set in the native component constructor in ReactWrapper
           # the setState update callback is not called when initalizing initial state
           if block
             %x{
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb b/ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb
@@ -1,8 +1,8 @@
 require 'react/native_library'
 
 module Hyperstack
-  module Component
-    module Internal
+  module Internal
+    module Component
       # contains the name of all HTML tags, and the mechanism to register a component
       # Provides the internal mechanisms to interface between reactrb and native components
       # the code will attempt to create a js component wrapper on any rb class that has a
@@ -167,10 +167,10 @@ def self.create_element(type, *args, &block)
             params << ncc
           elsif type.is_a?(Class)
             params << create_native_react_class(type)
-          elsif block_given? || Hyperstack::Internal::Component::Tags::HTML_TAGS.include?(type)
+          elsif block_given? || Tags::HTML_TAGS.include?(type)
             params << type
           elsif type.is_a?(String)
-            return Element.new(type)
+            return Hyperstack::Component::Element.new(type)
           else
             raise "#{type} not implemented"
           end
@@ -188,7 +188,7 @@ def self.create_element(type, *args, &block)
               }
             }
           end
-          Element.new(`React.createElement.apply(null, #{params})`, type, properties, block)
+          Hyperstack::Component::Element.new(`React.createElement.apply(null, #{params})`, type, properties, block)
         end
 
         def self.clear_component_class_cache
@@ -221,7 +221,7 @@ def self.convert_props(args)
                   end
 
                   properties['style'] = (properties['style'] || {}).merge(value)
-                elsif ReactAPI::HASH_ATTRIBUTES.include?(key) && value.is_a?(Hash)
+                elsif Hyperstack::Component::ReactAPI::HASH_ATTRIBUTES.include?(key) && value.is_a?(Hash)
                   properties[key] = (properties[key] || {}).merge(value)
                 else
                   properties[key] = value
@@ -255,10 +255,10 @@ def self.convert_props(args)
                                 }
                               }
                             }
-            elsif ReactAPI::HASH_ATTRIBUTES.include?(key) && value.is_a?(Hash)
+            elsif Hyperstack::Component::ReactAPI::HASH_ATTRIBUTES.include?(key) && value.is_a?(Hash)
               value.each { |k, v| props["#{key}-#{k.gsub(/__|_/, '__' => '_', '_' => '-')}"] = v.to_n }
             else
-              props[ReactAPI.html_attr?(lower_camelize(key)) ? lower_camelize(key) : key] = value
+              props[Hyperstack::Component::ReactAPI.html_attr?(lower_camelize(key)) ? lower_camelize(key) : key] = value
             end
           end
           props
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/tags.rb b/ruby/hyper-component/lib/hyperstack/internal/component/tags.rb
@@ -50,7 +50,7 @@ module Tags
         def self.html_tag_class_for(tag)
           downcased_tag = tag.downcase
           if tag =~ /[A-Z]+/ && HTML_TAGS.include?(downcased_tag)
-            Object.const_set tag, Hyperstack::Component::Internal::ReactWrapper.create_element(downcased_tag)
+            Object.const_set tag, ReactWrapper.create_element(downcased_tag)
           end
         end
 
diff --git a/ruby/hyper-component/lib/react/component.rb b/ruby/hyper-component/lib/react/component.rb
@@ -4,36 +4,18 @@
 require 'hyperstack/internal/component/callbacks'
 require 'react/rendering_context'
 require 'react/state_wrapper'
+require 'hyperstack/internal/component'
 require 'hyperstack/internal/component/instance_methods'
 require 'hyperstack/internal/component/class_methods'
 require 'hyperstack/internal/component/props_wrapper'
 module Hyperstack
   module Component
 
-    # TODO: move to its own file (i.e. component/force_update)
-    module Internal
-      class << self
-        def mounted_components
-          @mounted_components ||= Set.new
-        end
-      end
-    end
-    def self.force_update!
-      components = Internal.mounted_components.to_a
-      components.each do |comp|
-        next unless Internal.mounted_components.include? comp
-        comp.force_update!
-      end
-    end
-    # end of todo
-
     def self.included(base)
-      #base.include(Hyperstack::State::Observable)
       base.include(Hyperstack::State::Observer)
       base.include(Hyperstack::Internal::Component::InstanceMethods)
       base.include(Hyperstack::Internal::Component::Callbacks)
       base.include(Hyperstack::Internal::Component::Tags)
-      #base.include(React::Component::DslInstanceMethods)
       base.include(Hyperstack::Internal::Component::ShouldComponentUpdate)
       base.class_eval do
         class_attribute :initial_state
@@ -43,7 +25,7 @@ def self.included(base)
         define_callback :before_update
         define_callback :after_update
         define_callback :before_unmount
-        define_callback(:after_error) { Internal::ReactWrapper.add_after_error_hook(base) }
+        define_callback(:after_error) { Hyperstack::Internal::Component::ReactWrapper.add_after_error_hook(base) }
       end
       base.extend(Hyperstack::Internal::Component::ClassMethods)
     end
@@ -71,7 +53,7 @@ def emit(event_name, *args)
     def component_will_mount
       IsomorphicHelpers.load_context(true) if IsomorphicHelpers.on_opal_client?
       observing(immediate_update: true) do
-        Internal.mounted_components << self
+        Hyperstack::Internal::Component.mounted_components << self
         run_callback(:before_mount)
       end
     end
@@ -101,7 +83,7 @@ def component_will_unmount
       observing do
         run_callback(:before_unmount)
         remove
-        Internal.mounted_components.delete self
+        Hyperstack::Internal::Component.mounted_components.delete self
       end
     end
 
@@ -132,10 +114,6 @@ def update_react_js_state(object, name, value)
       end
     end
 
-    # def set_state_synchronously?
-    #   @native.JS[:__opalInstanceSyncSetState]
-    # end
-
     def render
       raise 'no render defined'
     end unless method_defined?(:render)
@@ -148,35 +126,5 @@ def _render_wrapper
         element
       end
     end
-
-      # def watch(value, &on_change)
-      #   Store::Observable.new(value, on_change)
-      # end
   end
 end
-
-# module React
-#   module Component
-#     def self.included(base)
-#       # note this is turned off during old style testing:  See the spec_helper
-#       deprecation_warning base, "The module name React::Component has been deprecated.  Use Hyperloop::Component instead."
-#       base.include Hyperloop::Component
-#     end
-#     def self.deprecation_warning(name, message)
-#       @deprecation_messages ||= []
-#       message = "Warning: Deprecated feature used in #{name}. #{message}"
-#       unless @deprecation_messages.include? message
-#         @deprecation_messages << message
-#         Hyperstack::Component::IsomorphicHelpers.log message, :warning
-#       end
-#     end
-#   end
-#   module ComponentNoNotice
-#     def self.included(base)
-#       base.include Hyperloop::Component
-#     end
-#   end
-# end
-#
-# module React
-# end
diff --git a/ruby/hyper-component/lib/react/element.rb b/ruby/hyper-component/lib/react/element.rb
@@ -49,7 +49,7 @@ def render(props = {}, &new_block)
         if props.empty?
           Internal::RenderingContext.render(self)
         else
-          props = ReactWrapper.convert_props(props)
+          props = Hyperstack::Internal::Component::ReactWrapper.convert_props(props)
           Internal::RenderingContext.render(
             Element.new(`React.cloneElement(#{@native}, #{props.shallow_to_n})`,
                         type, @properties.merge(props), block)
diff --git a/ruby/hyper-component/lib/react/native_library.rb b/ruby/hyper-component/lib/react/native_library.rb
@@ -70,7 +70,7 @@ def scope_native_name(js_name)
         end
 
         def create_component_wrapper(klass, native_name, ruby_name)
-          if Internal::ReactWrapper.native_react_component?(native_name)
+          if Hyperstack::Internal::Component::ReactWrapper.native_react_component?(native_name)
             new_klass = klass.const_set ruby_name, Class.new
             new_klass.class_eval do
               include Component
diff --git a/ruby/hyper-component/lib/react/ref_callback.rb b/ruby/hyper-component/lib/react/ref_callback.rb
diff --git a/ruby/hyper-component/lib/react/rendering_context.rb b/ruby/hyper-component/lib/react/rendering_context.rb
@@ -17,7 +17,7 @@ def render(name, *args, &block)
                 run_child_block(name.nil?, &block)
                 if name
                   buffer = @buffer.dup
-                  ReactWrapper.create_element(name, *args) { buffer }.tap do |element|
+                  Hyperstack::Internal::Component::ReactWrapper.create_element(name, *args) { buffer }.tap do |element|
                     element.waiting_on_resources = saved_waiting_on_resources || !!buffer.detect { |e| e.waiting_on_resources if e.respond_to?(:waiting_on_resources) }
                     element.waiting_on_resources ||= waiting_on_resources if buffer.last.is_a?(String)
                   end
@@ -31,7 +31,7 @@ def render(name, *args, &block)
             elsif name.is_a? Element
               element = name
             else
-              element = ReactWrapper.create_element(name, *args)
+              element = Hyperstack::Internal::Component::ReactWrapper.create_element(name, *args)
               element.waiting_on_resources = waiting_on_resources
             end
             @buffer << element
diff --git a/ruby/hyper-component/lib/react/this_is_unused_ref_callback.rb b/ruby/hyper-component/lib/react/this_is_unused_ref_callback.rb
@@ -0,0 +1,35 @@
+# require 'react/native_library'
+#
+# module Hyperstack
+#   module Component
+#     module Internal
+#       module RefsCallbackExtension
+#       end
+#
+#       class ReactWrapper
+#         class << self
+#           alias :orig_convert_props :convert_props
+#         end
+#
+#         def self.convert_props(properties)
+#           props = self.orig_convert_props(properties)
+#           props.map do |key, value|
+#             if key == "ref" && value.is_a?(Proc)
+#               new_proc = Proc.new do |native_inst|
+#                 if `#{native_inst} !== null && #{native_inst}.__opalInstance !== undefined && #{native_inst}.__opalInstance !== null`
+#                   value.call(`#{native_inst}.__opalInstance`)
+#                 elsif `#{native_inst} !== null &&  ReactDOM.findDOMNode !== undefined && #{native_inst}.nodeType === undefined`
+#                   value.call(`ReactDOM.findDOMNode(#{native_inst})`) # react >= v0.15.`)
+#                 else
+#                   value.call(native_inst)
+#                 end
+#               end
+#               props[key] = new_proc
+#             end
+#           end
+#           props
+#         end
+#       end
+#     end
+#   end
+# end
diff --git a/ruby/hyper-component/lib/react/top_level.rb b/ruby/hyper-component/lib/react/top_level.rb
@@ -52,7 +52,7 @@ def self.html_attr?(name)
       end
 
       def self.create_element(type, *properties, &block)
-        Internal::ReactWrapper.create_element(type, *properties, &block)
+        Hyperstack::Internal::Component::ReactWrapper.create_element(type, *properties, &block)
       end
 
       # def self.render(element, container)
diff --git a/ruby/hyper-component/spec/react/native_library_spec.rb b/ruby/hyper-component/spec/react/native_library_spec.rb
@@ -22,7 +22,7 @@ class NestedComponent < HyperComponent
   describe "functional stateless component (supported in reactjs v14+ only)" do
     it "is detected as native React.js component by `native_react_component?`" do
       expect_evaluate_ruby do
-        Hyperstack::Component::Internal::ReactWrapper.native_react_component?(JS.call(:eval, "(function () { return function C () { return null; }; })();"))
+        Hyperstack::Internal::Component::ReactWrapper.native_react_component?(JS.call(:eval, "(function () { return function C () { return null; }; })();"))
       end.to be_truthy
     end
 
@@ -50,16 +50,16 @@ class Foo < HyperComponent
       render() { return React.createElement("div", null, "Hello ", this.props.name); }
     }')
     expect_evaluate_ruby do
-      Hyperstack::Component::Internal::ReactWrapper.native_react_component?(JS.call(:eval, '(function(){ return window.NativeComponent; })();'))
+      Hyperstack::Internal::Component::ReactWrapper.native_react_component?(JS.call(:eval, '(function(){ return window.NativeComponent; })();'))
     end.to be_truthy
     expect_evaluate_ruby do
-      Hyperstack::Component::Internal::ReactWrapper.native_react_component?(JS.call(:eval, '(function(){ return {render: function render() {}}; })();'))
+      Hyperstack::Internal::Component::ReactWrapper.native_react_component?(JS.call(:eval, '(function(){ return {render: function render() {}}; })();'))
     end.to be_falsy
     expect_evaluate_ruby do
-      Hyperstack::Component::Internal::ReactWrapper.native_react_component?(JS.call(:eval, '(function(){ return window.DoesntExist; })();'))
+      Hyperstack::Internal::Component::ReactWrapper.native_react_component?(JS.call(:eval, '(function(){ return window.DoesntExist; })();'))
     end.to be_falsy
     expect_evaluate_ruby do
-      Hyperstack::Component::Internal::ReactWrapper.native_react_component?()
+      Hyperstack::Internal::Component::ReactWrapper.native_react_component?()
     end.to be_falsy
   end
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ def each(&block)`
`22`	`22`	`%x{`
`23`	`23`	`React.Children.forEach(#{@children}, function(context){`
`24`	`24`	`#{`
`25`		- element = Hyperstack::Component::Element.new(`context`)
	`25`	+ element = Element.new(`context`)
`26`	`26`	`block.call(element)`
`27`	`27`	`collection << element`
`28`	`28`	`}`