Skip to content

Commit 03b54d0

Browse files
n1k0n1k0
committed
Upgrade prettier to 1.6.1.
1 parent cedae76 commit 03b54d0

24 files changed

+151
-178
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.5.3",
76+
"prettier": "^1.6.1",
7777
"react": "^15.5.0",
7878
"react-addons-test-utils": "^15.3.2",
7979
"react-codemirror": "^0.2.3",

‎playground/app.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ class App extends Component {
463463
</div>
464464
</div>
465465
<div className="col-sm-5">
466-
{this.state.form &&
466+
{this.state.form && (
467467
<Form
468468
ArrayFieldTemplate={ArrayFieldTemplate}
469469
liveValidate={liveValidate}
@@ -494,7 +494,8 @@ class App extends Component {
494494
/>
495495
</div>
496496
</div>
497-
</Form>}
497+
</Form>
498+
)}
498499
</div>
499500
</div>
500501
);

‎playground/samples/customArray.js‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,43 @@ function ArrayFieldTemplate(props) {
44
return (
55
<div className={props.className}>
66
{props.items &&
7-
props.items.map(element =>
7+
props.items.map(element => (
88
<div key={element.index}>
9-
<div>
10-
{element.children}
11-
</div>
12-
{element.hasMoveDown &&
9+
<div>{element.children}</div>
10+
{element.hasMoveDown && (
1311
<button
1412
onClick={element.onReorderClick(
1513
element.index,
1614
element.index + 1
1715
)}>
1816
Down
19-
</button>}
20-
{element.hasMoveUp &&
17+
</button>
18+
)}
19+
{element.hasMoveUp && (
2120
<button
2221
onClick={element.onReorderClick(
2322
element.index,
2423
element.index - 1
2524
)}>
2625
Up
27-
</button>}
26+
</button>
27+
)}
2828
<button onClick={element.onDropIndexClick(element.index)}>
2929
Delete
3030
</button>
3131
<hr />
3232
</div>
33-
)}
33+
))}
3434

35-
{props.canAdd &&
35+
{props.canAdd && (
3636
<div className="row">
3737
<p className="col-xs-3 col-xs-offset-9 array-item-add text-right">
3838
<button onClick={props.onAddClick} type="button">
3939
Custom +
4040
</button>
4141
</p>
42-
</div>}
42+
</div>
43+
)}
4344
</div>
4445
);
4546
}

‎src/components/Form.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,15 @@ export default class Form extends Component {
203203
registry={registry}
204204
safeRenderCompletion={safeRenderCompletion}
205205
/>
206-
{children
207-
? children
208-
: <p>
209-
<button type="submit" className="btn btn-info">
210-
Submit
211-
</button>
212-
</p>}
206+
{children ? (
207+
children
208+
) : (
209+
<p>
210+
<button type="submit" className="btn btn-info">
211+
Submit
212+
</button>
213+
</p>
214+
)}
213215
</form>
214216
);
215217
}

‎src/components/fields/ArrayField.js‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,23 @@ function DefaultArrayItem(props) {
6060
{props.children}
6161
</div>
6262

63-
{props.hasToolbar &&
63+
{props.hasToolbar && (
6464
<div className="col-xs-3 array-item-toolbox">
6565
<div
6666
className="btn-group"
6767
style={{ display: "flex", justifyContent: "space-around" }}>
68-
{(props.hasMoveUp || props.hasMoveDown) &&
68+
{(props.hasMoveUp || props.hasMoveDown) && (
6969
<IconBtn
7070
icon="arrow-up"
7171
className="array-item-move-up"
7272
tabIndex="-1"
7373
style={btnStyle}
7474
disabled={props.disabled || props.readonly || !props.hasMoveUp}
7575
onClick={props.onReorderClick(props.index, props.index - 1)}
76-
/>}
76+
/>
77+
)}
7778

78-
{(props.hasMoveUp || props.hasMoveDown) &&
79+
{(props.hasMoveUp || props.hasMoveDown) && (
7980
<IconBtn
8081
icon="arrow-down"
8182
className="array-item-move-down"
@@ -85,9 +86,10 @@ function DefaultArrayItem(props) {
8586
props.disabled || props.readonly || !props.hasMoveDown
8687
}
8788
onClick={props.onReorderClick(props.index, props.index + 1)}
88-
/>}
89+
/>
90+
)}
8991

90-
{props.hasRemove &&
92+
{props.hasRemove && (
9193
<IconBtn
9294
type="danger"
9395
icon="remove"
@@ -96,9 +98,11 @@ function DefaultArrayItem(props) {
9698
style={btnStyle}
9799
disabled={props.disabled || props.readonly}
98100
onClick={props.onDropIndexClick(props.index)}
99-
/>}
101+
/>
102+
)}
100103
</div>
101-
</div>}
104+
</div>
105+
)}
102106
</div>
103107
);
104108
}
@@ -114,24 +118,26 @@ function DefaultFixedArrayFieldTemplate(props) {
114118
required={props.required}
115119
/>
116120

117-
{(props.uiSchema["ui:description"] || props.schema.description) &&
121+
{(props.uiSchema["ui:description"] || props.schema.description) && (
118122
<div
119123
className="field-description"
120124
key={`field-description-${props.idSchema.$id}`}>
121125
{props.uiSchema["ui:description"] || props.schema.description}
122-
</div>}
126+
</div>
127+
)}
123128

124129
<div
125130
className="row array-item-list"
126131
key={`array-item-list-${props.idSchema.$id}`}>
127132
{props.items && props.items.map(DefaultArrayItem)}
128133
</div>
129134

130-
{props.canAdd &&
135+
{props.canAdd && (
131136
<AddButton
132137
onClick={props.onAddClick}
133138
disabled={props.disabled || props.readonly}
134-
/>}
139+
/>
140+
)}
135141
</fieldset>
136142
);
137143
}
@@ -147,27 +153,29 @@ function DefaultNormalArrayFieldTemplate(props) {
147153
required={props.required}
148154
/>
149155

150-
{(props.uiSchema["ui:description"] || props.schema.description) &&
156+
{(props.uiSchema["ui:description"] || props.schema.description) && (
151157
<ArrayFieldDescription
152158
key={`array-field-description-${props.idSchema.$id}`}
153159
DescriptionField={props.DescriptionField}
154160
idSchema={props.idSchema}
155161
description={
156162
props.uiSchema["ui:description"] || props.schema.description
157163
}
158-
/>}
164+
/>
165+
)}
159166

160167
<div
161168
className="row array-item-list"
162169
key={`array-item-list-${props.idSchema.$id}`}>
163170
{props.items && props.items.map(p => DefaultArrayItem(p))}
164171
</div>
165172

166-
{props.canAdd &&
173+
{props.canAdd && (
167174
<AddButton
168175
onClick={props.onAddClick}
169176
disabled={props.disabled || props.readonly}
170-
/>}
177+
/>
178+
)}
171179
</fieldset>
172180
);
173181
}

