Skip to content

Commit 70f99c0

Browse files
committed
Merge branch 'release/2.0.0-alpha.3'
2 parents db069ca + 00696d6 commit 70f99c0

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

src/components/checkbox-group.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class CheckboxGroup extends React.Component<CheckboxGroupProps, {}> {
7272
}`;
7373

7474
const controls = [] as JSX.Element[];
75-
for(let i = 0; i < options.length; i++) {
75+
for (let i = 0; i < options.length; i++) {
7676
const checkbox = options[i];
7777
const checked = value.indexOf(checkbox.value) !== -1;
7878
const isDisabled = checkbox.disabled || disabled;
@@ -97,7 +97,9 @@ class CheckboxGroup extends React.Component<CheckboxGroupProps, {}> {
9797
<label className="custom-control-label" htmlFor={inputId}>
9898
{checkbox.label}
9999
</label>
100-
{isLast && showErrors ? <ErrorMessages messages={errorMessages} /> : null}
100+
{isLast && showErrors ? (
101+
<ErrorMessages messages={errorMessages} />
102+
) : null}
101103
</div>
102104
);
103105
controls.push(control);

src/components/select.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ class Select extends React.Component<SelectProps, {}> {
6767
const control = (
6868
<SelectControl
6969
{...inputProps}
70-
className={classNames(markAsInvalid ? ['is-invalid', className] : className)}
70+
className={classNames(
71+
markAsInvalid ? ['is-invalid', className] : className,
72+
)}
7173
elementRef={this.props.elementRef}
7274
id={id}
7375
name={name}

src/hoc/component.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ interface RequiredFromOriginalComponentProps {
4545
disabled: boolean;
4646
id: string;
4747
label: React.ReactNode;
48+
/* eslint-disable @typescript-eslint/no-explicit-any */
4849
componentRef: React.RefObject<any>;
50+
/* eslint-enable @typescript-eslint/no-explicit-any */
4951
}
5052

5153
/**
@@ -60,6 +62,7 @@ interface RequiredFromOriginalComponentProps {
6062
* the form, while retaining the ability to override the prop on a per-component
6163
* basis.
6264
*/
65+
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
6366
const withFRC = <TOriginalProps extends {}>(
6467
Component:
6568
| React.ComponentClass<TOriginalProps>

0 commit comments

Comments
 (0)