Skip to content

Commit c675967

Browse files
author
Scott Goodson
committed
Merge branch 'master' into RemoveWorkingWindow
2 parents 6ad1503 + e15a7db commit c675967

37 files changed

Lines changed: 1022 additions & 94 deletions

‎AsyncDisplayKit-Prefix.gcda‎

0 Bytes
Binary file not shown.

‎AsyncDisplayKit.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@
190190
258FF4281C0D152600A83844 /* ASRangeHandlerVisible.mm in Sources */ = {isa = PBXBuildFile; fileRef = 258FF4261C0D152600A83844 /* ASRangeHandlerVisible.mm */; };
191191
25A977EF1C0D2A5500406B62 /* ASRangeHandlerVisible.mm in Sources */ = {isa = PBXBuildFile; fileRef = 258FF4261C0D152600A83844 /* ASRangeHandlerVisible.mm */; };
192192
25BAA16F1C0D18D2002747C7 /* ASRangeHandlerVisible.h in Headers */ = {isa = PBXBuildFile; fileRef = 258FF4251C0D152600A83844 /* ASRangeHandlerVisible.h */; };
193+
25E327561C16819500A2170C /* ASPagerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 25E327541C16819500A2170C /* ASPagerNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
194+
25E327571C16819500A2170C /* ASPagerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 25E327541C16819500A2170C /* ASPagerNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
195+
25E327581C16819500A2170C /* ASPagerNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 25E327551C16819500A2170C /* ASPagerNode.m */; };
196+
25E327591C16819500A2170C /* ASPagerNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 25E327551C16819500A2170C /* ASPagerNode.m */; };
193197
2767E9411BB19BD600EA9B77 /* ASViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = ACC945A81BA9E7A0005E1FB8 /* ASViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
194198
2767E9421BB19BD600EA9B77 /* ASViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ACC945AA1BA9E7C1005E1FB8 /* ASViewController.m */; };
195199
2911485C1A77147A005D0878 /* ASControlNodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2911485B1A77147A005D0878 /* ASControlNodeTests.m */; };
@@ -523,7 +527,7 @@
523527
057D02C51AC0A66700C7AC3C /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
524528
057D02C61AC0A66700C7AC3C /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
525529
0587F9BB1A7309ED00AFF0BA /* ASEditableTextNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASEditableTextNode.h; sourceTree = "<group>"; };
526-
0587F9BC1A7309ED00AFF0BA /* ASEditableTextNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = ASEditableTextNode.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
530+
0587F9BC1A7309ED00AFF0BA /* ASEditableTextNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = ASEditableTextNode.mm; sourceTree = "<group>"; };
527531
058D09AC195D04C000B7D73C /* libAsyncDisplayKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAsyncDisplayKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
528532
058D09AF195D04C000B7D73C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
529533
058D09B3195D04C000B7D73C /* AsyncDisplayKit-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AsyncDisplayKit-Prefix.pch"; sourceTree = "<group>"; };
@@ -644,6 +648,8 @@
644648
257754BD1BEE458E00737CA5 /* ASTextNodeWordKerner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASTextNodeWordKerner.m; path = TextKit/ASTextNodeWordKerner.m; sourceTree = "<group>"; };
645649
258FF4251C0D152600A83844 /* ASRangeHandlerVisible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASRangeHandlerVisible.h; sourceTree = "<group>"; };
646650
258FF4261C0D152600A83844 /* ASRangeHandlerVisible.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASRangeHandlerVisible.mm; sourceTree = "<group>"; };
651+
25E327541C16819500A2170C /* ASPagerNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASPagerNode.h; sourceTree = "<group>"; };
652+
25E327551C16819500A2170C /* ASPagerNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASPagerNode.m; sourceTree = "<group>"; };
647653
2911485B1A77147A005D0878 /* ASControlNodeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASControlNodeTests.m; sourceTree = "<group>"; };
648654
292C59991A956527007E5DD6 /* ASLayoutRangeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutRangeType.h; sourceTree = "<group>"; };
649655
292C599A1A956527007E5DD6 /* ASRangeHandlerPreload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASRangeHandlerPreload.h; sourceTree = "<group>"; };
@@ -893,6 +899,8 @@
893899
0516FA3F1A1563D200B4EBED /* ASMultiplexImageNode.mm */,
894900
055B9FA61A1C154B00035D6D /* ASNetworkImageNode.h */,
895901
055B9FA71A1C154B00035D6D /* ASNetworkImageNode.mm */,
902+
25E327541C16819500A2170C /* ASPagerNode.h */,
903+
25E327551C16819500A2170C /* ASPagerNode.m */,
896904
D785F6601A74327E00291744 /* ASScrollNode.h */,
897905
D785F6611A74327E00291744 /* ASScrollNode.m */,
898906
B0F880581BEAEC7500D17647 /* ASTableNode.h */,
@@ -1246,6 +1254,7 @@
12461254
058D0A83195D060300B7D73C /* ASBaseDefines.h in Headers */,
12471255
054963491A1EA066000F8E56 /* ASBasicImageDownloader.h in Headers */,
12481256
2967F9E21AB0A5190072E4AB /* ASBasicImageDownloaderInternal.h in Headers */,
1257+
25E327561C16819500A2170C /* ASPagerNode.h in Headers */,
12491258
299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */,
12501259
251B8EF91BBB3D690087C538 /* ASCollectionViewFlowLayoutInspector.h in Headers */,
12511260
044285071BAA63FE00D16268 /* ASBatchFetching.h in Headers */,
@@ -1438,6 +1447,7 @@
14381447
B350622D1B010EFD0018CF92 /* ASScrollDirection.h in Headers */,
14391448
254C6B751BF94DF4003EC431 /* ASTextKitHelpers.h in Headers */,
14401449
B35062081B010EFD0018CF92 /* ASScrollNode.h in Headers */,
1450+
25E327571C16819500A2170C /* ASPagerNode.h in Headers */,
14411451
B35062551B010EFD0018CF92 /* ASSentinel.h in Headers */,
14421452
9C8221961BA237B80037F19A /* ASStackBaselinePositionedLayout.h in Headers */,
14431453
9C49C3701B853961000B0DD5 /* ASStackLayoutable.h in Headers */,
@@ -1687,6 +1697,7 @@
16871697
058D0A28195D050800B7D73C /* ASDisplayNode+AsyncDisplay.mm in Sources */,
16881698
058D0A29195D050800B7D73C /* ASDisplayNode+DebugTiming.mm in Sources */,
16891699
058D0A2A195D050800B7D73C /* ASDisplayNode+UIViewBridge.mm in Sources */,
1700+
25E327581C16819500A2170C /* ASPagerNode.m in Sources */,
16901701
058D0A14195D050800B7D73C /* ASDisplayNode.mm in Sources */,
16911702
058D0A15195D050800B7D73C /* ASDisplayNodeExtras.mm in Sources */,
16921703
0587F9BE1A7309ED00AFF0BA /* ASEditableTextNode.mm in Sources */,
@@ -1815,6 +1826,7 @@
18151826
B350621A1B010EFD0018CF92 /* ASDealloc2MainObject.m in Sources */,
18161827
34EFC75C1B701BD200AD841F /* ASDimension.mm in Sources */,
18171828
B350624E1B010EFD0018CF92 /* ASDisplayNode+AsyncDisplay.mm in Sources */,
1829+
25E327591C16819500A2170C /* ASPagerNode.m in Sources */,
18181830
B35062501B010EFD0018CF92 /* ASDisplayNode+DebugTiming.mm in Sources */,
18191831
254C6B891BF94F8A003EC431 /* ASTextKitRenderer+Positioning.mm in Sources */,
18201832
B35062511B010EFD0018CF92 /* ASDisplayNode+UIViewBridge.mm in Sources */,

