Skip to content

Commit 87e3589

Browse files
stevehustevehu
committed
update lib before publishing
1 parent ef01752 commit 87e3589

File tree

11 files changed

+179
-79
lines changed

11 files changed

+179
-79
lines changed

‎lib/Array.js‎

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66

7+
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
8+
79
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
810

911
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -63,14 +65,21 @@ var styles = function styles(theme) {
6365
arrayItem: {
6466
position: "relative",
6567
padding: theme.spacing.unit,
66-
marginBottom: theme.spacing.unit,
68+
marginTop: theme.spacing.unit,
6769
display: "flex"
6870
},
6971
deleteItemButton: {
7072
margin: [[-theme.spacing.unit, -theme.spacing.unit, "auto", "auto"]]
7173
},
7274
addButton: {
73-
marginTop: theme.spacing.unit
75+
marginLeft: theme.spacing.unit
76+
},
77+
elementsContainer: {
78+
display: "flex",
79+
flexWrap: "wrap"
80+
},
81+
title: {
82+
margin: "auto 0"
7483
}
7584
};
7685
};
@@ -158,7 +167,7 @@ var Array = function (_Component) {
158167
},
159168
_react2.default.createElement(
160169
"div",
161-
null,
170+
{ className: classes.elementsContainer },
162171
forms
163172
),
164173
_react2.default.createElement(
@@ -177,37 +186,33 @@ var Array = function (_Component) {
177186
}
178187
return _react2.default.createElement(
179188
"div",
180-
null,
189+
{ className: classes.root },
181190
_react2.default.createElement(
182191
"div",
183-
null,
192+
{ style: { display: "flex" } },
184193
_react2.default.createElement(
185194
_FormLabel2.default,
186-
{ variant: "h6", required: form.required },
195+
{
196+
required: form.required,
197+
className: classes.title
198+
},
187199
form.title && getLocalizedString(form.title)
188200
),
189-
_react2.default.createElement(
190-
"div",
191-
null,
192-
arrays
193-
)
201+
this.getAddButton()
194202
),
195203
_react2.default.createElement(
196-
_Button2.default,
197-
{
198-
className: classes.addButton,
199-
variant: "contained",
200-
color: "primary",
201-
onClick: this.onAppend
202-
},
203-
form.add || "Add"
204+
"div",
205+
null,
206+
arrays
204207
)
205208
);
206209
}
207210
}], [{
208211
key: "getDerivedStateFromProps",
209212
value: function getDerivedStateFromProps(props, state) {
210-
var propsKey = props.form.key;
213+
var form = props.form;
214+
215+
var propsKey = form.key;
211216
if (props.form && propsKey === state.formKey && props.model && props.model[propsKey] === state.model) {
212217
return null; // nothing changed
213218
}
@@ -223,7 +228,6 @@ var Array = function (_Component) {
223228
}(_react.Component);
224229

225230
Array.ITEM_ID = "_SCHEMAFORM_ITEM_ID";
226-
Array.SEQUENCE = 1;
227231

228232
Array.setIndex = function (index) {
229233
return function (form) {
@@ -245,6 +249,8 @@ Array.copyWithIndex = function (form, index) {
245249
var _initialiseProps = function _initialiseProps() {
246250
var _this3 = this;
247251

252+
this.SEQUENCE = 1;
253+
248254
this.onAppend = function () {
249255
var _props3 = _this3.props,
250256
form = _props3.form,
@@ -306,6 +312,26 @@ var _initialiseProps = function _initialiseProps() {
306312
onChangeValidate(model);
307313
};
308314
};
315+
316+
this.getAddButton = function () {
317+
var _props4 = _this3.props,
318+
form = _props4.form,
319+
classes = _props4.classes;
320+
321+
322+
var AddButton = form.AddButton || function (props) {
323+
return _react2.default.createElement(_Button2.default, _extends({
324+
className: classes.addButton,
325+
variant: "contained",
326+
color: "primary"
327+
}, props));
328+
};
329+
return _react2.default.createElement(
330+
AddButton,
331+
{ onClick: _this3.onAppend },
332+
form.add || "Add"
333+
);
334+
};
309335
};
310336

311337
exports.default = (0, _ComposedComponent2.default)((0, _styles.withStyles)(styles)(Array));

‎lib/ComposedComponent.js‎

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ var defaultValue = function defaultValue(props) {
4141
return value;
4242
};
4343

44+
var getDisplayName = function getDisplayName(WrappedComponent) {
45+
return WrappedComponent.displayName || WrappedComponent.name || "Component";
46+
};
47+
4448
exports.default = function (ComposedComponent) {
4549
var defaultProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
4650
return function (_React$Component) {
@@ -51,27 +55,10 @@ exports.default = function (ComposedComponent) {
5155

5256
var _this = _possibleConstructorReturn(this, (Composed.__proto__ || Object.getPrototypeOf(Composed)).call(this, props));
5357

54-
var _this$props = _this.props,
55-
errorText = _this$props.errorText,
56-
form = _this$props.form,
57-
showErrors = _this$props.showErrors;
58+
_this.displayName = "ComposedComponent(" + getDisplayName(ComposedComponent) + ")";
5859

5960
_this.onChangeValidate = _this.onChangeValidate.bind(_this);
60-
var value = defaultValue(_this.props);
61-
var validationResult = _utils2.default.validate(form, value);
62-
if (!showErrors) {
63-
_this.state = {
64-
value: value,
65-
valid: true,
66-
error: ""
67-
};
68-
} else {
69-
_this.state = {
70-
value: value,
71-
valid: !!(validationResult.valid || !value),
72-
error: !validationResult.valid && (value ? validationResult.error.message : null) || errorText
73-
};
74-
}
61+
_this.state = _this.constructor.getDerivedStateFromProps(_this.props);
7562
return _this;
7663
}
7764

@@ -86,21 +73,17 @@ exports.default = function (ComposedComponent) {
8673
value: function onChangeValidate(e, v) {
8774
var _props = this.props,
8875
form = _props.form,
89-
onChange = _props.onChange;
76+
onChange = _props.onChange,
77+
localization = _props.localization; // eslint-disable-line
9078

79+
var getLocalizedString = localization && localization.getLocalizedString;
9180
var value = null;
92-
switch (form.schema.type) {
81+
var type = form.schema ? form.schema.type : form.type;
82+
switch (type) {
9383
case "integer":
94-
value = parseInt(e.target.value, 10);
95-
break;
9684
case "number":
9785
{
98-
var values = e.target.value.split(".");
99-
if (values.length < 2) {
100-
value = parseInt(e.target.value, 10);
101-
} else if (values.length > 1) {
102-
if (values[1].length > 0) value = parseFloat(e.target.value);else value = parseInt(values[0], 10) + ".";
103-
}
86+
value = e;
10487
break;
10588
}
10689
case "boolean":
@@ -132,7 +115,7 @@ exports.default = function (ComposedComponent) {
132115

133116
}
134117

135-
var validationResult = _utils2.default.validate(form, value);
118+
var validationResult = _utils2.default.validate(form, value, getLocalizedString);
136119
this.setState({
137120
value: value,
138121
valid: validationResult.valid,
@@ -151,21 +134,29 @@ exports.default = function (ComposedComponent) {
151134
}], [{
152135
key: "getDerivedStateFromProps",
153136
value: function getDerivedStateFromProps(nextProps) {
154-
var value = defaultValue(nextProps);
155-
var showErrors = nextProps.showErrors;
137+
var errorText = nextProps.errorText,
138+
form = nextProps.form,
139+
showErrors = nextProps.showErrors,
140+
localization = nextProps.localization;
156141

157-
var validationResult = _utils2.default.validate(nextProps.form, value);
142+
var getLocalizedString = localization && localization.getLocalizedString;
143+
var value = defaultValue(nextProps);
158144
if (!showErrors) {
159145
return {
160146
value: value,
161147
valid: true,
162148
error: ""
163149
};
164150
}
151+
152+
var validationResult = _utils2.default.validate(form, value, getLocalizedString);
153+
154+
var error = !validationResult.valid ? validationResult.error : undefined;
155+
165156
return {
166157
value: value,
167158
valid: validationResult.valid,
168-
error: !validationResult.valid ? validationResult.error.message : null
159+
error: (!validationResult.valid ? error.message : null) || errorText
169160
};
170161
}
171162
}]);

‎lib/FieldSet.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ var FieldSet = function FieldSet(_ref) {
4949

5050
return _react2.default.createElement(
5151
_FormControl2.default,
52-
{ component: "fieldset", className: classes.root },
52+
{
53+
component: "fieldset",
54+
className: classes.root,
55+
style: form.style
56+
},
5357
_react2.default.createElement(
5458
_FormLabel2.default,
5559
{ component: "legend", required: form.required },

‎lib/MultiSelect.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,12 @@ var MultiSelect = function (_Component) {
166166
}], [{
167167
key: "getDerivedStateFromProps",
168168
value: function getDerivedStateFromProps(props) {
169-
if (props.model && props.form.key) {
169+
var model = props.model,
170+
form = props.form;
171+
172+
if (model && form.key) {
170173
return {
171-
currentValue: _utils2.default.getValueFromModel(props.model, props.form.key) || []
174+
currentValue: _utils2.default.getValueFromModel(model, form.key) || []
172175
};
173176
}
174177
return null;

‎lib/Number.js‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,32 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
3131
var NumberComponent = function NumberComponent(props) {
3232
var form = props.form,
3333
value = props.value,
34-
getLocalizedNumber = props.localization.getLocalizedNumber;
34+
getLocalizedNumber = props.localization.getLocalizedNumber,
35+
onChangeValidate = props.onChangeValidate;
3536

3637
var inputValue = value || value === 0 ? value : "";
3738
if (form.useLocalizer) inputValue = getLocalizedNumber(inputValue);
3839

40+
var onChange = function onChange(e) {
41+
var type = form.schema ? form.schema.type : form.type;
42+
var enteredValue = null;
43+
if (type === "integer") {
44+
enteredValue = parseInt(e.target.value, 10);
45+
} else if (type === "number") {
46+
var values = e.target.value.split(".");
47+
if (values.length < 2) {
48+
enteredValue = parseInt(e.target.value, 10);
49+
} else if (values.length > 1) {
50+
if (values[1].length > 0) enteredValue = parseFloat(e.target.value);else enteredValue = parseInt(values[0], 10) + ".";
51+
}
52+
}
53+
onChangeValidate(enteredValue);
54+
};
55+
3956
return _react2.default.createElement(_Text2.default, _extends({}, props, {
4057
form: Object.assign({}, form, { type: "string" }),
41-
value: inputValue
58+
value: inputValue,
59+
otherProps: { onChange: onChange }
4260
}));
4361
};
4462

‎lib/SchemaForm.js‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,14 @@ var SchemaForm = function (_Component) {
143143
};
144144
};
145145

146-
_this.onChange = _this.onChange.bind(_this);
147146
_this.builder = _this.builder.bind(_this);
148147
return _this;
149148
}
150149

151-
_createClass(SchemaForm, [{
152-
key: "onChange",
153-
value: function onChange(key, val) {
154-
var onModelChange = this.props.onModelChange;
155-
156-
onModelChange(key, val);
157-
}
150+
// Assign default values and save it to the model
158151

159-
// Assign default values and save it to the model
160152

161-
}, {
153+
_createClass(SchemaForm, [{
162154
key: "builder",
163155
value: function builder(form, model, index, mapper, onChange, _builder) {
164156
var _props = this.props,
@@ -204,6 +196,7 @@ var SchemaForm = function (_Component) {
204196
option = _props2.option,
205197
model = _props2.model,
206198
className = _props2.className,
199+
onModelChange = _props2.onModelChange,
207200
mapper = _props2.mapper;
208201

209202
var merged = _utils2.default.merge(schema, form, ignore, option);
@@ -213,7 +206,7 @@ var SchemaForm = function (_Component) {
213206
mergedMapper = (0, _merge2.default)(this.mapper, mapper);
214207
}
215208
var forms = merged.map(function (formPart, index) {
216-
return _this2.builder(formPart, model, index, mergedMapper, _this2.onChange, _this2.builder);
209+
return _this2.builder(formPart, model, index, mergedMapper, onModelChange, _this2.builder);
217210
});
218211

219212
return _react2.default.createElement(

‎lib/Select.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@ var Select = function (_Component) {
109109
}], [{
110110
key: "getDerivedStateFromProps",
111111
value: function getDerivedStateFromProps(props) {
112-
if (props.model && props.form.key) {
112+
var form = props.form,
113+
model = props.model;
114+
115+
if (model && form.key) {
113116
return {
114-
currentValue: _utils2.default.getValueFromModel(props.model, props.form.key)
117+
currentValue: _utils2.default.getValueFromModel(model, form.key)
115118
};
116119
}
117120
return null;

‎lib/Text.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ var Text = function (_React$Component) {
7272
value: value || "",
7373
disabled: form.readonly,
7474
fullWidth: true,
75-
required: form.required
75+
required: form.required,
76+
style: form.style
7677
}, otherProps));
7778
}
7879
}]);

0 commit comments

Comments
 (0)