isomorfeus-preact 22.9.0.rc6 → 22.9.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ca8bdcd1a2bca5716034b22c785b72a1a5b41c7b62d54c625c445bbdadc8501
-  data.tar.gz: 5ad31495ae9a95af445ff563fd1975d297bbc6bf20113cef70b00397100c56e7
+  metadata.gz: 33afa95cb2a08cd3e365b0fe5b602590f43ece313552f760047ed92ccef388b8
+  data.tar.gz: 6d23e97bc3af2352863e6b4fc0c8b8bab6ef471cddf1f5a63ce02bfeaf137e3b
 SHA512:
-  metadata.gz: f98ff1c4cfc2799c2560870a71b395990459dae4e931c336bdda23ea29cc2f587d9f64cd0541326bbaa5c389ed40e26c5d1add1f198242d46e1e06b6b887e24a
-  data.tar.gz: 813122cd579f3d5c68086559ac8c462b18e13039d6b4af99f7d6fa30f14e52be2bb25881e73f2d20e70713b5cc9005e85bc1f4f2c9800024a8b0fdf7b2c061ad
+  metadata.gz: 3b4cb524901cf8eaef3832d227874251db99c52ea643c1230903def189b565338e856abecd0a673cb4855fef82f63d955780040565a7f73901dc46175146afca
+  data.tar.gz: 66c58db0fa7a4717570b07552da43aa6b89f54e54ce8c461765b7d61014fe482070d8008713bb82ee10dafcb6170f8996903f6a6a2bfd55a7a6e2aae5bb87345

data/lib/isomorfeus/preact/config.rb

@@ -4,7 +4,6 @@ module Isomorfeus
       attr_accessor :browser_history
       attr_accessor :browser_location
       attr_accessor :current_user_sid_s
-      attr_accessor :initial_state_fetched
       attr_accessor :ssr_response_status
       attr_accessor :top_component
       attr_reader :initialized

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '22.9.0.rc6'
+    VERSION = '22.9.0.rc8'
   end
 end

data/lib/preact/elements.rb

@@ -45,9 +45,22 @@ module Preact::Elements
     view vkern
   ]
 
-  SUPPORTED_HTML_AND_SVG_ELEMENTS.each do |element|
-    define_method(element.to_s.underscore.upcase.to_sym) do |props = nil, &block|
-      Preact._render_element(element, props, &block)
+  if RUBY_ENGINE == 'opal'
+    SUPPORTED_HTML_AND_SVG_ELEMENTS.each do |element|
+      define_method(element.underscore.upcase) do |props = nil, &block|
+        %x{
+          const op = Opal.Preact;
+          const opr = op.render_buffer;
+          if (typeof block === 'function') op.$create_element.$$p = block.$to_proc();
+          opr[opr.length-1].push(op.$create_element(element, props, nil));
+        }
+      end
+    end
+  else
+    SUPPORTED_HTML_AND_SVG_ELEMENTS.each do |element|
+      define_method(element.to_s.underscore.upcase.to_sym) do |props = nil, &block|
+        Preact._render_element(element, props, &block)
+      end
     end
   end
 

data/lib/preact.rb

