generated from react-component/footer
-
-
Notifications
You must be signed in to change notification settings - Fork 334
Fix:RangePicker the triangle sign was not positioned correctly in some cases #886
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.
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
Closed
bbb169
wants to merge
13
commits into
react-component:master
from
bbb169:fix/range-picker-arrow-wrong-position
Closed
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
1ec2feb
feat: picker need to receive the placement aligned by popup
bbb169 e5f2671
feat: add test cases for rang being realigned
bbb169 1f63ee9
Update src/PickerTrigger/index.tsx
bbb169 18d41e0
chore: optimize range-align.spec.tsx
bbb169 e551d12
fix: avtive bar will be wrong position while init
bbb169 f33f841
fix: simulate parent width for active bar
bbb169 cba76c7
fix: arrow place above while placement is `topRight`
bbb169 7add058
test: move range-align into new-range and fix tests exceed time problem
bbb169 d02ddec
chore: merge two beforeEach hooks logics
bbb169 05eeced
fix: active bar always offset 1px
bbb169 9e4ee41
test: change the proxy `offsetLeft` to proxy `getBoundingClientRect`
bbb169 8f0cdc4
fix: tsc error
bbb169 f6ee130
Merge branch 'master' into fix/range-picker-arrow-wrong-position
bbb169 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| import { act, cleanup, render } from '@testing-library/react'; | ||
bbb169 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| import { spyElementPrototypes } from 'rc-util/lib/test/domHook'; | ||
| import React from 'react'; | ||
| import { DayRangePicker } from './util/commonUtil'; | ||
|
|
||
| describe('the popup arrow should be placed in the correct position.', () => { | ||
| let rangeRect = { x: 0, y: 0, width: 0, height: 0 }; | ||
|
|
||
| beforeEach(() => { | ||
| rangeRect = { | ||
| x: 0, | ||
| y: 0, | ||
| width: 200, | ||
| height: 100, | ||
| }; | ||
|
|
||
| document.documentElement.scrollLeft = 0; | ||
| }); | ||
bbb169 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| beforeAll(() => { | ||
| jest.spyOn(document.documentElement, 'scrollWidth', 'get').mockReturnValue(1000); | ||
|
|
||
| // Viewport size | ||
| spyElementPrototypes(HTMLElement, { | ||
| clientWidth: { | ||
| get: () => 400, | ||
| }, | ||
| clientHeight: { | ||
| get: () => 400, | ||
| }, | ||
| }); | ||
|
|
||
| // Popup size | ||
| spyElementPrototypes(HTMLDivElement, { | ||
| getBoundingClientRect() { | ||
| if (this.className.includes('rc-picker-dropdown')) { | ||
| return { | ||
| x: 0, | ||
| y: 0, | ||
| width: 300, | ||
| height: 100, | ||
| }; | ||
| } | ||
| if (this.className.includes('rc-picker-range')) { | ||
| return rangeRect; | ||
| } | ||
| }, | ||
| offsetWidth: { | ||
| get() { | ||
| if (this.className.includes('rc-picker-range-wrapper')) { | ||
| return rangeRect.width; | ||
| } | ||
| if (this.className.includes('rc-picker-range-arrow')) { | ||
| return 10; | ||
| } | ||
| if (this.className.includes('rc-picker-input')) { | ||
| return 100; | ||
| } | ||
| if (this.className.includes('rc-picker-dropdown')) { | ||
| return 300; | ||
| } | ||
| }, | ||
| }, | ||
| offsetLeft: { | ||
| get() { | ||
| if (this.className.includes('rc-picker-input')) { | ||
| return 0; | ||
| } | ||
| }, | ||
| }, | ||
| }); | ||
| spyElementPrototypes(HTMLElement, { | ||
| offsetParent: { | ||
| get: () => document.body, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| jest.useFakeTimers(); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| cleanup(); | ||
| jest.useRealTimers(); | ||
| }); | ||
|
|
||
| it('the arrow should be set to `inset-inline-start` when the popup is aligned to `bottomLeft`.', async () => { | ||
| render(<DayRangePicker open />); | ||
|
|
||
| await act(async () => { | ||
| jest.runAllTimers(); | ||
|
|
||
| await Promise.resolve(); | ||
| }); | ||
| expect(document.querySelector('.rc-picker-range-arrow')).toHaveStyle({ | ||
| 'inset-inline-start': '0', | ||
| }); | ||
| }); | ||
|
|
||
| it('the arrow should be set to `inset-inline-end` when the popup is aligned to `bottomRight`.', async () => { | ||
| const mock = spyElementPrototypes(HTMLDivElement, { | ||
| getBoundingClientRect() { | ||
| if (this.className.includes('rc-picker-dropdown')) { | ||
| return { | ||
| x: 0, | ||
| y: 0, | ||
| width: 300, | ||
| height: 100, | ||
| }; | ||
| } | ||
| if (this.className.includes('rc-picker-range')) { | ||
| return { | ||
| ...rangeRect, | ||
| x: 300, | ||
| }; | ||
| } | ||
| }, | ||
| }); | ||
|
|
||
| render(<DayRangePicker open />); | ||
|
|
||
| await act(async () => { | ||
| jest.runAllTimers(); | ||
|
|
||
| await Promise.resolve(); | ||
| }); | ||
| expect(document.querySelector('.rc-picker-range-arrow')).toHaveStyle({ | ||
| 'inset-inline-end': '0', | ||
| }); | ||
|
|
||
| mock.mockRestore(); | ||
| }); | ||
| }); | ||
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.