Merge pull request ismaelga#13 from ismaelga/rebase-react-json-editor

Merge from ismaelga/plexus-form

Author: ismaelga

dist/plexus-form.min.js

@@ -823,12 +823,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 	exports.section = function(props, fields) {
+	  if (React.isValidElement(props.sectionWrapper)) {
+	    return React.cloneElement(props.sectionWrapper, propsForWrapper(props, true), fields);
+	  }
 	  return React.createElement(props.sectionWrapper || SectionWrapper,
 	    propsForWrapper(props, true),
 	    fields);
 	};
 
 	exports.field = function(props, field) {
+	  if (React.isValidElement(props.fieldWrapper)) {
+	    return React.cloneElement(props.fieldWrapper, propsForWrapper(props), field);
+	  }
 	  return React.createElement(props.fieldWrapper || FieldWrapper,
 	    propsForWrapper(props),
 	    field);

dist/react-json-editor.js

@@ -14,7 +14,7 @@ exports.schema = function(value, schema, context) {
   var dereferenced = schema.oneOf.map(function(alt) {
     return resolve(alt, context);
   });
-    
+
   options = dereferenced.map(function(alt) {
     return ou.getIn(alt, [ 'properties', selector, 'enum', 0 ]) || "";
   });

lib/alternative.js

@@ -8,7 +8,7 @@ var CheckBox = React.createClass({
   displayName: 'CheckBox',
 
   handleChange: function(event) {
-    var val = event.target.checked;
+    var val = event.target.checked ? true : null;
     this.props.update(this.props.path, val, val);
   },
   render: function() {

lib/fields/checkbox.js

@@ -36,4 +36,3 @@ var InputField = React.createClass({
 });
 
 module.exports = InputField;
-

lib/fields/input.js

@@ -114,12 +114,18 @@ var propsForWrapper = function(props, section) {
 };
 
 exports.section = function(props, fields) {
+  if (React.isValidElement(props.sectionWrapper)) {
+    return React.cloneElement(props.sectionWrapper, propsForWrapper(props, true), fields);
+  }
   return React.createElement(props.sectionWrapper || SectionWrapper,
     propsForWrapper(props, true),
     fields);
 };
 
 exports.field = function(props, field) {
+  if (React.isValidElement(props.fieldWrapper)) {
+    return React.cloneElement(props.fieldWrapper, propsForWrapper(props), field);
+  }
   return React.createElement(props.fieldWrapper || FieldWrapper,
     propsForWrapper(props),
     field);

lib/fields/utils/wrapped.js

@@ -13,15 +13,15 @@ var types = {
   },
   array: function(fields, props) {
     var move = function(props, i, n) {
-	  return function(to) {
+      return function(to) {
         if(!canMoveUp(i, n) && !canMoveDown(i, n)) return;
         var newList = props.getValue(props.path);
         var value = newList.splice(to, 1);
 
         newList.splice(i, 0, value[0]);
         props.update(props.path, newList, newList);
       };
-	};
+    };
     var canMoveUp = function(i, n) {
       return i > 0 && i < n - 1;
     };