Merge branch 'master' into ASVideoNode

Author: lappp9

AsyncDisplayKit-Prefix.gcda

@@ -526,7 +526,7 @@
 		057D02C51AC0A66700C7AC3C /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		057D02C61AC0A66700C7AC3C /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		0587F9BB1A7309ED00AFF0BA /* ASEditableTextNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASEditableTextNode.h; sourceTree = "<group>"; };
-		0587F9BC1A7309ED00AFF0BA /* ASEditableTextNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = ASEditableTextNode.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		0587F9BC1A7309ED00AFF0BA /* ASEditableTextNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = ASEditableTextNode.mm; sourceTree = "<group>"; };
 		058D09AC195D04C000B7D73C /* libAsyncDisplayKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAsyncDisplayKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		058D09AF195D04C000B7D73C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		058D09B3195D04C000B7D73C /* AsyncDisplayKit-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AsyncDisplayKit-Prefix.pch"; sourceTree = "<group>"; };

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -1816,8 +1816,28 @@ - (void)layout
   CGRect subnodeFrame = CGRectZero;
   for (ASLayout *subnodeLayout in _layout.sublayouts) {
     ASDisplayNodeAssert([_subnodes containsObject:subnodeLayout.layoutableObject], @"Cached sublayouts must only contain subnodes' layout.");
-    subnodeFrame.origin = subnodeLayout.position;
-    subnodeFrame.size = subnodeLayout.size;
+    CGPoint adjustedOrigin = subnodeLayout.position;
+    if (isfinite(adjustedOrigin.x) == NO) {
+      ASDisplayNodeAssert(0, @"subnodeLayout has an invalid position");
+      adjustedOrigin.x = 0;
+    }
+    if (isfinite(adjustedOrigin.y) == NO) {
+      ASDisplayNodeAssert(0, @"subnodeLayout has an invalid position");
+      adjustedOrigin.y = 0;
+    }
+    subnodeFrame.origin = adjustedOrigin;
+    
+    CGSize adjustedSize = subnodeLayout.size;
+    if (isfinite(adjustedSize.width) == NO) {
+      ASDisplayNodeAssert(0, @"subnodeLayout has an invalid size");
+      adjustedSize.width = 0;
+    }
+    if (isfinite(adjustedSize.height) == NO) {
+      ASDisplayNodeAssert(0, @"subnodeLayout has an invalid position");
+      adjustedSize.height = 0;
+    }
+    subnodeFrame.size = adjustedSize;
+    
     subnode = ((ASDisplayNode *)subnodeLayout.layoutableObject);
     [subnode setFrame:subnodeFrame];
   }

AsyncDisplayKit/ASDisplayNode.mm

@@ -11,7 +11,10 @@
 
 @interface ASMapNode : ASImageNode
 
-- (instancetype)initWithCoordinate:(CLLocationCoordinate2D)coordinate NS_DESIGNATED_INITIALIZER;
+/**
+ The current region of ASMapNode. This can be set at any time and ASMapNode will animate the change.
+ */
+@property (nonatomic, assign) MKCoordinateRegion region;
 
 /**
  This is the MKMapView that is the live map part of ASMapNode. This will be nil if .liveMap = NO. Note, MKMapView is *not* thread-safe.

AsyncDisplayKit/ASMapNode.h

@@ -17,70 +17,80 @@ @interface ASMapNode()
   MKMapSnapshotter *_snapshotter;
   MKMapSnapshotOptions *_options;
   NSArray *_annotations;
-  ASDisplayNode *_mapNode;
   CLLocationCoordinate2D _centerCoordinateOfMap;
 }
 @end
 
 @implementation ASMapNode
 
-@synthesize liveMap = _liveMap;
 @synthesize needsMapReloadOnBoundsChange = _needsMapReloadOnBoundsChange;
 @synthesize mapDelegate = _mapDelegate;
+@synthesize region = _region;
 
-- (instancetype)initWithCoordinate:(CLLocationCoordinate2D)coordinate
+#pragma mark - Lifecycle
+- (instancetype)init
 {
   if (!(self = [super init])) {
     return nil;
   }
   self.backgroundColor = ASDisplayNodeDefaultPlaceholderColor();
   self.clipsToBounds = YES;
-
+  
   _needsMapReloadOnBoundsChange = YES;
-  _liveMap = NO;
+  
   _centerCoordinateOfMap = kCLLocationCoordinate2DInvalid;
-
+  _region = MKCoordinateRegionMake(CLLocationCoordinate2DMake(43.432858, 13.183671), MKCoordinateSpanMake(0.2, 0.2));
+  
   _options = [[MKMapSnapshotOptions alloc] init];
-  _options.region = MKCoordinateRegionMakeWithDistance(coordinate, 1000, 1000);;
+  _options.region = _region;
 
   return self;
 }
 
-- (void)setAnnotations:(NSArray *)annotations
+- (void)didLoad
 {
-  ASDN::MutexLocker l(_propertyLock);
-  _annotations = [annotations copy];
-  if (annotations.count != _annotations.count) {
-    // Redraw
-    [self setNeedsDisplay];
+  [super didLoad];
+  if ([self wasLiveMapPreviously]) {
+    self.userInteractionEnabled = YES;
+    [self addLiveMap];
   }
 }
 
-- (void)setUpSnapshotter
+- (void)fetchData
 {
-  if (!_snapshotter) {
-    ASDisplayNodeAssert(!CGSizeEqualToSize(CGSizeZero, self.calculatedSize), @"self.calculatedSize can not be zero. Make sure that you are setting a preferredFrameSize or wrapping ASMapNode in a ASRatioLayoutSpec or similar.");
-      _options.size = self.calculatedSize;
-      _snapshotter = [[MKMapSnapshotter alloc] initWithOptions:_options];
+  [super fetchData];
+  if ([self wasLiveMapPreviously]) {
+    [self addLiveMap];
+  } else {
+    [self setUpSnapshotter];
+    [self takeSnapshot];
   }
 }
 
+- (void)clearFetchedData
+{
+  [super clearFetchedData];
+  if (self.isLiveMap) {
+    [self removeLiveMap];
+  }
+}
+
+#pragma mark - Settings
+
 - (BOOL)isLiveMap
 {
-  ASDN::MutexLocker l(_propertyLock);
-  return _liveMap;
+  return (_mapView != nil);
 }
 
 - (void)setLiveMap:(BOOL)liveMap
 {
-  ASDN::MutexLocker l(_propertyLock);
-  if (liveMap == _liveMap) {
-    return;
-  }
-  _liveMap = liveMap;
   liveMap ? [self addLiveMap] : [self removeLiveMap];
 }
 
+- (BOOL)wasLiveMapPreviously
+{
+  return CLLocationCoordinate2DIsValid(_centerCoordinateOfMap);
+}
 
 - (BOOL)needsMapReloadOnBoundsChange
 {
@@ -94,24 +104,27 @@ - (void)setNeedsMapReloadOnBoundsChange:(BOOL)needsMapReloadOnBoundsChange
   _needsMapReloadOnBoundsChange = needsMapReloadOnBoundsChange;
 }
 
-- (void)fetchData
+- (MKCoordinateRegion)region
 {
-  [super fetchData];
-  if (_liveMap && !_mapNode) {
-    [self addLiveMap];
-  }
-  else {
-    [self setUpSnapshotter];
-    [self takeSnapshot];
-  }
+  ASDN::MutexLocker l(_propertyLock);
+  return _region;
 }
 
-- (void)clearFetchedData
+- (void)setRegion:(MKCoordinateRegion)region
 {
-  [super clearFetchedData];
-  [self removeLiveMap];
+  ASDN::MutexLocker l(_propertyLock);
+  _region = region;
+  if (self.isLiveMap) {
+    [_mapView setRegion:_region animated:YES];
+  } else {
+    _options.region = _region;
+    [self resetSnapshotter];
+    [self takeSnapshot];
+  }
 }
 
+#pragma mark - Snapshotter
+
 - (void)takeSnapshot
 {
   if (!_snapshotter.isLoading) {
@@ -150,61 +163,76 @@ - (void)takeSnapshot
   }
 }
 
+- (void)setUpSnapshotter
+{
+  if (!_snapshotter) {
+    ASDisplayNodeAssert(!CGSizeEqualToSize(CGSizeZero, self.calculatedSize), @"self.calculatedSize can not be zero. Make sure that you are setting a preferredFrameSize or wrapping ASMapNode in a ASRatioLayoutSpec or similar.");
+    _options.size = self.calculatedSize;
+    _snapshotter = [[MKMapSnapshotter alloc] initWithOptions:_options];
+  }
+}
+
 - (void)resetSnapshotter
 {
   if (!_snapshotter.isLoading) {
-    _options.size = self.calculatedSize;
     _snapshotter = [[MKMapSnapshotter alloc] initWithOptions:_options];
   }
 }
 
-#pragma mark - Action
+#pragma mark - Actions
 - (void)addLiveMap
 {
-  if (self.isNodeLoaded && !_mapNode) {
-    _mapNode = [[ASDisplayNode alloc]initWithViewBlock:^UIView *{
-      _mapView = [[MKMapView alloc]initWithFrame:CGRectMake(0.0f, 0.0f, self.calculatedSize.width, self.calculatedSize.height)];
-      _mapView.delegate = _mapDelegate;
-      [_mapView setRegion:_options.region];
-      [_mapView addAnnotations:_annotations];
-      return _mapView;
-    }];
-    [self addSubnode:_mapNode];
+  ASDisplayNodeAssertMainThread();
+  if (!self.isLiveMap) {
+    __weak ASMapNode *weakSelf = self;
+    _mapView = [[MKMapView alloc] initWithFrame:CGRectZero];
+    _mapView.delegate = weakSelf.mapDelegate;
+    [_mapView setRegion:_options.region];
+    [_mapView addAnnotations:_annotations];
+    [weakSelf setNeedsLayout];
+    [weakSelf.view addSubview:_mapView];
 
     if (CLLocationCoordinate2DIsValid(_centerCoordinateOfMap)) {
       [_mapView setCenterCoordinate:_centerCoordinateOfMap];
+    } else {
+      _centerCoordinateOfMap = _options.region.center;
     }
   }
 }
 
 - (void)removeLiveMap
 {
-  if (_mapNode) {
-    _centerCoordinateOfMap = _mapView.centerCoordinate;
-    [_mapNode removeFromSupernode];
-    _mapView = nil;
-    _mapNode = nil;
+  _centerCoordinateOfMap = _mapView.centerCoordinate;
+  [_mapView removeFromSuperview];
+  _mapView = nil;
+}
+
+- (void)setAnnotations:(NSArray *)annotations
+{
+  ASDN::MutexLocker l(_propertyLock);
+  _annotations = [annotations copy];
+  if (self.isLiveMap) {
+    [_mapView removeAnnotations:_mapView.annotations];
+    [_mapView addAnnotations:annotations];
+  } else {
+    [self takeSnapshot];
   }
-  self.image = nil;
 }
 
 #pragma mark - Layout
 // Layout isn't usually needed in the box model, but since we are making use of MKMapView which is hidden in an ASDisplayNode this is preferred.
 - (void)layout
 {
   [super layout];
-  if (_mapView) {
+  if (self.isLiveMap) {
     _mapView.frame = CGRectMake(0.0f, 0.0f, self.calculatedSize.width, self.calculatedSize.height);
-  }
-  else {
+  } else {
     // If our bounds.size is different from our current snapshot size, then let's request a new image from MKMapSnapshotter.
-    if (!CGSizeEqualToSize(_options.size, self.bounds.size)) {
-      if (_needsMapReloadOnBoundsChange && self.image) {
-        [self resetSnapshotter];
-        [self takeSnapshot];
-      }
+    if (!CGSizeEqualToSize(_options.size, self.bounds.size) && _needsMapReloadOnBoundsChange) {
+      _options.size = self.bounds.size;
+      [self resetSnapshotter];
+      [self takeSnapshot];
     }
   }
 }
-
-@end
+@end

AsyncDisplayKit/ASMapNode.mm

@@ -194,6 +194,9 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) {
 
 /**
  @abstract Responds to actions from links in the text node.
+ @discussion The delegate must be set before the node is loaded, and implement
+             textNode:longPressedLinkAttribute:value:atPoint:textRange: in order for
+             the long press gesture recognizer to be installed.
  */
 @property (nonatomic, weak) id<ASTextNodeDelegate> delegate;
 
@@ -233,6 +236,8 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) {
  @param value The value of the tapped attribute.
  @param point The point within textNode, in textNode's coordinate system, that was tapped.
  @param textRange The range of highlighted text.
+ @discussion In addition to implementing this method, the delegate must be set on the text
+             node before it is loaded (the recognizer is created in -didLoad)
  */
 - (void)textNode:(ASTextNode *)textNode longPressedLinkAttribute:(NSString *)attribute value:(id)value atPoint:(CGPoint)point textRange:(NSRange)textRange;