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.

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

fix: DOMRect value issues #481

Merged
merged 5 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/hooks/useAlign.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@
};
} else {
const rect = target.getBoundingClientRect();
rect.x = rect.x ?? rect.left;
rect.y = rect.y ?? rect.top

Check notice

Code scanning / CodeQL

Semicolon insertion Note

Avoid automated semicolon insertion (99% of all statements in
the enclosing function
have an explicit semicolon).
targetRect = {
x: rect.x,
y: rect.y,
Expand All @@ -220,6 +222,8 @@
};
}
const popupRect = popupElement.getBoundingClientRect();
popupRect.x = popupRect.x ?? popupRect.left;
popupRect.y = popupRect.y ?? popupRect.top;
const {
clientWidth,
clientHeight,
Expand Down
2 changes: 2 additions & 0 deletions tests/align.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ describe('Trigger.Align', () => {
getBoundingClientRect: () => ({
x: rectX,
y: rectY,
left: rectX,
top: rectY,
width: rectWidth,
height: rectHeight,
right: 200,
Expand Down
2 changes: 2 additions & 0 deletions tests/arrow.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ describe('Trigger.Arrow', () => {
() => ({
x: 200,
y: 200,
left: 200,
top: 200,
width: 100,
height: 50,
}),
Expand Down
12 changes: 12 additions & 0 deletions tests/flip-visibleFirst.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,26 @@ describe('Trigger.VisibleFirst', () => {
let containerRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 100,
height: 100,
};

let targetRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 1,
height: 1,
};

let popupRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 100,
height: 100,
};
Expand All @@ -84,18 +90,24 @@ describe('Trigger.VisibleFirst', () => {
containerRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 100,
height: 100,
};
targetRect = {
x: 250,
y: 250,
left: 250,
top: 250,
width: 1,
height: 1,
};
popupRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 100,
height: 100,
};
Expand Down
14 changes: 14 additions & 0 deletions tests/flip.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,17 @@ describe('Trigger.Align', () => {
let spanRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 1,
height: 1,
};

let popupRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 100,
height: 100,
};
Expand Down Expand Up @@ -112,12 +116,16 @@ describe('Trigger.Align', () => {
spanRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 1,
height: 1,
};
popupRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 100,
height: 100,
};
Expand Down Expand Up @@ -253,6 +261,8 @@ describe('Trigger.Align', () => {
popupRect = {
x: 100,
y: 1,
left: 100,
top: 1,
width: 100,
height: 100,
};
Expand Down Expand Up @@ -339,6 +349,8 @@ describe('Trigger.Align', () => {
({
x: 100,
y: 100,
left: 100,
top: 100,
width: 300,
height: 300,
} as any);
Expand Down Expand Up @@ -384,6 +396,8 @@ describe('Trigger.Align', () => {
popupRect = {
x: 0,
y: 0,
left: 0,
top: 0,
width: 200,
height: 200,
};
Expand Down
6 changes: 5 additions & 1 deletion tests/flipShift.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,14 @@ const builtinPlacements = {
};

describe('Trigger.Flip+Shift', () => {
let spanRect = { x: 0, y: 0, width: 0, height: 0 };
let spanRect = { x: 0, y: 0, left: 0, top: 0, width: 0, height: 0 };

beforeEach(() => {
spanRect = {
x: 0,
y: 100,
left: 0,
top: 100,
width: 100,
height: 100,
};
Expand Down Expand Up @@ -113,6 +115,8 @@ describe('Trigger.Flip+Shift', () => {
return {
x: 0,
y: 0,
left: 0,
top: 0,
width: 100,
height: 300,
};
Expand Down
78 changes: 78 additions & 0 deletions tests/rect.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import { cleanup, render } from '@testing-library/react';
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
import React from 'react';
import Trigger from '../src';
import { awaitFakeTimer } from './util';

describe('Trigger.Rect', () => {
let targetVisible = true;

let rectX = 100;
let rectY = 100;
let rectWidth = 100;
let rectHeight = 100;

beforeAll(() => {
spyElementPrototypes(HTMLDivElement, {
getBoundingClientRect: () => ({
left: rectX,
top: rectY,
width: rectWidth,
height: rectHeight,
right: 200,
bottom: 200,
}),
});

spyElementPrototypes(HTMLElement, {
offsetParent: {
get: () => (targetVisible ? document.body : null),
},
});
spyElementPrototypes(SVGElement, {
offsetParent: {
get: () => (targetVisible ? document.body : null),
},
});
});

beforeEach(() => {
targetVisible = true;

rectX = 100;
rectY = 100;
rectWidth = 100;
rectHeight = 100;

jest.useFakeTimers();
});

afterEach(() => {
cleanup();
jest.useRealTimers();
});

it('getBoundingClientRect top and left', async () => {
render(
<Trigger
popupVisible
popup={<span className="bamboo" />}
popupAlign={{
points: ['bc', 'tc'],
_experimental: {
dynamicInset: true,
},
}}
>
<div />
</Trigger>,
);

await awaitFakeTimer();

expect(document.querySelector('.rc-trigger-popup')).toHaveStyle({
bottom: `100px`,
});
});

});
Loading