Skip to content

use getBoundingClientRect to account for decimals in container size #260

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

Open
bodymovin wants to merge 2 commits into
base: main
Choose a base branch
from
+38 −18
Open

use getBoundingClientRect to account for decimals in container size #260

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
25276ad
use getBoundingClientRect to account for decimals in container size
bodymovin May 28, 2024
45dacb6
fix test
bodymovin May 28, 2024
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
5 changes: 3 additions & 2 deletions src/hooks/useResizeCanvas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ export default function useResizeCanvas({
const { maxX, maxY } = artboardBounds ?? {};

const getContainerDimensions = useCallback(() => {
const width = containerRef.current?.clientWidth ?? 0;
const height = containerRef.current?.clientHeight ?? 0;
const boundingBox = containerRef.current?.getBoundingClientRect();
const width = Math.ceil(boundingBox?.width ?? 0);
const height = Math.ceil(boundingBox?.height ?? 0);
if (fitCanvasToArtboardHeight && artboardBounds) {
const { maxY, maxX } = artboardBounds;
return { width, height: width * (maxY / maxX) };
Expand Down
51 changes: 35 additions & 16 deletions test/useRive.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ jest.mock('@rive-app/canvas', () => ({
describe('useRive', () => {
let controlledRiveloadCb: () => void;
let baseRiveMock: Partial<rive.Rive>;
const mockBoundingBox = {
width: 100,
height: 100,
x: 0,
top: 0,
y: 0,
bottom: 100,
left: 0,
right: 100,
toJSON: () => '',
};

beforeEach(() => {
baseRiveMock = {
Expand Down Expand Up @@ -162,8 +173,9 @@ describe('useRive', () => {

const canvasSpy = document.createElement('canvas');
const containerSpy = document.createElement('div');
jest.spyOn(containerSpy, 'clientWidth', 'get').mockReturnValue(100);
jest.spyOn(containerSpy, 'clientHeight', 'get').mockReturnValue(100);
jest
.spyOn(containerSpy, 'getBoundingClientRect')
.mockReturnValue(mockBoundingBox);

const { result } = renderHook(() => useRive(params));

Expand Down Expand Up @@ -200,8 +212,9 @@ describe('useRive', () => {

const canvasSpy = document.createElement('canvas');
const containerSpy = document.createElement('div');
jest.spyOn(containerSpy, 'clientWidth', 'get').mockReturnValue(100);
jest.spyOn(containerSpy, 'clientHeight', 'get').mockReturnValue(100);
jest
.spyOn(containerSpy, 'getBoundingClientRect')
.mockReturnValue(mockBoundingBox);

const { result } = renderHook(() =>
useRive(params, { customDevicePixelRatio: 1 })
Expand Down Expand Up @@ -241,8 +254,9 @@ describe('useRive', () => {

const canvasSpy = document.createElement('canvas');
const containerSpy = document.createElement('div');
jest.spyOn(containerSpy, 'clientWidth', 'get').mockReturnValue(100);
jest.spyOn(containerSpy, 'clientHeight', 'get').mockReturnValue(100);
jest
.spyOn(containerSpy, 'getBoundingClientRect')
.mockReturnValue(mockBoundingBox);

const { result } = renderHook(() => useRive(params, opts));

Expand Down Expand Up @@ -284,8 +298,9 @@ describe('useRive', () => {

const canvasSpy = document.createElement('canvas');
const containerSpy = document.createElement('div');
jest.spyOn(containerSpy, 'clientWidth', 'get').mockReturnValue(100);
jest.spyOn(containerSpy, 'clientHeight', 'get').mockReturnValue(100);
jest
.spyOn(containerSpy, 'getBoundingClientRect')
.mockReturnValue(mockBoundingBox);

const { result } = renderHook(() => useRive(params, opts));

Expand Down Expand Up @@ -468,8 +483,9 @@ describe('useRive', () => {

const canvasSpy = document.createElement('canvas');
const containerSpy = document.createElement('div');
jest.spyOn(containerSpy, 'clientWidth', 'get').mockReturnValue(100);
jest.spyOn(containerSpy, 'clientHeight', 'get').mockReturnValue(100);
jest
.spyOn(containerSpy, 'getBoundingClientRect')
.mockReturnValue(mockBoundingBox);

const { result } = renderHook(() => useRive(params));

Expand Down Expand Up @@ -500,16 +516,18 @@ describe('useRive', () => {

const canvasSpy = document.createElement('canvas');
const containerSpy = document.createElement('div');
jest.spyOn(containerSpy, 'clientWidth', 'get').mockReturnValue(100);
jest.spyOn(containerSpy, 'clientHeight', 'get').mockReturnValue(100);
jest
.spyOn(containerSpy, 'getBoundingClientRect')
.mockReturnValue(mockBoundingBox);

const { result } = renderHook(() => useRive(params));

await act(async () => {
result.current.setCanvasRef(canvasSpy);
result.current.setContainerRef(containerSpy);
jest.spyOn(containerSpy, 'clientWidth', 'get').mockReturnValue(200);
jest.spyOn(containerSpy, 'clientHeight', 'get').mockReturnValue(200);
jest
.spyOn(containerSpy, 'getBoundingClientRect')
.mockReturnValue({...mockBoundingBox, width: 200, height: 200});
});
await waitFor(() => {
expect(result.current.canvas).toBe(canvasSpy);
Expand Down Expand Up @@ -559,8 +577,9 @@ describe('useRive', () => {
});

await act(async () => {
jest.spyOn(containerSpy, 'clientWidth', 'get').mockReturnValue(500);
jest.spyOn(containerSpy, 'clientHeight', 'get').mockReturnValue(500);
jest
.spyOn(containerSpy, 'getBoundingClientRect')
.mockReturnValue({...mockBoundingBox, width: 500, height: 500});
containerSpy.dispatchEvent(new Event('resize'));
});

Expand Down