@react-native-ohos/react-native-keyboard-controller 1.16.6-rc.1 → 1.16.7-beta.2
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 +21 -21
- package/README.OpenSource +10 -10
- package/README.md +19 -19
- package/harmony/keyboard_controller/BuildProfile.ets +16 -16
- package/harmony/keyboard_controller/Index.ets +28 -7
- package/harmony/keyboard_controller/build-profile.json5 +31 -31
- package/harmony/keyboard_controller/hvigorfile.ts +6 -6
- package/harmony/keyboard_controller/obfuscation-rules.txt +17 -17
- package/harmony/keyboard_controller/oh-package.json5 +10 -10
- package/harmony/keyboard_controller/src/main/cpp/CMakeLists.txt +7 -7
- package/harmony/keyboard_controller/src/main/cpp/EventEmitters.cpp +95 -95
- package/harmony/keyboard_controller/src/main/cpp/EventEmitters.h +111 -90
- package/harmony/keyboard_controller/src/main/cpp/KeyboardControllerViewComponentDescriptor.h +94 -73
- package/harmony/keyboard_controller/src/main/cpp/KeyboardControllerViewComponentInstance.cpp +286 -171
- package/harmony/keyboard_controller/src/main/cpp/KeyboardControllerViewComponentInstance.h +103 -76
- package/harmony/keyboard_controller/src/main/cpp/KeyboardControllerViewJSIBinder.h +65 -44
- package/harmony/keyboard_controller/src/main/cpp/KeyboardGestureAreaComponentDescriptor.h +79 -58
- package/harmony/keyboard_controller/src/main/cpp/KeyboardGestureAreaComponentInstance.cpp +107 -86
- package/harmony/keyboard_controller/src/main/cpp/KeyboardGestureAreaComponentInstance.h +83 -62
- package/harmony/keyboard_controller/src/main/cpp/KeyboardGestureAreaJSIBinder.h +60 -39
- package/harmony/keyboard_controller/src/main/cpp/RNKeyboardController.cpp +46 -25
- package/harmony/keyboard_controller/src/main/cpp/RNKeyboardController.h +48 -27
- package/harmony/keyboard_controller/src/main/cpp/RNStatusBarManagerCompat.cpp +45 -24
- package/harmony/keyboard_controller/src/main/cpp/RNStatusBarManagerCompat.h +49 -28
- package/harmony/keyboard_controller/src/main/cpp/ViewHierarchyNavigator.cpp +186 -0
- package/harmony/keyboard_controller/src/main/cpp/ViewHierarchyNavigator.h +112 -0
- package/harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.cpp +64 -43
- package/harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.h +77 -56
- package/harmony/keyboard_controller/src/main/ets/Logger.ts +66 -45
- package/harmony/keyboard_controller/src/main/ets/RNKeyboardControllerPackage.ts +66 -45
- package/harmony/keyboard_controller/src/main/ets/RNKeyboardControllerTurboModule.ts +273 -238
- package/harmony/keyboard_controller/src/main/ets/RNStatusBarManagerCompatTurboModule.ts +119 -98
- package/harmony/keyboard_controller/src/main/ets/Type.ts +62 -41
- package/harmony/keyboard_controller/src/main/module.json5 +11 -11
- package/harmony/keyboard_controller/src/main/resources/base/element/string.json +8 -8
- package/harmony/keyboard_controller/src/main/resources/en_US/element/string.json +8 -8
- package/harmony/keyboard_controller/src/main/resources/zh_CN/element/string.json +8 -8
- package/harmony/keyboard_controller/ts.ts +29 -8
- package/harmony/keyboard_controller.har +0 -0
- package/lib/commonjs/animated.js +2 -2
- package/lib/commonjs/animated.js.map +1 -1
- package/lib/commonjs/bindings.js +3 -3
- package/lib/commonjs/bindings.js.map +1 -1
- package/lib/commonjs/bindings.native.js +3 -3
- package/lib/commonjs/bindings.native.js.map +1 -1
- package/lib/commonjs/components/KeyboardAvoidingView/hooks.js.map +1 -1
- package/lib/commonjs/components/KeyboardAvoidingView/index.js +3 -3
- package/lib/commonjs/components/KeyboardAvoidingView/index.js.map +1 -1
- package/lib/commonjs/components/KeyboardAwareScrollView/index.js +39 -39
- package/lib/commonjs/components/KeyboardAwareScrollView/index.js.map +1 -1
- package/lib/commonjs/components/KeyboardAwareScrollView/useSmoothKeyboardHandler.js +3 -3
- package/lib/commonjs/components/KeyboardAwareScrollView/useSmoothKeyboardHandler.js.map +1 -1
- package/lib/commonjs/components/KeyboardAwareScrollView/utils.js.map +1 -1
- package/lib/commonjs/components/KeyboardStickyView/index.js.map +1 -1
- package/lib/commonjs/components/KeyboardToolbar/Arrow.js.map +1 -1
- package/lib/commonjs/components/KeyboardToolbar/Button.js.map +1 -1
- package/lib/commonjs/components/KeyboardToolbar/colors.js.map +1 -1
- package/lib/commonjs/components/KeyboardToolbar/colors.native.js.map +1 -1
- package/lib/commonjs/components/KeyboardToolbar/index.js +3 -3
- package/lib/commonjs/components/KeyboardToolbar/index.js.map +1 -1
- package/lib/commonjs/components/KeyboardToolbar/types.js.map +1 -1
- package/lib/commonjs/components/hooks/useColorScheme.js.map +1 -1
- package/lib/commonjs/components/index.js.map +1 -1
- package/lib/commonjs/constants.js.map +1 -1
- package/lib/commonjs/context.js.map +1 -1
- package/lib/commonjs/hooks/index.js.map +1 -1
- package/lib/commonjs/hooks/useWindowDimensions/index.android.js.map +1 -1
- package/lib/commonjs/hooks/useWindowDimensions/index.js.map +1 -1
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/internal.js +18 -18
- package/lib/commonjs/internal.js.map +1 -1
- package/lib/commonjs/module.js.map +1 -1
- package/lib/commonjs/monkey-patch.android.js +4 -4
- package/lib/commonjs/monkey-patch.android.js.map +1 -1
- package/lib/commonjs/monkey-patch.js.map +1 -1
- package/lib/commonjs/reanimated.js.map +1 -1
- package/lib/commonjs/reanimated.native.js.map +1 -1
- package/lib/commonjs/specs/KeyboardControllerViewNativeComponent.js.map +1 -1
- package/lib/commonjs/specs/KeyboardGestureAreaNativeComponent.js.map +1 -1
- package/lib/commonjs/specs/NativeKeyboardController.js.map +1 -1
- package/lib/commonjs/specs/NativeStatusBarManagerCompat.js.map +1 -1
- package/lib/commonjs/specs/OverKeyboardViewNativeComponent.js.map +1 -1
- package/lib/commonjs/types.js.map +1 -1
- package/lib/commonjs/utils.js.map +1 -1
- package/lib/commonjs/views/OverKeyboardView/index.js.map +1 -1
- package/lib/commonjs/views/index.js.map +1 -1
- package/lib/module/animated.js +2 -2
- package/lib/module/animated.js.map +1 -1
- package/lib/module/bindings.js +3 -3
- package/lib/module/bindings.js.map +1 -1
- package/lib/module/bindings.native.js +3 -3
- package/lib/module/bindings.native.js.map +1 -1
- package/lib/module/components/KeyboardAvoidingView/hooks.js.map +1 -1
- package/lib/module/components/KeyboardAvoidingView/index.js +3 -3
- package/lib/module/components/KeyboardAvoidingView/index.js.map +1 -1
- package/lib/module/components/KeyboardAwareScrollView/index.js +39 -39
- package/lib/module/components/KeyboardAwareScrollView/index.js.map +1 -1
- package/lib/module/components/KeyboardAwareScrollView/useSmoothKeyboardHandler.js +3 -3
- package/lib/module/components/KeyboardAwareScrollView/useSmoothKeyboardHandler.js.map +1 -1
- package/lib/module/components/KeyboardAwareScrollView/utils.js.map +1 -1
- package/lib/module/components/KeyboardStickyView/index.js.map +1 -1
- package/lib/module/components/KeyboardToolbar/Arrow.js.map +1 -1
- package/lib/module/components/KeyboardToolbar/Button.js.map +1 -1
- package/lib/module/components/KeyboardToolbar/colors.js.map +1 -1
- package/lib/module/components/KeyboardToolbar/colors.native.js.map +1 -1
- package/lib/module/components/KeyboardToolbar/index.js +3 -3
- package/lib/module/components/KeyboardToolbar/index.js.map +1 -1
- package/lib/module/components/KeyboardToolbar/types.js.map +1 -1
- package/lib/module/components/hooks/useColorScheme.js.map +1 -1
- package/lib/module/components/index.js.map +1 -1
- package/lib/module/constants.js.map +1 -1
- package/lib/module/context.js.map +1 -1
- package/lib/module/hooks/index.js.map +1 -1
- package/lib/module/hooks/useWindowDimensions/index.android.js.map +1 -1
- package/lib/module/hooks/useWindowDimensions/index.js.map +1 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/internal.js +18 -18
- package/lib/module/internal.js.map +1 -1
- package/lib/module/module.js.map +1 -1
- package/lib/module/monkey-patch.android.js +4 -4
- package/lib/module/monkey-patch.android.js.map +1 -1
- package/lib/module/monkey-patch.js.map +1 -1
- package/lib/module/reanimated.js.map +1 -1
- package/lib/module/reanimated.native.js.map +1 -1
- package/lib/module/specs/KeyboardControllerViewNativeComponent.js.map +1 -1
- package/lib/module/specs/KeyboardGestureAreaNativeComponent.js.map +1 -1
- package/lib/module/specs/NativeKeyboardController.js.map +1 -1
- package/lib/module/specs/NativeStatusBarManagerCompat.js.map +1 -1
- package/lib/module/specs/OverKeyboardViewNativeComponent.js.map +1 -1
- package/lib/module/types.js.map +1 -1
- package/lib/module/utils.js.map +1 -1
- package/lib/module/views/OverKeyboardView/index.js.map +1 -1
- package/lib/module/views/index.js.map +1 -1
- package/package.json +173 -173
- package/src/animated.tsx +255 -256
- package/src/bindings.native.ts +62 -62
- package/src/bindings.ts +42 -42
- package/src/components/KeyboardAvoidingView/hooks.ts +123 -123
- package/src/components/KeyboardAvoidingView/index.tsx +188 -188
- package/src/components/KeyboardAwareScrollView/index.tsx +389 -389
- package/src/components/KeyboardAwareScrollView/useSmoothKeyboardHandler.ts +133 -133
- package/src/components/KeyboardAwareScrollView/utils.ts +41 -41
- package/src/components/KeyboardStickyView/index.tsx +66 -66
- package/src/components/KeyboardToolbar/Arrow.tsx +80 -80
- package/src/components/KeyboardToolbar/Button.tsx +98 -98
- package/src/components/KeyboardToolbar/colors.native.ts +37 -37
- package/src/components/KeyboardToolbar/colors.ts +16 -16
- package/src/components/KeyboardToolbar/index.tsx +223 -223
- package/src/components/KeyboardToolbar/types.ts +40 -40
- package/src/components/hooks/useColorScheme.ts +5 -5
- package/src/components/index.ts +11 -11
- package/src/constants.ts +19 -19
- package/src/context.ts +68 -68
- package/src/hooks/index.ts +90 -90
- package/src/hooks/useWindowDimensions/index.android.ts +38 -38
- package/src/hooks/useWindowDimensions/index.ts +1 -1
- package/src/index.ts +23 -23
- package/src/internal.ts +84 -84
- package/src/module.ts +52 -52
- package/src/monkey-patch.android.ts +44 -44
- package/src/monkey-patch.ts +4 -4
- package/src/reanimated.native.ts +132 -132
- package/src/reanimated.ts +29 -29
- package/src/specs/KeyboardControllerViewNativeComponent.ts +71 -71
- package/src/specs/KeyboardGestureAreaNativeComponent.ts +20 -20
- package/src/specs/NativeKeyboardController.ts +19 -19
- package/src/specs/NativeStatusBarManagerCompat.ts +14 -14
- package/src/specs/OverKeyboardViewNativeComponent.ts +12 -12
- package/src/types.ts +243 -243
- package/src/utils.ts +1 -1
- package/src/views/OverKeyboardView/index.tsx +43 -43
- package/src/views/index.ts +1 -1
- package/react-native-keyboard-controller.podspec +0 -61
package/harmony/keyboard_controller/src/main/cpp/KeyboardControllerViewComponentInstance.cpp
CHANGED
|
@@ -1,172 +1,287 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c)
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
void KeyboardControllerViewComponentInstance::
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
auto
|
|
122
|
-
arkTsTurboModule
|
|
123
|
-
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* MIT License
|
|
6
|
+
*
|
|
7
|
+
* Copyright (C) 2024 Huawei Device Co., Ltd.
|
|
8
|
+
*
|
|
9
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
10
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
11
|
+
* in the Software without restriction, including without limitation the rights
|
|
12
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
13
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
14
|
+
* furnished to do so, subject to the following conditions:
|
|
15
|
+
*
|
|
16
|
+
* The above copyright notice and this permission notice shall be included in all
|
|
17
|
+
* copies or substantial portions of the Software.
|
|
18
|
+
*
|
|
19
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
20
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
21
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
22
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
23
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
24
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
25
|
+
* SOFTWARE.
|
|
26
|
+
*/
|
|
27
|
+
|
|
28
|
+
#include "KeyboardControllerViewComponentInstance.h"
|
|
29
|
+
#include <folly/dynamic.h>
|
|
30
|
+
#include <iostream>
|
|
31
|
+
#include <arkui/native_interface_focus.h>
|
|
32
|
+
|
|
33
|
+
namespace rnoh {
|
|
34
|
+
using KeyboardControllerStatus = rnoh::KeyboardControllerStatus;
|
|
35
|
+
KeyboardControllerViewComponentInstance::KeyboardControllerViewComponentInstance(Context context)
|
|
36
|
+
: CppComponentInstance(std::move(context)), ArkTSMessageHub::Observer(m_deps->arkTSMessageHub) {
|
|
37
|
+
DLOG(INFO) << "KeyboardControllerViewComponentInstance";
|
|
38
|
+
|
|
39
|
+
m_customNode.setCustomNodeDelegate(this);
|
|
40
|
+
}
|
|
41
|
+
void KeyboardControllerViewComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
|
|
42
|
+
std::size_t index) {
|
|
43
|
+
CppComponentInstance::onChildInserted(childComponentInstance, index);
|
|
44
|
+
m_customNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index);
|
|
45
|
+
DLOG(INFO) << "###111" << childComponentInstance->getComponentName();
|
|
46
|
+
findTextInputComponents(childComponentInstance);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
void KeyboardControllerViewComponentInstance::onChildRemoved(ComponentInstance::Shared const &childComponentInstance) {
|
|
50
|
+
CppComponentInstance::onChildRemoved(childComponentInstance);
|
|
51
|
+
m_customNode.removeChild(childComponentInstance->getLocalRootArkUINode());
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
void KeyboardControllerViewComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
|
|
55
|
+
DLOG(INFO) << "###onPropsChanged" << props->enabled << props->statusBarTranslucent
|
|
56
|
+
<< props->navigationBarTranslucent << props->preserveEdgeToEdge;
|
|
57
|
+
CppComponentInstance::onPropsChanged(props);
|
|
58
|
+
if (this->enabled != props->enabled) {
|
|
59
|
+
this->enabled = props->enabled;
|
|
60
|
+
this->startKeyboardObserver();
|
|
61
|
+
}
|
|
62
|
+
if (this->navigationBarTranslucent != props->navigationBarTranslucent) {
|
|
63
|
+
this->navigationBarTranslucent = props->navigationBarTranslucent;
|
|
64
|
+
this->setWindowSystemBarEnable();
|
|
65
|
+
}
|
|
66
|
+
if (this->statusBarTranslucent != props->statusBarTranslucent) {
|
|
67
|
+
this->statusBarTranslucent = props->statusBarTranslucent;
|
|
68
|
+
this->setWindowSystemBarEnable();
|
|
69
|
+
}
|
|
70
|
+
if (this->preserveEdgeToEdge != props->preserveEdgeToEdge) {
|
|
71
|
+
this->preserveEdgeToEdge = props->preserveEdgeToEdge;
|
|
72
|
+
this->setWindowLayoutFullScreen();
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
void KeyboardControllerViewComponentInstance::onCommandReceived(std::string const &commandName,
|
|
77
|
+
folly::dynamic const &args) {
|
|
78
|
+
CppComponentInstance::onCommandReceived(commandName, args);
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
ArkUINode &KeyboardControllerViewComponentInstance::getLocalRootArkUINode() { return m_customNode; }
|
|
82
|
+
void KeyboardControllerViewComponentInstance::onClick() {}
|
|
83
|
+
void KeyboardControllerViewComponentInstance::onMessageReceived(ArkTSMessage const &message) {
|
|
84
|
+
DLOG(INFO) << "onMessageReceived";
|
|
85
|
+
if (message.name == "keyboardHeightChange") {
|
|
86
|
+
double height = message.payload.getDouble();
|
|
87
|
+
DLOG(INFO) << "keyboardHeightChange: " << height;
|
|
88
|
+
if (height > 0) {
|
|
89
|
+
this->keyboardStatus = KeyboardControllerStatus::SHOW;
|
|
90
|
+
this->keyboardHeight = height;
|
|
91
|
+
this->textInputVector.clear();
|
|
92
|
+
this->focusDidSet();
|
|
93
|
+
auto textInputVectorTemp = ViewHierarchyNavigator::getAllInputFields(this->shared_from_this());
|
|
94
|
+
for (size_t i = 0; i < textInputVectorTemp.size(); ++i) {
|
|
95
|
+
auto &input = textInputVectorTemp[i];
|
|
96
|
+
findTextInputComponents(input);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
if (height == 0) {
|
|
100
|
+
this->keyboardStatus = KeyboardControllerStatus::HIDE;
|
|
101
|
+
}
|
|
102
|
+
this->keyboardHeightChangeHandle();
|
|
103
|
+
}
|
|
104
|
+
if (message.name == "setFocusTo") {
|
|
105
|
+
std::string direction = message.payload.getString();
|
|
106
|
+
this->setFocusTo(direction);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
void KeyboardControllerViewComponentInstance::setWindowSystemBarEnable() {
|
|
110
|
+
auto rnInstancePtr = this->m_deps->rnInstance.lock();
|
|
111
|
+
if (rnInstancePtr != nullptr) {
|
|
112
|
+
auto turboModule = rnInstancePtr->getTurboModule("KeyboardController");
|
|
113
|
+
auto arkTsTurboModule = std::dynamic_pointer_cast<rnoh::ArkTSTurboModule>(turboModule);
|
|
114
|
+
arkTsTurboModule->callSync("setWindowSystemBarEnable", {this->statusBarTranslucent, this->navigationBarTranslucent});
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
void KeyboardControllerViewComponentInstance::startKeyboardObserver() {
|
|
119
|
+
auto rnInstancePtr = this->m_deps->rnInstance.lock();
|
|
120
|
+
if (rnInstancePtr != nullptr) {
|
|
121
|
+
auto turboModule = rnInstancePtr->getTurboModule("KeyboardController");
|
|
122
|
+
auto arkTsTurboModule = std::dynamic_pointer_cast<rnoh::ArkTSTurboModule>(turboModule);
|
|
123
|
+
arkTsTurboModule->callSync("startKeyboardObserver", {this->enabled});
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
void KeyboardControllerViewComponentInstance::keyboardHeightChangeHandle() {
|
|
129
|
+
auto rnInstancePtr = this->m_deps->rnInstance.lock();
|
|
130
|
+
if (rnInstancePtr != nullptr && this->enabled) {
|
|
131
|
+
if (this->keyboardStatus == KeyboardControllerStatus::HIDE) {
|
|
132
|
+
facebook::react::KeyboardControllerViewEventEmitter::MoveEvent start = {this->keyboardHeight, 0, 0, m_tag};
|
|
133
|
+
facebook::react::KeyboardControllerViewEventEmitter::MoveEvent end = {0, 0, 0, m_tag};
|
|
134
|
+
m_eventEmitter->onKeyboardMoveStart(start);
|
|
135
|
+
m_eventEmitter->onKeyboardMove(end);
|
|
136
|
+
m_eventEmitter->onKeyboardMoveEnd(end);
|
|
137
|
+
} else {
|
|
138
|
+
facebook::react::KeyboardControllerViewEventEmitter::MoveEvent start = {0, 0, 0, m_tag};
|
|
139
|
+
facebook::react::KeyboardControllerViewEventEmitter::MoveEvent end = {this->keyboardHeight, 1, 0, m_tag};
|
|
140
|
+
m_eventEmitter->onKeyboardMoveStart(start);
|
|
141
|
+
m_eventEmitter->onKeyboardMove(end);
|
|
142
|
+
m_eventEmitter->onKeyboardMoveEnd(end);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
void KeyboardControllerViewComponentInstance::setWindowLayoutFullScreen() {
|
|
148
|
+
auto rnInstancePtr = this->m_deps->rnInstance.lock();
|
|
149
|
+
if (rnInstancePtr != nullptr) {
|
|
150
|
+
auto turboModule = rnInstancePtr->getTurboModule("KeyboardController");
|
|
151
|
+
auto arkTsTurboModule = std::dynamic_pointer_cast<rnoh::ArkTSTurboModule>(turboModule);
|
|
152
|
+
arkTsTurboModule->callSync("setWindowLayoutFullScreen", {this->preserveEdgeToEdge});
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* 遍历查找TextInput
|
|
158
|
+
* */
|
|
159
|
+
void KeyboardControllerViewComponentInstance::findTextInputComponents(
|
|
160
|
+
ComponentInstance::Shared const &childComponentInstance) {
|
|
161
|
+
std::string name = childComponentInstance->getComponentName();
|
|
162
|
+
DLOG(INFO) << "###" << name;
|
|
163
|
+
if (name.find("TextInput") != std::string::npos || name.find("TextArea") != std::string::npos) {
|
|
164
|
+
auto input = std::dynamic_pointer_cast<TextInputComponentInstance>(childComponentInstance);
|
|
165
|
+
ArkUINode &node = input->getLocalRootArkUINode();
|
|
166
|
+
TextInputNode *inputNodePtr = dynamic_cast<TextInputNode *>(&node);
|
|
167
|
+
if (!inputNodePtr) {
|
|
168
|
+
TextAreaNode *textAreaNodePtr = dynamic_cast<TextAreaNode *>(&node);
|
|
169
|
+
textAreaNodePtr->setTextAreaNodeDelegate(this);
|
|
170
|
+
} else {
|
|
171
|
+
inputNodePtr->setTextInputNodeDelegate(this);
|
|
172
|
+
}
|
|
173
|
+
this->textInputVector.push_back(input);
|
|
174
|
+
}
|
|
175
|
+
auto childrenComponentInstances = childComponentInstance->getChildren();
|
|
176
|
+
if (childrenComponentInstances.empty()) {
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
std::vector<ComponentInstance::Shared>::iterator it1;
|
|
181
|
+
for (it1 = childrenComponentInstances.begin(); it1 != childrenComponentInstances.end(); ++it1) {
|
|
182
|
+
ComponentInstance::Shared const &t = *it1;
|
|
183
|
+
findTextInputComponents(t);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
void KeyboardControllerViewComponentInstance::onChange(std::string text) {
|
|
188
|
+
facebook::react::KeyboardControllerViewEventEmitter::TextChangeEvent event = {text};
|
|
189
|
+
if(this->enabled){
|
|
190
|
+
m_eventEmitter->onFocusedInputTextChanged(event);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
void KeyboardControllerViewComponentInstance::onChange(std::string text, std::string extendStr) {
|
|
195
|
+
onChange(std::move(text));
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
void KeyboardControllerViewComponentInstance::onTextSelectionChange(int32_t location, int32_t length) {
|
|
199
|
+
DLOG(INFO) << " onKeyboardControllerView onTextSelectionChange";
|
|
200
|
+
// to do
|
|
201
|
+
};
|
|
202
|
+
|
|
203
|
+
void KeyboardControllerViewComponentInstance::focusDidSet() {
|
|
204
|
+
int currentIndex = -1;
|
|
205
|
+
this->textInputVector = ViewHierarchyNavigator::getAllInputFields(this->shared_from_this());
|
|
206
|
+
int count = static_cast<int>(this->textInputVector.size());
|
|
207
|
+
for (size_t i = 0; i < this->textInputVector.size(); ++i) {
|
|
208
|
+
auto& input = this->textInputVector[i];
|
|
209
|
+
ArkUINode& node = input->getLocalRootArkUINode();
|
|
210
|
+
if (node.isFocused()) {
|
|
211
|
+
currentIndex = static_cast<int>(i);
|
|
212
|
+
break;
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
this->textInputVector.clear();
|
|
216
|
+
// 发送 focusDidSet 事件到 JS 层
|
|
217
|
+
if (currentIndex >= 0 && this->enabled) {
|
|
218
|
+
auto rnInstancePtr = this->m_deps->rnInstance.lock();
|
|
219
|
+
if (rnInstancePtr != nullptr) {
|
|
220
|
+
folly::dynamic payload = folly::dynamic::object
|
|
221
|
+
("current", currentIndex)
|
|
222
|
+
("count", count);
|
|
223
|
+
rnInstancePtr->postMessageToArkTS("focusDidSet", payload);
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
void KeyboardControllerViewComponentInstance::onFocus() {
|
|
229
|
+
DLOG(INFO) << "onKeyboardControllerView onFocus";
|
|
230
|
+
this->focusDidSet();
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
void KeyboardControllerViewComponentInstance::onBlur() { DLOG(INFO) << " onKeyboardControllerView onBlur"; }
|
|
234
|
+
|
|
235
|
+
/**
|
|
236
|
+
* 设置焦点到指定方向的输入框
|
|
237
|
+
* 实现逻辑仿照 iOS ViewHierarchyNavigator.swift
|
|
238
|
+
* @param direction "next" | "prev"
|
|
239
|
+
*/
|
|
240
|
+
void KeyboardControllerViewComponentInstance::setFocusTo(const std::string& direction) {
|
|
241
|
+
// 确定当前焦点组件
|
|
242
|
+
this->textInputVector = ViewHierarchyNavigator::getAllInputFields(this->shared_from_this());
|
|
243
|
+
ComponentInstance::Shared currentFocus = nullptr;
|
|
244
|
+
for (size_t i = 0; i < this->textInputVector.size(); ++i) {
|
|
245
|
+
auto& input = this->textInputVector[i];
|
|
246
|
+
ArkUINode& node = input->getLocalRootArkUINode();
|
|
247
|
+
if (node.isFocused()) {
|
|
248
|
+
currentFocus = input;
|
|
249
|
+
break;
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
if (!currentFocus) {
|
|
253
|
+
DLOG(INFO) << "no current focus available";
|
|
254
|
+
return;
|
|
255
|
+
}
|
|
256
|
+
// 使用 ViewHierarchyNavigator 查找目标输入框
|
|
257
|
+
auto targetInput = ViewHierarchyNavigator::setFocusTo(direction, currentFocus);
|
|
258
|
+
if (targetInput) {
|
|
259
|
+
DLOG(INFO) << "setFocusTo: found target, requesting focus, tag=" << targetInput->getTag();
|
|
260
|
+
// 获取 ArkUI_NodeHandle 并请求焦点
|
|
261
|
+
ArkUINode& node = targetInput->getLocalRootArkUINode();
|
|
262
|
+
ArkUI_NodeHandle nodeHandle = node.getArkUINodeHandle();
|
|
263
|
+
ArkUI_ErrorCode result = ARKUI_ERROR_CODE_NO_ERROR;
|
|
264
|
+
high_lib_handle = dlopen("libace_ndk.z.so", RTLD_LAZY);
|
|
265
|
+
if (high_lib_handle == NULL) {
|
|
266
|
+
DLOG(INFO) << "libace_ndk.z.so not existed";
|
|
267
|
+
dlclose(high_lib_handle);
|
|
268
|
+
} else {
|
|
269
|
+
focusRequestMethod = (ArkUI_ErrorCode(*)(ArkUI_NodeHandle node))dlsym(high_lib_handle, "OH_ArkUI_FocusRequest");
|
|
270
|
+
bool isFocusRequestMethodExisted = focusRequestMethod != NULL;
|
|
271
|
+
if (isFocusRequestMethodExisted) {
|
|
272
|
+
DLOG(INFO) << "OH_ArkUI_FocusRequest method existed";
|
|
273
|
+
result = focusRequestMethod(nodeHandle);
|
|
274
|
+
} else {
|
|
275
|
+
DLOG(INFO) << "OH_ArkUI_FocusRequest method not existed";
|
|
276
|
+
}
|
|
277
|
+
dlclose(high_lib_handle);
|
|
278
|
+
}
|
|
279
|
+
if (!(result == ARKUI_ERROR_CODE_NO_ERROR)) {
|
|
280
|
+
DLOG(WARNING) << "setFocusTo: focus request failed with error code: " << result;
|
|
281
|
+
}
|
|
282
|
+
} else {
|
|
283
|
+
DLOG(INFO) << "setFocusTo: no target input found in direction " << direction;
|
|
284
|
+
}
|
|
285
|
+
this->textInputVector.clear();
|
|
286
|
+
}
|
|
172
287
|
} // namespace rnoh
|
|
@@ -1,76 +1,103 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c)
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
void
|
|
66
|
-
void
|
|
67
|
-
|
|
68
|
-
void
|
|
69
|
-
|
|
70
|
-
void
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* MIT License
|
|
6
|
+
*
|
|
7
|
+
* Copyright (C) 2024 Huawei Device Co., Ltd.
|
|
8
|
+
*
|
|
9
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
10
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
11
|
+
* in the Software without restriction, including without limitation the rights
|
|
12
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
13
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
14
|
+
* furnished to do so, subject to the following conditions:
|
|
15
|
+
*
|
|
16
|
+
* The above copyright notice and this permission notice shall be included in all
|
|
17
|
+
* copies or substantial portions of the Software.
|
|
18
|
+
*
|
|
19
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
20
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
21
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
22
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
23
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
24
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
25
|
+
* SOFTWARE.
|
|
26
|
+
*/
|
|
27
|
+
|
|
28
|
+
#ifndef KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
|
|
29
|
+
#define KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
|
|
30
|
+
|
|
31
|
+
#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
|
|
32
|
+
#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
|
|
33
|
+
|
|
34
|
+
#include <any>
|
|
35
|
+
#include "RNOH/CppComponentInstance.h"
|
|
36
|
+
#include "KeyboardControllerViewComponentDescriptor.h"
|
|
37
|
+
#include "RNOHCorePackage/ComponentInstances/TextInputComponentInstance.h"
|
|
38
|
+
#include "RNOH/arkui/CustomNode.h"
|
|
39
|
+
#include "RNOH/ArkTSMessageHub.h"
|
|
40
|
+
#include "RNOH/arkui/TextInputNode.h"
|
|
41
|
+
#include "RNOH/arkui/TextAreaNode.h"
|
|
42
|
+
#include "ViewHierarchyNavigator.h"
|
|
43
|
+
|
|
44
|
+
namespace rnoh {
|
|
45
|
+
enum KeyboardControllerStatus { HIDE = 0, SHOW = 1 };
|
|
46
|
+
class KeyboardControllerViewComponentInstance
|
|
47
|
+
: public CppComponentInstance<facebook::react::KeyboardControllerViewShadowNode>,
|
|
48
|
+
public CustomNodeDelegate,
|
|
49
|
+
public TextAreaNodeDelegate,
|
|
50
|
+
public TextInputNodeDelegate,
|
|
51
|
+
public ArkTSMessageHub::Observer {
|
|
52
|
+
public:
|
|
53
|
+
KeyboardControllerViewComponentInstance(Context context);
|
|
54
|
+
void onKeyboardMoveStart();
|
|
55
|
+
void onKeyboardMove();
|
|
56
|
+
void onKeyboardMoveEnd();
|
|
57
|
+
void onKeyboardMoveInteractive();
|
|
58
|
+
void onFocusedInputLayoutChanged();
|
|
59
|
+
void onFocusedInputTextChanged();
|
|
60
|
+
void onFocusedInputSelectionChanged();
|
|
61
|
+
|
|
62
|
+
void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
|
|
63
|
+
void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override;
|
|
64
|
+
void onPropsChanged(SharedConcreteProps const &props) override;
|
|
65
|
+
void onCommandReceived(std::string const &commandName, folly::dynamic const &args) override;
|
|
66
|
+
void onMessageReceived(ArkTSMessage const &message) override;
|
|
67
|
+
ArkUINode &getLocalRootArkUINode() override;
|
|
68
|
+
void onClick() override;
|
|
69
|
+
// textArea textInput delegate
|
|
70
|
+
void onChange(std::string text) override;
|
|
71
|
+
void onChange(std::string text, std::string extendStr) override;
|
|
72
|
+
void onBlur() override;
|
|
73
|
+
void onFocus() override;
|
|
74
|
+
void onTextSelectionChange(int32_t location, int32_t length) override;
|
|
75
|
+
|
|
76
|
+
protected:
|
|
77
|
+
private:
|
|
78
|
+
bool enabled;
|
|
79
|
+
bool statusBarTranslucent;
|
|
80
|
+
bool navigationBarTranslucent;
|
|
81
|
+
bool preserveEdgeToEdge;
|
|
82
|
+
double keyboardHeight;
|
|
83
|
+
std::map<std::string, std::any> dictionary;
|
|
84
|
+
int keyboardStatus;
|
|
85
|
+
std::vector<TextInputComponentInstance::Shared> textInputVector{};
|
|
86
|
+
CustomNode m_customNode{};
|
|
87
|
+
ComponentInstance::Shared currentResponder;
|
|
88
|
+
void findTextInputComponents(ComponentInstance::Shared const &parentComponentInstance);
|
|
89
|
+
void setWindowSystemBarEnable();
|
|
90
|
+
void startKeyboardObserver();
|
|
91
|
+
void closeKeyboardObserver();
|
|
92
|
+
void keyboardHeightChangeHandle();
|
|
93
|
+
void setWindowLayoutFullScreen();
|
|
94
|
+
void setFocusTo(const std::string& direction);
|
|
95
|
+
void focusDidSet();
|
|
96
|
+
void *high_lib_handle = NULL;
|
|
97
|
+
ArkUI_ErrorCode (*focusRequestMethod)(ArkUI_NodeHandle node);
|
|
98
|
+
};
|
|
99
|
+
} // namespace rnoh
|
|
100
|
+
|
|
101
|
+
#endif
|
|
102
|
+
|
|
103
|
+
#endif
|