Narrow typing

great-expectations · May 20, 2024 · 5b5f29b · 5b5f29b
1 parent 54be81e
commit 5b5f29b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 18 deletions.
diff --git a/src/controls/BooleanControl.tsx b/src/controls/BooleanControl.tsx
@@ -43,8 +43,8 @@ export function BooleanControl({
 
   const showTooltip =
     !showDescription && !isDescriptionHidden(visible, description, true, true)
-  const uiSchema = uischema as ControlUISchema<typeof uischema> & ControlElement
-  const formItemProps = uiSchema.formItemProps ?? {}
+  const uiSchema = uischema as ControlUISchema<unknown> | ControlElement
+  const formItemProps = "formItemProps" in uiSchema ? uiSchema.formItemProps : {}
   const tooltip = showTooltip && description ? description : undefined
 
   return (

diff --git a/src/controls/NumericControl.tsx b/src/controls/NumericControl.tsx
@@ -19,9 +19,8 @@ export const NumericControl = (props: ControlProps & RendererProps) => {
     { required: props.required, message: `${props.label} is required` },
   ]
 
-  const uiSchema = props.uischema as ControlUISchema<typeof props.uischema> &
-    ControlElement
-  const formItemProps = uiSchema.formItemProps ?? {}
+  const uiSchema = props.uischema as ControlUISchema<unknown> | ControlElement
+  const formItemProps = "formItemProps" in uiSchema ? uiSchema.formItemProps : {}
 
   return (
     <Form.Item

diff --git a/src/controls/NumericSliderControl.tsx b/src/controls/NumericSliderControl.tsx
@@ -22,9 +22,8 @@ export const NumericSliderControl = (props: ControlProps & RendererProps) => {
     { required: props.required, message: `${props.label} is required` },
   ]
 
-  const uiSchema = props.uischema as ControlUISchema<typeof props.uischema> &
-    ControlElement
-  const formItemProps = uiSchema.formItemProps ?? {}
+  const uiSchema = props.uischema as ControlUISchema<unknown> | ControlElement
+  const formItemProps = "formItemProps" in uiSchema ? uiSchema.formItemProps : {}
 
   return (
     <Form.Item

diff --git a/src/controls/ObjectArrayControl.tsx b/src/controls/ObjectArrayControl.tsx
@@ -1,4 +1,5 @@
 import {
+  ControlElement,
   Helpers,
   ArrayLayoutProps,
   composePaths,
@@ -12,7 +13,7 @@ import {
 import { Flex, Form, List, Button } from "antd"
 import range from "lodash.range"
 import { useEffect, useMemo } from "react"
-import { ArrayControlOptions } from "../ui-schema"
+import { ArrayControlOptions, ControlUISchema } from "../ui-schema"
 import { usePreviousValue } from "../common/usePreviousValue"
 import React from "react"
 
@@ -58,6 +59,9 @@ export function ObjectArrayControl({
     }
   })
 
+  const uiSchema = uischema as ControlUISchema<unknown> | ControlElement
+  const formItemProps = "formItemProps" in uiSchema ? uiSchema.formItemProps : {}
+
   const labelDescription = Helpers.createLabelDescriptionFrom(uischema, schema)
   const label = labelDescription.show ? labelDescription.text : ""
 
@@ -86,6 +90,7 @@ export function ObjectArrayControl({
       required={required}
       rules={[{ required: required, message: `${label} is required` }]}
       validateTrigger={["onBlur"]}
+      {...formItemProps}
     >
       <>{label}</>
       <List<unknown>

diff --git a/src/controls/PrimitiveArrayControl.tsx b/src/controls/PrimitiveArrayControl.tsx
@@ -69,9 +69,9 @@ export function PrimitiveArrayControl({
   const labelDescription = Helpers.createLabelDescriptionFrom(uischema, schema)
   const label = labelDescription.text || props.label // nullish coalescing doesn't work here because labelDescription.text can be an empty string =(
 
-  const uiSchema = uischema as ControlUISchema<typeof uischema> & ControlElement
+  const uiSchema = uischema as ControlUISchema<unknown> | ControlElement
   const options: ArrayControlOptions = uiSchema.options ?? {}
-  const formItemProps = uiSchema.formItemProps ?? {}
+  const formItemProps = "formItemProps" in uiSchema ? uiSchema.formItemProps : {}
 
   return (
     <Form.Item

diff --git a/src/controls/TextControl.tsx b/src/controls/TextControl.tsx
@@ -25,7 +25,7 @@ export function TextControl({
   id,
   uischema,
 }: TextControlProps) {
-  const uiSchema = uischema as ControlUISchema<typeof uischema> & ControlElement
+  const uiSchema = uischema as ControlUISchema<unknown> | ControlElement
   const setInitialValue = useCallback(
     (value: unknown) => {
       if (typeof value !== "number") return value
@@ -38,8 +38,8 @@ export function TextControl({
   const ariaLabel = label || schema.description
   const options: TextControlOptions =
     (uiSchema.options as TextControlOptions) ?? {}
-  const formItemProps = uiSchema.formItemProps ?? {}
-  const tooltip = options.tooltip ? options.tooltip : formItemProps.tooltip
+  const formItemProps = "formItemProps" in uiSchema ? uiSchema.formItemProps : {}
+  const tooltip = options.tooltip ? options.tooltip : formItemProps?.tooltip
   const placeholderText = options.placeholderText
   const form = Form.useFormInstance()
   const rules: Rule[] = [

diff --git a/src/controls/combinators/AnyOfControl.tsx b/src/controls/combinators/AnyOfControl.tsx
@@ -75,8 +75,8 @@ export function AnyOfControl({
 
   const labelDescription = Helpers.createLabelDescriptionFrom(uischema, schema)
 
-  const uiSchema = uischema as ControlUISchema<typeof uischema> & ControlElement
-  const formItemProps = uiSchema.formItemProps ?? {}
+  const uiSchema = uischema as ControlUISchema<unknown> | ControlElement
+  const formItemProps = "formItemProps" in uiSchema ? uiSchema.formItemProps : {}
 
   return (
     <Space direction="vertical" style={{ width: "100%" }} size="middle">

diff --git a/src/controls/combinators/OneOfControl.tsx b/src/controls/combinators/OneOfControl.tsx
@@ -36,8 +36,8 @@ export function OneOfControl({
     uischemas,
   )
 
-  const uiSchema = uischema as ControlUISchema<typeof uischema> & ControlElement
-  const formItemProps = uiSchema.formItemProps ?? {}
+  const uiSchema = uischema as ControlUISchema<unknown> | ControlElement
+  const formItemProps = "formItemProps" in uiSchema ? uiSchema.formItemProps : {}
 
   return (
     <Form.Item