@react-native-ohos/flash-list 1.8.3-rc.2 → 1.8.3-rc.4

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.
Files changed (206) hide show
  1. package/LICENSE +6 -6
  2. package/README.OpenSource +10 -10
  3. package/README.md +9 -9
  4. package/dist/AnimatedFlashList.d.ts +28 -25
  5. package/dist/AnimatedFlashList.d.ts.map +1 -1
  6. package/dist/AnimatedFlashList.js +30 -30
  7. package/dist/FlashList.d.ts +179 -179
  8. package/dist/FlashList.d.ts.map +1 -1
  9. package/dist/FlashList.js +599 -598
  10. package/dist/FlashList.js.map +1 -1
  11. package/dist/FlashListProps.d.ts +278 -278
  12. package/dist/FlashListProps.js +31 -31
  13. package/dist/GridLayoutProviderWithProps.d.ts +64 -64
  14. package/dist/GridLayoutProviderWithProps.js +137 -136
  15. package/dist/GridLayoutProviderWithProps.js.map +1 -1
  16. package/dist/MasonryFlashList.d.ts +73 -73
  17. package/dist/MasonryFlashList.d.ts.map +1 -1
  18. package/dist/MasonryFlashList.js +274 -274
  19. package/dist/MasonryFlashList.js.map +1 -1
  20. package/dist/PureComponentWrapper.d.ts +44 -44
  21. package/dist/PureComponentWrapper.js +59 -59
  22. package/dist/PureComponentWrapper.js.map +1 -1
  23. package/dist/benchmark/AutoScrollHelper.d.ts +40 -40
  24. package/dist/benchmark/AutoScrollHelper.js +90 -90
  25. package/dist/benchmark/AutoScrollHelper.js.map +1 -1
  26. package/dist/benchmark/JSFPSMonitor.d.ts +45 -45
  27. package/dist/benchmark/JSFPSMonitor.js +87 -87
  28. package/dist/benchmark/JSFPSMonitor.js.map +1 -1
  29. package/dist/benchmark/roundToDecimalPlaces.d.ts +24 -24
  30. package/dist/benchmark/roundToDecimalPlaces.js +31 -30
  31. package/dist/benchmark/roundToDecimalPlaces.js.map +1 -1
  32. package/dist/benchmark/useBenchmark.d.ts +57 -57
  33. package/dist/benchmark/useBenchmark.js +189 -188
  34. package/dist/benchmark/useBenchmark.js.map +1 -1
  35. package/dist/benchmark/useBlankAreaTracker.d.ts +56 -56
  36. package/dist/benchmark/useBlankAreaTracker.js +89 -88
  37. package/dist/benchmark/useBlankAreaTracker.js.map +1 -1
  38. package/dist/benchmark/useDataMultiplier.d.ts +31 -31
  39. package/dist/benchmark/useDataMultiplier.js +47 -46
  40. package/dist/benchmark/useDataMultiplier.js.map +1 -1
  41. package/dist/benchmark/useFlatListBenchmark.d.ts +35 -34
  42. package/dist/benchmark/useFlatListBenchmark.d.ts.map +1 -1
  43. package/dist/benchmark/useFlatListBenchmark.js +122 -121
  44. package/dist/benchmark/useFlatListBenchmark.js.map +1 -1
  45. package/dist/errors/CustomError.d.ts +30 -30
  46. package/dist/errors/CustomError.js +36 -36
  47. package/dist/errors/CustomError.js.map +1 -1
  48. package/dist/errors/ExceptionList.d.ts +46 -46
  49. package/dist/errors/ExceptionList.js +48 -48
  50. package/dist/errors/Warnings.d.ts +31 -31
  51. package/dist/errors/Warnings.js +35 -35
  52. package/dist/fabric/AutoLayoutNativeComponent.d.ts +41 -41
  53. package/dist/fabric/AutoLayoutNativeComponent.d.ts.map +1 -1
  54. package/dist/fabric/AutoLayoutNativeComponent.js +28 -28
  55. package/dist/fabric/CellContainerNativeComponent.d.ts +30 -30
  56. package/dist/fabric/CellContainerNativeComponent.d.ts.map +1 -1
  57. package/dist/fabric/CellContainerNativeComponent.js +28 -28
  58. package/dist/index.d.ts +36 -36
  59. package/dist/index.js +54 -52
  60. package/dist/index.js.map +1 -1
  61. package/dist/native/auto-layout/AutoLayoutView.d.ts +44 -44
  62. package/dist/native/auto-layout/AutoLayoutView.d.ts.map +1 -1
  63. package/dist/native/auto-layout/AutoLayoutView.js +70 -70
  64. package/dist/native/auto-layout/AutoLayoutView.js.map +1 -1
  65. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.android.d.ts +26 -25
  66. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.android.d.ts.map +1 -1
  67. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.android.js +28 -28
  68. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.d.ts +27 -27
  69. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.d.ts.map +1 -1
  70. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.harmony.d.ts +26 -25
  71. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.harmony.d.ts.map +1 -1
  72. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.harmony.js +28 -28
  73. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.ios.d.ts +26 -25
  74. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.ios.d.ts.map +1 -1
  75. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.ios.js +28 -28
  76. package/dist/native/auto-layout/AutoLayoutViewNativeComponent.js +28 -28
  77. package/dist/native/auto-layout/AutoLayoutViewNativeComponentProps.d.ts +38 -38
  78. package/dist/native/auto-layout/AutoLayoutViewNativeComponentProps.js +25 -25
  79. package/dist/native/cell-container/CellContainer.android.d.ts +28 -28
  80. package/dist/native/cell-container/CellContainer.android.d.ts.map +1 -1
  81. package/dist/native/cell-container/CellContainer.android.js +31 -31
  82. package/dist/native/cell-container/CellContainer.d.ts +30 -29
  83. package/dist/native/cell-container/CellContainer.d.ts.map +1 -1
  84. package/dist/native/cell-container/CellContainer.harmony.d.ts +28 -28
  85. package/dist/native/cell-container/CellContainer.harmony.d.ts.map +1 -1
  86. package/dist/native/cell-container/CellContainer.harmony.js +31 -31
  87. package/dist/native/cell-container/CellContainer.ios.d.ts +28 -28
  88. package/dist/native/cell-container/CellContainer.ios.d.ts.map +1 -1
  89. package/dist/native/cell-container/CellContainer.ios.js +31 -31
  90. package/dist/native/cell-container/CellContainer.js +33 -33
  91. package/dist/native/cell-container/CellContainer.web.d.ts +29 -28
  92. package/dist/native/cell-container/CellContainer.web.d.ts.map +1 -1
  93. package/dist/native/cell-container/CellContainer.web.js +35 -35
  94. package/dist/native/config/PlatformHelper.android.d.ts +48 -48
  95. package/dist/native/config/PlatformHelper.android.d.ts.map +1 -1
  96. package/dist/native/config/PlatformHelper.android.js +45 -45
  97. package/dist/native/config/PlatformHelper.d.ts +48 -48
  98. package/dist/native/config/PlatformHelper.d.ts.map +1 -1
  99. package/dist/native/config/PlatformHelper.harmony.d.ts +48 -48
  100. package/dist/native/config/PlatformHelper.harmony.d.ts.map +1 -1
  101. package/dist/native/config/PlatformHelper.harmony.js +44 -44
  102. package/dist/native/config/PlatformHelper.ios.d.ts +48 -48
  103. package/dist/native/config/PlatformHelper.ios.d.ts.map +1 -1
  104. package/dist/native/config/PlatformHelper.ios.js +44 -44
  105. package/dist/native/config/PlatformHelper.js +45 -45
  106. package/dist/native/config/PlatformHelper.web.d.ts +49 -49
  107. package/dist/native/config/PlatformHelper.web.d.ts.map +1 -1
  108. package/dist/native/config/PlatformHelper.web.js +47 -47
  109. package/dist/tsconfig.tsbuildinfo +1 -1
  110. package/dist/utils/AverageWindow.d.ts +43 -43
  111. package/dist/utils/AverageWindow.js +71 -71
  112. package/dist/utils/ContentContainerUtils.d.ts +49 -49
  113. package/dist/utils/ContentContainerUtils.d.ts.map +1 -1
  114. package/dist/utils/ContentContainerUtils.js +70 -70
  115. package/dist/utils/ContentContainerUtils.js.map +1 -1
  116. package/dist/viewability/ViewToken.d.ts +30 -30
  117. package/dist/viewability/ViewToken.js +25 -25
  118. package/dist/viewability/ViewabilityHelper.d.ts +48 -48
  119. package/dist/viewability/ViewabilityHelper.js +129 -129
  120. package/dist/viewability/ViewabilityHelper.js.map +1 -1
  121. package/dist/viewability/ViewabilityManager.d.ts +47 -47
  122. package/dist/viewability/ViewabilityManager.d.ts.map +1 -1
  123. package/dist/viewability/ViewabilityManager.js +130 -130
  124. package/dist/viewability/ViewabilityManager.js.map +1 -1
  125. package/harmony/flash_list/BuildProfile.ets +16 -16
  126. package/harmony/flash_list/LICENSE +7 -7
  127. package/harmony/flash_list/build-profile.json5 +7 -7
  128. package/harmony/flash_list/hvigorfile.ts +1 -1
  129. package/harmony/flash_list/index.ets +27 -27
  130. package/harmony/flash_list/obfuscation-rules.txt +17 -17
  131. package/harmony/flash_list/oh-package.json5 +23 -23
  132. package/harmony/flash_list/src/main/cpp/AutoLayoutNode.cpp +63 -140
  133. package/harmony/flash_list/src/main/cpp/AutoLayoutNode.h +53 -53
  134. package/harmony/flash_list/src/main/cpp/AutoLayoutShadow.cpp +31 -24
  135. package/harmony/flash_list/src/main/cpp/AutoLayoutShadow.h +66 -66
  136. package/harmony/flash_list/src/main/cpp/AutoLayoutViewComponentInstance.cpp +208 -208
  137. package/harmony/flash_list/src/main/cpp/AutoLayoutViewComponentInstance.h +78 -78
  138. package/harmony/flash_list/src/main/cpp/AutoLayoutViewEventEmitRequestHandler.h +53 -53
  139. package/harmony/flash_list/src/main/cpp/AutoLayoutViewJSIBinder.h +50 -50
  140. package/harmony/flash_list/src/main/cpp/CMakeLists.txt +6 -6
  141. package/harmony/flash_list/src/main/cpp/CellContainerComponentInstance.cpp +79 -79
  142. package/harmony/flash_list/src/main/cpp/CellContainerComponentInstance.h +63 -63
  143. package/harmony/flash_list/src/main/cpp/CellContainerJSIBinder.h +38 -38
  144. package/harmony/flash_list/src/main/cpp/ComponentDescriptors.h +40 -40
  145. package/harmony/flash_list/src/main/cpp/EventEmitters.cpp +39 -39
  146. package/harmony/flash_list/src/main/cpp/EventEmitters.h +48 -48
  147. package/harmony/flash_list/src/main/cpp/FlashListPackage.h +77 -77
  148. package/harmony/flash_list/src/main/cpp/FlashListStackNode.cpp +87 -87
  149. package/harmony/flash_list/src/main/cpp/FlashListStackNode.h +56 -56
  150. package/harmony/flash_list/src/main/cpp/Props.cpp +51 -51
  151. package/harmony/flash_list/src/main/cpp/Props.h +64 -64
  152. package/harmony/flash_list/src/main/cpp/ShadowNodes.cpp +33 -33
  153. package/harmony/flash_list/src/main/cpp/ShadowNodes.h +48 -48
  154. package/harmony/flash_list/src/main/ets/Logger.ets +63 -63
  155. package/harmony/flash_list/src/main/ets/RNAutoLayoutShadow.ets +153 -153
  156. package/harmony/flash_list/src/main/ets/RNAutoLayoutView.ets +276 -276
  157. package/harmony/flash_list/src/main/ets/RNCellContainer.ets +113 -113
  158. package/harmony/flash_list/src/main/module.json5 +9 -9
  159. package/harmony/flash_list/src/main/resources/base/element/color.json +7 -7
  160. package/harmony/flash_list/src/main/resources/base/element/string.json +15 -15
  161. package/harmony/flash_list/src/main/resources/base/profile/main_pages.json +5 -5
  162. package/harmony/flash_list/src/main/resources/en_US/element/string.json +15 -15
  163. package/harmony/flash_list/src/main/resources/zh_CN/element/string.json +15 -15
  164. package/harmony/flash_list.har +0 -0
  165. package/jestSetup.js +40 -40
  166. package/package.json +82 -82
  167. package/src/AnimatedFlashList.ts +35 -35
  168. package/src/FlashList.tsx +949 -949
  169. package/src/FlashListProps.ts +359 -359
  170. package/src/GridLayoutProviderWithProps.ts +204 -204
  171. package/src/MasonryFlashList.tsx +499 -499
  172. package/src/PureComponentWrapper.tsx +65 -65
  173. package/src/benchmark/AutoScrollHelper.ts +94 -94
  174. package/src/benchmark/JSFPSMonitor.ts +98 -98
  175. package/src/benchmark/roundToDecimalPlaces.ts +28 -28
  176. package/src/benchmark/useBenchmark.ts +264 -264
  177. package/src/benchmark/useBlankAreaTracker.ts +141 -141
  178. package/src/benchmark/useDataMultiplier.ts +43 -43
  179. package/src/benchmark/useFlatListBenchmark.ts +131 -131
  180. package/src/errors/CustomError.ts +34 -34
  181. package/src/errors/ExceptionList.ts +52 -52
  182. package/src/errors/Warnings.ts +39 -39
  183. package/src/fabric/AutoLayoutNativeComponent.ts +52 -52
  184. package/src/fabric/CellContainerNativeComponent.ts +35 -35
  185. package/src/index.ts +67 -67
  186. package/src/native/auto-layout/AutoLayoutView.tsx +97 -97
  187. package/src/native/auto-layout/AutoLayoutViewNativeComponent.android.ts +31 -31
  188. package/src/native/auto-layout/AutoLayoutViewNativeComponent.harmony.ts +31 -31
  189. package/src/native/auto-layout/AutoLayoutViewNativeComponent.ios.ts +31 -31
  190. package/src/native/auto-layout/AutoLayoutViewNativeComponent.ts +31 -31
  191. package/src/native/auto-layout/AutoLayoutViewNativeComponentProps.ts +41 -41
  192. package/src/native/cell-container/CellContainer.android.ts +31 -31
  193. package/src/native/cell-container/CellContainer.harmony.ts +31 -31
  194. package/src/native/cell-container/CellContainer.ios.ts +31 -31
  195. package/src/native/cell-container/CellContainer.tsx +38 -38
  196. package/src/native/cell-container/CellContainer.web.tsx +33 -33
  197. package/src/native/config/PlatformHelper.android.ts +53 -53
  198. package/src/native/config/PlatformHelper.harmony.ts +52 -52
  199. package/src/native/config/PlatformHelper.ios.ts +52 -52
  200. package/src/native/config/PlatformHelper.ts +53 -53
  201. package/src/native/config/PlatformHelper.web.ts +58 -58
  202. package/src/utils/AverageWindow.ts +73 -73
  203. package/src/utils/ContentContainerUtils.ts +116 -116
  204. package/src/viewability/ViewToken.ts +31 -31
  205. package/src/viewability/ViewabilityHelper.ts +190 -190
  206. package/src/viewability/ViewabilityManager.ts +169 -169
