diff --git a/src/assets/scss/components/appForm.scss b/src/assets/scss/components/appForm.scss index 4a55012..60f0dd4 100644 --- a/src/assets/scss/components/appForm.scss +++ b/src/assets/scss/components/appForm.scss @@ -40,6 +40,14 @@ } } } +.appForm__oneCol { + display: flex; + flex-direction: column; + + label { + font-weight: 400; + } +} .appForm__twoCols { display: flex; gap: 1rem; diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index e0844b0..588ee27 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -14,6 +14,7 @@ .appPageSection { display: flex; flex-direction: column; + align-items: flex-start; h2 { color: var(--Black); diff --git a/src/components/FormField/components/DatepickerRange/index.js b/src/components/FormField/components/DatepickerRange/index.js index 2868e2b..ac53c09 100644 --- a/src/components/FormField/components/DatepickerRange/index.js +++ b/src/components/FormField/components/DatepickerRange/index.js @@ -1,7 +1,9 @@ import React from 'react'; import { classNames } from 'primereact/utils'; +import { isEmpty, isNil } from 'ramda'; + +// components import { Controller } from 'react-hook-form'; -import { isNil } from 'ramda'; import { Calendar } from 'primereact/calendar'; const DatepickerRange = ({ @@ -15,6 +17,7 @@ const DatepickerRange = ({ minDate = null, maxDate = null }) => { + const datesDefaultValue = !isNil(defaultValue) && !isEmpty(defaultValue) && defaultValue.length ? defaultValue.map(v => new Date(v)) : []; return ( <>