Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Date Picker [LG-3897] backspace #2143

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Date Picker [LG-3897] backspace #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67cad4
add tests
shaneeza Dec 18, 2023
3112ac2
move test
shaneeza Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 68 additions & 26 deletions packages/date-picker/src/DatePicker/DatePicker.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,6 +1250,26 @@ describe('packages/date-picker', () => {
*/
describe('Arrow key', () => {
describe('Input', () => {
describe('Left Arrow', () => {
test('moves the cursor when the value starts with 0', () => {
const { monthInput } = renderDatePicker({});
userEvent.type(monthInput, '04{arrowleft}{arrowleft}');
expect(monthInput).toHaveFocus();
});

test('moves the cursor when the value is 0', () => {
const { monthInput } = renderDatePicker({});
userEvent.type(monthInput, '0{arrowleft}');
expect(monthInput).toHaveFocus();
});

test('moves the cursor to the next segment when the value is 0', () => {
const { yearInput, monthInput } = renderDatePicker({});
userEvent.type(monthInput, '0{arrowleft}{arrowleft}');
expect(yearInput).toHaveFocus();
});
});

test('right arrow moves focus through segments', () => {
const { yearInput, monthInput, dayInput } = renderDatePicker();
userEvent.click(yearInput);
Expand Down Expand Up @@ -2122,37 +2142,59 @@ describe('packages/date-picker', () => {
});

describe('updating a segment', () => {
test('clearing the segment updates the input', () => {
const { yearInput, monthInput, dayInput } = renderDatePicker({});
userEvent.type(yearInput, '2020');
userEvent.type(monthInput, '7');
userEvent.type(dayInput, '4');
describe('backspace', () => {
test('clearing the segment updates the input', () => {
const { yearInput, monthInput, dayInput } = renderDatePicker({});
userEvent.type(yearInput, '2020');
userEvent.type(monthInput, '7');
userEvent.type(dayInput, '4');

yearInput.setSelectionRange(0, 4);
userEvent.type(yearInput, '{backspace}');
expect(yearInput).toHaveValue('');
});
yearInput.setSelectionRange(0, 4);
userEvent.type(yearInput, '{backspace}');
expect(yearInput).toHaveValue('');
});

test('clearing and typing a new value does not format the input', () => {
const { yearInput, monthInput, dayInput } = renderDatePicker({});
userEvent.type(yearInput, '2020');
userEvent.type(monthInput, '7');
userEvent.type(dayInput, '4');
test('keeps the focus inside the segment if it is not empty', () => {
const { monthInput } = renderDatePicker({});

yearInput.setSelectionRange(0, 4);
userEvent.type(yearInput, '{backspace}');
userEvent.type(yearInput, '2');
expect(yearInput).toHaveValue('2');
});
userEvent.type(monthInput, '0');
userEvent.type(monthInput, '{backspace}');

test('deleting characters does not format the segment', () => {
const { yearInput, monthInput, dayInput } = renderDatePicker({});
userEvent.type(yearInput, '2020');
userEvent.type(monthInput, '7');
userEvent.type(dayInput, '4');
expect(monthInput).toHaveValue('');
expect(monthInput).toHaveFocus();
});

test('moves the focus to the next segment', () => {
const { yearInput, monthInput } = renderDatePicker({});

userEvent.type(monthInput, '0');
userEvent.type(monthInput, '{backspace}{backspace}');

expect(monthInput).toHaveValue('');
expect(yearInput).toHaveFocus();
});

userEvent.type(yearInput, '{backspace}{backspace}');
expect(yearInput).toHaveValue('20');
test('clearing and typing a new value does not format the input', () => {
const { yearInput, monthInput, dayInput } = renderDatePicker({});
userEvent.type(yearInput, '2020');
userEvent.type(monthInput, '7');
userEvent.type(dayInput, '4');

yearInput.setSelectionRange(0, 4);
userEvent.type(yearInput, '{backspace}');
userEvent.type(yearInput, '2');
expect(yearInput).toHaveValue('2');
});

test('deleting characters does not format the segment', () => {
const { yearInput, monthInput, dayInput } = renderDatePicker({});
userEvent.type(yearInput, '2020');
userEvent.type(monthInput, '7');
userEvent.type(dayInput, '4');

userEvent.type(yearInput, '{backspace}{backspace}');
expect(yearInput).toHaveValue('20');
});
});

describe('typing new characters', () => {
Expand Down
9 changes: 5 additions & 4 deletions packages/date-picker/src/DatePicker/DatePickerInput/DatePickerInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import React, {
} from 'react';

import { isSameUTCDay } from '@leafygreen-ui/date-utils';
import { isZeroLike } from '@leafygreen-ui/lib';
import { createSyntheticEvent, keyMap } from '@leafygreen-ui/lib';

import { DateFormField, DateInputBox } from '../../shared/components/DateInput';
Expand Down Expand Up @@ -88,7 +87,7 @@ export const DatePickerInput = forwardRef<HTMLDivElement, DatePickerInputProps>(
// if target is not a segment, do nothing
if (!isSegment) return;

const isSegmentEmpty = isZeroLike(target.value);
const isSegmentEmpty = !target.value;

const { selectionStart, selectionEnd } = target;

Expand All @@ -97,7 +96,7 @@ export const DatePickerInput = forwardRef<HTMLDivElement, DatePickerInputProps>(
// if input is empty,
// or the cursor is at the beginning of the input
// set focus to prev. input (if it exists)
if (isSegmentEmpty || selectionStart === 0) {
if (selectionStart === 0) {
const segmentToFocus = getRelativeSegmentRef('prev', {
segment: target,
formatParts,
Expand All @@ -115,7 +114,7 @@ export const DatePickerInput = forwardRef<HTMLDivElement, DatePickerInputProps>(
// if input is empty,
// or the cursor is at the end of the input
// set focus to next. input (if it exists)
if (isSegmentEmpty || selectionEnd === target.value.length) {
if (selectionEnd === target.value.length) {
const segmentToFocus = getRelativeSegmentRef('next', {
segment: target,
formatParts,
Expand All @@ -137,6 +136,8 @@ export const DatePickerInput = forwardRef<HTMLDivElement, DatePickerInputProps>(

case keyMap.Backspace: {
if (isSegmentEmpty) {
// prevent the backspace in the previous segment
e.preventDefault();
const segmentToFocus = getRelativeSegmentRef('prev', {
segment: target,
formatParts,
Expand Down
Loading