‎AsyncDisplayKit/ASCollectionNode.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright (c) 2015 Facebook. All rights reserved.
77
//
88

9-
#import <AsyncDisplayKit/AsyncDisplayKit.h>
9+
#import <AsyncDisplayKit/ASCollectionView.h>
1010

1111
/**
1212
* ASCollectionNode is a node based class that wraps an ASCollectionView. It can be used

‎AsyncDisplayKit/ASCollectionNode.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import "ASCollectionNode.h"
10+
#import "ASDisplayNode+Subclasses.h"
1011

1112
@implementation ASCollectionNode
1213

‎AsyncDisplayKit/ASDisplayNode.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,6 @@ typedef NS_OPTIONS(NSUInteger, ASInterfaceState)
685685
* @param node The node to be added.
686686
*/
687687
- (void)addSubnode:(ASDisplayNode *)node;
688-
- (NSString *)name;
689688
@end
690689

691690
/** CALayer(AsyncDisplayKit) defines convenience method for adding sub-ASDisplayNode to a CALayer. */
@@ -696,7 +695,6 @@ typedef NS_OPTIONS(NSUInteger, ASInterfaceState)
696695
* @param node The node to be added.
697696
*/
698697
- (void)addSubnode:(ASDisplayNode *)node;
699-
- (NSString *)name;
700698
@end
701699

