Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

chore: scroll timer type fix (#4110)

lumixb4cfe8ddd2f5
diff --git a/packages/engine-render/src/basics/scroll-xy.ts b/packages/engine-render/src/basics/scroll-xy.ts
index 98e6cc1fe7..9c95d20cd4 100644
--- a/packages/engine-render/src/basics/scroll-xy.ts
+++ b/packages/engine-render/src/basics/scroll-xy.ts
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-import type { Viewport } from '../viewport';
+import type { ScrollTimer } from '../scroll-timer';
+import { Vector2 } from './vector2';
-export function getCurrentScrollXY(scrollTimer: any) {
+export function getCurrentScrollXY(scrollTimer: ScrollTimer) {
const scene = scrollTimer.getScene();
- const viewport = scrollTimer.getViewportByCoord(scene) as Viewport;
+ const viewport = scene.findViewportByPosToScene(Vector2.FromArray([scrollTimer.offsetX, scrollTimer.offsetY]));
const scrollX = 0;
const scrollY = 0;
if (!viewport) {
diff --git a/packages/engine-render/src/scroll-timer.ts b/packages/engine-render/src/scroll-timer.ts
index 8e6a30efc7..052a52d19d 100644
--- a/packages/engine-render/src/scroll-timer.ts
+++ b/packages/engine-render/src/scroll-timer.ts
@@ -56,6 +56,14 @@ export class ScrollTimer {
return new ScrollTimer(scene, scrollTimerType, padding);
}
+ get offsetX() {
+ return this._offsetX;
+ }
+
+ get offsetY() {
+ return this._offsetY;
+ }
+
set scrollTimerType(type: ScrollTimerType) {
this._scrollTimerType = type;
}