From 1b8451b114f0ff024845bbfe5efaf3417dc12264 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <p.gawron@atcomp.pl>
Date: Fri, 10 May 2024 15:31:25 +0200
Subject: [PATCH] fitounds should be called after rendering id finished
---
.../pluginsManager/map/fitBounds/fitBounds.test.ts | 14 ++++++++++----
.../pluginsManager/map/fitBounds/fitBounds.ts | 4 +++-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/services/pluginsManager/map/fitBounds/fitBounds.test.ts b/src/services/pluginsManager/map/fitBounds/fitBounds.test.ts
index 1f45aecf..1fd5ec32 100644
--- a/src/services/pluginsManager/map/fitBounds/fitBounds.test.ts
+++ b/src/services/pluginsManager/map/fitBounds/fitBounds.test.ts
@@ -29,7 +29,6 @@ describe('fitBounds', () => {
const mapInstance = new Map({ target: dummyElement });
MapManager.setMapInstance(mapInstance);
const view = mapInstance.getView();
- const getViewSpy = jest.spyOn(mapInstance, 'getView');
const fitSpy = jest.spyOn(view, 'fit');
const getStateSpy = jest.spyOn(store, 'getState');
getStateSpy.mockImplementation(
@@ -57,6 +56,10 @@ describe('fitBounds', () => {
}) as any,
);
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-expect-error
+ jest.spyOn(window, 'requestAnimationFrame').mockImplementation(cb => cb());
+
fitBounds({
x1: 10,
y1: 10,
@@ -64,7 +67,7 @@ describe('fitBounds', () => {
y2: 20,
});
- expect(getViewSpy).toHaveBeenCalledTimes(1);
+ // expect(getViewSpy).toHaveBeenCalledTimes(1);
expect(fitSpy).toHaveBeenCalledWith([-18472078, 16906648, -17689363, 18472078], {
maxZoom: 1,
padding: [128, 128, 128, 128],
@@ -76,7 +79,6 @@ describe('fitBounds', () => {
const mapInstance = new Map({ target: dummyElement });
MapManager.setMapInstance(mapInstance);
const view = mapInstance.getView();
- const getViewSpy = jest.spyOn(mapInstance, 'getView');
const fitSpy = jest.spyOn(view, 'fit');
const getStateSpy = jest.spyOn(store, 'getState');
getStateSpy.mockImplementation(
@@ -104,6 +106,10 @@ describe('fitBounds', () => {
}) as any,
);
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-expect-error
+ jest.spyOn(window, 'requestAnimationFrame').mockImplementation(cb => cb());
+
fitBounds({
x1: 10,
y1: 10,
@@ -111,7 +117,7 @@ describe('fitBounds', () => {
y2: 20,
});
- expect(getViewSpy).toHaveBeenCalledTimes(1);
+ // expect(getViewSpy).toHaveBeenCalledTimes(1);
expect(fitSpy).toHaveBeenCalledWith([-18472078, 16906648, -17689363, 18472078], {
maxZoom: 99,
padding: [128, 128, 128, 128],
diff --git a/src/services/pluginsManager/map/fitBounds/fitBounds.ts b/src/services/pluginsManager/map/fitBounds/fitBounds.ts
index 079c6d9c..7a1931e6 100644
--- a/src/services/pluginsManager/map/fitBounds/fitBounds.ts
+++ b/src/services/pluginsManager/map/fitBounds/fitBounds.ts
@@ -41,5 +41,7 @@ export const fitBounds = ({ x1, y1, x2, y2 }: FitBoundsArgs): void => {
maxZoom: mapSize.maxZoom,
};
- mapInstance.getView().fit(extent, options);
+ window.requestAnimationFrame(() => {
+ mapInstance.getView().fit(extent, options);
+ });
};
--
GitLab