@react-native-ohos/react-native-safe-area-context 4.7.5-rc.1 → 5.1.1-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/README.OpenSource +1 -1
- package/README.md +1 -2
- package/harmony/safe_area/index.ets +1 -3
- package/harmony/safe_area/oh-package.json5 +14 -7
- package/harmony/safe_area/src/main/cpp/SafeAreaBeanData.h +2 -1
- package/harmony/safe_area/src/main/cpp/SafeAreaColumnNode.cpp +6 -7
- package/harmony/safe_area/src/main/cpp/SafeAreaColumnNode.h +4 -5
- package/harmony/safe_area/src/main/cpp/SafeAreaManagerMap.cpp +3 -2
- package/harmony/safe_area/src/main/cpp/SafeAreaManagerMap.h +15 -0
- package/harmony/safe_area/src/main/cpp/SafeAreaProviderComponentInstance.cpp +9 -15
- package/harmony/safe_area/src/main/cpp/SafeAreaProviderComponentInstance.h +18 -16
- package/harmony/safe_area/src/main/cpp/SafeAreaStackNode.cpp +64 -48
- package/harmony/safe_area/src/main/cpp/SafeAreaStackNode.h +43 -19
- package/harmony/safe_area/src/main/cpp/SafeAreaViewComponentInstance.cpp +44 -32
- package/harmony/safe_area/src/main/cpp/SafeAreaViewComponentInstance.h +15 -9
- package/harmony/safe_area/src/main/cpp/SafeAreaViewPackage.h +9 -9
- package/harmony/safe_area/src/main/cpp/TurboModuleRequest.cpp +11 -11
- package/harmony/safe_area/src/main/cpp/TurboModuleRequest.h +2 -1
- package/harmony/safe_area/src/main/cpp/generated/RNOH/generated/BaseReactNativeSafeAreaContextPackage.h +23 -26
- package/harmony/safe_area/src/main/cpp/generated/RNOH/generated/components/BaseRNCSafeAreaProviderComponentInstance.h +8 -9
- package/harmony/safe_area/src/main/cpp/generated/RNOH/generated/components/BaseRNCSafeAreaViewComponentInstance.h +7 -8
- package/harmony/safe_area/src/main/cpp/generated/RNOH/generated/components/RNCSafeAreaProviderJSIBinder.h +6 -7
- package/harmony/safe_area/src/main/cpp/generated/RNOH/generated/components/RNCSafeAreaViewJSIBinder.h +3 -6
- package/harmony/safe_area/src/main/cpp/generated/RNOH/generated/turbo_modules/RNCSafeAreaContext.cpp +3 -4
- package/harmony/safe_area/src/main/cpp/generated/RNOH/generated/turbo_modules/RNCSafeAreaContext.h +2 -1
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/ComponentDescriptors.h +6 -2
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/EventEmitters.cpp +35 -36
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/EventEmitters.h +28 -31
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/Props.cpp +5 -2
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/Props.h +46 -57
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/ShadowNodes.cpp +4 -2
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/ShadowNodes.h +15 -5
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/States.cpp +5 -2
- package/harmony/safe_area/src/main/cpp/generated/react/renderer/components/react_native_safe_area_context/States.h +5 -2
- package/harmony/safe_area/src/main/ets/Logger.ts +1 -1
- package/harmony/safe_area/src/main/ets/SafeAreaProvider.ets +1 -1
- package/harmony/safe_area/src/main/ets/SafeAreaProviderModifier.ets +1 -1
- package/harmony/safe_area/src/main/ets/SafeAreaView.ets +1 -1
- package/harmony/safe_area/src/main/ets/SafeAreaViewModifier.ets +1 -1
- package/harmony/safe_area/src/main/ets/{SafeAreaViewPackage.ets → SafeAreaViewPackage.ts} +2 -3
- package/harmony/safe_area/src/main/ets/SafeViewTurboModule.ts +1 -1
- package/harmony/safe_area/src/main/ets/common/SafeAreaType.ts +1 -1
- package/harmony/safe_area/{ts.ets → ts.ts} +1 -1
- package/harmony/safe_area.har +0 -0
- package/lib/commonjs/SafeArea.types.js +6 -0
- package/lib/commonjs/SafeArea.types.js.map +1 -0
- package/lib/commonjs/SafeAreaView.js +209 -0
- package/lib/commonjs/SafeAreaView.js.map +1 -0
- package/lib/commonjs/index.js +74 -0
- package/lib/commonjs/index.js.map +1 -0
- package/lib/commonjs/package.json +1 -0
- package/lib/commonjs/specs/NativeSafeAreaContext.js +32 -0
- package/lib/commonjs/specs/NativeSafeAreaContext.js.map +1 -0
- package/lib/commonjs/specs/NativeSafeAreaProvider.js +33 -0
- package/lib/commonjs/specs/NativeSafeAreaProvider.js.map +1 -0
- package/lib/commonjs/specs/NativeSafeAreaView.js +35 -0
- package/lib/commonjs/specs/NativeSafeAreaView.js.map +1 -0
- package/lib/module/SafeArea.types.js +4 -0
- package/lib/module/SafeArea.types.js.map +1 -0
- package/lib/module/SafeAreaView.js +202 -0
- package/lib/module/SafeAreaView.js.map +1 -0
- package/lib/module/index.js +31 -0
- package/lib/module/index.js.map +1 -0
- package/lib/module/specs/NativeSafeAreaContext.js +28 -0
- package/lib/module/specs/NativeSafeAreaContext.js.map +1 -0
- package/lib/module/specs/NativeSafeAreaProvider.js +29 -0
- package/lib/module/specs/NativeSafeAreaProvider.js.map +1 -0
- package/lib/module/specs/NativeSafeAreaView.js +30 -0
- package/lib/module/specs/NativeSafeAreaView.js.map +1 -0
- package/lib/typescript/SafeArea.types.d.ts +59 -0
- package/lib/typescript/SafeArea.types.d.ts.map +1 -0
- package/lib/typescript/SafeAreaView.d.ts +29 -0
- package/lib/typescript/SafeAreaView.d.ts.map +1 -0
- package/lib/typescript/index.d.ts +5 -0
- package/lib/typescript/index.d.ts.map +1 -0
- package/lib/typescript/specs/NativeSafeAreaContext.d.ts +46 -0
- package/lib/typescript/specs/NativeSafeAreaContext.d.ts.map +1 -0
- package/lib/typescript/specs/NativeSafeAreaProvider.d.ts +45 -0
- package/lib/typescript/specs/NativeSafeAreaProvider.d.ts.map +1 -0
- package/lib/typescript/specs/NativeSafeAreaView.d.ts +24 -0
- package/lib/typescript/specs/NativeSafeAreaView.d.ts.map +1 -0
- package/package.json +39 -39
- package/src/SafeArea.types.ts +23 -0
- package/src/SafeAreaView.tsx +23 -0
- package/src/index.tsx +25 -0
- package/src/specs/NativeSafeAreaContext.ts +23 -0
- package/src/specs/NativeSafeAreaProvider.ts +24 -1
- package/src/specs/NativeSafeAreaView.ts +23 -0
- package/harmony/safe_area/LICENSE +0 -21
- package/harmony/safe_area/NOTICE +0 -33
package/LICENSE
CHANGED
|
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
18
18
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
19
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
20
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
21
|
+
SOFTWARE.
|
package/README.OpenSource
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"Name": "react-native-safe-area-context",
|
|
4
4
|
"License": "MIT License",
|
|
5
5
|
"License File": "LICENSE",
|
|
6
|
-
"Version Number": "
|
|
6
|
+
"Version Number": "5.1.0",
|
|
7
7
|
"Owner" : "xiafeng@huawei.com",
|
|
8
8
|
"Upstream URL": "https://github.com/th3rdwave/react-native-safe-area-context",
|
|
9
9
|
"Description": "A flexible way to handle safe area insets in JS. Also works on Android and Web!"
|
package/README.md
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# @react-native-ohos/react-native-safe-area-context
|
|
2
|
-
This project is based on
|
|
2
|
+
This project is based on [react-native-safe-area-context@v5.1.0](https://github.com/AppAndFlow/react-native-safe-area-context/tree/v5.1.0)
|
|
3
3
|
|
|
4
4
|
## Documentation
|
|
5
5
|
[中文](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-safe-area-context.md)
|
|
@@ -8,4 +8,3 @@ This project is based on [react-native-safe-area-context@5.6.2](https://github.
|
|
|
8
8
|
|
|
9
9
|
## License
|
|
10
10
|
This library is licensed under [The MIT License (MIT)](https://github.com/th3rdwave/react-native-safe-area-context/blob/main/LICENSE).
|
|
11
|
-
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* MIT License
|
|
3
3
|
*
|
|
4
|
-
* Copyright (C)
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
5
|
*
|
|
6
6
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
7
|
* of this software and associated documentation files (the "Software"), to deal
|
|
@@ -21,8 +21,6 @@
|
|
|
21
21
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
|
-
import { SafeAreaViewPackage } from './src/main/ets/SafeAreaViewPackage'
|
|
25
|
-
export default SafeAreaViewPackage
|
|
26
24
|
export * from "./ts"
|
|
27
25
|
export * from "./src/main/ets/SafeAreaView"
|
|
28
26
|
export * from "./src/main/ets/SafeAreaProvider"
|
|
@@ -1,15 +1,22 @@
|
|
|
1
1
|
{
|
|
2
2
|
"license": "ISC",
|
|
3
3
|
"types": "",
|
|
4
|
-
"devDependencies": {
|
|
5
|
-
|
|
6
|
-
},
|
|
4
|
+
"devDependencies": {},
|
|
7
5
|
"author": "",
|
|
8
6
|
"name": "@react-native-ohos/react-native-safe-area-context",
|
|
9
7
|
"description": "Please describe the basic information.",
|
|
10
8
|
"main": "index.ets",
|
|
11
|
-
"version": "
|
|
9
|
+
"version": "5.1.1-rc.3",
|
|
12
10
|
"dependencies": {
|
|
13
|
-
"@rnoh/react-native-openharmony": "file
|
|
14
|
-
}
|
|
15
|
-
|
|
11
|
+
"@rnoh/react-native-openharmony": "file:../../node_modules/@react-native-oh/react-native-harmony/harmony/react_native_openharmony.har"
|
|
12
|
+
},
|
|
13
|
+
"metadata": {
|
|
14
|
+
"sourceRoots": [
|
|
15
|
+
"./src/main"
|
|
16
|
+
],
|
|
17
|
+
"debug": true
|
|
18
|
+
},
|
|
19
|
+
"compatibleSdkVersion": 12,
|
|
20
|
+
"compatibleSdkType": "HarmonyOS",
|
|
21
|
+
"obfuscated": false
|
|
22
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* MIT License
|
|
3
3
|
*
|
|
4
|
-
* Copyright (C)
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
5
|
*
|
|
6
6
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
7
|
* of this software and associated documentation files (the "Software"), to deal
|
|
@@ -52,4 +52,5 @@ namespace safeArea {
|
|
|
52
52
|
Frame frame;
|
|
53
53
|
};
|
|
54
54
|
} // namespace safeArea
|
|
55
|
+
|
|
55
56
|
#endif // HARMONY_SAFEAREABEANDATA_H
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* MIT License
|
|
3
3
|
*
|
|
4
|
-
* Copyright (C)
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
5
|
*
|
|
6
6
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
7
|
* of this software and associated documentation files (the "Software"), to deal
|
|
@@ -28,19 +28,18 @@
|
|
|
28
28
|
#include "RNOH/arkui/NativeNodeApi.h"
|
|
29
29
|
|
|
30
30
|
namespace rnoh {
|
|
31
|
+
|
|
31
32
|
SafeAreaColumnNode::SafeAreaColumnNode()
|
|
32
33
|
: ArkUINode(NativeNodeApi::getInstance()->createNode(ArkUI_NodeType::ARKUI_NODE_COLUMN)) {}
|
|
33
34
|
|
|
34
35
|
SafeAreaColumnNode::~SafeAreaColumnNode() {}
|
|
35
36
|
|
|
36
|
-
void SafeAreaColumnNode::insertChild(ArkUINode &child, std::size_t index)
|
|
37
|
-
{
|
|
37
|
+
void SafeAreaColumnNode::insertChild(ArkUINode &child, std::size_t index) {
|
|
38
38
|
maybeThrow(NativeNodeApi::getInstance()->insertChildAt(m_nodeHandle, child.getArkUINodeHandle(),
|
|
39
|
-
|
|
39
|
+
static_cast<int32_t>(index)));
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
void SafeAreaColumnNode::removeChild(ArkUINode &child)
|
|
43
|
-
{
|
|
42
|
+
void SafeAreaColumnNode::removeChild(ArkUINode &child) {
|
|
44
43
|
maybeThrow(NativeNodeApi::getInstance()->removeChild(m_nodeHandle, child.getArkUINodeHandle()));
|
|
45
44
|
}
|
|
46
|
-
}
|
|
45
|
+
} // namespace rnoh
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* MIT License
|
|
3
3
|
*
|
|
4
|
-
* Copyright (C)
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
5
|
*
|
|
6
6
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
7
|
* of this software and associated documentation files (the "Software"), to deal
|
|
@@ -21,8 +21,6 @@
|
|
|
21
21
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
|
-
#ifndef SAFEAREACOLUMNNODE_H
|
|
25
|
-
#define SAFEAREACOLUMNNODE_H
|
|
26
24
|
#pragma once
|
|
27
25
|
|
|
28
26
|
#include "RNOH/arkui/ArkUINode.h"
|
|
@@ -32,8 +30,9 @@ class SafeAreaColumnNode : public ArkUINode {
|
|
|
32
30
|
public:
|
|
33
31
|
SafeAreaColumnNode();
|
|
34
32
|
~SafeAreaColumnNode() override;
|
|
33
|
+
|
|
35
34
|
void insertChild(ArkUINode &child, std::size_t index);
|
|
36
35
|
void removeChild(ArkUINode &child);
|
|
37
36
|
};
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
|
|
38
|
+
} // namespace rnoh
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
SafeAreaManagerMap::SafeAreaManagerMap()
|
|
28
28
|
{
|
|
29
29
|
}
|
|
30
|
+
|
|
30
31
|
SafeAreaManagerMap &SafeAreaManagerMap::getInstance()
|
|
31
32
|
{
|
|
32
33
|
static SafeAreaManagerMap instance;
|
|
@@ -48,7 +49,7 @@ bool SafeAreaManagerMap::GetHasSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nod
|
|
|
48
49
|
}
|
|
49
50
|
auto it = hasSafeAreaProviderMap_.find(nodeHandle);
|
|
50
51
|
if (it != hasSafeAreaProviderMap_.end()) {
|
|
51
|
-
|
|
52
|
+
return hasSafeAreaProviderMap_.at(nodeHandle);
|
|
52
53
|
}
|
|
53
54
|
return false;
|
|
54
55
|
}
|
|
@@ -60,6 +61,6 @@ void SafeAreaManagerMap::RemoveSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nod
|
|
|
60
61
|
}
|
|
61
62
|
auto it = hasSafeAreaProviderMap_.find(nodeHandle);
|
|
62
63
|
if (it != hasSafeAreaProviderMap_.end()) {
|
|
63
|
-
|
|
64
|
+
hasSafeAreaProviderMap_.erase(nodeHandle);
|
|
64
65
|
}
|
|
65
66
|
}
|
|
@@ -21,22 +21,37 @@
|
|
|
21
21
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
|
+
|
|
24
25
|
#ifndef HARMONY_SAFEAREAMANAGERMAP_H
|
|
25
26
|
#define HARMONY_SAFEAREAMANAGERMAP_H
|
|
27
|
+
|
|
26
28
|
#include <arkui/native_type.h>
|
|
27
29
|
#include <unordered_map>
|
|
30
|
+
|
|
28
31
|
class SafeAreaManagerMap {
|
|
32
|
+
|
|
29
33
|
private:
|
|
34
|
+
|
|
30
35
|
SafeAreaManagerMap();
|
|
36
|
+
|
|
31
37
|
SafeAreaManagerMap(const SafeAreaManagerMap &) = delete;
|
|
38
|
+
|
|
32
39
|
SafeAreaManagerMap &operator=(const SafeAreaManagerMap &) = delete;
|
|
40
|
+
|
|
33
41
|
SafeAreaManagerMap(SafeAreaManagerMap &&) = delete;
|
|
42
|
+
|
|
34
43
|
SafeAreaManagerMap &operator=(SafeAreaManagerMap &&) = delete;
|
|
44
|
+
|
|
35
45
|
std::unordered_map<ArkUI_NodeHandle, bool> hasSafeAreaProviderMap_;
|
|
46
|
+
|
|
36
47
|
public:
|
|
37
48
|
static SafeAreaManagerMap &getInstance();
|
|
49
|
+
|
|
38
50
|
void SetHasSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nodeHandle, bool isHasSafeAreaProvider);
|
|
51
|
+
|
|
39
52
|
bool GetHasSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nodeHandle);
|
|
53
|
+
|
|
40
54
|
void RemoveSafeAreaProviderByNodeHandle(ArkUI_NodeHandle nodeHandle);
|
|
41
55
|
};
|
|
56
|
+
|
|
42
57
|
#endif //HARMONY_SAFEAREAMANAGERMAP_H
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* MIT License
|
|
3
3
|
*
|
|
4
|
-
* Copyright (C)
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
5
|
*
|
|
6
6
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
7
|
* of this software and associated documentation files (the "Software"), to deal
|
|
@@ -30,34 +30,28 @@
|
|
|
30
30
|
namespace rnoh {
|
|
31
31
|
|
|
32
32
|
SafeAreaProviderComponentInstance::SafeAreaProviderComponentInstance(Context context)
|
|
33
|
-
: BaseRNCSafeAreaProviderComponentInstance(std::move(context))
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
true);
|
|
37
|
-
}
|
|
33
|
+
: BaseRNCSafeAreaProviderComponentInstance(std::move(context)) {
|
|
34
|
+
SafeAreaManagerMap::getInstance().SetHasSafeAreaProviderByNodeHandle(m_stackNode.getArkUINodeHandle(), true);
|
|
35
|
+
}
|
|
38
36
|
|
|
39
37
|
void SafeAreaProviderComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
|
|
40
|
-
|
|
41
|
-
{
|
|
38
|
+
std::size_t index) {
|
|
42
39
|
super::onChildInserted(childComponentInstance, index);
|
|
43
40
|
m_stackNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index);
|
|
44
41
|
}
|
|
45
42
|
|
|
46
|
-
void SafeAreaProviderComponentInstance::onChildRemoved(ComponentInstance::Shared const &childComponentInstance)
|
|
47
|
-
{
|
|
43
|
+
void SafeAreaProviderComponentInstance::onChildRemoved(ComponentInstance::Shared const &childComponentInstance) {
|
|
48
44
|
super::onChildRemoved(childComponentInstance);
|
|
49
45
|
m_stackNode.removeChild(childComponentInstance->getLocalRootArkUINode());
|
|
50
46
|
};
|
|
51
47
|
|
|
52
48
|
SafeAreaStackNode &SafeAreaProviderComponentInstance::getLocalRootArkUINode() { return m_stackNode; }
|
|
53
49
|
|
|
54
|
-
void SafeAreaProviderComponentInstance::onPropsChanged(SharedConcreteProps const &props)
|
|
55
|
-
{
|
|
50
|
+
void SafeAreaProviderComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
|
|
56
51
|
super::onPropsChanged(props);
|
|
57
52
|
}
|
|
58
53
|
|
|
59
|
-
void SafeAreaProviderComponentInstance::onEventEmitterChanged(SharedConcreteEventEmitter const &eventEmitter)
|
|
60
|
-
{
|
|
54
|
+
void SafeAreaProviderComponentInstance::onEventEmitterChanged(SharedConcreteEventEmitter const &eventEmitter) {
|
|
61
55
|
auto newEventEmitter = std::dynamic_pointer_cast<const ConcreteEventEmitter>(eventEmitter);
|
|
62
56
|
if (!newEventEmitter) {
|
|
63
57
|
return;
|
|
@@ -73,7 +67,7 @@ namespace rnoh {
|
|
|
73
67
|
double providerBottom = MAX(MIN(y + height - data.frame.height, 0) + data.insets.bottom, 0);
|
|
74
68
|
double providerLeft = MAX(data.insets.left - x, 0);
|
|
75
69
|
facebook::react::RNCSafeAreaProviderEventEmitter::OnInsetsChangeInsets insets = {providerTop, providerRight,
|
|
76
|
-
|
|
70
|
+
providerBottom, providerLeft};
|
|
77
71
|
facebook::react::RNCSafeAreaProviderEventEmitter::OnInsetsChangeFrame frame = {x, y, width, height};
|
|
78
72
|
facebook::react::RNCSafeAreaProviderEventEmitter::OnInsetsChange insetsChange = {insets, frame};
|
|
79
73
|
newEventEmitter->onInsetsChange(insetsChange);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* MIT License
|
|
3
3
|
*
|
|
4
|
-
* Copyright (C)
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
5
|
*
|
|
6
6
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
7
|
* of this software and associated documentation files (the "Software"), to deal
|
|
@@ -21,8 +21,6 @@
|
|
|
21
21
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
|
-
#ifndef SAFEAREAPROVIDERCOMPONENTINSTANCE_H
|
|
25
|
-
#define SAFEAREAPROVIDERCOMPONENTINSTANCE_H
|
|
26
24
|
#pragma once
|
|
27
25
|
#include "RNOH/CppComponentInstance.h"
|
|
28
26
|
#include "SafeAreaStackNode.h"
|
|
@@ -30,18 +28,22 @@
|
|
|
30
28
|
#include "generated/react/renderer/components/react_native_safe_area_context/EventEmitters.h"
|
|
31
29
|
namespace rnoh {
|
|
32
30
|
class SafeAreaProviderComponentInstance : public BaseRNCSafeAreaProviderComponentInstance {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
SafeAreaStackNode m_stackNode;
|
|
36
|
-
public:
|
|
37
|
-
explicit SafeAreaProviderComponentInstance(Context context);
|
|
31
|
+
|
|
32
|
+
using super = BaseRNCSafeAreaProviderComponentInstance;
|
|
38
33
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
34
|
+
private:
|
|
35
|
+
SafeAreaStackNode m_stackNode;
|
|
36
|
+
public:
|
|
37
|
+
SafeAreaProviderComponentInstance(Context context);
|
|
38
|
+
|
|
39
|
+
void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
|
|
40
|
+
|
|
41
|
+
void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override;
|
|
42
|
+
|
|
43
|
+
SafeAreaStackNode &getLocalRootArkUINode() override;
|
|
44
|
+
|
|
45
|
+
void onPropsChanged(SharedConcreteProps const &props) override;
|
|
46
|
+
|
|
47
|
+
void onEventEmitterChanged(SharedConcreteEventEmitter const &eventEmitter) override;
|
|
45
48
|
};
|
|
46
|
-
}
|
|
47
|
-
#endif
|
|
49
|
+
} // namespace rnoh
|
|
@@ -1,78 +1,94 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* MIT License
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
|
+
*
|
|
6
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
8
|
+
* in the Software without restriction, including without limitation the rights
|
|
9
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
10
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
11
|
+
* furnished to do so, subject to the following conditions:
|
|
12
|
+
*
|
|
13
|
+
* The above copyright notice and this permission notice shall be included in all
|
|
14
|
+
* copies or substantial portions of the Software.
|
|
15
|
+
*
|
|
16
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
17
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
18
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
19
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
20
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
21
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
|
+
* SOFTWARE.
|
|
23
|
+
*/
|
|
1
24
|
#include "SafeAreaStackNode.h"
|
|
2
25
|
|
|
3
26
|
#include <glog/logging.h>
|
|
4
27
|
#include <memory>
|
|
5
28
|
#include "RNOH/arkui/NativeNodeApi.h"
|
|
6
29
|
#include "SafeAreaManagerMap.h"
|
|
7
|
-
#define CLICK_EVENT 2
|
|
8
|
-
#define THREE_INDEX 3
|
|
9
30
|
|
|
10
31
|
namespace rnoh {
|
|
11
32
|
|
|
12
33
|
SafeAreaStackNode::SafeAreaStackNode()
|
|
13
34
|
: ArkUINode(NativeNodeApi::getInstance()->createNode(
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
m_nodeHandle, NODE_EVENT_ON_APPEAR, NODE_EVENT_ON_APPEAR, this));
|
|
35
|
+
ArkUI_NodeType::ARKUI_NODE_STACK)),
|
|
36
|
+
m_stackNodeDelegate(nullptr) {
|
|
37
|
+
maybeThrow(NativeNodeApi::getInstance()->registerNodeEvent(
|
|
38
|
+
m_nodeHandle, NODE_ON_CLICK, NODE_ON_CLICK, this));
|
|
39
|
+
maybeThrow(NativeNodeApi::getInstance()->registerNodeEvent(
|
|
40
|
+
m_nodeHandle, NODE_EVENT_ON_APPEAR, NODE_EVENT_ON_APPEAR, this));
|
|
21
41
|
}
|
|
22
42
|
|
|
23
|
-
void SafeAreaStackNode::insertChild(ArkUINode& child, std::size_t index)
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
m_nodeHandle, child.getArkUINodeHandle(), static_cast<int32_t>(index)));
|
|
43
|
+
void SafeAreaStackNode::insertChild(ArkUINode& child, std::size_t index) {
|
|
44
|
+
maybeThrow(NativeNodeApi::getInstance()->insertChildAt(
|
|
45
|
+
m_nodeHandle, child.getArkUINodeHandle(), static_cast<int32_t>(index)));
|
|
27
46
|
}
|
|
28
47
|
|
|
29
|
-
void SafeAreaStackNode::removeChild(ArkUINode& child)
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
m_nodeHandle, child.getArkUINodeHandle()));
|
|
48
|
+
void SafeAreaStackNode::removeChild(ArkUINode& child) {
|
|
49
|
+
maybeThrow(NativeNodeApi::getInstance()->removeChild(
|
|
50
|
+
m_nodeHandle, child.getArkUINodeHandle()));
|
|
33
51
|
}
|
|
34
52
|
|
|
35
|
-
void SafeAreaStackNode::setStackNodeDelegate(SafeAreaStackNodeDelegate* SafeAreaStackNodeDelegate)
|
|
36
|
-
|
|
37
|
-
m_stackNodeDelegate = SafeAreaStackNodeDelegate;
|
|
53
|
+
void SafeAreaStackNode::setStackNodeDelegate(SafeAreaStackNodeDelegate* SafeAreaStackNodeDelegate) {
|
|
54
|
+
m_stackNodeDelegate = SafeAreaStackNodeDelegate;
|
|
38
55
|
}
|
|
39
56
|
|
|
40
57
|
void SafeAreaStackNode::onNodeEvent(
|
|
41
58
|
ArkUI_NodeEventType eventType,
|
|
42
|
-
EventArgs& eventArgs)
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
59
|
+
EventArgs& eventArgs) {
|
|
60
|
+
if (eventType == ArkUI_NodeEventType::NODE_ON_CLICK &&
|
|
61
|
+
eventArgs[3].i32 != 2) {
|
|
62
|
+
onClick();
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
if (eventType == ArkUI_NodeEventType::NODE_EVENT_ON_APPEAR) {
|
|
66
|
+
if(m_stackNodeDelegate != nullptr) {
|
|
67
|
+
m_stackNodeDelegate->onAppear();
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
52
71
|
}
|
|
53
72
|
|
|
54
|
-
void SafeAreaStackNode::onClick()
|
|
55
|
-
{
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
}
|
|
73
|
+
void SafeAreaStackNode::onClick() {
|
|
74
|
+
if (m_stackNodeDelegate != nullptr) {
|
|
75
|
+
m_stackNodeDelegate->onClick();
|
|
76
|
+
}
|
|
59
77
|
}
|
|
60
78
|
|
|
61
|
-
SafeAreaStackNode::~SafeAreaStackNode()
|
|
62
|
-
|
|
79
|
+
SafeAreaStackNode::~SafeAreaStackNode() {
|
|
80
|
+
NativeNodeApi::getInstance()->unregisterNodeEvent(
|
|
81
|
+
m_nodeHandle, NODE_ON_CLICK);
|
|
63
82
|
NativeNodeApi::getInstance()->unregisterNodeEvent(
|
|
64
|
-
|
|
65
|
-
NativeNodeApi::getInstance()->unregisterNodeEvent(
|
|
66
|
-
m_nodeHandle, NODE_EVENT_ON_APPEAR);
|
|
83
|
+
m_nodeHandle, NODE_EVENT_ON_APPEAR);
|
|
67
84
|
SafeAreaManagerMap::getInstance().RemoveSafeAreaProviderByNodeHandle(m_nodeHandle);
|
|
68
85
|
}
|
|
69
86
|
|
|
70
|
-
SafeAreaStackNode& SafeAreaStackNode::setAlign(int32_t align)
|
|
71
|
-
{
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
return *this;
|
|
77
|
-
}
|
|
87
|
+
SafeAreaStackNode& SafeAreaStackNode::setAlign(int32_t align) {
|
|
88
|
+
ArkUI_NumberValue value[] = {{.i32 = align}};
|
|
89
|
+
ArkUI_AttributeItem item = {.value = value, .size = 1};
|
|
90
|
+
maybeThrow(NativeNodeApi::getInstance()->setAttribute(
|
|
91
|
+
m_nodeHandle, NODE_STACK_ALIGN_CONTENT, &item));
|
|
92
|
+
return *this;
|
|
78
93
|
}
|
|
94
|
+
} // namespace rnoh
|
|
@@ -1,29 +1,53 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/**
|
|
2
|
+
* MIT License
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
|
+
*
|
|
6
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
8
|
+
* in the Software without restriction, including without limitation the rights
|
|
9
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
10
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
11
|
+
* furnished to do so, subject to the following conditions:
|
|
12
|
+
*
|
|
13
|
+
* The above copyright notice and this permission notice shall be included in all
|
|
14
|
+
* copies or substantial portions of the Software.
|
|
15
|
+
*
|
|
16
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
17
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
18
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
19
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
20
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
21
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
|
+
* SOFTWARE.
|
|
23
|
+
*/
|
|
3
24
|
#pragma once
|
|
4
25
|
|
|
5
26
|
#include "RNOH/arkui/ArkUINode.h"
|
|
6
27
|
|
|
7
28
|
namespace rnoh {
|
|
8
29
|
class SafeAreaStackNodeDelegate {
|
|
9
|
-
public:
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
30
|
+
public:
|
|
31
|
+
virtual ~SafeAreaStackNodeDelegate() = default;
|
|
32
|
+
virtual void onClick() {};
|
|
33
|
+
virtual void onAppear(){};
|
|
13
34
|
};
|
|
14
35
|
|
|
15
36
|
class SafeAreaStackNode : public ArkUINode {
|
|
16
|
-
protected:
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
37
|
+
protected:
|
|
38
|
+
SafeAreaStackNodeDelegate* m_stackNodeDelegate;
|
|
39
|
+
|
|
40
|
+
public:
|
|
41
|
+
SafeAreaStackNode();
|
|
42
|
+
~SafeAreaStackNode() override;
|
|
43
|
+
|
|
44
|
+
void insertChild(ArkUINode& child, std::size_t index);
|
|
45
|
+
void removeChild(ArkUINode& child);
|
|
46
|
+
void onNodeEvent(ArkUI_NodeEventType eventType, EventArgs& eventArgs)
|
|
47
|
+
override;
|
|
48
|
+
void onClick();
|
|
49
|
+
void setStackNodeDelegate(SafeAreaStackNodeDelegate* safeAreaStackNodeDelegate);
|
|
50
|
+
SafeAreaStackNode& setAlign(int32_t align);
|
|
27
51
|
};
|
|
28
|
-
|
|
29
|
-
|
|
52
|
+
|
|
53
|
+
} // namespace rnoh
|