Merge pull request #4708 from 3drepo/ISSUE_4639

ISSUE #4639 - Sequences don't revert to a previously selected date on cancel
3drepo · Jan 23, 2024 · bddf217 · bddf217
2 parents 2147652 + f2345da
commit bddf217
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 44 deletions.
diff --git a/frontend/src/v4/routes/components/dateField/dateField.component.tsx b/frontend/src/v4/routes/components/dateField/dateField.component.tsx
@@ -14,12 +14,10 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { ComponentType, useEffect } from 'react';
-import { DatePickerProps } from '@mui/lab/DatePicker';
-import { DateTimePickerProps } from '@mui/lab/DateTimePicker';
 import { TextField } from '@mui/material';
-import { useState } from 'react';
-import { StyledDatePicker, StyledDateTimePicker } from './dateField.styles';
+import { useEffect, useState } from 'react';
+import { DateTimePicker } from '@controls/inputs/datePicker/dateTimePicker.component';
+import { DatePicker } from '@controls/inputs/datePicker/datePicker.component';
 
 interface IProps {
 	value?: any;
@@ -44,11 +42,10 @@ export const DateField = ({
 	placeholder,
 	dateTime,
 	defaultValue,
-	className,
 	...dateFieldProps
 }: IProps) => {
 	const [value, setValue] = useState(propValue || null);
-	const Picker: ComponentType<DatePickerProps | DateTimePickerProps> = dateTime ? StyledDateTimePicker : StyledDatePicker;
+	const Picker = dateTime ? DateTimePicker : DatePicker;
 
 	const handleAccept = (newValue) => {
 		if (newValue) {
@@ -72,14 +69,15 @@ export const DateField = ({
 			onAccept={handleAccept}
 			onChange={() => {}}
 			disableHighlightToday
+			// @ts-ignore
+			inputProps={{ readOnly: true, placeholder }}
+			components={{ ActionBar: null }}
 			renderInput={(props) => (
 				<TextField
-					placeholder={placeholder}
 					defaultValue={defaultValue}
 					name={name}
-					onBlur={onBlur}
-					className={className}
 					{...props}
+					InputProps={{ endAdornment: null }}
 				/>
 			)}
 			{...dateFieldProps}

diff --git a/frontend/src/v4/routes/components/dateField/dateField.styles.ts b/frontend/src/v4/routes/components/dateField/dateField.styles.ts
diff --git a/...ls/inputs/datePicker/baseCalendarPicker/calendarActionBar/calendarActionBar.component.tsx b/...ls/inputs/datePicker/baseCalendarPicker/calendarActionBar/calendarActionBar.component.tsx
@@ -25,7 +25,7 @@ type ICalendarActionBar = {
 export const CalendarActionBar = ({ onClear, hidden }: ICalendarActionBar) => {
 	if (hidden) return null;
 	return (
-		<ClearDateAction onClick={onClear} hidden={hidden}>
+		<ClearDateAction onClick={onClear}>
 			<FormattedMessage id="datePicker.actionBar.clear" defaultMessage="Clear date" />
 		</ClearDateAction>
 	);

diff --git a/frontend/src/v5/ui/v4Adapter/overrides/cards/sharedStyles/sequencesTab.overrides.ts b/frontend/src/v5/ui/v4Adapter/overrides/cards/sharedStyles/sequencesTab.overrides.ts
@@ -52,7 +52,7 @@ export default css`
 			
 			${SequenceDateActions} {
 				bottom: -3px;
-				left: -9px;
+				left: -41px;
 				top: unset;
 				right: unset;
 				.MuiIconButton-root {