@react-native-ohos/react-native-safe-area-context 4.7.5-rc.2 → 4.7.5-rc.3

package/harmony/safe_area/oh-package.json5

@@ -8,7 +8,7 @@
   "name": "@react-native-ohos/react-native-safe-area-context",
   "description": "Please describe the basic information.",
   "main": "index.ets",
-  "version": "4.7.5-rc.2",
+  "version": "4.7.5-rc.3",
   "dependencies": {
     "@rnoh/react-native-openharmony": "file:../react_native_openharmony"
   }

package/harmony/safe_area/src/main/cpp/SafeAreaManagerMap.cpp

@@ -27,6 +27,7 @@
 SafeAreaManagerMap::SafeAreaManagerMap()
 {
 }
+
 SafeAreaManagerMap &SafeAreaManagerMap::getInstance()
 {
     static SafeAreaManagerMap instance;
@@ -41,6 +42,22 @@ void SafeAreaManagerMap::SetHasSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nod
     hasSafeAreaProviderMap_[nodeHandle] = isHasSafeAreaProvider;
 }
 
+void SafeAreaManagerMap::SetProviderTopByNodeHandle(ArkUI_NodeHandle nodeHandle, float y)
+{
+    if (!nodeHandle) {
+        return;
+    }
+    providerTopMap_[nodeHandle] = y;
+}
+
+void SafeAreaManagerMap::SetProviderBottomByNodeHandle(ArkUI_NodeHandle nodeHandle, float height)
+{
+    if (!nodeHandle) {
+        return;
+    }
+    providerBottomMap_[nodeHandle] = height;
+}
+
 bool SafeAreaManagerMap::GetHasSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nodeHandle)
 {
     if (!nodeHandle) {
@@ -48,11 +65,35 @@ bool SafeAreaManagerMap::GetHasSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nod
     }
     auto it = hasSafeAreaProviderMap_.find(nodeHandle);
     if (it != hasSafeAreaProviderMap_.end()) {
-        return hasSafeAreaProviderMap_.at(nodeHandle);
+       return hasSafeAreaProviderMap_.at(nodeHandle);
     }
     return false;
 }
 
+float SafeAreaManagerMap::GetProviderTopByNodeHandle(ArkUI_NodeHandle nodeHandle)
+{
+    if (!nodeHandle) {
+        return 0;
+    }
+    auto it = providerTopMap_.find(nodeHandle);
+    if (it != providerTopMap_.end()) {
+       return providerTopMap_.at(nodeHandle);
+    }
+    return 0;
+}
+
+float SafeAreaManagerMap::GetProviderBottomByNodeHandle(ArkUI_NodeHandle nodeHandle)
+{
+    if (!nodeHandle) {
+        return 0;
+    }
+    auto it = providerBottomMap_.find(nodeHandle);
+    if (it != providerBottomMap_.end()) {
+       return providerBottomMap_.at(nodeHandle);
+    }
+    return 0;
+}
+
 void SafeAreaManagerMap::RemoveSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nodeHandle)
 {
     if (!nodeHandle) {
@@ -60,6 +101,16 @@ void SafeAreaManagerMap::RemoveSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nod
     }
     auto it = hasSafeAreaProviderMap_.find(nodeHandle);
     if (it != hasSafeAreaProviderMap_.end()) {
-        hasSafeAreaProviderMap_.erase(nodeHandle);
+       hasSafeAreaProviderMap_.erase(nodeHandle);
+    }
+    
+    auto it2 = providerTopMap_.find(nodeHandle);
+    if (it2 != providerTopMap_.end()) {
+       providerTopMap_.erase(nodeHandle);
+    }
+    
+    auto it3 = providerBottomMap_.find(nodeHandle);
+    if (it3 != providerBottomMap_.end()) {
+       providerBottomMap_.erase(nodeHandle);
     }
 }

package/harmony/safe_area/src/main/cpp/SafeAreaManagerMap.h

@@ -21,22 +21,49 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 #ifndef HARMONY_SAFEAREAMANAGERMAP_H
 #define HARMONY_SAFEAREAMANAGERMAP_H
+
 #include <arkui/native_type.h>
 #include <unordered_map>
+
 class SafeAreaManagerMap {
+
 private:
+
     SafeAreaManagerMap();
+
     SafeAreaManagerMap(const SafeAreaManagerMap &) = delete;
+
     SafeAreaManagerMap &operator=(const SafeAreaManagerMap &) = delete;
+
     SafeAreaManagerMap(SafeAreaManagerMap &&) = delete;
+
     SafeAreaManagerMap &operator=(SafeAreaManagerMap &&) = delete;
+
     std::unordered_map<ArkUI_NodeHandle, bool> hasSafeAreaProviderMap_;
+    
+    std::unordered_map<ArkUI_NodeHandle, float> providerTopMap_;
+    
+    std::unordered_map<ArkUI_NodeHandle, float> providerBottomMap_;
+
 public:
     static SafeAreaManagerMap &getInstance();
+    
     void SetHasSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nodeHandle, bool isHasSafeAreaProvider);
