statebus 7.0.7 → 7.0.10

package/client-library.js

@@ -721,8 +721,8 @@
         // We create special functions for INPUT and TEXTAREA, because they
         // have to do extra work to maintain the cursor when we use statebus
         // instead of React's setState() for state updates.
-        window.INPUT    = function_for_tag(make_fixed_textbox('input'))
-        window.TEXTAREA = function_for_tag(make_fixed_textbox('textarea'))
+        window.INPUT    = function_for_tag(bus.libs.react17.input)
+        window.TEXTAREA = function_for_tag(bus.libs.react17.textarea)
 
 
         // Improve the functions ^^^ put this above
@@ -784,7 +784,9 @@
     // This one is for react v17+.
     function make_fixed_textbox (tagname) {
         // `tagname` can be either "input" or "textarea"
-        return createReactClass({
+
+        // Create a special component
+        var component = createReactClass({
             getInitialState: function() {
                 return {value: this.props.value}
             },
@@ -796,19 +798,42 @@
                 if (this.props.value)
                     this.setState({value: e.target.value})
             },
+            onInput: function(e) {
+                this.props.onInput && this.props.onInput(e)
+                if (this.props.value)
+                    this.setState({value: e.target.value})
+            },
             render: function() {
-                var new_props = {}
-                for (var k in this.props)
-                    if (this.props.hasOwnProperty(k))
-                        new_props[k] = this.props[k]
-                if (this.state.hasOwnProperty('value'))
-                    new_props.value = this.state.value
-                new_props.onChange = this.onChange
+                var new_props = {
+                    ...this.props,
+                    ref: this.props.forwarded_ref   // We had to rename ref
+                }
+                delete new_props.forwarded_ref      // Delete the old name
+
+                // Now replace any onChange or onInput with our wrapper handlers
+                if (new_props.hasOwnProperty('onChange'))
+                    new_props.onChange = this.onChange
+                if (new_props.hasOwnProperty('onInput'))
+                    new_props.onInput = this.onInput
+
                 return React.createElement(tagname, new_props)
             }
         })
+
+        // But react components don't pass through the `ref` prop by default,
+        // so we have to do that with this special function and rename it to
+        // forwarded_ref temporarily:
+        return React.forwardRef((props, ref) => {
+            return React.createElement(component, {...props, forwarded_ref: ref})
+        })
     }
 
+    // We create special functions for INPUT and TEXTAREA, because they
+    // have to do extra work to maintain the cursor when we use statebus
+    // instead of React's setState() for state updates.
+    bus.libs.react17.input = make_fixed_textbox('input')
+    bus.libs.react17.textarea = make_fixed_textbox('textarea')
+
     function autodetect_args (func) {
         if (func.args) return
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "statebus",
-  "version": "7.0.7",
+  "version": "7.0.10",
   "description": "Synchronize state.",
   "main": "statebus.js",
   "scripts": {

package/server-library.js

@@ -145,8 +145,11 @@ function import_server (bus, make_statebus, options)
         // If this requests knows about Braid then we presume the programmer
         // knows that any client might make this cross-origin request.
         if (req.headers.version || req.headers.parents || req.headers.subscribe
+            || req.headers.peer || req.headers['put-order']
             || req.method === 'OPTIONS')
             free_the_cors(req, res)
+        if (req.method === 'OPTIONS')
+            return
 
         // Initialize new clients with an id.  We put the client id on
         // req.client, and also in a cookie for the browser to see.
@@ -258,7 +261,7 @@ function import_server (bus, make_statebus, options)
                     if (req.headers.peer) {
                         let peer = req.headers.peer,
                             key = obj.key
-                        var cb = cbus.http_callbacks[
+                        var cb = cbus.http_callbacks && cbus.http_callbacks[
                             JSON.stringify({peer, key})
                         ]
                         if (cb) cb.has_seen(cbus, key, t.version)
@@ -2535,7 +2538,7 @@ function free_the_cors (req, res, next) {
     var free_the_cors = {
         "Access-Control-Allow-Origin": "*",
         "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT, UNSUBSCRIBE",
-        "Access-Control-Allow-Headers": "subscribe, peer, version, parents, merge-type, content-type, patches, cache-control"
+        "Access-Control-Allow-Headers": "subscribe, peer, version, parents, merge-type, content-type, patches, cache-control, put-order"
     }
     Object.entries(free_the_cors).forEach(x => res.setHeader(x[0], x[1]))
     if (req.method === 'OPTIONS') {