From ccc05cd05445773b1cb7d547c6be23bb38eb76d9 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Mon, 18 Nov 2019 18:22:35 -0800 Subject: [PATCH] Fabric: Fixed onLoadEnd event in RCTImageComponentView Summary: `onLoadEnd` event should be called when load either succeeds or fails. Before the fix, we didn't call it on error case. Changelog: [Internal] Fabric-specific internal change. Reviewed By: sammy-SC Differential Revision: D18566996 fbshipit-source-id: 92727e91be167eb1e8eec4a40e90097972097c05 --- .../Mounting/ComponentViews/Image/RCTImageComponentView.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm index dbe39a74a4e..90c490d083f 100644 --- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm @@ -139,6 +139,7 @@ } std::static_pointer_cast(_eventEmitter)->onLoad(); + std::static_pointer_cast(_eventEmitter)->onLoadEnd(); const auto &imageProps = *std::static_pointer_cast(_props); @@ -160,8 +161,6 @@ // Apply trilinear filtering to smooth out mis-sized images. self->_imageView.layer.minificationFilter = kCAFilterTrilinear; self->_imageView.layer.magnificationFilter = kCAFilterTrilinear; - - std::static_pointer_cast(self->_eventEmitter)->onLoadEnd(); } - (void)didReceiveProgress:(float)progress fromObserver:(void const *)observer @@ -182,6 +181,7 @@ } std::static_pointer_cast(_eventEmitter)->onError(); + std::static_pointer_cast(_eventEmitter)->onLoadEnd(); } @end