isomorfeus-react 16.9.2 → 16.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a1941b8bebb3eef585602735dc05d182dfe09b6ad1f5ba774ddb10790556bb
-  data.tar.gz: 549f3f98cc52b1f47aed4b6e7b0152d924a0827c868165ee5ada3099b4e7037d
+  metadata.gz: 81bc6523000cdabde5e53469a494472e5fc2bbf8afdfdc4ba90b5d0483f5aae5
+  data.tar.gz: f8c768ab6fadb01f0199b0cec8db35356b30759897369ba8db0c340ad5f2b15a
 SHA512:
-  metadata.gz: a13a3fbcb9b37b09104e8397cf9e13e4e70f0d8fcd3cbc3e879369fb213880d0d3505ede782263702ab0d543197663d6b9000ddd27334a726bdf1695d248fc94
-  data.tar.gz: 06e9d53a8ac9d70125ac519835ad128ca3e47b54bef2eb4a5320116b92b294841403fe2c34f966321318c38588dfefea1822f3259f6294414304245459577faa
+  metadata.gz: 613e7d265c470bab6690c0808395f699438dfcba5b71a1a346ebbbf9a0f897c8678d2afdd05409493ba64aa920c8af7fc3ad1c7a173ac5f2627cd369fb3f6c02
+  data.tar.gz: dbd5819a705824b0701650c5ea7e9c61a176d03eae852eb698de96652b7e89681f8d6e4e54353ee69b2308f274b77acd970a159601d862727c9eb8dc22cca4f7

data/lib/isomorfeus/react_view_helper.rb

@@ -19,12 +19,13 @@ module Isomorfeus
 
         # if location_host and scheme are given and if Transport is loaded, connect and then render, otherwise do not render
         ws_scheme = props[:location_scheme] == 'https:' ? 'wss:' : 'ws:'
+        location_host = props[:location_host] ? props[:location_host] : 'localhost'
         api_ws_path = Isomorfeus.respond_to?(:api_websocket_path) ? Isomorfeus.api_websocket_path : ''
         javascript << <<~JAVASCRIPT
-          var location_host = '#{props[:location_host]}';
+          var location_host = '#{location_host}';
           var ws_scheme = '#{ws_scheme}';
           var api_ws_path = '#{api_ws_path}';
-          if (typeof global.Opal.Isomorfeus.Transport !== 'undefined' && location_host !== '' && api_ws_path !== '') {
+          if (typeof global.Opal.Isomorfeus.Transport !== 'undefined' && api_ws_path !== '') {
             global.Opal.Isomorfeus.TopLevel["$transport_ws_url="](ws_scheme + location_host + api_ws_path);
             global.Opal.send(global.Opal.Isomorfeus.Transport.$promise_connect(), 'then', [], ($$1 = function(){
               try {

data/lib/react/component/callbacks.rb

@@ -60,8 +60,8 @@ module React
             %x{
                var fun = function(error) {
                 var result = #{`this.__ruby_instance`.instance_exec(`error`, &block)};
-                if (result === null) { return null; }
-                if (typeof result.$to_n === 'function') { return result.$to_n() }
+                if (typeof result.$to_n === 'function') { result = result.$to_n() }
+                if (result === Opal.nil) { return null; }
                 return result;
               }
               if (self.lucid_react_component) { self.lucid_react_component.prototype.getDerivedStateFromError = fun; }
@@ -73,10 +73,12 @@ module React
             %x{
               var fun = function(props, state) {
                 Opal.React.active_redux_components.push(this.__ruby_instance);
-                #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new({props: props})`,
-                                                       `Opal.React.Component.State.$new({state: state})`,
-                                                       &block)};
+                var result = #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new({props: props})`,
+                                                                     `Opal.React.Component.State.$new({state: state})`, &block)};
                 Opal.React.active_redux_components.pop();
+                if (typeof result.$to_n === 'function') { result = result.$to_n() }
+                if (result === Opal.nil) { return null; }
+                return result;
               }
               if (self.lucid_react_component) { self.lucid_react_component.prototype.getDerivedStateFromProps = fun; }
               else { self.react_component.prototype.getDerivedStateFromProps = fun; }
@@ -86,11 +88,12 @@ module React
           def get_snapshot_before_update(&block)
             %x{
               var fun = function(prev_props, prev_state) {
-                Opal.React.active_redux_components.push(this.__ruby_instance);
-                #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new({props: prev_props})`,
-                                                       `Opal.React.Component.State.$new({state: prev_state})`,
-                                                       &block)};
+
+                var result = #{`this.__ruby_instance`.instance_exec(`Opal.React.Component.Props.$new({props: prev_props})`,
+                                                                    `Opal.React.Component.State.$new({state: prev_state})`, &block)};
                 Opal.React.active_redux_components.pop();
+                if (result === Opal.nil) { return null; }
+                return result;
               }
               if (self.lucid_react_component) { self.lucid_react_component.prototype.getSnapshotBeforeUpdate = fun; }
               else { self.react_component.prototype.getSnapshotBeforeUpdate = fun; }

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.9.2'
+  VERSION = '16.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.9.2
+  version: 16.9.3
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: React for Opal Ruby.