Skip to content

Commit e0318d6

Browse files
committed
Remove not needed <div>
Enzyme 3 fails with fragments, see enzymejs/enzyme#1213 (comment)
1 parent 76bb6b8 commit e0318d6

File tree

4 files changed

+17
-22
lines changed

4 files changed

+17
-22
lines changed

examples/Bootstrap4/App.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import * as React from 'react';
44
import * as ReactDOM from 'react-dom';
55

6-
import { FormWithConstraints, FieldFeedback } from '../../src/index';
7-
import { FieldFeedbacks, FormGroup, FormControlLabel, FormControlInput } from '../../src/Bootstrap4';
6+
import { FormWithConstraints, FieldFeedbacks } from '../../src/index';
7+
import { FieldFeedback, FormGroup, FormControlLabel, FormControlInput } from '../../src/Bootstrap4';
88

99
import './index.html';
1010

src/Bootstrap4.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as PropTypes from 'prop-types';
33

44
import {
55
Input, FormWithConstraintsChildContext,
6-
FieldFeedbacks as FieldFeedbacks_, FieldFeedbacksProps
6+
FieldFeedback as FieldFeedback_, FieldFeedbackProps
77
} from './index';
88

99
export interface FormGroupProps extends React.HTMLAttributes<HTMLDivElement> {
@@ -132,12 +132,12 @@ export class FormControlInput extends React.Component<FormControlInputProps> {
132132
}
133133

134134

135-
const FieldFeedbacks: React.SFC<FieldFeedbacksProps> = props => {
135+
const FieldFeedback: React.SFC<FieldFeedbackProps> = props => {
136136
const { className, children, ...other } = props;
137137
const classes = className !== undefined ? `${className} form-control-feedback` : 'form-control-feedback';
138-
return <FieldFeedbacks_ {...other} className={classes}>{children}</FieldFeedbacks_>;
138+
return <FieldFeedback_ {...other} className={classes}>{children}</FieldFeedback_>;
139139
};
140-
export { FieldFeedbacks };
140+
export { FieldFeedback };
141141

142142

143143
export interface LabelWithFormControlStyleProps extends React.LabelHTMLAttributes<HTMLLabelElement> {

src/FieldFeedbacks.test.tsx

+9-13
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ describe('render()', () => {
211211
}
212212
});
213213
expect(component.html()).toEqual(
214-
'<div><div><div class="error">Suffering from being missing</div></div></div>'
214+
'<div><div class="error">Suffering from being missing</div></div>'
215215
);
216216
});
217217

@@ -229,9 +229,7 @@ describe('render()', () => {
229229
expect(form.fieldsStore.fields).toEqual({
230230
username: fieldWithoutFeedback
231231
});
232-
expect(component.html()).toEqual(
233-
'<div></div>'
234-
);
232+
expect(component.html()).toEqual(null);
235233
});
236234

237235
describe('show prop', () => {
@@ -259,7 +257,7 @@ describe('render()', () => {
259257
});
260258

261259
expect(component.html()).toEqual(
262-
'<div><div class="error">Suffering from being missing</div><div class="error">Suffering from being missing</div><div class="error">Suffering from being missing</div></div>'
260+
'<div class="error">Suffering from being missing</div><div class="error">Suffering from being missing</div><div class="error">Suffering from being missing</div>'
263261
);
264262
});
265263

@@ -287,7 +285,7 @@ describe('render()', () => {
287285
});
288286

289287
expect(component.html()).toEqual(
290-
'<div><div class="error">Suffering from being missing</div></div>'
288+
'<div class="error">Suffering from being missing</div>'
291289
);
292290
});
293291

@@ -315,7 +313,7 @@ describe('render()', () => {
315313
});
316314

317315
expect(component.html()).toEqual(
318-
'<div><div class="error">Suffering from being missing</div><div class="info">Suffering from being missing</div></div>'
316+
'<div class="error">Suffering from being missing</div><div class="info">Suffering from being missing</div>'
319317
);
320318
});
321319
});
@@ -343,13 +341,11 @@ describe('reRender()', () => {
343341
}
344342
});
345343
expect(component.html()).toEqual(
346-
'<div><div class="error">Suffering from being missing</div></div>'
344+
'<div class="error">Suffering from being missing</div>'
347345
);
348346

349347
form.fieldsStore.updateField('username', fieldWithoutFeedback);
350-
expect(component.html()).toEqual(
351-
'<div></div>'
352-
);
348+
expect(component.html()).toEqual(null);
353349
});
354350

355351
test('unknown field updated', () => {
@@ -373,7 +369,7 @@ describe('reRender()', () => {
373369
}
374370
});
375371
expect(component.html()).toEqual(
376-
'<div><div class="error">Suffering from being missing</div></div>'
372+
'<div class="error">Suffering from being missing</div>'
377373
);
378374

379375
const assert = console.assert;
@@ -387,7 +383,7 @@ describe('reRender()', () => {
387383
console.assert = assert;
388384

389385
expect(component.html()).toEqual(
390-
'<div><div class="error">Suffering from being missing</div></div>'
386+
'<div class="error">Suffering from being missing</div>'
391387
);
392388
});
393389
});

src/FieldFeedbacks.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { EventEmitter } from './EventEmitter'; // FIXME See https://github.com/M
77
import Input from './Input';
88
import { FieldEvent } from './FieldsStore';
99

10-
export interface FieldFeedbacksProps extends React.HTMLAttributes<HTMLDivElement> {
10+
export interface FieldFeedbacksProps {
1111
for: string;
1212

1313
/**
@@ -116,7 +116,6 @@ export class FieldFeedbacks extends withValidateEventEmitter(FieldFeedbacksCompo
116116
}
117117

118118
render() {
119-
const { for: fieldName, show, children, ...divProps } = this.props;
120-
return <div {...divProps}>{children}</div>;
119+
return this.props.children;
121120
}
122121
}

0 commit comments

Comments
 (0)