[form-builder] Fix value typing for inputs

sanity-io · Oct 6, 2020 · f3fc5fc · f3fc5fc
1 parent 41767ae
commit f3fc5fc
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 22 deletions.
diff --git a/packages/@sanity/form-builder/src/inputs/ArrayInput/ArrayInput.tsx b/packages/@sanity/form-builder/src/inputs/ArrayInput/ArrayInput.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
-import ArrayFunctions from 'part:@sanity/form-builder/input/array/functions'
 import {map} from 'rxjs/operators'
 import {isPlainObject, get} from 'lodash'
 import {FOCUS_TERMINATOR, startsWith} from '@sanity/util/paths'
-import Button from 'part:@sanity/components/buttons/default'
-import Fieldset from 'part:@sanity/components/fieldsets/default'
 import formBuilderConfig from 'config:@sanity/form-builder'
+import ArrayFunctions from 'part:@sanity/form-builder/input/array/functions'
 import DefaultButton from 'part:@sanity/components/buttons/default'
+import Button from 'part:@sanity/components/buttons/default'
+import Fieldset from 'part:@sanity/components/fieldsets/default'
 import {ResolvedUploader, Uploader} from '../../sanity/uploads/typedefs'
 import {Marker, Type} from '../../typedefs'
 import {Path} from '../../typedefs/path'

