moved class_methods props_wrapper and should_component_update

Author: catmando

ruby/hyper-component/lib/hyper-component.rb

@@ -13,9 +13,8 @@
   require 'react/api'
   require 'react/component'
   #require 'react/component/dsl_instance_methods'
-  require 'react/component/should_component_update'
+  require 'hyperstack/internal/component/should_component_update'
   require 'hyperstack/internal/component/tags'
-  require 'react/component/base'
   require 'react/event'
   require 'react/rendering_context'
   #require 'react/state'

…ent/lib/react/component/class_methods.rb …tack/internal/component/class_methods.rbruby/hyper-component/lib/react/component/class_methods.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/class_methods.rb ruby/hyper-component/lib/react/component/class_methods.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/class_methods.rb

@@ -1,6 +1,6 @@
 module Hyperstack
-  module Component
-    module Internal
+  module Internal
+    module Component
       # class level methods (macros) for components
       module ClassMethods
 
@@ -24,9 +24,9 @@ def append_backtrace(message_array, backtrace)
 
         def render(container = nil, params = {}, &block)
           if container
-            container = container.type if container.is_a? Element
+            container = container.type if container.is_a? Hyperstack::Component::Element
             define_method :render do
-              RenderingContext.render(container, params) { instance_eval(&block) if block }
+              Hyperstack::Component::Internal::RenderingContext.render(container, params) { instance_eval(&block) if block }
             end
           else
             define_method(:render) { instance_eval(&block) }
@@ -46,13 +46,13 @@ def method_missing(name, *args, &children)
           # makes sure to autoimport the component.  This is not needed here, as
           # we already have the class.
 
-          RenderingContext.render(
-            self, class: Element.haml_class_name(name), &children
+          Hyperstack::Component::Internal::RenderingContext.render(
+            self, class: Hyperstack::Component::Element.haml_class_name(name), &children
           )
         end
 
         def validator
-          @validator ||= Validator.new(props_wrapper)
+          @validator ||= Hyperstack::Component::Internal::Validator.new(props_wrapper)
         end
 
         def prop_types
@@ -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],
-            [ReactWrapper.create_native_react_class(self)] + export_name[1..-1].reverse
+            [Hyperstack::Component::Internal::ReactWrapper.create_native_react_class(self)] + export_name[1..-1].reverse
           ).to_n
         end
 
         def imports(component_name)
-          ReactWrapper.import_native_component(
-            self, ReactWrapper.eval_native_react_component(component_name)
+          Hyperstack::Component::Internal::ReactWrapper.import_native_component(
+            self, Hyperstack::Component::Internal::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,7 @@ def add_item_to_tree(current_tree, new_item)
         end
 
         def to_n
-          ReactWrapper.class_eval('@@component_classes')[self]
+          Hyperstack::Component::Internal::ReactWrapper.class_eval('@@component_classes')[self]
         end
       end
     end

…ent/lib/react/component/props_wrapper.rb …tack/internal/component/props_wrapper.rbruby/hyper-component/lib/react/component/props_wrapper.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/props_wrapper.rb ruby/hyper-component/lib/react/component/props_wrapper.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/props_wrapper.rb

@@ -1,29 +1,12 @@
 module Hyperstack
-  module Component
-    module Internal
+  module Internal
+    module Component
 
       class PropsWrapper
         attr_reader :component
 
         def self.define_param(name, param_type)
-          if false && param_type == Store::Observable
-            define_method("#{name}") do
-              value_for(name)
-            end
-            define_method("#{name}!") do |*args|
-              current_value = value_for(name)
-              if args.count > 0
-                props[name].call args[0]
-                current_value
-              else
-                # rescue in case we in middle of render... What happens during a
-                # render that causes exception?
-                # Where does `dont_update_state` come from?
-                props[name].call current_value unless @dont_update_state rescue nil
-                props[name]
-              end
-            end
-          elsif param_type == Proc
+          if param_type == Proc
             define_method("#{name}") do |*args, &block|
               props[name].call(*args, &block) if props[name]
             end

…act/component/should_component_update.rb …nal/component/should_component_update.rbruby/hyper-component/lib/react/component/should_component_update.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/should_component_update.rb ruby/hyper-component/lib/react/component/should_component_update.rb renamed to ruby/hyper-component/lib/hyperstack/internal/component/should_component_update.rb

@@ -1,6 +1,6 @@
 module Hyperstack
-  module Component
-    module Internal
+  module Internal
+    module Component
       #
       # React assumes all components should update, unless a component explicitly overrides
       # the shouldComponentUpdate method.  Reactrb does an explicit check doing a shallow

ruby/hyper-component/lib/react/component.rb

@@ -5,8 +5,8 @@
 require 'react/rendering_context'
 require 'react/state_wrapper'
 require 'hyperstack/internal/component/instance_methods'
-require 'react/component/class_methods'
-require 'react/component/props_wrapper'
+require 'hyperstack/internal/component/class_methods'
+require 'hyperstack/internal/component/props_wrapper'
 module Hyperstack
   module Component
 
@@ -34,7 +34,7 @@ def self.included(base)
       base.include(Hyperstack::Internal::Component::Callbacks)
       base.include(Hyperstack::Internal::Component::Tags)
       #base.include(React::Component::DslInstanceMethods)
-      base.include(Internal::ShouldComponentUpdate)
+      base.include(Hyperstack::Internal::Component::ShouldComponentUpdate)
       base.class_eval do
         class_attribute :initial_state
         define_callback :before_mount
@@ -45,7 +45,7 @@ def self.included(base)
         define_callback :before_unmount
         define_callback(:after_error) { Internal::ReactWrapper.add_after_error_hook(base) }
       end
-      base.extend(Internal::ClassMethods)
+      base.extend(Hyperstack::Internal::Component::ClassMethods)
     end
 
     def self.deprecation_warning(message)

ruby/hyper-component/lib/react/component/base.rb

@@ -1,7 +1,6 @@
 require "native"
 require 'active_support/core_ext/object/try'
 require 'hyperstack/internal/component/tags'
-require 'react/component/base'
 
 module Hyperstack
   module Component

ruby/hyper-component/lib/react/component/not_used_dsl_instance_methods.rb

@@ -6,7 +6,7 @@ class Validator
         attr_reader :props_wrapper
         private :errors, :props_wrapper
 
-        def initialize(props_wrapper = Class.new(Internal::PropsWrapper))
+        def initialize(props_wrapper = Class.new(Hyperstack::Internal::Component::PropsWrapper))
           @props_wrapper = props_wrapper
         end