Fixing a distributing problem

client/splatsheet/sheetRenderer/parts/box/box.jsx

@@ -8,7 +8,7 @@ var Box = React.createClass({
 	mixins : [utils],
 	getDefaultProps: function() {
 		return {
-			name : 'box',
+			//name : 'box',
 			defaultData : {},
 
 			id : '',

client/splatsheet/sheetRenderer/parts/skill/skill.jsx

@@ -41,13 +41,11 @@ var Skill = React.createClass({
 			val : e.target.value
 		})
 	},
-
 	renderExpert : function(){
 		if(this.props.showExpert){
 			return <input type="radio" className='expertToggle' onChange={this.handleToggleExpert} checked={this.data().expert} />
 		}
 	},
-
 	render : function(){
 		return <div className='skill'>
 			{this.renderExpert()}

client/splatsheet/sheetRenderer/parts/utils.js

@@ -16,14 +16,18 @@ module.exports = {
 	updateData : function(val){
 		if(typeof this.props.onChange !== 'function') throw "No onChange handler set";
 
-		if(_.isObject(val)){
+		var newVal = val;
+
+		//Clone the data if it's an object to avoid mutation bugs
+		if(_.isObject(val)) newVal = _.extend({}, this.data(), val);
+
+		if(this.id()){
 			this.props.onChange({
-				[this.id()] : _.extend({}, this.data(), val)
+				[this.id()] : newVal
 			});
 		}else{
-			this.props.onChange({
+			//If the box has no id, don't add it to the chain
-				[this.id()] : val
+			this.props.onChange(newVal)
-			});
 		}
 	}
 }

client/splatsheet/sheetRenderer/sheetRenderer.jsx

@@ -33,7 +33,6 @@ var SheetRenderer = React.createClass({
 		})
 	},
 	renderSheet : function(){
-
 		try{
 			var nodes = jsx2json(this.props.code);
 			nodes = _.map(nodes, (node)=>{
@@ -43,8 +42,6 @@ var SheetRenderer = React.createClass({
 				}
 				return node
 			})
-
-
 			return this.renderChildren(nodes);
 		}catch(e){
 			return <div>Error bruh {e.toString()}</div>

client/splatsheet/splatsheet.jsx

@@ -16,13 +16,7 @@ var SplatSheet = React.createClass({
 	getInitialState: function() {
 		return {
 			sheetCode: '',
-			characterData : {
+			characterData : {}
-				playerInfo : {
-					name : 'scott',
-					race : 'human',
-					class : 'coder'
-				}
-			}
 		};
 	},
 

shared/jsx-parser.js

@@ -187,7 +187,18 @@ var parser = function(tokens){
 
 
 
-/*
+
+
+
+
+
+
+
+
+
+
+
+
 var test1 = `
 <div test="hey there champ" more_cool=false size=0>
 	<span>
@@ -205,7 +216,10 @@ var test2 = "<div cool=0 same>Hey there!</div>"
 var tokens = tokenizer(test1);
 
 console.log(test1, '\n---\n', tokens, '---\n', JSON.stringify(parser(tokens), null, '  '));
-*/
+
+
+
+
 
 module.exports = function(input){
 	return parser(tokenizer(input));