Merge branch 'next' into rework-views

mui · Dec 13, 2022 · d6a20b2 · d6a20b2
2 parents 4e51830 + 055b78b
commit d6a20b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/x-date-pickers/src/DateField/tests/selection.DateField.test.tsx b/packages/x-date-pickers/src/DateField/tests/selection.DateField.test.tsx
@@ -36,9 +36,8 @@ describe('<DateField /> - Selection', () => {
  render(<DateField autoFocus />);
  const input = screen.getByRole('textbox');
 
- expect(input.value).to.equal('MM / DD / YYYY');
- expect(input.selectionStart).to.equal(0);
- expect(input.selectionEnd).to.equal(input.value.length);
+ expectInputValue(input, 'MM / DD / YYYY');
+ expect(getCleanedSelectedContent(input)).to.equal('MM / DD / YYYY');
  });
 
  it('should select all on <Tab> focus', () => {
@@ -51,8 +50,7 @@ describe('<DateField /> - Selection', () => {
  });
 
  expectInputValue(input, 'MM / DD / YYYY');
- expect(input.selectionStart).to.equal(0);
- expect(input.selectionEnd).to.equal(input.value.length);
+ expect(getCleanedSelectedContent(input)).to.equal('MM / DD / YYYY');
  });
 
  it('should select day on mobile', () => {

diff --git a/packages/x-date-pickers/src/internals/hooks/useField/useField.ts b/packages/x-date-pickers/src/internals/hooks/useField/useField.ts
@@ -456,6 +456,7 @@ export const useField = <
 
  const firstSelectedSection = state.sections[selectedSectionIndexes.startIndex];
  const lastSelectedSection = state.sections[selectedSectionIndexes.endIndex];
+
  updateSelectionRangeIfChanged(
  firstSelectedSection.startInInput,
  lastSelectedSection.endInInput,