From 1a0304381577a277439bbe8ef6b0e69da6f1df42 Mon Sep 17 00:00:00 2001
From: zhanghang <zhanghang160@huawei-partners.com>
Date: Thu, 4 Sep 2025 09:49:32 +0800
Subject: [PATCH] Add ContentSize function for scrollable components

Signed-off-by: zhanghang <zhanghang160@huawei-partners.com>
---
 .../declarative_frontend/jsview/js_scroller.cpp  | 16 ++++++++++++++++
 .../declarative_frontend/jsview/js_scroller.h    |  1 +
 .../components/scroll/scroll_controller_base.h   |  6 ++++++
 .../pattern/scrollable/scrollable_controller.cpp |  7 +++++++
 .../pattern/scrollable/scrollable_controller.h   |  1 +
 5 files changed, 31 insertions(+)

diff --git a/frameworks/bridge/declarative_frontend/jsview/js_scroller.cpp b/frameworks/bridge/declarative_frontend/jsview/js_scroller.cpp
index 9c6297c879a..8a2383eff9f 100644
--- a/frameworks/bridge/declarative_frontend/jsview/js_scroller.cpp
+++ b/frameworks/bridge/declarative_frontend/jsview/js_scroller.cpp
@@ -77,6 +77,7 @@ void JSScroller::JSBind(BindingTarget globalObj)
     JSClass<JSScroller>::CustomMethod("isAtEnd", &JSScroller::IsAtEnd);
     JSClass<JSScroller>::CustomMethod("getItemRect", &JSScroller::GetItemRect);
     JSClass<JSScroller>::CustomMethod("getItemIndex", &JSScroller::GetItemIndex);
+    JSClass<JSScroller>::CustomMethod("contentSize", &JSScroller::ContentSize);
     JSClass<JSScroller>::Bind(globalObj, JSScroller::Constructor, JSScroller::Destructor);
 }
 
@@ -434,4 +435,19 @@ void JSScroller::GetItemIndex(const JSCallbackInfo& args)
 
     return;
 }
+
+void JSScroller::ContentSize(const JSCallbackInfo& args)
+{
+    auto scrollController = controllerWeak_.Upgrade();
+    if (!scrollController) {
+        JSException::Throw(ERROR_CODE_NAMED_ROUTE_ERROR, "%s", "Controller not bound to component.");
+        return;
+    }
+    auto retObj = JSRef<JSObject>::New();
+    ContainerScope scope(instanceId_);
+    auto contentSize = scrollController->ContentSize();
+    retObj->SetProperty<double>("width", Dimension(contentSize.Width(), DimensionUnit::PX).ConvertToVp());
+    retObj->SetProperty<double>("height", Dimension(contentSize.Height(), DimensionUnit::PX).ConvertToVp());
+    args.SetReturnValue(retObj);
+}
 } // namespace OHOS::Ace::Framework
diff --git a/frameworks/bridge/declarative_frontend/jsview/js_scroller.h b/frameworks/bridge/declarative_frontend/jsview/js_scroller.h
index 9511ba97ff4..a9412dd857f 100644
--- a/frameworks/bridge/declarative_frontend/jsview/js_scroller.h
+++ b/frameworks/bridge/declarative_frontend/jsview/js_scroller.h
@@ -43,6 +43,7 @@ public:
     void IsAtEnd(const JSCallbackInfo& args);
     void GetItemRect(const JSCallbackInfo& args);
     void GetItemIndex(const JSCallbackInfo& args);
+    void ContentSize(const JSCallbackInfo& args);
 
     const WeakPtr<ScrollControllerBase>& GetController() const
     {
diff --git a/frameworks/core/components/scroll/scroll_controller_base.h b/frameworks/core/components/scroll/scroll_controller_base.h
index 248d6c761d2..dacbb417114 100644
--- a/frameworks/core/components/scroll/scroll_controller_base.h
+++ b/frameworks/core/components/scroll/scroll_controller_base.h
@@ -18,6 +18,7 @@
 
 #include "base/geometry/axis.h"
 #include "base/geometry/dimension.h"
+#include "base/geometry/ng/size_t.h"
 #include "base/geometry/offset.h"
 #include "base/geometry/rect.h"
 #include "base/memory/ace_type.h"
@@ -130,6 +131,11 @@ public:
     {
         return -1;
     }
+    
+    virtual NG::SizeF ContentSize() const
+    {
+        return NG::SizeF();
+    }
 
     virtual Rect GetItemRectInGroup(int32_t index, int32_t indexInGroup) const
     {
diff --git a/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.cpp b/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.cpp
index 2be674fb97b..37f338dbd1e 100644
--- a/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.cpp
+++ b/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.cpp
@@ -220,6 +220,13 @@ int32_t ScrollableController::GetItemIndex(double x, double y) const
     return pattern->GetItemIndex(x, y);
 }
 
+SizeF ScrollableController::ContentSize() const
+{
+    auto pattern = scroll_.Upgrade();
+    CHECK_NULL_RETURN(pattern, SizeF());
+    return pattern->GetChildrenExpandedSize();
+}
+
 void ScrollableController::StopAnimate()
 {
     auto pattern = scroll_.Upgrade();
diff --git a/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.h b/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.h
index d5c5ee652ed..89ad6bd9299 100644
--- a/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.h
+++ b/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.h
@@ -56,6 +56,7 @@ public:
     bool IsAtEnd() const override;
     Rect GetItemRect(int32_t index) const override;
     int32_t GetItemIndex(double x, double y) const override;
+    SizeF ContentSize() const override;
     void StopAnimate() override;
 
     void SetObserver(const ScrollerObserver& observer) override
-- 
Gitee