Merge branch 'release/2.0.0-alpha.3'

twisty · Sep 11, 2019 · 70f99c0 · 70f99c0
2 parents db069ca + 00696d6
commit 70f99c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/components/checkbox-group.tsx b/src/components/checkbox-group.tsx
@@ -72,7 +72,7 @@ class CheckboxGroup extends React.Component<CheckboxGroupProps, {}> {
     }`;
 
     const controls = [] as JSX.Element[];
-    for(let i = 0; i < options.length; i++) {
+    for (let i = 0; i < options.length; i++) {
       const checkbox = options[i];
       const checked = value.indexOf(checkbox.value) !== -1;
       const isDisabled = checkbox.disabled || disabled;
@@ -97,7 +97,9 @@ class CheckboxGroup extends React.Component<CheckboxGroupProps, {}> {
           <label className="custom-control-label" htmlFor={inputId}>
             {checkbox.label}
           </label>
-          {isLast && showErrors ? <ErrorMessages messages={errorMessages} /> : null}
+          {isLast && showErrors ? (
+            <ErrorMessages messages={errorMessages} />
+          ) : null}
         </div>
       );
       controls.push(control);

diff --git a/src/components/select.tsx b/src/components/select.tsx
@@ -67,7 +67,9 @@ class Select extends React.Component<SelectProps, {}> {
     const control = (
       <SelectControl
         {...inputProps}
-        className={classNames(markAsInvalid ? ['is-invalid', className] : className)}
+        className={classNames(
+          markAsInvalid ? ['is-invalid', className] : className,
+        )}
         elementRef={this.props.elementRef}
         id={id}
         name={name}

diff --git a/src/hoc/component.tsx b/src/hoc/component.tsx
@@ -45,7 +45,9 @@ interface RequiredFromOriginalComponentProps {
   disabled: boolean;
   id: string;
   label: React.ReactNode;
+  /* eslint-disable @typescript-eslint/no-explicit-any */
   componentRef: React.RefObject<any>;
+  /* eslint-enable @typescript-eslint/no-explicit-any */
 }
 
 /**
@@ -60,6 +62,7 @@ interface RequiredFromOriginalComponentProps {
  * the form, while retaining the ability to override the prop on a per-component
  * basis.
  */
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 const withFRC = <TOriginalProps extends {}>(
   Component:
     | React.ComponentClass<TOriginalProps>