Merge pull request #268 from commitd/sh/minor

Minor fixes found in using version 7

Author: stuarthendren

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Install Dependencies
         run: |
           npm install
-      - name: Run lint
+      - name: Run build
         run: |
           npm run build
       - name: Upload build artifacts

src/components/FormControl/FormControl.tsx

@@ -6,7 +6,7 @@ import React, {
   useRef,
   useState,
 } from 'react'
-import { styled } from '../../stitches.config'
+import { CSSProps, styled } from '../../stitches.config'
 import { Text } from '../Text'
 import {
   DEFAULT_FORM_STATE,
@@ -21,11 +21,11 @@ const Root = styled(DEFAULT_TAG, {
   boxSizing: 'border-box',
   outline: 'none',
 
-  display: 'inline-flex',
+  display: 'flex',
   flexDirection: 'column',
 })
 
-type FormControlProps = {
+type FormControlProps = CSSProps & {
   children: React.ReactNode
 }
 

src/components/Input/Input.tsx

@@ -18,7 +18,10 @@ const StyledInput = styled(
 
 type InputVariants = Omit<VariantProps<typeof StyledInput>, 'state'>
 
-type InputProps = ComponentProps<typeof StyledInput> &
+// Required due to ts error forcing the enterKeyHint props. Likely can be removed in later version.
+type StyledInputProps = Omit<ComponentProps<typeof StyledInput>, 'enterKeyHint'>
+
+type InputProps = StyledInputProps &
   UseFormControlProps &
   InputVariants & {
     /** Add a label to the Input */
@@ -27,6 +30,16 @@ type InputProps = ComponentProps<typeof StyledInput> &
     required?: boolean
     /** Called on input change with new value */
     onValueChange?: (value: string) => void
+    /* Added directly to correct ts error */
+    enterKeyHint?:
+      | 'enter'
+      | 'done'
+      | 'go'
+      | 'next'
+      | 'previous'
+      | 'search'
+      | 'send'
+      | undefined
   } & CSSProps
 
 export const Input = forwardRef<ElementRef<typeof DEFAULT_TAG>, InputProps>(