@@ -1,208 +1,208 @@
1
- /**
2
- * MIT License
3
- *
4
- * Copyright (C) 2024 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
- */
24
-
25
- #include "AutoLayoutViewComponentInstance.h"
26
- #include "RNOHCorePackage/ComponentInstances/ViewComponentInstance.h"
27
- #include "folly/Synchronized.h"
28
- #include "folly/synchronization/Lock.h"
29
- #include <mutex>
30
- #include <sys/param.h>
31
-
32
- namespace rnoh {
33
-
34
- AutoLayoutViewComponentInstance::AutoLayoutViewComponentInstance(Context context)
35
- : CppComponentInstance(std::move(context)) {
36
- m_autoLayoutNode.setAutoLayoutNodeDelegate(this);
37
- }
38
-
39
- void AutoLayoutViewComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
40
- std::size_t index) {
41
- CppComponentInstance::onChildInserted(childComponentInstance, index);
42
- m_autoLayoutNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index);
43
- }
44
-
45
- AutoLayoutNode &AutoLayoutViewComponentInstance::getLocalRootArkUINode() { return m_autoLayoutNode; }
46
-
47
- void AutoLayoutViewComponentInstance::onChildRemoved(ComponentInstance::Shared const &childComponentInstance) {
48
- CppComponentInstance::onChildRemoved(childComponentInstance);
49
- m_autoLayoutNode.removeChild(childComponentInstance->getLocalRootArkUINode());
50
- };
51
-
52
- void AutoLayoutViewComponentInstance::finalizeUpdates() {
53
- if (parentScrollView != nullptr) {
54
- onAppear();
55
- }
56
- ComponentInstance::finalizeUpdates();
57
- }
58
-
59
- facebook::react::Float AutoLayoutViewComponentInstance::getLeft() { return m_layoutMetrics.frame.origin.x; }
60
- facebook::react::Float AutoLayoutViewComponentInstance::getTop() { return m_layoutMetrics.frame.origin.y; }
61
- facebook::react::Float AutoLayoutViewComponentInstance::getRight() {
62
- return m_layoutMetrics.frame.origin.x + m_layoutMetrics.frame.size.width;
63
- }
64
- facebook::react::Float AutoLayoutViewComponentInstance::getBottom() {
65
- return m_layoutMetrics.frame.origin.y + m_layoutMetrics.frame.size.height;
66
- }
67
- facebook::react::Float AutoLayoutViewComponentInstance::getHeight() { return m_layoutMetrics.frame.size.height; }
68
- facebook::react::Float AutoLayoutViewComponentInstance::getWidth() { return m_layoutMetrics.frame.size.width; }
69
-
70
- void AutoLayoutViewComponentInstance::onAppear() {
71
- fixLayout();
72
- fixFooter();
73
- getLocalRootArkUINode().markDirty();
74
-
75
- parentScrollView = getParentScrollView();
76
- if (enableInstrumentation && parentScrollView != nullptr) {
77
- auto scrollContainerSize = alShadow.horizontal ? parentScrollView->getLayoutMetrics().frame.size.width
78
- : parentScrollView->getLayoutMetrics().frame.size.height;
79
- auto currentScrollOffset = alShadow.horizontal ? parentScrollView->getScrollViewMetrics().contentOffset.x
80
- : parentScrollView->getScrollViewMetrics().contentOffset.y;
81
-
82
- auto startOffset = alShadow.horizontal ? getLeft() : getTop();
83
- auto endOffset = alShadow.horizontal ? getRight() : getBottom();
84
-
85
- auto distanceFromWindowStart = MAX(startOffset - currentScrollOffset, 0);
86
- auto distanceFromWindowEnd = MAX(currentScrollOffset + scrollContainerSize - endOffset, 0);
87
- alShadow.computeBlankFromGivenOffset(currentScrollOffset - startOffset, distanceFromWindowStart,
88
- distanceFromWindowEnd);
89
- emitBlankAreaEvent();
90
- }
91
- }
92
-
93
- void AutoLayoutViewComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
94
- CppComponentInstance::onPropsChanged(props);
95
- horizontal = props->horizontal;
96
- alShadow.horizontal = props->horizontal;
97
- alShadow.scrollOffset = props->scrollOffset;
98
- alShadow.windowSize = props->windowSize;
99
- alShadow.renderOffset = props->renderAheadOffset;
100
- enableInstrumentation = props->enableInstrumentation;
101
- disableAutoLayout = props->disableAutoLayout;
102
- if (parentScrollView != nullptr) {
103
- onAppear();
104
- }
105
- }
106
-
107
- /** Sorts views by index and then invokes clearGaps which does the correction.
108
- * Performance: Sort is needed. Given relatively low number of views in RecyclerListView render tree this should be
109
- * a non issue.*/
110
- void AutoLayoutViewComponentInstance::fixLayout() {
111
- auto children = getChildren();
112
- if (children.size() > 1 && !disableAutoLayout) {
113
- std::vector<rnoh::CellContainerComponentInstance::Shared> childrenView;
114
- for (int i = 0; i < children.size(); i++) {
115
- auto cell = std::dynamic_pointer_cast<rnoh::CellContainerComponentInstance>(children[i]);
116
- childrenView.push_back(cell);
117
- }
118
- std::sort(childrenView.begin(), childrenView.end(),
119
- [](auto &a, auto &b) { return a->getIndex() < b->getIndex(); });
120
-
121
- alShadow.offsetFromStart = alShadow.horizontal ? getLeft() : getTop();
122
- alShadow.clearGapsAndOverlaps(childrenView);
123
- }
124
- }
125
-
126
- /** Fixes footer position along with rest of the items */
127
- void AutoLayoutViewComponentInstance::fixFooter() {
128
- parentScrollView = getParentScrollView();
129
- if (disableAutoLayout || parentScrollView == nullptr) {
130
- return;
131
- }
132
- auto isAutoLayoutEndVisible = alShadow.horizontal
133
- ? getRight() <= parentScrollView->getLayoutMetrics().frame.size.width
134
- : getBottom() <= parentScrollView->getLayoutMetrics().frame.size.height;
135
- if (!isAutoLayoutEndVisible) {
136
- return;
137
- }
138
- auto autoLayoutParent = getParent().lock();
139
- auto footer = getFooter();
140
- auto diff = static_cast<facebook::react::Float>(getFooterDiff());
141
- if (diff == 0 || footer == nullptr || autoLayoutParent == nullptr) {
142
- return;
143
- }
144
- if (alShadow.horizontal) {
145
- auto footerLayoutMetrics = footer->getLayoutMetrics();
146
- footerLayoutMetrics.frame.origin.x += diff;
147
- footer->setLayout(footerLayoutMetrics);
148
-
149
- m_layoutMetrics.frame.size.width += diff;
150
- setLayout(m_layoutMetrics);
151
-
152
- auto parentLayoutMetrics = autoLayoutParent->getLayoutMetrics();
153
- parentLayoutMetrics.frame.size.width += diff;
154
- autoLayoutParent->setLayout(parentLayoutMetrics);
155
- } else {
156
- auto footerLayoutMetrics = footer->getLayoutMetrics();
157
- footerLayoutMetrics.frame.origin.y += diff;
158
- footer->setLayout(footerLayoutMetrics);
159
-
160
- m_layoutMetrics.frame.size.height += diff;
161
- setLayout(m_layoutMetrics);
162
-
163
- auto parentLayoutMetrics = autoLayoutParent->getLayoutMetrics();
164
- parentLayoutMetrics.frame.size.height += diff;
165
- autoLayoutParent->setLayout(parentLayoutMetrics);
166
- }
167
- }
168
-
169
- facebook::react::Float AutoLayoutViewComponentInstance::getFooterDiff() {
170
- if (getChildren().empty()) {
171
- alShadow.lastMaxBoundOverall = 0;
172
- } else if (getChildren().size() == 1) {
173
- auto firstChild = std::dynamic_pointer_cast<rnoh::CellContainerComponentInstance>(getChildren()[0]);
174
- alShadow.lastMaxBoundOverall = alShadow.horizontal ? firstChild->getRight() : firstChild->getBottom();
175
- }
176
- auto autoLayoutEnd = alShadow.horizontal ? getWidth() : getHeight();
177
- return alShadow.lastMaxBoundOverall - autoLayoutEnd;
178
- }
179
-
180
- std::shared_ptr<rnoh::CellContainerComponentInstance> AutoLayoutViewComponentInstance::getFooter() {
181
- for (auto const child : getChildren()) {
182
- auto childInstance = std::dynamic_pointer_cast<rnoh::CellContainerComponentInstance>(child);
183
- if (childInstance != nullptr && childInstance->getIndex() == -1) {
184
- return childInstance;
185
- }
186
- }
187
- return nullptr;
188
- }
189
-
190
- std::shared_ptr<rnoh::ScrollViewComponentInstance> AutoLayoutViewComponentInstance::getParentScrollView() {
191
- auto autoLayoutParent = getParent().lock();
192
- while (autoLayoutParent) {
193
- auto scrollView = std::dynamic_pointer_cast<rnoh::ScrollViewComponentInstance>(autoLayoutParent);
194
- if (scrollView) {
195
- return scrollView;
196
- }
197
- autoLayoutParent = autoLayoutParent->getParent().lock();
198
- }
199
- return nullptr;
200
- }
201
-
202
- void AutoLayoutViewComponentInstance::emitBlankAreaEvent() {
203
- AutoLayoutViewEventEmitter::OnBlankAreaEvent blankAreaEvent;
204
- blankAreaEvent.offsetStart = alShadow.blankOffsetAtStart / pixelDensity;
205
- blankAreaEvent.offsetEnd = alShadow.blankOffsetAtEnd / pixelDensity;
206
- m_eventEmitter->onBlankAreaEvent(blankAreaEvent);
207
- }
208
- } // namespace rnoh
1
+ /**
2
+ * MIT License
3
+ *
4
+ * Copyright (C) 2024 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
+ */
24
+
25
+ #include "AutoLayoutViewComponentInstance.h"
26
+ #include "RNOHCorePackage/ComponentInstances/ViewComponentInstance.h"
27
+ #include "folly/Synchronized.h"
28
+ #include "folly/synchronization/Lock.h"
29
+ #include <mutex>
30
+ #include <sys/param.h>
31
+
32
+ namespace rnoh {
33
+
34
+ AutoLayoutViewComponentInstance::AutoLayoutViewComponentInstance(Context context)
35
+ : CppComponentInstance(std::move(context)) {
36
+ m_autoLayoutNode.setAutoLayoutNodeDelegate(this);
37
+ }
38
+
39
+ void AutoLayoutViewComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
40
+ std::size_t index) {
41
+ CppComponentInstance::onChildInserted(childComponentInstance, index);
42
+ m_autoLayoutNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index);
43
+ }
44
+
45
+ AutoLayoutNode &AutoLayoutViewComponentInstance::getLocalRootArkUINode() { return m_autoLayoutNode; }
46
+
47
+ void AutoLayoutViewComponentInstance::onChildRemoved(ComponentInstance::Shared const &childComponentInstance) {
48
+ CppComponentInstance::onChildRemoved(childComponentInstance);
49
+ m_autoLayoutNode.removeChild(childComponentInstance->getLocalRootArkUINode());
50
+ };
51
+
52
+ void AutoLayoutViewComponentInstance::finalizeUpdates() {
53
+ if (parentScrollView != nullptr) {
54
+ onAppear();
55
+ }
56
+ ComponentInstance::finalizeUpdates();
57
+ }
58
+
59
+ facebook::react::Float AutoLayoutViewComponentInstance::getLeft() { return m_layoutMetrics.frame.origin.x; }
60
+ facebook::react::Float AutoLayoutViewComponentInstance::getTop() { return m_layoutMetrics.frame.origin.y; }
61
+ facebook::react::Float AutoLayoutViewComponentInstance::getRight() {
62
+ return m_layoutMetrics.frame.origin.x + m_layoutMetrics.frame.size.width;
63
+ }
64
+ facebook::react::Float AutoLayoutViewComponentInstance::getBottom() {
65
+ return m_layoutMetrics.frame.origin.y + m_layoutMetrics.frame.size.height;
66
+ }
67
+ facebook::react::Float AutoLayoutViewComponentInstance::getHeight() { return m_layoutMetrics.frame.size.height; }
68
+ facebook::react::Float AutoLayoutViewComponentInstance::getWidth() { return m_layoutMetrics.frame.size.width; }
69
+
70
+ void AutoLayoutViewComponentInstance::onAppear() {
71
+ fixLayout();
72
+ fixFooter();
73
+ getLocalRootArkUINode().markDirty();
74
+
75
+ parentScrollView = getParentScrollView();
76
+ if (enableInstrumentation && parentScrollView != nullptr) {
77
+ auto scrollContainerSize = alShadow.horizontal ? parentScrollView->getLayoutMetrics().frame.size.width
78
+ : parentScrollView->getLayoutMetrics().frame.size.height;
79
+ auto currentScrollOffset = alShadow.horizontal ? parentScrollView->getScrollViewMetrics().contentOffset.x
80
+ : parentScrollView->getScrollViewMetrics().contentOffset.y;
81
+
82
+ auto startOffset = alShadow.horizontal ? getLeft() : getTop();
83
+ auto endOffset = alShadow.horizontal ? getRight() : getBottom();
84
+
85
+ auto distanceFromWindowStart = MAX(startOffset - currentScrollOffset, 0);
86
+ auto distanceFromWindowEnd = MAX(currentScrollOffset + scrollContainerSize - endOffset, 0);
87
+ alShadow.computeBlankFromGivenOffset(currentScrollOffset - startOffset, distanceFromWindowStart,
88
+ distanceFromWindowEnd);
89
+ emitBlankAreaEvent();
90
+ }
91
+ }
92
+
93
+ void AutoLayoutViewComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
94
+ CppComponentInstance::onPropsChanged(props);
95
+ horizontal = props->horizontal;
96
+ alShadow.horizontal = props->horizontal;
97
+ alShadow.scrollOffset = props->scrollOffset;
98
+ alShadow.windowSize = props->windowSize;
99
+ alShadow.renderOffset = props->renderAheadOffset;
100
+ enableInstrumentation = props->enableInstrumentation;
101
+ disableAutoLayout = props->disableAutoLayout;
102
+ if (parentScrollView != nullptr) {
103
+ onAppear();
104
+ }
105
+ }
106
+
107
+ /** Sorts views by index and then invokes clearGaps which does the correction.
108
+ * Performance: Sort is needed. Given relatively low number of views in RecyclerListView render tree this should be
109
+ * a non issue.*/
110
+ void AutoLayoutViewComponentInstance::fixLayout() {
111
+ auto children = getChildren();
112
+ if (children.size() > 1 && !disableAutoLayout) {
113
+ std::vector<rnoh::CellContainerComponentInstance::Shared> childrenView;
114
+ for (int i = 0; i < children.size(); i++) {
115
+ auto cell = std::dynamic_pointer_cast<rnoh::CellContainerComponentInstance>(children[i]);
116
+ childrenView.push_back(cell);
117
+ }
118
+ std::sort(childrenView.begin(), childrenView.end(),
119
+ [](auto &a, auto &b) { return a->getIndex() < b->getIndex(); });
120
+
121
+ alShadow.offsetFromStart = alShadow.horizontal ? getLeft() : getTop();
122
+ alShadow.clearGapsAndOverlaps(childrenView);
123
+ }
124
+ }
125
+
126
+ /** Fixes footer position along with rest of the items */
127
+ void AutoLayoutViewComponentInstance::fixFooter() {
128
+ parentScrollView = getParentScrollView();
129
+ if (disableAutoLayout || parentScrollView == nullptr) {
130
+ return;
131
+ }
132
+ auto isAutoLayoutEndVisible = alShadow.horizontal
133
+ ? getRight() <= parentScrollView->getLayoutMetrics().frame.size.width
134
+ : getBottom() <= parentScrollView->getLayoutMetrics().frame.size.height;
135
+ if (!isAutoLayoutEndVisible) {
136
+ return;
137
+ }
138
+ auto autoLayoutParent = getParent().lock();
139
+ auto footer = getFooter();
140
+ auto diff = static_cast<facebook::react::Float>(getFooterDiff());
141
+ if (diff == 0 || footer == nullptr || autoLayoutParent == nullptr) {
142
+ return;
143
+ }
144
+ if (alShadow.horizontal) {
145
+ auto footerLayoutMetrics = footer->getLayoutMetrics();
146
+ footerLayoutMetrics.frame.origin.x += diff;
147
+ footer->setLayout(footerLayoutMetrics);
148
+
149
+ m_layoutMetrics.frame.size.width += diff;
150
+ setLayout(m_layoutMetrics);
151
+
152
+ auto parentLayoutMetrics = autoLayoutParent->getLayoutMetrics();
153
+ parentLayoutMetrics.frame.size.width += diff;
154
+ autoLayoutParent->setLayout(parentLayoutMetrics);
155
+ } else {
156
+ auto footerLayoutMetrics = footer->getLayoutMetrics();
157
+ footerLayoutMetrics.frame.origin.y += diff;
158
+ footer->setLayout(footerLayoutMetrics);
159
+
160
+ m_layoutMetrics.frame.size.height += diff;
161
+ setLayout(m_layoutMetrics);
162
+
163
+ auto parentLayoutMetrics = autoLayoutParent->getLayoutMetrics();
164
+ parentLayoutMetrics.frame.size.height += diff;
165
+ autoLayoutParent->setLayout(parentLayoutMetrics);
166
+ }
167
+ }
168
+
169
+ facebook::react::Float AutoLayoutViewComponentInstance::getFooterDiff() {
170
+ if (getChildren().empty()) {
171
+ alShadow.lastMaxBoundOverall = 0;
172
+ } else if (getChildren().size() == 1) {
173
+ auto firstChild = std::dynamic_pointer_cast<rnoh::CellContainerComponentInstance>(getChildren()[0]);
174
+ alShadow.lastMaxBoundOverall = alShadow.horizontal ? firstChild->getRight() : firstChild->getBottom();
175
+ }
176
+ auto autoLayoutEnd = alShadow.horizontal ? getWidth() : getHeight();
177
+ return alShadow.lastMaxBoundOverall - autoLayoutEnd;
178
+ }
179
+
180
+ std::shared_ptr<rnoh::CellContainerComponentInstance> AutoLayoutViewComponentInstance::getFooter() {
181
+ for (auto const child : getChildren()) {
182
+ auto childInstance = std::dynamic_pointer_cast<rnoh::CellContainerComponentInstance>(child);
183
+ if (childInstance != nullptr && childInstance->getIndex() == -1) {
184
+ return childInstance;
185
+ }
186
+ }
187
+ return nullptr;
188
+ }
189
+
190
+ std::shared_ptr<rnoh::ScrollViewComponentInstance> AutoLayoutViewComponentInstance::getParentScrollView() {
191
+ auto autoLayoutParent = getParent().lock();
192
+ while (autoLayoutParent) {
193
+ auto scrollView = std::dynamic_pointer_cast<rnoh::ScrollViewComponentInstance>(autoLayoutParent);
194
+ if (scrollView) {
195
+ return scrollView;
196
+ }
197
+ autoLayoutParent = autoLayoutParent->getParent().lock();
198
+ }
199
+ return nullptr;
200
+ }
201
+
202
+ void AutoLayoutViewComponentInstance::emitBlankAreaEvent() {
203
+ AutoLayoutViewEventEmitter::OnBlankAreaEvent blankAreaEvent;
204
+ blankAreaEvent.offsetStart = alShadow.blankOffsetAtStart / pixelDensity;
205
+ blankAreaEvent.offsetEnd = alShadow.blankOffsetAtEnd / pixelDensity;
206
+ m_eventEmitter->onBlankAreaEvent(blankAreaEvent);
207
+ }
208
+ } // namespace rnoh
@@ -1,78 +1,78 @@
1
- /**
2
- * MIT License
3
- *
4
- * Copyright (C) 2024 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
- */
24
-
25
- #ifndef HARMONY_AUTOLAYOUTVIEWCOMPONENTINSTANCE_H
26
- #define HARMONY_AUTOLAYOUTVIEWCOMPONENTINSTANCE_H
27
-
28
- #include "RNOH/CppComponentInstance.h"
29
- #include "RNOHCorePackage/ComponentInstances/ScrollViewComponentInstance.h"
30
- #include "AutoLayoutShadow.h"
31
- #include "AutoLayoutNode.h"
32
- #include "ShadowNodes.h"
33
-
34
- namespace rnoh {
35
- class AutoLayoutViewComponentInstance : public CppComponentInstance<facebook::react::AutoLayoutViewShadowNode>,
36
- public AutoLayoutNodeDelegate {
37
- private:
38
- AutoLayoutNode m_autoLayoutNode;
39
- AutoLayoutShadow alShadow{AutoLayoutShadow()};
40
- bool horizontal{false};
41
-
42
- bool enableInstrumentation{false};
43
- bool disableAutoLayout{false};
44
- Float pixelDensity{1.0};
45
-
46
- std::shared_ptr<rnoh::ScrollViewComponentInstance> parentScrollView;
47
-
48
- public:
49
- AutoLayoutViewComponentInstance(Context context);
50
-
51
- void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
52
-
53
- void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override;
54
-
55
- AutoLayoutNode &getLocalRootArkUINode() override;
56
-
57
- void onPropsChanged(SharedConcreteProps const &props) override;
58
- void getNapiProps(facebook::react::Props::Shared props);
59
- void finalizeUpdates() override;
60
-
61
- facebook::react::Float getLeft();
62
- facebook::react::Float getTop();
63
- facebook::react::Float getRight();
64
- facebook::react::Float getBottom();
65
- facebook::react::Float getHeight();
66
- facebook::react::Float getWidth();
67
-
68
- void fixLayout();
69
- void fixFooter();
70
- facebook::react::Float getFooterDiff();
71
- void onAppear() override;
72
- std::shared_ptr<rnoh::CellContainerComponentInstance> getFooter();
73
- std::shared_ptr<rnoh::ScrollViewComponentInstance> getParentScrollView();
74
- void emitBlankAreaEvent() override;
75
- };
76
- } // namespace rnoh
77
-
78
- #endif // HARMONY_AUTOLAYOUTVIEWCOMPONENTINSTANCE_H
1
+ /**
2
+ * MIT License
3
+ *
4
+ * Copyright (C) 2024 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
+ */
24
+
25
+ #ifndef HARMONY_AUTOLAYOUTVIEWCOMPONENTINSTANCE_H
26
+ #define HARMONY_AUTOLAYOUTVIEWCOMPONENTINSTANCE_H
27
+
28
+ #include "RNOH/CppComponentInstance.h"
29
+ #include "RNOHCorePackage/ComponentInstances/ScrollViewComponentInstance.h"
30
+ #include "AutoLayoutShadow.h"
31
+ #include "AutoLayoutNode.h"
32
+ #include "ShadowNodes.h"
33
+
34
+ namespace rnoh {
35
+ class AutoLayoutViewComponentInstance : public CppComponentInstance<facebook::react::AutoLayoutViewShadowNode>,
36
+ public AutoLayoutNodeDelegate {
37
+ private:
38
+ AutoLayoutNode m_autoLayoutNode;
39
+ AutoLayoutShadow alShadow{AutoLayoutShadow()};
40
+ bool horizontal{false};
41
+
42
+ bool enableInstrumentation{false};
43
+ bool disableAutoLayout{false};
44
+ Float pixelDensity{1.0};
45
+
46
+ std::shared_ptr<rnoh::ScrollViewComponentInstance> parentScrollView;
47
+
48
+ public:
49
+ AutoLayoutViewComponentInstance(Context context);
50
+
51
+ void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
52
+
53
+ void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override;
54
+
55
+ AutoLayoutNode &getLocalRootArkUINode() override;
56
+
57
+ void onPropsChanged(SharedConcreteProps const &props) override;
58
+ void getNapiProps(facebook::react::Props::Shared props);
59
+ void finalizeUpdates() override;
60
+
61
+ facebook::react::Float getLeft();
62
+ facebook::react::Float getTop();
63
+ facebook::react::Float getRight();
64
+ facebook::react::Float getBottom();
65
+ facebook::react::Float getHeight();
66
+ facebook::react::Float getWidth();
67
+
68
+ void fixLayout();
69
+ void fixFooter();
70
+ facebook::react::Float getFooterDiff();
71
+ void onAppear() override;
72
+ std::shared_ptr<rnoh::CellContainerComponentInstance> getFooter();
73
+ std::shared_ptr<rnoh::ScrollViewComponentInstance> getParentScrollView();
74
+ void emitBlankAreaEvent() override;
75
+ };
76
+ } // namespace rnoh
77
+
78
+ #endif // HARMONY_AUTOLAYOUTVIEWCOMPONENTINSTANCE_H