@react-native-ohos/flash-list 1.8.3-rc.3 → 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,140 +1,63 @@
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 <react/renderer/components/view/ViewProps.h>
26
- #include <glog/logging.h>
27
- #include <sys/param.h>
28
- #include <thread>
29
- #include "AutoLayoutShadow.h"
30
- #include <random>
31
-
32
- namespace rnoh {
33
-
34
- /**checks for overlaps or gaps.between adjacent items and then applies a correction (Only Grid layouts with varying
35
- * spans) Performance: RecyclerListView renders very small number of views and this is not going to trigger multiple
36
- * layouts on Android side. Not expecting any major perf issu.*/
37
- void AutoLayoutShadow::clearGapsAndOverlaps(std::vector<CellContainerComponentInstance::Shared> sortedItems) {
38
- if (sortedItems.empty()) {
39
- return;
40
- }
41
- Float maxBound = 0;
42
- Float minBound = INT_MAX;
43
- Float maxBoundNeighbour = 0;
44
- lastMaxBoundOverall = 0;
45
- for (int i = 0; i < sortedItems.size() - 1; i++) {
46
- auto cell = sortedItems[i];
47
- auto neighbour = sortedItems[i + 1];
48
- std::optional<facebook::react::LayoutMetrics> neighbourMetrics;
49
- // Only apply correction if the next cell is consecutive.
50
- bool isNeighbourConsecutive = neighbour->getIndex() == cell->getIndex() + 1;
51
- if (isWithinBounds(cell->getLayoutMetrics())) {
52
- if (!horizontal) {
53
- maxBound = MAX(maxBound, cell->getBottom());
54
- minBound = MIN(minBound, cell->getTop());
55
- maxBoundNeighbour = maxBound;
56
- if (isNeighbourConsecutive) {
57
- neighbourMetrics = neighbour->getLayoutMetrics();
58
- if (cell->getLeft() < neighbour->getLeft()) {
59
- if (cell->getRight() != neighbour->getLeft()) {
60
- neighbourMetrics.value().frame.origin.x = cell->getRight();
61
- }
62
- if (cell->getTop() != neighbour->getTop()) {
63
- neighbourMetrics.value().frame.origin.y = cell->getTop();
64
- }
65
- } else {
66
- neighbourMetrics.value().frame.origin.y = maxBound;
67
- }
68
- }
69
- if (isWithinBounds(*neighbourMetrics)) {
70
- float bottom = neighbourMetrics->frame.origin.y + neighbourMetrics->frame.size.height;
71
- maxBoundNeighbour = MAX(maxBound, bottom);
72
- }
73
- } else {
74
- maxBound = MAX(maxBound, cell->getRight());
75
- minBound = MIN(minBound, cell->getLeft());
76
- maxBoundNeighbour = maxBound;
77
- if (isNeighbourConsecutive) {
78
- neighbourMetrics = neighbour->getLayoutMetrics();
79
- if (cell->getTop() < neighbour->getTop()) {
80
- if (cell->getBottom() != neighbour->getTop()) {
81
- neighbourMetrics.value().frame.origin.y = cell->getBottom();
82
- }
83
- if (cell->getLeft() != neighbour->getLeft()) {
84
- neighbourMetrics.value().frame.origin.x = cell->getLeft();
85
- }
86
- } else {
87
- neighbourMetrics.value().frame.origin.x = maxBound;
88
- }
89
- }
90
- if (isWithinBounds(*neighbourMetrics)) {
91
- float right = neighbourMetrics->frame.origin.x + neighbourMetrics->frame.size.width;
92
- maxBoundNeighbour = MAX(maxBound, right);
93
- }
94
- }
95
- }
96
- if (horizontal) {
97
- lastMaxBoundOverall = MAX(lastMaxBoundOverall, cell->getRight());
98
- float right = neighbourMetrics->frame.origin.x + neighbourMetrics->frame.size.width;
99
- lastMaxBoundOverall = MAX(lastMaxBoundOverall, neighbour->getRight());
100
- } else {
101
- lastMaxBoundOverall = MAX(lastMaxBoundOverall, cell->getBottom());
102
- float bottom = neighbourMetrics->frame.origin.y + neighbourMetrics->frame.size.height;
103
- lastMaxBoundOverall = MAX(lastMaxBoundOverall, bottom);
104
- }
105
- cell->setLayout(cell->getLayoutMetrics());
106
- neighbour->setLayout(neighbourMetrics ? neighbourMetrics.value() : neighbour->getLayoutMetrics());
107
- }
108
- lastMaxBound = maxBoundNeighbour;
109
- lastMinBound = minBound;
110
- }
111
-
112
- /** Offset provider by react can be one frame behind the real one, it's important that this method is called with
113
- * offset taken directly from scrollview object*/
114
- Float AutoLayoutShadow::computeBlankFromGivenOffset(Float actualScrollOffset, Float distanceFromWindowStart,
115
- Float distanceFromWindowEnd) {
116
- blankOffsetAtStart = lastMinBound - actualScrollOffset - distanceFromWindowStart;
117
- blankOffsetAtEnd = actualScrollOffset + windowSize - renderOffset - lastMaxBound - distanceFromWindowEnd;
118
- return MAX(blankOffsetAtStart, blankOffsetAtEnd);
119
- }
120
-
121
- /**It's importance to aviod correcting views outside the render window. An item that isn't being recycled might
122
- * still remain in the view tree. If views outside get considered then gaps between unused items will cause
123
- * algorithm to fail.*/
124
- bool AutoLayoutShadow::isWithinBounds(const facebook::react::LayoutMetrics& metrics) {
125
- auto boundsStart = scrollOffset - renderOffset;
126
- auto boundsEnd = scrollOffset + windowSize;
127
- float top = metrics.frame.origin.y;
128
- float bottom = metrics.frame.origin.y + metrics.frame.size.height;
129
- float left = metrics.frame.origin.x;
130
- float right = metrics.frame.origin.x + metrics.frame.size.width;
131
-
132
- if (!this->horizontal) {
133
- return (top >= boundsStart || bottom >= boundsStart) &&
134
- (top <= boundsEnd || bottom <= boundsEnd);
135
- } else {
136
- return (left >= boundsStart || right >= boundsStart) &&
137
- (left <= boundsEnd || right <= boundsEnd);
138
- }
139
- }
140
- } // 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 "AutoLayoutNode.h"
26
+ #include <memory>
27
+ #include <glog/logging.h>
28
+
29
+ namespace rnoh {
30
+
31
+ AutoLayoutNode::AutoLayoutNode()
32
+ : ArkUINode(NativeNodeApi::getInstance()->createNode(ArkUI_NodeType::ARKUI_NODE_STACK)) {
33
+ maybeThrow(NativeNodeApi::getInstance()->registerNodeEvent(m_nodeHandle, NODE_EVENT_ON_APPEAR, 0, this));
34
+ }
35
+
36
+ void AutoLayoutNode::insertChild(ArkUINode &child, std::size_t index) {
37
+ maybeThrow(NativeNodeApi::getInstance()->insertChildAt(m_nodeHandle, child.getArkUINodeHandle(), index));
38
+ }
39
+
40
+ void AutoLayoutNode::removeChild(ArkUINode &child) {
41
+ maybeThrow(NativeNodeApi::getInstance()->removeChild(m_nodeHandle, child.getArkUINodeHandle()));
42
+ }
43
+
44
+ void AutoLayoutNode::onNodeEvent(ArkUI_NodeEventType eventType, EventArgs &eventArgs) {
45
+ if (eventType == ArkUI_NodeEventType::NODE_EVENT_ON_APPEAR) {
46
+ m_autoLayoutNodeDelegate->onAppear();
47
+ }
48
+ }
49
+
50
+ void AutoLayoutNode::setAutoLayoutNodeDelegate(AutoLayoutNodeDelegate *scrollNodeDelegate) {
51
+ m_autoLayoutNodeDelegate = scrollNodeDelegate;
52
+ }
53
+
54
+ AutoLayoutNode::~AutoLayoutNode() {
55
+ NativeNodeApi::getInstance()->unregisterNodeEvent(m_nodeHandle, NODE_EVENT_ON_APPEAR);
56
+ }
57
+
58
+ void AutoLayoutNode::setAlign(int32_t align) {
59
+ ArkUI_NumberValue value[] = {{.i32 = align}};
60
+ ArkUI_AttributeItem item = {.value = value, .size = 1};
61
+ maybeThrow(NativeNodeApi::getInstance()->setAttribute(m_nodeHandle, NODE_STACK_ALIGN_CONTENT, &item));
62
+ }
63
+ } // namespace rnoh
@@ -1,54 +1,54 @@
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
- #pragma once
26
-
27
- #include "RNOH/arkui/ArkUINode.h"
28
- #include "RNOH/arkui/NativeNodeApi.h"
29
-
30
- namespace rnoh {
31
-
32
- class AutoLayoutNodeDelegate {
33
- public:
34
- virtual ~AutoLayoutNodeDelegate() = default;
35
- virtual void onAppear(){};
36
- virtual void emitBlankAreaEvent(){};
37
- };
38
-
39
- class AutoLayoutNode : public ArkUINode {
40
- protected:
41
- AutoLayoutNodeDelegate *m_autoLayoutNodeDelegate;
42
-
43
- public:
44
- AutoLayoutNode();
45
- ~AutoLayoutNode() override;
46
-
47
- void insertChild(ArkUINode &child, std::size_t index);
48
- void removeChild(ArkUINode &child);
49
- void onNodeEvent(ArkUI_NodeEventType eventType, EventArgs &eventArgs) override;
50
- void setAutoLayoutNodeDelegate(AutoLayoutNodeDelegate *autoLayoutNodeDelegate);
51
- void setAlign(int32_t align);
52
- };
53
-
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
+ #pragma once
26
+
27
+ #include "RNOH/arkui/ArkUINode.h"
28
+ #include "RNOH/arkui/NativeNodeApi.h"
29
+
30
+ namespace rnoh {
31
+
32
+ class AutoLayoutNodeDelegate {
33
+ public:
34
+ virtual ~AutoLayoutNodeDelegate() = default;
35
+ virtual void onAppear(){};
36
+ virtual void emitBlankAreaEvent(){};
37
+ };
38
+
39
+ class AutoLayoutNode : public ArkUINode {
40
+ protected:
41
+ AutoLayoutNodeDelegate *m_autoLayoutNodeDelegate;
42
+
43
+ public:
44
+ AutoLayoutNode();
45
+ ~AutoLayoutNode() override;
46
+
47
+ void insertChild(ArkUINode &child, std::size_t index);
48
+ void removeChild(ArkUINode &child);
49
+ void onNodeEvent(ArkUI_NodeEventType eventType, EventArgs &eventArgs) override;
50
+ void setAutoLayoutNodeDelegate(AutoLayoutNodeDelegate *autoLayoutNodeDelegate);
51
+ void setAlign(int32_t align);
52
+ };
53
+
54
54
  } // namespace rnoh
@@ -27,6 +27,7 @@
27
27
  #include <sys/param.h>
28
28
  #include <thread>
29
29
  #include "AutoLayoutShadow.h"
30
+ #include <random>
30
31
 
31
32
  namespace rnoh {
32
33
 
@@ -44,64 +45,65 @@ void AutoLayoutShadow::clearGapsAndOverlaps(std::vector<CellContainerComponentIn
44
45
  for (int i = 0; i < sortedItems.size() - 1; i++) {
45
46
  auto cell = sortedItems[i];
46
47
  auto neighbour = sortedItems[i + 1];
48
+ std::optional<facebook::react::LayoutMetrics> neighbourMetrics;
47
49
  // Only apply correction if the next cell is consecutive.
48
50
  bool isNeighbourConsecutive = neighbour->getIndex() == cell->getIndex() + 1;
49
- if (isWithinBounds(*cell)) {
51
+ if (isWithinBounds(cell->getLayoutMetrics())) {
50
52
  if (!horizontal) {
51
53
  maxBound = MAX(maxBound, cell->getBottom());
52
54
  minBound = MIN(minBound, cell->getTop());
53
55
  maxBoundNeighbour = maxBound;
54
56
  if (isNeighbourConsecutive) {
57
+ neighbourMetrics = neighbour->getLayoutMetrics();
55
58
  if (cell->getLeft() < neighbour->getLeft()) {
56
59
  if (cell->getRight() != neighbour->getLeft()) {
57
- neighbour->setRight(cell->getRight() + neighbour->getWidth());
58
- neighbour->setLeft(cell->getRight());
60
+ neighbourMetrics.value().frame.origin.x = cell->getRight();
59
61
  }
60
62
  if (cell->getTop() != neighbour->getTop()) {
61
- neighbour->setBottom(cell->getTop() + neighbour->getHeight());
62
- neighbour->setTop(cell->getTop());
63
+ neighbourMetrics.value().frame.origin.y = cell->getTop();
63
64
  }
64
65
  } else {
65
- neighbour->setBottom(maxBound + neighbour->getHeight());
66
- neighbour->setTop(maxBound);
66
+ neighbourMetrics.value().frame.origin.y = maxBound;
67
67
  }
68
68
  }
69
- if (isWithinBounds(*neighbour)) {
70
- maxBoundNeighbour = MAX(maxBound, neighbour->getBottom());
69
+ if (isWithinBounds(*neighbourMetrics)) {
70
+ float bottom = neighbourMetrics->frame.origin.y + neighbourMetrics->frame.size.height;
71
+ maxBoundNeighbour = MAX(maxBound, bottom);
71
72
  }
72
73
  } else {
73
74
  maxBound = MAX(maxBound, cell->getRight());
74
75
  minBound = MIN(minBound, cell->getLeft());
75
76
  maxBoundNeighbour = maxBound;
76
77
  if (isNeighbourConsecutive) {
78
+ neighbourMetrics = neighbour->getLayoutMetrics();
77
79
  if (cell->getTop() < neighbour->getTop()) {
78
80
  if (cell->getBottom() != neighbour->getTop()) {
79
- neighbour->setBottom(cell->getBottom() + neighbour->getHeight());
80
- neighbour->setTop(cell->getBottom());
81
+ neighbourMetrics.value().frame.origin.y = cell->getBottom();
81
82
  }
82
83
  if (cell->getLeft() != neighbour->getLeft()) {
83
- neighbour->setRight(cell->getLeft() + neighbour->getWidth());
84
- neighbour->setLeft(cell->getLeft());
84
+ neighbourMetrics.value().frame.origin.x = cell->getLeft();
85
85
  }
86
86
  } else {
87
- neighbour->setRight(maxBound + neighbour->getWidth());
88
- neighbour->setLeft(maxBound);
87
+ neighbourMetrics.value().frame.origin.x = maxBound;
89
88
  }
90
89
  }
91
- if (isWithinBounds(*neighbour)) {
92
- maxBoundNeighbour = MAX(maxBound, neighbour->getRight());
90
+ if (isWithinBounds(*neighbourMetrics)) {
91
+ float right = neighbourMetrics->frame.origin.x + neighbourMetrics->frame.size.width;
92
+ maxBoundNeighbour = MAX(maxBound, right);
93
93
  }
94
94
  }
95
95
  }
96
96
  if (horizontal) {
97
97
  lastMaxBoundOverall = MAX(lastMaxBoundOverall, cell->getRight());
98
+ float right = neighbourMetrics->frame.origin.x + neighbourMetrics->frame.size.width;
98
99
  lastMaxBoundOverall = MAX(lastMaxBoundOverall, neighbour->getRight());
99
100
  } else {
100
101
  lastMaxBoundOverall = MAX(lastMaxBoundOverall, cell->getBottom());
101
- lastMaxBoundOverall = MAX(lastMaxBoundOverall, neighbour->getBottom());
102
+ float bottom = neighbourMetrics->frame.origin.y + neighbourMetrics->frame.size.height;
103
+ lastMaxBoundOverall = MAX(lastMaxBoundOverall, bottom);
102
104
  }
103
105
  cell->setLayout(cell->getLayoutMetrics());
104
- neighbour->setLayout(neighbour->getLayoutMetrics());
106
+ neighbour->setLayout(neighbourMetrics ? neighbourMetrics.value() : neighbour->getLayoutMetrics());
105
107
  }
106
108
  lastMaxBound = maxBoundNeighbour;
107
109
  lastMinBound = minBound;
@@ -119,15 +121,20 @@ Float AutoLayoutShadow::computeBlankFromGivenOffset(Float actualScrollOffset, Fl
119
121
  /**It's importance to aviod correcting views outside the render window. An item that isn't being recycled might
120
122
  * still remain in the view tree. If views outside get considered then gaps between unused items will cause
121
123
  * algorithm to fail.*/
122
- bool AutoLayoutShadow::isWithinBounds(CellContainerComponentInstance &cell) {
124
+ bool AutoLayoutShadow::isWithinBounds(const facebook::react::LayoutMetrics& metrics) {
123
125
  auto boundsStart = scrollOffset - renderOffset;
124
126
  auto boundsEnd = scrollOffset + windowSize;
127
+ float top = metrics.frame.origin.y;
128
+ float bottom = metrics.frame.origin.y + metrics.frame.size.height;
129
+ float left = metrics.frame.origin.x;
130
+ float right = metrics.frame.origin.x + metrics.frame.size.width;
131
+
125
132
  if (!this->horizontal) {
126
- return (cell.getTop() >= boundsStart || cell.getBottom() >= boundsStart) &&
127
- (cell.getTop() <= boundsEnd || cell.getBottom() <= boundsEnd);
133
+ return (top >= boundsStart || bottom >= boundsStart) &&
134
+ (top <= boundsEnd || bottom <= boundsEnd);
128
135
  } else {
129
- return (cell.getLeft() >= boundsStart || cell.getRight() >= boundsStart) &&
130
- (cell.getLeft() <= boundsEnd || cell.getRight() <= boundsEnd);
136
+ return (left >= boundsStart || right >= boundsStart) &&
137
+ (left <= boundsEnd || right <= boundsEnd);
131
138
  }
132
139
  }
133
140
  } // namespace rnoh
@@ -1,66 +1,66 @@
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
- //
26
- // Created on 5/3/2024.
27
- //
28
- // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
29
- // please include "napi/native_api.h".
30
-
31
- #ifndef HARMONY_AUTOLAYOUTSHADOW_H
32
- #define HARMONY_AUTOLAYOUTSHADOW_H
33
-
34
- #include "react/renderer/graphics/Float.h"
35
- #include "CellContainerComponentInstance.h"
36
-
37
- using namespace facebook;
38
- using namespace react;
39
-
40
- namespace rnoh {
41
-
42
- class AutoLayoutShadow {
43
- private:
44
- Float lastMaxBound; // Tracks where the last pixel is drawn in the visible window
45
- Float lastMinBound; // Tracks where first pixel is drawn in the visible window
46
- bool isWithinBounds(CellContainerComponentInstance &);
47
-
48
- public:
49
- bool horizontal{false};
50
- Float scrollOffset{0};
51
- Float offsetFromStart{0};
52
- Float windowSize{0};
53
- Float renderOffset{0};
54
- Float blankOffsetAtStart{0}; // Tracks blank area from the top
55
- Float blankOffsetAtEnd{0}; // Tracks blank area from the bottom
56
- Float lastMaxBoundOverall{0}; // Tracks where the last pixel is drawn in the overall
57
-
58
- AutoLayoutShadow(){};
59
- ~AutoLayoutShadow(){};
60
- void clearGapsAndOverlaps(std::vector<CellContainerComponentInstance::Shared> sortedItems);
61
- Float computeBlankFromGivenOffset(Float actualScrollOffset, Float distanceFromWindowStart,
62
- Float distanceFromWindowEnd);
63
- };
64
- } // namespace rnoh
65
-
66
- #endif // HARMONY_AUTOLAYOUTSHADOW_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
+ //
26
+ // Created on 5/3/2024.
27
+ //
28
+ // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
29
+ // please include "napi/native_api.h".
30
+
31
+ #ifndef HARMONY_AUTOLAYOUTSHADOW_H
32
+ #define HARMONY_AUTOLAYOUTSHADOW_H
33
+
34
+ #include "react/renderer/graphics/Float.h"
35
+ #include "CellContainerComponentInstance.h"
36
+
37
+ using namespace facebook;
38
+ using namespace react;
39
+
40
+ namespace rnoh {
41
+
42
+ class AutoLayoutShadow {
43
+ private:
44
+ Float lastMaxBound; // Tracks where the last pixel is drawn in the visible window
45
+ Float lastMinBound; // Tracks where first pixel is drawn in the visible window
46
+ bool isWithinBounds(const facebook::react::LayoutMetrics& metrics);
47
+
48
+ public:
49
+ bool horizontal{false};
50
+ Float scrollOffset{0};
51
+ Float offsetFromStart{0};
52
+ Float windowSize{0};
53
+ Float renderOffset{0};
54
+ Float blankOffsetAtStart{0}; // Tracks blank area from the top
55
+ Float blankOffsetAtEnd{0}; // Tracks blank area from the bottom
56
+ Float lastMaxBoundOverall{0}; // Tracks where the last pixel is drawn in the overall
57
+
58
+ AutoLayoutShadow(){};
59
+ ~AutoLayoutShadow(){};
60
+ void clearGapsAndOverlaps(std::vector<CellContainerComponentInstance::Shared> sortedItems);
61
+ Float computeBlankFromGivenOffset(Float actualScrollOffset, Float distanceFromWindowStart,
62
+ Float distanceFromWindowEnd);
63
+ };
64
+ } // namespace rnoh
65
+
66
+ #endif // HARMONY_AUTOLAYOUTSHADOW_H