diff --git a/packages/@sanity/form-builder/src/inputs/BooleanInput.tsx b/packages/@sanity/form-builder/src/inputs/BooleanInput.tsx
@@ -9,7 +9,7 @@ import styles from './BooleanInput.css'
 import {Props} from './types'
 
 const BooleanInput = React.forwardRef(
-  (props: Props, ref: React.MutableRefObject<HTMLDivElement>) => {
+  (props: Props<boolean>, ref: React.MutableRefObject<HTMLDivElement>) => {
     const inputRef = useRef<any>(null)
     const handleChange = (event: React.SyntheticEvent<HTMLInputElement>) => {
       props.onChange(PatchEvent.from(set(event.currentTarget.checked)))

diff --git a/packages/@sanity/form-builder/src/inputs/EmailInput.tsx b/packages/@sanity/form-builder/src/inputs/EmailInput.tsx
@@ -1,10 +1,11 @@
 import React from 'react'
+import {uniqueId} from 'lodash'
 import TextInput from 'part:@sanity/components/textinputs/default'
 import FormField from 'part:@sanity/components/formfields/default'
 import PatchEvent, {set, unset} from '../PatchEvent'
 import {Props} from './types'
-import {uniqueId} from 'lodash'
-export default class EmailInput extends React.Component<Props, {}> {
+
+export default class EmailInput extends React.Component<Props<string>> {
   _input: TextInput | null
   _inputId = uniqueId('EmailInput')
   handleChange = (event: React.SyntheticEvent<HTMLInputElement>) => {

diff --git a/packages/@sanity/form-builder/src/inputs/NumberInput.tsx b/packages/@sanity/form-builder/src/inputs/NumberInput.tsx
@@ -1,11 +1,12 @@
 import React from 'react'
+import {uniqueId} from 'lodash'
 import TextInput from 'part:@sanity/components/textinputs/default'
 import FormField from 'part:@sanity/components/formfields/default'
 import {getValidationRule} from '../utils/getValidationRule'
 import PatchEvent, {set, unset} from '../PatchEvent'
 import {Props} from './types'
-import {uniqueId} from 'lodash'
-export default class NumberInput extends React.Component<Props, {}> {
+
+export default class NumberInput extends React.Component<Props<number>> {
   _input: TextInput | null
   _inputId = uniqueId('NumberInput')
   handleChange = (event: React.SyntheticEvent<HTMLInputElement>) => {

diff --git a/packages/@sanity/form-builder/src/inputs/SelectInput.tsx b/packages/@sanity/form-builder/src/inputs/SelectInput.tsx
@@ -15,7 +15,7 @@ function toSelectItem(option) {
   return {title: capitalize(option), value: option}
 }
 
-export default class SelectInput extends React.Component<Props> {
+export default class SelectInput extends React.Component<Props<string | number>> {
   _input: (RadioSelect | Select) | null
   name = uniqueId('RadioName')
   static defaultProps = {

diff --git a/packages/@sanity/form-builder/src/inputs/StringInput.tsx b/packages/@sanity/form-builder/src/inputs/StringInput.tsx
@@ -1,10 +1,11 @@
 import React from 'react'
+import {uniqueId} from 'lodash'
 import TextInput from 'part:@sanity/components/textinputs/default'
 import FormField from 'part:@sanity/components/formfields/default'
 import PatchEvent, {set, unset} from '../PatchEvent'
 import {Props} from './types'
-import {uniqueId} from 'lodash'
-export default class StringInput extends React.Component<Props> {
+
+export default class StringInput extends React.Component<Props<string>> {
   _input: TextInput | null
   _inputId = uniqueId('StringInput')
   handleChange = (event: React.SyntheticEvent<HTMLInputElement>) => {

diff --git a/packages/@sanity/form-builder/src/inputs/TagsArrayInput.tsx b/packages/@sanity/form-builder/src/inputs/TagsArrayInput.tsx
@@ -1,11 +1,11 @@
 import React from 'react'
+import {uniqueId} from 'lodash'
 import FormField from 'part:@sanity/components/formfields/default'
 import TagInput from 'part:@sanity/components/tags/textfield'
 import PatchEvent, {set, unset} from '../../PatchEvent'
 import {Props} from './types'
-import {uniqueId} from 'lodash'
 
-export default class TagsArrayInput extends React.PureComponent<Props> {
+export default class TagsArrayInput extends React.PureComponent<Props<string[]>> {
   _input: TagInput
   _inputId = uniqueId('TagsArrayInput')
   set(nextValue: string[]) {

diff --git a/packages/@sanity/form-builder/src/inputs/TelephoneInput.tsx b/packages/@sanity/form-builder/src/inputs/TelephoneInput.tsx
@@ -1,10 +1,11 @@
 import React from 'react'
+import {uniqueId} from 'lodash'
 import TextInput from 'part:@sanity/components/textinputs/default'
 import FormField from 'part:@sanity/components/formfields/default'
 import PatchEvent, {set, unset} from '../PatchEvent'
 import {Props} from './types'
-import {uniqueId} from 'lodash'
-export default class TelephoneInput extends React.Component<Props> {
+
+export default class TelephoneInput extends React.Component<Props<string>> {
   _input: TextInput | null
   _inputId = uniqueId('TelephoneInput')
   handleChange = (event: React.SyntheticEvent<HTMLInputElement>) => {

diff --git a/packages/@sanity/form-builder/src/inputs/TextInput.tsx b/packages/@sanity/form-builder/src/inputs/TextInput.tsx
@@ -1,11 +1,11 @@
 import React from 'react'
+import {uniqueId} from 'lodash'
 import FormField from 'part:@sanity/components/formfields/default'
 import TextArea from 'part:@sanity/components/textareas/default'
 import PatchEvent, {set, unset} from '../PatchEvent'
 import {Props} from './types'
-import {uniqueId} from 'lodash'
 
-export default class TextInput extends React.Component<Props> {
+export default class TextInput extends React.Component<Props<string>> {
   _input: TextArea | null
   _inputId = uniqueId('TextInput')
   handleChange = (event: React.SyntheticEvent<HTMLInputElement>) => {

diff --git a/packages/@sanity/form-builder/src/inputs/UrlInput.tsx b/packages/@sanity/form-builder/src/inputs/UrlInput.tsx
@@ -5,7 +5,8 @@ import FormField from 'part:@sanity/components/formfields/default'
 import {getValidationRule} from '../utils/getValidationRule'
 import PatchEvent, {set, unset} from '../PatchEvent'
 import {Props} from './types'
-export default class UrlInput extends React.Component<Props> {
+
+export default class UrlInput extends React.Component<Props<string>> {
   _input: TextInput | null
   _inputId = uniqueId('UrlInput')
   handleChange = (event: React.SyntheticEvent<HTMLInputElement>) => {

diff --git a/packages/@sanity/form-builder/src/inputs/types.ts b/packages/@sanity/form-builder/src/inputs/types.ts
@@ -2,14 +2,14 @@ import {FormFieldPresence} from '@sanity/base/presence'
 import {Type, Marker} from '../typedefs'
 import PatchEvent from '../PatchEvent'
 
-export type Props = {
+export type Props<T> = {
   type: Type
   level: number
-  value: string | null
+  value: T | null | undefined
   readOnly: boolean | null
-  onChange: (arg0: PatchEvent) => void
+  onChange: (patchEvent: PatchEvent) => void
   onFocus: () => void
   onBlur?: () => void
-  markers: Array<Marker>
+  markers: Marker[]
   presence: FormFieldPresence[]
 }