+    
+    void SetProviderTopByNodeHandle(ArkUI_NodeHandle nodeHandle, float y);
+
+    float GetProviderTopByNodeHandle(ArkUI_NodeHandle nodeHandle);
+    
+    void SetProviderBottomByNodeHandle(ArkUI_NodeHandle nodeHandle, float height);
+
+    float GetProviderBottomByNodeHandle(ArkUI_NodeHandle nodeHandle);
+    
     bool GetHasSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nodeHandle);
+    
     void RemoveSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nodeHandle);
 };
+
 #endif //HARMONY_SAFEAREAMANAGERMAP_H

package/harmony/safe_area/src/main/cpp/SafeAreaProviderComponentInstance.cpp

@@ -72,6 +72,8 @@ namespace rnoh {
         double providerRight = MAX(MIN(x + width - data.frame.width, 0) + data.insets.right, 0);
         double providerBottom = MAX(MIN(y + height - data.frame.height, 0) + data.insets.bottom, 0);
         double providerLeft = MAX(data.insets.left - x, 0);
+        SafeAreaManagerMap::getInstance().SetProviderTopByNodeHandle(m_stackNode.getArkUINodeHandle(), providerTop);
+        SafeAreaManagerMap::getInstance().SetProviderBottomByNodeHandle(m_stackNode.getArkUINodeHandle(), providerBottom);
         facebook::react::RNCSafeAreaProviderEventEmitter::OnInsetsChangeInsets insets = {providerTop, providerRight,
             providerBottom, providerLeft};
         facebook::react::RNCSafeAreaProviderEventEmitter::OnInsetsChangeFrame frame = {x, y, width, height};

package/harmony/safe_area/src/main/cpp/SafeAreaViewComponentInstance.cpp

@@ -21,8 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include <deviceinfo.h>
-#include <info/application_target_sdk_version.h>
+#include <dlfcn.h>
 #include "SafeAreaViewComponentInstance.h"
 #include "TurboModuleRequest.h"
 #include "SafeAreaManagerMap.h"
@@ -52,54 +51,63 @@ SafeAreaStackNode &SafeAreaViewComponentInstance::getLocalRootArkUINode() { retu
 
 void SafeAreaViewComponentInstance::updateInsert(SharedConcreteProps p)
 {
-    DLOG(INFO) << "SafeAreaViewComponentInstance OH_CURRENT_API_VERSION:" << OH_CURRENT_API_VERSION
- 	                 << ";ROM SDK:" << OH_GetSdkApiVersion();
- 	     
-    #if OH_CURRENT_API_VERSION >= 14
- 	     if (OH_GetSdkApiVersion() < 14) {
-             TurboModuleRequest request;
-             safeArea::Event data = request.getTurboModuleData(this->m_deps);
-             facebook::react::RNCSafeAreaViewEventEmitter::OnSafeAreaValueChange inset = {data.insets.top, data.insets.right,
-                                                                                    data.insets.bottom, data.insets.left};
-             m_eventEmitter->onSafeAreaValueChange(inset);
- 	         return;
- 	     }
-        auto parentNodeHandle = findParentNodeHandle(m_safeAreaViewStackNode.getArkUINodeHandle());
-        DLOG(INFO) << "SafeAreaViewComponentInstance findParentNodeHandle " << parentNodeHandle.nodeHandle << " hasSafeAreaProvider " << parentNodeHandle.hasSafeAreaProvider;
-        if (parentNodeHandle.hasSafeAreaProvider) {
-            TurboModuleRequest request;
-            safeArea::Event data = request.getTurboModuleData(this->m_deps);
-            facebook::react::RNCSafeAreaViewEventEmitter::OnSafeAreaValueChange inset = {data.insets.top, data.insets.right,
-                                                                                    data.insets.bottom, data.insets.left};
-            m_eventEmitter->onSafeAreaValueChange(inset);
-        }
-        else {
-            facebook::react::RNCSafeAreaViewEventEmitter::OnSafeAreaValueChange inset = {0, 0, 0, 0};
-            m_eventEmitter->onSafeAreaValueChange(inset);
-        }
-    #else
+    high_lib_handle = dlopen("libace_ndk.z.so", RTLD_LAZY);
+    if (high_lib_handle == NULL) {
+        DLOG(INFO) << "SafeAreaViewComponentInstance libace_ndk.z.so not existed";
         TurboModuleRequest request;
         safeArea::Event data = request.getTurboModuleData(this->m_deps);
         facebook::react::RNCSafeAreaViewEventEmitter::OnSafeAreaValueChange inset = {data.insets.top, data.insets.right,
                                                                                 data.insets.bottom, data.insets.left};
         m_eventEmitter->onSafeAreaValueChange(inset);
-    #endif
+        dlclose(high_lib_handle);
+        return;
+    }
+    
+    getParentInPageTreeMethod = (ArkUI_NodeHandle(*)(ArkUI_NodeHandle))dlsym(high_lib_handle, "OH_ArkUI_NodeUtils_GetParentInPageTree");
+    bool isExisted = getParentInPageTreeMethod != NULL;
+    if (!isExisted) {
+        DLOG(INFO) << "SafeAreaViewComponentInstance OH_ArkUI_NodeUtils_GetParentInPageTree not existed";
+        TurboModuleRequest request;
+        safeArea::Event data = request.getTurboModuleData(this->m_deps);
+        facebook::react::RNCSafeAreaViewEventEmitter::OnSafeAreaValueChange inset = {data.insets.top, data.insets.right,
+                                                                                data.insets.bottom, data.insets.left};
+        m_eventEmitter->onSafeAreaValueChange(inset);
+        dlclose(high_lib_handle);
+        return;
+    }
+    auto parentNodeHandle = findParentNodeHandle(m_safeAreaViewStackNode.getArkUINodeHandle());
+    DLOG(INFO) << "SafeAreaViewComponentInstance findParentNodeHandle " << parentNodeHandle.nodeHandle << " hasSafeAreaProvider " << parentNodeHandle.hasSafeAreaProvider;
+    if (parentNodeHandle.hasSafeAreaProvider) {
+        TurboModuleRequest request;
+        safeArea::Event data = request.getTurboModuleData(this->m_deps);
+        facebook::react::RNCSafeAreaViewEventEmitter::OnSafeAreaValueChange inset = {parentNodeHandle.providerTop, data.insets.right,
+                                                                                parentNodeHandle.providerBottom, data.insets.left};
+        m_eventEmitter->onSafeAreaValueChange(inset);
+    }
+    else {
+        facebook::react::RNCSafeAreaViewEventEmitter::OnSafeAreaValueChange inset = {0, 0, 0, 0};
+        m_eventEmitter->onSafeAreaValueChange(inset);
+    }
 }
 
 SafeAreaViewComponentInstance::ParentNodeInfo SafeAreaViewComponentInstance::findParentNodeHandle(
     ArkUI_NodeHandle nodehandle)
 {
     ParentNodeInfo parentNodeInfo;
-    if (!nodehandle) {
+    if(!nodehandle) {
+        dlclose(high_lib_handle);
         return parentNodeInfo;
     }
-    auto parentNode  = OH_ArkUI_NodeUtils_GetParentInPageTree(nodehandle);
+    auto parentNode = getParentInPageTreeMethod(nodehandle);
     bool hasSafeAreaProvider =  SafeAreaManagerMap::getInstance().GetHasSafeAreaProviderByNodeHandle(parentNode);
     parentNodeInfo.hasSafeAreaProvider = hasSafeAreaProvider;
     parentNodeInfo.nodeHandle = parentNode;
     if (!hasSafeAreaProvider && parentNode) {
         return findParentNodeHandle(parentNode);
     }
+    dlclose(high_lib_handle);
+    parentNodeInfo.providerTop = SafeAreaManagerMap::getInstance().GetProviderTopByNodeHandle(parentNode);
+    parentNodeInfo.providerBottom = SafeAreaManagerMap::getInstance().GetProviderBottomByNodeHandle(parentNode);
     return parentNodeInfo;
 }
 

package/harmony/safe_area/src/main/cpp/SafeAreaViewComponentInstance.h

@@ -38,11 +38,18 @@ namespace rnoh {
     struct ParentNodeInfo {
         ArkUI_NodeHandle nodeHandle = nullptr;
         bool hasSafeAreaProvider = false;
+        float providerTop = 0;
+        float providerBottom = 0;
+        
     };
     private:
         SafeAreaStackNode m_safeAreaViewStackNode;
         bool m_isFirstShow = true;
         SharedConcreteProps m_SharedConcreteProps;
+        void *high_lib_handle = NULL;
+        ArkUI_NodeHandle (*getParentInPageTreeMethod)(ArkUI_NodeHandle node);
+        float providerTop = 0;
+        float providerBottom = 0;
     public:
         explicit SafeAreaViewComponentInstance(Context context);
         void onChildInserted(ComponentInstance::Shared const &childComponentInstance,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-safe-area-context",
-  "version": "4.7.5-rc.2",
+  "version": "4.7.5-rc.3",
   "description": "A flexible way to handle safe area, also works on Android and web.",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",