Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dynamic imageSrc removal #737

Merged
merged 3 commits into from
Oct 31, 2016
Merged

Fix dynamic imageSrc removal #737

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f513e82
Fix dynamic imageSrc removal
btoueg Oct 27, 2016
7a90c77
Fix #738
btoueg Oct 27, 2016
b2dc3e7
Fix typo in condition
btoueg Oct 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ios/AirGoogleMaps/AIRGoogleMapMarker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,18 @@ - (void)setImageSrc:(NSString *)imageSrc
_reloadImageCancellationBlock = nil;
}

if (!_imageSrc) {
if (_iconImageView) [_iconImageView removeFromSuperview];
return;
}

if (!_iconImageView) {
// prevent glitch with marker (cf. https://github.com/airbnb/react-native-maps/issues/738)
UIImageView *empyImageView = [[UIImageView alloc] init];
_iconImageView = empyImageView;
[self iconViewInsertSubview:_iconImageView atIndex:0];
}

_reloadImageCancellationBlock = [_bridge.imageLoader loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
size:self.bounds.size
scale:RCTScreenScale()
Expand Down