GithubStar/Hippy
1
0
Fork 0
mirror of https://github.com/Tencent/Hippy.git synced 2026-10-17 04:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): correct view index of move operations in UIManager (#4443)

Browse Source
This commit is contained in:
wwwcg
2025-10-21 16:28:19 +08:00
committed by wwwcg
parent 4b69480703
commit e79a483d22
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderer/native/ios/renderer/HippyUIManager.mm
+17 -4
View File
@@ -985,32 +985,45 @@ NSString *const HippyUIManagerDidEndBatchNotification = @"HippyUIManagerDidEndBa
std::lock_guard<std::mutex> lock([self renderQueueLock]);
HippyShadowView *fromShadowView = [_shadowViewRegistry componentForTag:@(fromContainer) onRootTag:@(rootTag)];
HippyShadowView *toShadowView = [_shadowViewRegistry componentForTag:@(toContainer) onRootTag:@(rootTag)];
std::vector<int32_t> moved_ids_render_idxs;
moved_ids_render_idxs.reserve(ids.size());
for (int32_t hippyTag : ids) {
HippyShadowView *view = [_shadowViewRegistry componentForTag:@(hippyTag) onRootTag:@(rootTag)];
if (!view) {
HippyLogWarn(@"Invalid Move, No ShadowView! (%d of %d)", hippyTag, rootTag);
continue;
}
auto domNode = view.domNode.lock();
if (!domNode) {
HippyLogWarn(@"DomNode is null for view tag %d", hippyTag);
continue;
}
int32_t nodeRenderIndex = domNode->GetRenderInfo().index;
moved_ids_render_idxs.push_back(nodeRenderIndex);
HippyAssert(fromShadowView == [view parent], @"ShadowView(%d)'s parent should be %d", hippyTag, fromContainer);
[view removeFromHippySuperview];
[toShadowView insertHippySubview:view atIndex:index];
[toShadowView insertHippySubview:view atIndex:nodeRenderIndex];
}
[fromShadowView dirtyPropagation:NativeRenderUpdateLifecycleLayoutDirtied];
[toShadowView dirtyPropagation:NativeRenderUpdateLifecycleLayoutDirtied];
[fromShadowView didUpdateHippySubviews];
[toShadowView didUpdateHippySubviews];
auto strongTags = std::move(ids);
[self addUIBlock:^(__unused HippyUIManager *uiManager, NSDictionary<NSNumber *,__kindof UIView *> *viewRegistry) {
UIView *fromView = [viewRegistry objectForKey:@(fromContainer)];
UIView *toView = [viewRegistry objectForKey:@(toContainer)];
for (int32_t tag : strongTags) {
for (int i = 0; i < strongTags.size(); i++) {
int32_t tag = strongTags[i];
UIView *view = [viewRegistry objectForKey:@(tag)];
if (!view) {
continue;
}
HippyAssert(fromView == [view parent], @"parent of object view with tag %d is not object view with tag %d", tag, fromContainer);
HippyAssert(fromView == [view parent], @"Parent of View(%d) should be %@(%d)!", tag, fromView, fromContainer);
[view removeFromHippySuperview];
[toView insertHippySubview:view atIndex:index];
[toView insertHippySubview:view atIndex:moved_ids_render_idxs[i]];
}
[fromView clearSortedSubviews];
[fromView didUpdateHippySubviews];