File tree Expand file tree Collapse file tree 4 files changed +13
-41
lines changed
v4/routes/components/dateField
controls/inputs/datePicker/baseCalendarPicker/calendarActionBar
v4Adapter/overrides/cards/sharedStyles Expand file tree Collapse file tree 4 files changed +13
-41
lines changed Original file line number Diff line number Diff line change 1414 * You should have received a copy of the GNU Affero General Public License
1515 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1616 */
17- import { ComponentType , useEffect } from 'react' ;
18- import { DatePickerProps } from '@mui/lab/DatePicker' ;
19- import { DateTimePickerProps } from '@mui/lab/DateTimePicker' ;
17+ import { useEffect } from 'react' ;
2018import { TextField } from '@mui/material' ;
2119import { useState } from 'react' ;
22- import { StyledDatePicker , StyledDateTimePicker } from './dateField.styles' ;
20+ import { DateTimePicker } from '@controls/inputs/datePicker/dateTimePicker.component' ;
21+ import { DatePicker } from '@controls/inputs/datePicker/datePicker.component' ;
2322
2423interface IProps {
2524 value ?: any ;
@@ -48,7 +47,7 @@ export const DateField = ({
4847 ...dateFieldProps
4948} : IProps ) => {
5049 const [ value , setValue ] = useState ( propValue || null ) ;
51- const Picker : ComponentType < DatePickerProps | DateTimePickerProps > = dateTime ? StyledDateTimePicker : StyledDatePicker ;
50+ const Picker = dateTime ? DateTimePicker : DatePicker ;
5251
5352 const handleAccept = ( newValue ) => {
5453 if ( newValue ) {
@@ -78,11 +77,13 @@ export const DateField = ({
7877 defaultValue = { defaultValue }
7978 name = { name }
8079 onBlur = { onBlur }
81- className = { className }
8280 { ...props }
81+ InputProps = { { endAdornment : null } }
8382 />
8483 ) }
84+ className = { className }
8585 { ...dateFieldProps }
86+ components = { { ActionBar : null } }
8687 />
8788 ) ;
8889} ;
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ type ICalendarActionBar = {
2525export const CalendarActionBar = ( { onClear, hidden } : ICalendarActionBar ) => {
2626 if ( hidden ) return null ;
2727 return (
28- < ClearDateAction onClick = { onClear } hidden = { hidden } >
28+ < ClearDateAction onClick = { onClear } >
2929 < FormattedMessage id = "datePicker.actionBar.clear" defaultMessage = "Clear date" />
3030 </ ClearDateAction >
3131 ) ;
Original file line number Diff line number Diff line change @@ -35,11 +35,14 @@ export default css`
3535 }
3636 ${ SequenceDateContainer } {
3737 width : 190px ;
38- ${ SequenceDateField } {
38+ ${ SequenceDateField } { // HERE
39+ outline : 1px solid peru;
3940 .MuiInputBase-root {
41+ outline : 1px solid hotpink;
4042 margin : 0px ;
41-
43+
4244 input {
45+ outline : 1px solid lightgoldenrodyellow;
4346 color : ${ ( { theme } ) => theme . palette . secondary . main } ;
4447 box-sizing : border-box;
4548 width : 184px ;
You can’t perform that action at this time.
0 commit comments