@@ -770,7 +770,8 @@ module Preact
         if (newType.declared_props && newType.declared_props !== nil) {
           #{
             `newType.declared_props`.each do |prop, value|
-              `newProps`[prop] = value[:default] if value.key?(:default) && !`newProps`.key?(prop)
+              `if (Object.hasOwnProperty.call(value.$$smap, "default") && !Object.hasOwnProperty.call(newProps.$$smap, prop)) { #{`newProps`[prop] = value[:default]} }`
+              nil
             end
           }
           if (Opal.Isomorfeus.development) { #{`newType`.validate_props(`newProps`)} }
@@ -1187,43 +1188,6 @@ module Preact
       end
     end
 
-    def create_element(type, props = nil, children = nil, &block)
-      if props
-        if props.is_a?(Hash)
-          normalized_props = props.dup
-          key = normalized_props.delete(:key)
-          ref = normalized_props.delete(:ref)
-        else
-          children = props
-          normalized_props = {}
-          key = nil
-          ref = nil
-        end
-      else
-        normalized_props = {}
-        key = nil
-        ref = nil
-      end
-
-      if block_given?
-        pr = render_buffer
-        pr.push([])
-        block_result = block.call
-        children = pr.pop
-        if Preact.is_renderable?(block_result)
-          children.push(block_result)
-        end
-      end
-
-      normalized_props[:children] = children unless children.nil?
-
-      if RUBY_ENGINE == 'opal'
-        `self.createVNode(type, normalized_props, key, ref, null)`
-      else
-        _create_vnode(type, normalized_props, key, ref, nil)
-      end
-    end
-
     def create_context(const_name, default_value = nil)
       context = Preact::Context.new(default_value)
       Object.const_set(const_name, context)
@@ -1246,6 +1210,40 @@ module Preact
       attr_accessor :render_buffer
       attr_accessor :rerender_queue
 
+      def create_element(type, props = nil, children = nil, &block)
+        if props
+          if props.is_a?(Hash)
+            normalized_props = props.dup
+            key = normalized_props.delete(:key)
+            ref = normalized_props.delete(:ref)
+          else
+            children = props
+            normalized_props = {}
+            key = nil
+            ref = nil
+          end
+        else
+          normalized_props = {}
+          key = nil
+          ref = nil
+        end
+
+        if block_given?
+          pr = render_buffer
+          pr.JS.push([])
+          block_result = block.call
+          children = pr.JS.pop()
+          if Preact.is_renderable?(block_result)
+            children.JS.push(block_result)
+          end
+        end
+
+        %x{
+          if (children !== nil && children !== null) { #{normalized_props[:children] = children} }
+          return self.createVNode(type, normalized_props, key, ref, null);
+        }
+      end
+
       def _enqueue_render(c)
         if ((`!c._dirty` && (`c._dirty = true`) && rerender_queue.push(c) && `!self.process._rerenderCount++`))
           `setTimeout(self.process)`
@@ -1320,6 +1318,38 @@ module Preact
         VNode.new(type, props, key, ref, original)
       end
 
+      def create_element(type, props = nil, children = nil, &block)
+        if props
+          if props.is_a?(Hash)
+            normalized_props = props.dup
+            key = normalized_props.delete(:key)
+            ref = normalized_props.delete(:ref)
+          else
+            children = props
+            normalized_props = {}
+            key = nil
+            ref = nil
+          end
+        else
+          normalized_props = {}
+          key = nil
+          ref = nil
+        end
+
+        if block_given?
+          pr = render_buffer
+          pr.push([])
+          block_result = block.call
+          children = pr.pop
+          if Preact.is_renderable?(block_result)
+            children.push(block_result)
+          end
+        end
+
+        normalized_props[:children] = children unless children.nil?
+        _create_vnode(type, normalized_props, key, ref, nil)
+      end
+
       def _encode_entities(input)
         s = input.to_s
         return s unless ENCODED_ENTITIES.match?(s)
@@ -1426,7 +1456,7 @@ module Preact
             declared_props = node_name.instance_variable_get(:@declared_props)
             if declared_props
               declared_props.each do |prop, value|
-                props[prop] = value[:default] if !props.key?(prop) && value.key?(:default)
+                props[prop] = value[:default] if value.key?(:default) && !props.key?(prop)
               end
               node_name.validate_props(props) if Isomorfeus.development?
             end

data/lib/route.rb

@@ -2,14 +2,15 @@ class Route < Preact::Component
   render do
     route_match = @context[:router][:matcher].call(props[:path], @context[:location])
     matches, params = props[:match] || route_match
-    return unless matches
-    component = props[:component]
-    component_props = props[:component_props] || {}
-    if component
-      component = component.constantize if component.is_a?(String)
-      Preact.create_element(component, component_props.merge!({ params: params }))
-    else
-      props[:children]
+    if matches
+      component = props[:component]
+      component_props = props[:component_props] || {}
+      if component
+        component = component.constantize if component.is_a?(String)
+        Preact.create_element(component, component_props.merge!({ params: params }))
+      else
+        props[:children]
+      end
     end
   end
 end

data/lib/switch.rb

@@ -8,11 +8,11 @@ class Switch < Preact::Component
     end
   end
 
-  def flatten(children)
-    if children.is_a?(Array)
-      children.compact!
-      children.map! do |child|
-        if RUBY_ENGINE == 'opal'
+  if RUBY_ENGINE == 'opal'
+    def flatten(children)
+      if children.is_a?(Array)
+        children.compact!
+        children.map! do |child|
           if child.is_a?(Array)
             flatten(child)
           elsif `child.type === Opal.Fragment`
@@ -20,18 +20,27 @@ class Switch < Preact::Component
           else
             child
           end
-        else
+        end
+      else
+        [children]
+      end
+    end
+  else
+    def flatten(children)
+      if children.is_a?(Array)
+        children.compact!
+        children.map! do |child|
           if child.is_a?(Array)
             flatten(child)
           elsif child.type == ::Fragment
-            flatten(child.JS[:props][:children])
+            flatten(child[:props][:children])
           else
             child
           end
         end
+      else
+        [children]
       end
-    else
-      [children]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 22.9.0.rc6
+  version: 22.9.0.rc8
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc6
+        version: 22.9.0.rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc6
+        version: 22.9.0.rc8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc6
+        version: 22.9.0.rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc6
+        version: 22.9.0.rc8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-puppetmaster
   requirement: !ruby/object:Gem::Requirement