bright-components 10.1.0 → 10.2.1

package/src/components/DayPicker/index.js

@@ -26,6 +26,8 @@ import breakpoints from 'constants/breakpoints';
 
 import CalendarIcon from 'components/Icons/Calendar/';
 
+import NewDayPicker from './NewDayPicker';
+
 const friendlyShort = 'EEE dd MMM';
 const friendlyShortWithYear = 'EEE dd MMM yyyy';
 
@@ -232,11 +234,12 @@ class DayPicker extends React.Component {
 			panelAbsoluteOnDesktop,
 			onSelectedDate,
 			isDateSelect,
+			typeable,
 			...rest
 		} = this.props;
 
 		const { dayPickerOpen } = this.state;
-		const { range } = this.props;
+		const { range, locale } = this.props;
 
 		const fromDate = range.from
 			? format(range.from, this.getDisplayFormat())
@@ -250,20 +253,39 @@ class DayPicker extends React.Component {
 
 		return (
 			<DayPickerInputContainer {...rest}>
-				<InputBox
-					onClick={this.toggleDayPicker}
-					error={error}
-					disabled={disabled}
-					legacyInputStyle={legacyInputStyle}
-					data-testid="input-selector"
-				>
-					{datesToDisplay ? (
-						<span>{datesToDisplay}</span>
-					) : (
-						<Placeholder>{placeholder}</Placeholder>
-					)}
-					<OpenCalendarIcon size={22} disabled={disabled} />
-				</InputBox>
+				{!typeable || dateRange ? (
+					<InputBox
+						onClick={this.toggleDayPicker}
+						error={error}
+						disabled={disabled}
+						legacyInputStyle={legacyInputStyle}
+						data-testid="input-selector"
+					>
+						{datesToDisplay ? (
+							<span>{datesToDisplay}</span>
+						) : (
+							<Placeholder>{placeholder}</Placeholder>
+						)}
+						<OpenCalendarIcon size={22} disabled={disabled} />
+					</InputBox>
+				) : (
+					<NewDayPicker
+						placeholder={placeholder}
+						datesToDisplay={datesToDisplay}
+						range={range}
+						allowClear={allowClear}
+						yearRange={yearRange}
+						onSelectedDate={onSelectedDate}
+						locale={locale}
+						clearValue={this.clearValue}
+						disabled={disabled}
+						error={error}
+						toggleDayPicker={this.toggleDayPicker}
+						GA={GA}
+						recordValue={recordValue}
+						dayPickerOpen={dayPickerOpen}
+					/>
+				)}
 
 				{dayPickerOpen && (
 					<DayRangeContainer
@@ -330,7 +352,9 @@ DayPicker.propTypes = {
 	legacyInputStyle: bool,
 	closeButton: bool,
 	panelAbsoluteOnDesktop: bool,
-	isDateSelect: bool
+	isDateSelect: bool,
+	typeable: bool,
+	locale: string
 };
 
 DayPicker.defaultProps = {
@@ -356,7 +380,9 @@ DayPicker.defaultProps = {
 	legacyInputStyle: false,
 	closeButton: false,
 	panelAbsoluteOnDesktop: true,
-	isDateSelect: false
+	isDateSelect: false,
+	typeable: false,
+	locale: 'GB'
 };
 
 export { DayPicker as Unwrapped };

package/src/components/DayPicker/test.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
+import { render, fireEvent, wait } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import ReactGA from 'react-ga';
 import DayPicker from '.';
 
@@ -406,4 +407,299 @@ describe('<DayPicker />', () => {
 			expect(ReactGA.event).toHaveBeenCalledTimes(1);
 		});
 	});
+
+	describe('Typing date', () => {
+		it('should set the correct date when typed in', async () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					GA={{
+						category: undefined,
+						actionId: undefined
+					}}
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+			userEvent.type(inputSelect, `010203`);
+			await wait(() => expect(inputSelect.value).toEqual('01/02/03'));
+			fireEvent.blur(inputSelect);
+
+			expect(onMockSelectedDate).toHaveBeenLastCalledWith({
+				from: new Date('2003-02-01T00:00:00.000Z'),
+				to: new Date('2003-02-01T00:00:00.000Z')
+			});
+		});
+
+		it('should set the correct date when typed in - CA', () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					locale="CA"
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+			userEvent.type(inputSelect, '010203');
+			fireEvent.blur(inputSelect);
+
+			expect(onMockSelectedDate).toHaveBeenLastCalledWith({
+				from: new Date('2001-02-03T00:00:00.000Z'),
+				to: new Date('2001-02-03T00:00:00.000Z')
+			});
+		});
+
+		it('should show the correct date when date pre set', () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					range={{
+						from: new Date('2019-08-01'),
+						to: undefined
+					}}
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+
+			expect(inputSelect.value).toEqual('01/08/19');
+		});
+
+		it('should show the correct date when date pre set - CA', () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					range={{
+						from: new Date('2019-08-01'),
+						to: undefined
+					}}
+					locale="CA"
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+
+			expect(inputSelect.value).toEqual('19/08/01');
+		});
+
+		it('should allow clearing date', () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					range={{
+						from: new Date('2019-08-01'),
+						to: undefined
+					}}
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+			userEvent.type(inputSelect, '{selectall}{backspace}');
+			fireEvent.blur(inputSelect);
+
+			expect(onMockSelectedDate).toHaveBeenLastCalledWith({
+				from: undefined,
+				to: undefined
+			});
+		});
+
+		it('shouldnt save invalid dates', () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					range={{
+						from: new Date('2019-08-01'),
+						to: undefined
+					}}
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+			fireEvent.blur(inputSelect);
+			fireEvent.focus(inputSelect);
+			userEvent.type(inputSelect, '{selectall}{backspace}0101');
+			fireEvent.blur(inputSelect);
+
+			expect(onMockSelectedDate).toHaveBeenLastCalledWith('');
+			expect(wrapper.getByText('Date is invalid')).toBeInTheDocument();
+		});
+
+		it('shouldnt save dates outside the range', () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2018, max: 2030 }}
+					range={{
+						from: new Date('2019-08-01'),
+						to: undefined
+					}}
+					allowClear={false}
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+			userEvent.type(inputSelect, '{selectall}{backspace}010131');
+			fireEvent.blur(inputSelect);
+
+			expect(onMockSelectedDate).toHaveBeenLastCalledWith({
+				from: new Date('2019-08-01T00:00:00.000Z'),
+				to: undefined
+			});
+			expect(
+				wrapper.getByText(
+					'Year is outside of range. Must be between 2018 - 2030'
+				)
+			).toBeInTheDocument();
+		});
+
+		it('should revert invalid date to empty if no initial date', () => {
+			onMockSelectedDate.mockClear();
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					range={{
+						from: undefined,
+						to: undefined
+					}}
+					allowClear={false}
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+			fireEvent.blur(inputSelect);
+			fireEvent.focus(inputSelect);
+			userEvent.type(inputSelect, '{selectall}{backspace}0101');
+			fireEvent.blur(inputSelect);
+
+			expect(onMockSelectedDate).not.toHaveBeenCalled();
+		});
+
+		it('backspace / automatically', () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					range={{
+						from: new Date('2019-08-01'),
+						to: undefined
+					}}
+				/>
+			);
+			const inputSelect = wrapper.getByTestId('new input');
+
+			fireEvent.focus(inputSelect);
+			userEvent.type(inputSelect, `{backspace}{backspace}/`);
+			expect(inputSelect.value).toEqual('01/08/');
+		});
+
+		it('should open calendar view with the icon', () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					yearRange={{ min: 2000, max: 2100 }}
+					range={{
+						from: new Date('2019-08-01'),
+						to: undefined
+					}}
+				/>
+			);
+
+			fireEvent.click(wrapper.getByTestId('calendarIcon'));
+			expect(wrapper.getByTestId('daypicker-panel')).toBeInTheDocument();
+
+			const inputSelect = wrapper.getByTestId('new input');
+			fireEvent.focus(inputSelect);
+			fireEvent.blur(inputSelect);
+
+			expect(
+				wrapper.queryByTestId('daypicker-panel')
+			).not.toBeInTheDocument();
+		});
+
+		it('should apply the error styling if error', () => {
+			wrapper.rerender(
+				<DayPicker {...props} dateRange={false} typeable error />
+			);
+
+			const inputSelect = wrapper.getByTestId('input-selector');
+			expect(inputSelect).toHaveStyleRule(
+				'border-color',
+				'#FF5000 !important'
+			);
+		});
+
+		it('should apply the error styling if disabled', () => {
+			wrapper.rerender(
+				<DayPicker {...props} typeable dateRange={false} disabled />
+			);
+
+			const inputSelect = wrapper.getByTestId('new input');
+			expect(inputSelect).toBeDisabled();
+		});
+
+		it('should call the correct GA tags when the date is typed', async () => {
+			wrapper.rerender(
+				<DayPicker
+					{...props}
+					typeable
+					dateRange={false}
+					range={{
+						from: undefined,
+						to: undefined
+					}}
+					recordValue
+				/>
+			);
+			expect(ReactGA.event).toHaveBeenCalledTimes(0);
+
+			const inputSelect = wrapper.getByTestId('new input');
+			fireEvent.focus(inputSelect);
+			userEvent.type(inputSelect, `201222`);
+			await wait(() => expect(inputSelect.value).toEqual('20/12/22'));
+			fireEvent.blur(inputSelect);
+
+			await wait(() =>
+				expect(ReactGA.event).toHaveBeenCalledWith({
+					action: 'ActionID - Set via Typing',
+					category: 'Test',
+					label: 'Tue 20 Dec 2022'
+				})
+			);
+		});
+	});
 });