702700
@interface ASDisplayNode (Deprecated)

‎AsyncDisplayKit/ASDisplayNode.mm‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,8 +1849,28 @@ - (void)layout
18491849
CGRect subnodeFrame = CGRectZero;
18501850
for (ASLayout *subnodeLayout in _layout.sublayouts) {
18511851
ASDisplayNodeAssert([_subnodes containsObject:subnodeLayout.layoutableObject], @"Cached sublayouts must only contain subnodes' layout.");
1852-
subnodeFrame.origin = subnodeLayout.position;
1853-
subnodeFrame.size = subnodeLayout.size;
1852+
CGPoint adjustedOrigin = subnodeLayout.position;
1853+
if (isfinite(adjustedOrigin.x) == NO) {
1854+
ASDisplayNodeAssert(0, @"subnodeLayout has an invalid position");
1855+
adjustedOrigin.x = 0;
1856+
}
1857+
if (isfinite(adjustedOrigin.y) == NO) {
1858+
ASDisplayNodeAssert(0, @"subnodeLayout has an invalid position");
1859+
adjustedOrigin.y = 0;
1860+
}
1861+
subnodeFrame.origin = adjustedOrigin;
1862+
1863+
CGSize adjustedSize = subnodeLayout.size;
1864+
if (isfinite(adjustedSize.width) == NO) {
1865+
ASDisplayNodeAssert(0, @"subnodeLayout has an invalid size");
1866+
adjustedSize.width = 0;
1867+
}
1868+
if (isfinite(adjustedSize.height) == NO) {
1869+
ASDisplayNodeAssert(0, @"subnodeLayout has an invalid position");
1870+
adjustedSize.height = 0;
1871+
}
1872+
subnodeFrame.size = adjustedSize;
1873+
18541874
subnode = ((ASDisplayNode *)subnodeLayout.layoutableObject);
18551875
[subnode setFrame:subnodeFrame];
18561876
}
@@ -2293,11 +2313,6 @@ - (void)addSubnode:(ASDisplayNode *)node
22932313
}
22942314
}
22952315

2296-
- (NSString *)name
2297-
{
2298-
return self.asyncdisplaykit_node.name;
2299-
}
2300-
23012316
@end
23022317

23032318
@implementation CALayer (AsyncDisplayKit)
@@ -2307,11 +2322,6 @@ - (void)addSubnode:(ASDisplayNode *)node
23072322
[self addSublayer:node.layer];
23082323
}
23092324

2310-
- (NSString *)name
2311-
{
2312-
return self.asyncdisplaykit_node.name;
2313-
}
2314-
23152325
@end
23162326

23172327

‎AsyncDisplayKit/ASEditableTextNode.mm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ - (void)didLoad
124124
textView.opaque = NO;
125125
}
126126
textView.textContainerInset = self.textContainerInset;
127-
textView.clipsToBounds = NO; // We don't want selection handles cut off.
128127
};
129128

130129
// Create and configure the placeholder text view.

‎AsyncDisplayKit/ASMapNode.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111

1212
@interface ASMapNode : ASImageNode
1313

14-
- (instancetype)initWithCoordinate:(CLLocationCoordinate2D)coordinate NS_DESIGNATED_INITIALIZER;
14+
/**
15+
The current region of ASMapNode. This can be set at any time and ASMapNode will animate the change.
16+
*/
17+
@property (nonatomic, assign) MKCoordinateRegion region;
1518

1619
/**
1720
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.

0 commit comments

Comments
 (0)