fix(ui): Combinations of scrolling and touch events also should not c…

…ause any jank
Hypfer · Oct 6, 2021 · e36c40f · e36c40f
1 parent adcd117
commit e36c40f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/frontend/src/map/Map.tsx b/frontend/src/map/Map.tsx
@@ -487,7 +487,7 @@ class Map extends React.Component<MapProps, MapState > {
 
             this.draw();
 
-            if (this.pendingInternalDrawableStateUpdate) {
+            if (this.pendingInternalDrawableStateUpdate && !this.activeScrollEvent) {
                 this.pendingInternalDrawableStateUpdate = false;
                 this.updateInternalDrawableState();
             }
@@ -665,7 +665,7 @@ class Map extends React.Component<MapProps, MapState > {
             this.scrollTimeout = setTimeout(() => {
                 this.activeScrollEvent = false;
 
-                if (this.pendingInternalDrawableStateUpdate) {
+                if (this.pendingInternalDrawableStateUpdate && !this.activeTouchEvent) {
                     this.pendingInternalDrawableStateUpdate = false;
                     this.updateInternalDrawableState();
                 }