‎src/components/fields/ObjectField.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,27 +61,27 @@ class ObjectField extends Component {
6161
Invalid {name || "root"} object field configuration:
6262
<em>{err.message}</em>.
6363
</p>
64-
<pre>
65-
{JSON.stringify(schema)}
66-
</pre>
64+
<pre>{JSON.stringify(schema)}</pre>
6765
</div>
6866
);
6967
}
7068
return (
7169
<fieldset>
72-
{(uiSchema["ui:title"] || title) &&
70+
{(uiSchema["ui:title"] || title) && (
7371
<TitleField
7472
id={`${idSchema.$id}__title`}
7573
title={uiSchema["ui:title"] || title}
7674
required={required}
7775
formContext={formContext}
78-
/>}
79-
{(uiSchema["ui:description"] || schema.description) &&
76+
/>
77+
)}
78+
{(uiSchema["ui:description"] || schema.description) && (
8079
<DescriptionField
8180
id={`${idSchema.$id}__description`}
8281
description={uiSchema["ui:description"] || schema.description}
8382
formContext={formContext}
84-
/>}
83+
/>
84+
)}
8585
{orderedProperties.map((name, index) => {
8686
return (
8787
<SchemaField

‎src/components/fields/SchemaField.js‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,9 @@ function Help(props) {
6363
return <div />;
6464
}
6565
if (typeof help === "string") {
66-
return (
67-
<p className="help-block">
68-
{help}
69-
</p>
70-
);
66+
return <p className="help-block">{help}</p>;
7167
}
72-
return (
73-
<div className="help-block">
74-
{help}
75-
</div>
76-
);
68+
return <div className="help-block">{help}</div>;
7769
}
7870

7971
function ErrorList(props) {
@@ -260,11 +252,7 @@ function SchemaFieldRender(props) {
260252
uiSchema,
261253
};
262254

263-
return (
264-
<FieldTemplate {...fieldProps}>
265-
{field}
266-
</FieldTemplate>
267-
);
255+
return <FieldTemplate {...fieldProps}>{field}</FieldTemplate>;
268256
}
269257

270258
class SchemaField extends React.Component {

‎src/components/fields/TitleField.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ 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 (
10-
<legend id={id}>
11-
{legend}
12-
</legend>
13-
);
9+
return <legend id={id}>{legend}</legend>;
1410
}
1511

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

‎src/components/fields/UnsupportedField.js‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,14 @@ function UnsupportedField({ schema, idSchema, reason }) {
66
<div className="unsupported-field">
77
<p>
88
Unsupported field schema{idSchema &&
9-
idSchema.$id &&
9+
idSchema.$id && (
1010
<span>
1111
{" for"} field <code>{idSchema.$id}</code>
12-
</span>}
13-
{reason &&
14-
<em>
15-
: {reason}
16-
</em>}.
12+
</span>
13+
)}
14+
{reason && <em>: {reason}</em>}.
1715
</p>
18-
{schema &&
19-
<pre>
20-
{JSON.stringify(schema, null, 2)}
21-
</pre>}
16+
{schema && <pre>{JSON.stringify(schema, null, 2)}</pre>}
2217
</div>
2318
);
2419
}

‎src/components/widgets/AltDateWidget.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class AltDateWidget extends Component {
121121
const { id, disabled, readonly, autofocus, registry, onBlur } = this.props;
122122
return (
123123
<ul className="list-inline">
124-
{this.dateElementProps.map((elemProps, i) =>
124+
{this.dateElementProps.map((elemProps, i) => (
125125
<li key={i}>
126126
<DateElement
127127
rootId={id}
@@ -134,7 +134,7 @@ class AltDateWidget extends Component {
134134
autofocus={autofocus && i === 0}
135135
/>
136136
</li>
137-
)}
137+
))}
138138
<li>
139139
<a href="#" className="btn btn-info btn-now" onClick={this.setNow}>
140140
Now

0 commit comments

Comments
 (0)