From 0546f231502df0ece8558376c9ffec8b8f29d150 Mon Sep 17 00:00:00 2001 From: Braden MacDonald Date: Fri, 13 Sep 2024 10:59:22 -0700 Subject: [PATCH] fix: warning from FormikControl with blank help={...} --- .../{FormikControl.jsx => FormikControl.tsx} | 39 +++++++------------ .../CreateCollectionModal.tsx | 3 -- 2 files changed, 14 insertions(+), 28 deletions(-) rename src/generic/{FormikControl.jsx => FormikControl.tsx} (66%) diff --git a/src/generic/FormikControl.jsx b/src/generic/FormikControl.tsx similarity index 66% rename from src/generic/FormikControl.jsx rename to src/generic/FormikControl.tsx index 048ad991ab..dd9702c0a0 100644 --- a/src/generic/FormikControl.jsx +++ b/src/generic/FormikControl.tsx @@ -1,16 +1,24 @@ /* eslint-disable react/jsx-no-useless-fragment */ import { Form } from '@openedx/paragon'; import { getIn, useFormikContext } from 'formik'; -import PropTypes from 'prop-types'; import React from 'react'; import FormikErrorFeedback from './FormikErrorFeedback'; -const FormikControl = ({ +interface Props { + name: string; + label?: React.ReactElement; + help?: React.ReactElement; + className?: string; + controlClasses?: string; + value: string | number; +} + +const FormikControl: React.FC> = ({ name, - label, - help, - className, - controlClasses, + label = <>, + help = <>, + className = '', + controlClasses = 'pb-2', ...params }) => { const { @@ -39,23 +47,4 @@ const FormikControl = ({ ); }; -FormikControl.propTypes = { - name: PropTypes.string.isRequired, - label: PropTypes.element, - help: PropTypes.element, - className: PropTypes.string, - controlClasses: PropTypes.string, - value: PropTypes.oneOfType([ - PropTypes.string, - PropTypes.number, - ]).isRequired, -}; - -FormikControl.defaultProps = { - help: <>, - label: <>, - className: '', - controlClasses: 'pb-2', -}; - export default FormikControl; diff --git a/src/library-authoring/create-collection/CreateCollectionModal.tsx b/src/library-authoring/create-collection/CreateCollectionModal.tsx index e9cd2153c2..905272b181 100644 --- a/src/library-authoring/create-collection/CreateCollectionModal.tsx +++ b/src/library-authoring/create-collection/CreateCollectionModal.tsx @@ -79,8 +79,6 @@ const CreateCollectionModal = () => { )} value={formikProps.values.title} placeholder={intl.formatMessage(messages.createCollectionModalNamePlaceholder)} - help={null} - className="" controlClasses="pb-2" /> { {intl.formatMessage(messages.createCollectionModalDescriptionDetails)} )} - className="" controlClasses="pb-2" rows="5" />