diff --git a/packages/react-native/ReactApple/RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.mm b/packages/react-native/ReactApple/RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.mm index 6dfee4465e6..772dbf7f40d 100644 --- a/packages/react-native/ReactApple/RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.mm +++ b/packages/react-native/ReactApple/RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.mm @@ -26,6 +26,26 @@ std::function _onRender; } +- (void)dealloc +{ + if (_displayLink != nil) { +#if TARGET_OS_OSX + RCTPlatformDisplayLink *displayLink = _displayLink; +#else + CADisplayLink *displayLink = _displayLink; +#endif + _displayLink = nil; + if ([NSThread isMainThread]) { + [displayLink invalidate]; + } else { + dispatch_sync(dispatch_get_main_queue(), ^{ + [displayLink invalidate]; + }); + } + _onRender = nullptr; + } +} + - (void)_onDisplayLinkTick { if (_displayLink != nullptr && _onRender != nullptr) { @@ -69,11 +89,16 @@ const auto stop_render = [weakSelf]() { RCTAnimatedModuleProvider *strongSelf = weakSelf; if (strongSelf) { - if (strongSelf->_displayLink != nil) { - [strongSelf->_displayLink invalidate]; - strongSelf->_displayLink = nil; - strongSelf->_onRender = nullptr; +#if TARGET_OS_OSX + RCTPlatformDisplayLink *displayLink = strongSelf->_displayLink; +#else + CADisplayLink *displayLink = strongSelf->_displayLink; +#endif + strongSelf->_displayLink = nil; + if (displayLink != nil) { + [displayLink invalidate]; } + strongSelf->_onRender = nullptr; } };