fix(android): do scrollTo after scroll range reduce

Tencent · Mar 7, 2024 · 27127e4 · 27127e4
1 parent 48fd18b
commit 27127e4
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 1 deletion.
diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/uimanager/RenderManager.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/uimanager/RenderManager.java
@@ -93,6 +93,10 @@ public void addUpdateNodeIfNeeded(RenderNode renderNode) {
         mUIUpdateNodes.add(renderNode);
       }
     }
+    RenderNode parent = renderNode.getParent();
+    if (parent instanceof ScrollViewRenderNode) {
+      mUIUpdateNodes.add(parent);
+    }
   }
 
   void addNullUINodeIfNeeded(RenderNode renderNode) {

diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/uimanager/ScrollViewRenderNode.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/uimanager/ScrollViewRenderNode.java
@@ -0,0 +1,28 @@
+/* Tencent is pleased to support the open source community by making Hippy available.
+ * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.tencent.mtt.hippy.uimanager;
+
+import com.tencent.mtt.hippy.HippyRootView;
+import com.tencent.mtt.hippy.common.HippyMap;
+
+public class ScrollViewRenderNode extends RenderNode {
+
+    public ScrollViewRenderNode(int mId, HippyMap mPropsToUpdate, String className,
+            HippyRootView mRootView, ControllerManager componentManager, boolean isLazyLoad) {
+        super(mId, mPropsToUpdate, className, mRootView, componentManager, isLazyLoad);
+    }
+}
diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/views/scroll/HippyHorizontalScrollView.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/views/scroll/HippyHorizontalScrollView.java
@@ -69,7 +69,7 @@ public class HippyHorizontalScrollView extends HorizontalScrollView implements H
   protected int mScrollEventThrottle = 10;
   private long mLastScrollEventTimeStamp = -1;
   private boolean mHasUnsentScrollEvent;
-
+  private int mScrollRange = 0;
   protected int mScrollMinOffset = 0;
   private int startScrollX = 0;
   private int mLastX = 0;
@@ -484,7 +484,15 @@ public void setInitialContentOffset(int offset) {
 
   @Override
   public void scrollToInitContentOffset() {
+    int scrollRange = mScrollRange;
+    View firstChild = getChildAt(0);
+    if (firstChild != null) {
+      mScrollRange = firstChild.getWidth();
+    }
     if (hasCompleteFirstBatch) {
+      if (mScrollRange < scrollRange) {
+        scrollTo(getScrollX(), getScrollY());
+      }
       return;
     }
 

diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/views/scroll/HippyScrollViewController.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/views/scroll/HippyScrollViewController.java
@@ -4,12 +4,17 @@
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
+import com.tencent.mtt.hippy.HippyRootView;
 import com.tencent.mtt.hippy.annotation.HippyController;
 import com.tencent.mtt.hippy.annotation.HippyControllerProps;
 import com.tencent.mtt.hippy.common.HippyArray;
 import com.tencent.mtt.hippy.common.HippyMap;
 import com.tencent.mtt.hippy.dom.node.NodeProps;
+import com.tencent.mtt.hippy.uimanager.ControllerManager;
 import com.tencent.mtt.hippy.uimanager.HippyGroupController;
+import com.tencent.mtt.hippy.uimanager.ListItemRenderNode;
+import com.tencent.mtt.hippy.uimanager.RenderNode;
+import com.tencent.mtt.hippy.uimanager.ScrollViewRenderNode;
 import com.tencent.mtt.hippy.utils.PixelUtil;
 import com.tencent.mtt.hippy.views.list.HippyListView;
 import com.tencent.mtt.hippy.views.view.HippyViewGroup;
@@ -26,6 +31,11 @@ public class HippyScrollViewController<T extends ViewGroup & HippyScrollView> ex
 
   public static final String CLASS_NAME = "ScrollView";
 
+  @Override
+  public RenderNode createRenderNode(int id, HippyMap props, String className,
+          HippyRootView hippyRootView, ControllerManager controllerManager, boolean lazy) {
+    return new ScrollViewRenderNode(id, props, className, hippyRootView, controllerManager, lazy);
+  }
 
   @Override
   protected View createViewImpl(Context context, HippyMap iniProps) {

diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/views/scroll/HippyVerticalScrollView.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/views/scroll/HippyVerticalScrollView.java
@@ -67,6 +67,7 @@ public class HippyVerticalScrollView extends NestedScrollView implements HippyVi
   private boolean mHasUnsentScrollEvent;
 
   protected int mScrollMinOffset = 0;
+  private int mScrollRange = 0;
   private int startScrollY = 0;
   private int mLastY = 0;
   private int initialContentOffset = 0;
@@ -352,7 +353,15 @@ public void setInitialContentOffset(int offset) {
 
   @Override
   public void scrollToInitContentOffset() {
+    int scrollRange = mScrollRange;
+    View firstChild = getChildAt(0);
+    if (firstChild != null) {
+      mScrollRange = firstChild.getHeight();
+    }
     if (hasCompleteFirstBatch) {
+      if (mScrollRange < scrollRange) {
+        scrollTo(getScrollX(), getScrollY());
+      }
       return;
     }