fix(ios): add a null protection to animation target (new anim module)

Tencent · Jul 10, 2024 · 4cd995d · 4cd995d
1 parent 07d39fe
commit 4cd995d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/ios/sdk/module/animation2/HippyNextAnimationModule.m b/ios/sdk/module/animation2/HippyNextAnimationModule.m
@@ -464,14 +464,25 @@ - (void)animatorDidAnimate:(HPOPAnimator *)animator inCustomQueue:(dispatch_queu
             NSMutableArray<HippyNextAnimation *> *pendingAnims = [strongSelf.pendingStartGroupAnimations objectForKey:queueKey];
             [strongSelf.groupAnimSyncLock unlock];
 
+            NSMutableArray<HippyNextAnimation *> *resultAnims = nil;
             NSMutableArray<id> *targetObjects = [NSMutableArray arrayWithCapacity:pendingAnims.count];
             CFTimeInterval now = CACurrentMediaTime();
             for (HippyNextAnimation *anim in pendingAnims) {
+                id target = anim.targetObject;
+                if (!target) {
+                    if (!resultAnims) {
+                        // only copy when needed
+                        resultAnims = [pendingAnims mutableCopy];
+                    }
+                    [resultAnims removeObject:anim];
+                    continue;
+                }
                 anim.beginTime = now + anim.delayTime;
-                [targetObjects addObject:anim.targetObject];
+                [targetObjects addObject:target];
             }
 
-            [[HPOPAnimator sharedAnimator] addAnimations:pendingAnims forObjects:targetObjects andKeys:nil];
+            [[HPOPAnimator sharedAnimator] addAnimations:resultAnims ?: pendingAnims
+                                              forObjects:targetObjects andKeys:nil];
             [pendingAnims removeAllObjects];
         });
     }