package/src/components/DayPickerPanel/index.js

@@ -178,7 +178,7 @@ class DayPickerPanel extends React.Component {
 			range: { from, to }
 		} = this.state;
 
-		const actionEvent = selectedDay ? 'Set' : 'Apply';
+		const actionEvent = selectedDay ? 'Set via Date Picker' : 'Apply';
 
 		if (category) {
 			const label = dateRange

package/src/components/DayPickerPanel/test.js

@@ -73,7 +73,7 @@ describe('Month Year and Calendar view', () => {
 
 			expect(event).toHaveBeenCalledWith({
 				category: 'Cat',
-				action: 'Action ID - Set',
+				action: 'Action ID - Set via Date Picker',
 				label: 'Tue 03 Apr 2018'
 			});
 		});

package/src/components/DurationInput/test.js

@@ -20,7 +20,7 @@ describe('<DurationInput />', () => {
 		});
 
 		it('should select a new days value when the days input is changed', () => {
-			const daysInput = wrapper.getByRole('textbox');
+			const daysInput = wrapper.getByRole('spinbutton');
 
 			expect(onChange).not.toHaveBeenCalled();
 
@@ -36,7 +36,7 @@ describe('<DurationInput />', () => {
 			const blurProps = { ...props, onBlur: jest.fn() };
 			wrapper.rerender(<DurationInput {...blurProps} />);
 
-			const daysInput = wrapper.getByRole('textbox');
+			const daysInput = wrapper.getByRole('spinbutton');
 			fireEvent.blur(daysInput);
 
 			expect(blurProps.onBlur).toHaveBeenCalled();
@@ -54,7 +54,9 @@ describe('<DurationInput />', () => {
 		});
 
 		it('should select a new hours value and a new minutes value when the inputs are changed', () => {
-			const [hoursInput, minutesInput] = wrapper.getAllByRole('textbox');
+			const [hoursInput, minutesInput] = wrapper.getAllByRole(
+				'spinbutton'
+			);
 
 			expect(onChange).not.toHaveBeenCalled();
 

package/src/components/EmployeePicker/FilterBar/test.js

@@ -33,7 +33,7 @@ describe('EmployeePickerFilterBar', () => {
 	});
 
 	const getInput = () => element.getByPlaceholderText('Enter name');
-	const getSelect = () => element.getByRole('listbox');
+	const getSelect = () => element.getByRole('combobox');
 
 	it('should call updateType when the user selects a filter type', () => {
 		const input = getInput();

package/src/components/Modal/ModalBody/index.js

@@ -3,6 +3,7 @@ import spacing from 'constants/spacing';
 
 const ModalBody = styled.div`
 	padding: ${props => (props.noPadding ? '0px' : spacing.s2)};
+	overflow-y: auto;
 `;
 ModalBody.displayName = 'ModalBody';
 

package/src/components/Modal/index.js

@@ -34,6 +34,8 @@ const Background = styled.div`
 `;
 
 const ModalContainer = styled.div`
+	display: flex;
+	flex-direction: column;
 	background: white;
 	position: relative;
 	width: ${props => props.width};
@@ -43,7 +45,6 @@ const ModalContainer = styled.div`
 	border-radius: ${vars.borderRadius};
 	max-height: 90%;
 	overflow-x: hidden;
-	overflow-y: auto;
 	${props => props.version === '1' && '-webkit-overflow-scrolling: touch'};
 
 	${props =>

package/src/components/Modal/test.js

@@ -133,7 +133,6 @@ describe('<Modal />', () => {
 		const modalContainer = wrapper.getByRole('region');
 
 		expect(modalContainer).toHaveStyleRule('overflow-x', 'hidden');
-		expect(modalContainer).toHaveStyleRule('overflow-y', 'auto');
 
 		wrapper.rerender(
 			<Modal close={closeFn} allowOverflow>

package/src/components/ResponsiveTabs/test.js

@@ -15,7 +15,7 @@ describe('<ResponsiveTabs />', () => {
 			</ResponsiveTabs>
 		);
 
-		expect(getByRole('listbox')).toBeInTheDocument();
+		expect(getByRole('combobox')).toBeInTheDocument();
 		expect(getAllByRole('option')).toHaveLength(2);
 	});
 
@@ -38,7 +38,7 @@ describe('<ResponsiveTabs />', () => {
 		expect(getByTestId('tab1')).toBeVisible();
 		expect(getByTestId('tab2')).not.toBeVisible();
 
-		const dropdown = getByRole('listbox');
+		const dropdown = getByRole('combobox');
 		fireEvent.change(dropdown, { target: { value: 'Two' } });
 
 		expect(getByTestId('tab1')).not.toBeVisible();
@@ -90,7 +90,7 @@ describe('<ResponsiveTabs />', () => {
 			</ResponsiveTabs>
 		);
 
-		fireEvent.change(getByRole('listbox'), { target: { value: 'One' } });
+		fireEvent.change(getByRole('combobox'), { target: { value: 'One' } });
 		expect(event).not.toHaveBeenCalled();
 
 		fireEvent.click(getByRole('tab'));

package/src/components/Time/TimePicker/index.js

@@ -118,6 +118,7 @@ const TimePicker = ({
 		<>
 			<MobileTimePicker
 				type="time"
+				data-testid="mobileTimePicker"
 				onChange={e => {
 					const timeString = e.target.value;
 					if (timeString.length === 5) {