Skip to content

Commit 2d390f6

Browse files
authored
Upgrade prettier to 1.5.2. (rjsf-team#629)
1 parent 41f6816 commit 2d390f6

21 files changed

+115
-37
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"jsdom": "^8.3.0",
7474
"lint-staged": "^3.3.1",
7575
"mocha": "^2.5.3",
76-
"prettier": "^1.4.2",
76+
"prettier": "^1.5.2",
7777
"react": "^15.5.0",
7878
"react-addons-test-utils": "^15.3.2",
7979
"react-codemirror": "^0.2.3",

playground/samples/customArray.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ import React from "react";
33
function ArrayFieldTemplate(props) {
44
return (
55
<div className={props.className}>
6-
76
{props.items &&
87
props.items.map(element =>
98
<div key={element.index}>
10-
<div>{element.children}</div>
9+
<div>
10+
{element.children}
11+
</div>
1112
{element.hasMoveDown &&
1213
<button
1314
onClick={element.onReorderClick(
@@ -34,10 +35,11 @@ function ArrayFieldTemplate(props) {
3435
{props.canAdd &&
3536
<div className="row">
3637
<p className="col-xs-3 col-xs-offset-9 array-item-add text-right">
37-
<button onClick={props.onAddClick} type="button">Custom +</button>
38+
<button onClick={props.onAddClick} type="button">
39+
Custom +
40+
</button>
3841
</p>
3942
</div>}
40-
4143
</div>
4244
);
4345
}

playground/samples/widgets.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,11 @@ module.exports = {
141141
value={value}
142142
onChange={event => onChange(event.target.value)}>
143143
{enumOptions.map(({ label, value }, i) => {
144-
return <option key={i} value={value}>{label}</option>;
144+
return (
145+
<option key={i} value={value}>
146+
{label}
147+
</option>
148+
);
145149
})}
146150
</select>
147151
);

src/components/Form.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,9 @@ export default class Form extends Component {
193193
{children
194194
? children
195195
: <p>
196-
<button type="submit" className="btn btn-info">Submit</button>
196+
<button type="submit" className="btn btn-info">
197+
Submit
198+
</button>
197199
</p>}
198200
</form>
199201
);

src/components/fields/ArrayField.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ function DefaultArrayItem(props) {
5555
};
5656
return (
5757
<div key={props.index} className={props.className}>
58-
5958
<div className={props.hasToolbar ? "col-xs-9" : "col-xs-12"}>
6059
{props.children}
6160
</div>
@@ -65,7 +64,6 @@ function DefaultArrayItem(props) {
6564
<div
6665
className="btn-group"
6766
style={{ display: "flex", justifyContent: "space-around" }}>
68-
6967
{(props.hasMoveUp || props.hasMoveDown) &&
7068
<IconBtn
7169
icon="arrow-up"
@@ -100,15 +98,13 @@ function DefaultArrayItem(props) {
10098
/>}
10199
</div>
102100
</div>}
103-
104101
</div>
105102
);
106103
}
107104

108105
function DefaultFixedArrayFieldTemplate(props) {
109106
return (
110107
<fieldset className={props.className}>
111-
112108
<ArrayFieldTitle
113109
key={`array-field-title-${props.idSchema.$id}`}
114110
TitleField={props.TitleField}
@@ -142,7 +138,6 @@ function DefaultFixedArrayFieldTemplate(props) {
142138
function DefaultNormalArrayFieldTemplate(props) {
143139
return (
144140
<fieldset className={props.className}>
145-
146141
<ArrayFieldTitle
147142
key={`array-field-title-${props.idSchema.$id}`}
148143
TitleField={props.TitleField}

src/components/fields/DescriptionField.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,17 @@ function DescriptionField(props) {
88
return <div />;
99
}
1010
if (typeof description === "string") {
11-
return <p id={id} className="field-description">{description}</p>;
11+
return (
12+
<p id={id} className="field-description">
13+
{description}
14+
</p>
15+
);
1216
} else {
13-
return <div id={id} className="field-description">{description}</div>;
17+
return (
18+
<div id={id} className="field-description">
19+
{description}
20+
</div>
21+
);
1422
}
1523
}
1624

src/components/fields/ObjectField.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ class ObjectField extends Component {
6060
Invalid {name || "root"} object field configuration:
6161
<em>{err.message}</em>.
6262
</p>
63-
<pre>{JSON.stringify(schema)}</pre>
63+
<pre>
64+
{JSON.stringify(schema)}
65+
</pre>
6466
</div>
6567
);
6668
}

src/components/fields/SchemaField.js

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,17 @@ function Help(props) {
5353
return <div />;
5454
}
5555
if (typeof help === "string") {
56-
return <p className="help-block">{help}</p>;
56+
return (
57+
<p className="help-block">
58+
{help}
59+
</p>
60+
);
5761
}
58-
return <div className="help-block">{help}</div>;
62+
return (
63+
<div className="help-block">
64+
{help}
65+
</div>
66+
);
5967
}
6068

6169
function ErrorList(props) {
@@ -68,7 +76,11 @@ function ErrorList(props) {
6876
<p />
6977
<ul className="error-detail bs-callout bs-callout-info">
7078
{errors.map((error, index) => {
71-
return <li className="text-danger" key={index}>{error}</li>;
79+
return (
80+
<li className="text-danger" key={index}>
81+
{error}
82+
</li>
83+
);
7284
})}
7385
</ul>
7486
</div>
@@ -238,7 +250,11 @@ function SchemaFieldRender(props) {
238250
uiSchema,
239251
};
240252

241-
return <FieldTemplate {...fieldProps}>{field}</FieldTemplate>;
253+
return (
254+
<FieldTemplate {...fieldProps}>
255+
{field}
256+
</FieldTemplate>
257+
);
242258
}
243259

244260
class SchemaField extends React.Component {

src/components/fields/TitleField.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ const REQUIRED_FIELD_SYMBOL = "*";
66
function TitleField(props) {
77
const { id, title, required } = props;
88
const legend = required ? title + REQUIRED_FIELD_SYMBOL : title;
9-
return <legend id={id}>{legend}</legend>;
9+
return (
10+
<legend id={id}>
11+
{legend}
12+
</legend>
13+
);
1014
}
1115

1216
if (process.env.NODE_ENV !== "production") {

src/components/widgets/CheckboxWidget.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ function CheckboxWidget(props) {
2828
autoFocus={autofocus}
2929
onChange={event => onChange(event.target.checked)}
3030
/>
31-
<span>{label}</span>
31+
<span>
32+
{label}
33+
</span>
3234
</label>
3335
</div>
3436
);

0 commit comments

Comments
 (0)