fix(types): Fix Col and Input types (reactstrap#2008)

- Adds missing cssModule for Col - Fixes innerRef for Input to allow HTMLTextAreaElement - Removes CSSModule export in root index.d.ts
humphreyja · Nov 2, 2020 · 363dfbe · 363dfbe
1 parent 54afca4
commit 363dfbe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,7 +1,3 @@
-export interface CSSModule {
-  [className: string]: string;
-}
-
 export { default as Alert } from './lib/Alert';
 export { AlertProps } from './lib/Alert';
 export { default as Badge } from './lib/Badge';

diff --git a/types/lib/Col.d.ts b/types/lib/Col.d.ts
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { CSSModule } from './index';
 
 export type ColumnProps =
   | string
@@ -13,6 +14,7 @@ export type ColumnProps =
 export interface ColProps extends React.HTMLAttributes<HTMLDivElement> {
   [key: string]: any;
   tag?: React.ElementType;
+  cssModule?: CSSModule;
   xs?: ColumnProps;
   sm?: ColumnProps;
   md?: ColumnProps;

diff --git a/types/lib/Input.d.ts b/types/lib/Input.d.ts
@@ -36,7 +36,7 @@ export interface InputProps
   valid?: boolean;
   invalid?: boolean;
   tag?: React.ElementType;
-  innerRef?: React.Ref<HTMLInputElement>;
+  innerRef?: React.Ref<HTMLInputElement | HTMLTextAreaElement>;
   plaintext?: boolean;
   addon?: boolean;
   cssModule?: CSSModule;

diff --git a/types/reactstrap-tests.tsx b/types/reactstrap-tests.tsx
@@ -746,7 +746,7 @@ const Example26 = (props: any) => {
 const Example27 = (props: any) => {
   return (
     <Row noGutters>
-      <Col sm="6">
+      <Col sm="6" cssModule={{ col: 'test' }}>
         <Card body>
           <CardTitle>Special Title Treatment</CardTitle>
           <CardText>
@@ -2151,9 +2151,7 @@ class Example61 extends React.Component {
           <Col sm="4">.col .col-sm-4</Col>
         </Row>
         <Row>
-          <Col sm={{ size: 6, offset: 1 }}>
-            .col .col-sm-6 .col-sm-offset-2
-          </Col>
+          <Col sm={{ size: 6, offset: 1 }}>.col .col-sm-6 .col-sm-offset-2</Col>
         </Row>
         <Row>
           <Col sm="12" md={{ size: 8, offset: 2 }}>
@@ -4400,7 +4398,7 @@ class Example107 extends React.Component {
     return (
       <Input
         type="file"
-        innerRef={(input) => {
+        innerRef={(input: HTMLInputElement) => {
           this.input = input;
         }}
       />
@@ -5746,6 +5744,8 @@ const MegaTest = () => {
       <FormGroup ref={React.createRef<FormGroup>()} {...htmlProps} />
       <FormText ref={React.createRef<FormText>()} {...htmlProps} />
       <Input ref={React.createRef<Input>()} {...htmlProps} />
+      <Input innerRef={React.createRef<HTMLTextAreaElement>()} />
+      <Input innerRef={React.createRef<HTMLInputElement>()} />
       <InputGroup ref={React.createRef<InputGroup>()} {...htmlProps} />
       <InputGroupAddon
         ref={React.createRef<InputGroupAddon>()}