Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit 2d9064d

Browse files
committed
Merge pull request #932 from garrettmoon/exposeRecursivelyEnsureDisplay
Introduce ASDisplayNode+Beta.h - Expose recursivelyEnsureDisplay
2 parents c9a0a3d + 082dc1c commit 2d9064d

2 files changed

Lines changed: 26 additions & 1 deletion

File tree

AsyncDisplayKit.xcodeproj/project.pbxproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,8 @@
255255
509E68641B3AEDB7009B9150 /* ASCollectionViewLayoutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E1C1B373A2C007741D0 /* ASCollectionViewLayoutController.mm */; };
256256
509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1F1B376416007741D0 /* CGRect+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; };
257257
509E68661B3AEDD7009B9150 /* CGRect+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E201B376416007741D0 /* CGRect+ASConvenience.m */; };
258+
68B0277A1C1A79CC0041016B /* ASDisplayNode+Beta.h in Headers */ = {isa = PBXBuildFile; fileRef = 68B027791C1A79CC0041016B /* ASDisplayNode+Beta.h */; settings = {ATTRIBUTES = (Public, ); }; };
259+
68B0277B1C1A79D60041016B /* ASDisplayNode+Beta.h in Headers */ = {isa = PBXBuildFile; fileRef = 68B027791C1A79CC0041016B /* ASDisplayNode+Beta.h */; settings = {ATTRIBUTES = (Public, ); }; };
258260
6BDC61F61979037800E50D21 /* AsyncDisplayKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
259261
92DD2FE31BF4B97E0074C9DD /* ASMapNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 92DD2FE11BF4B97E0074C9DD /* ASMapNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
260262
92DD2FE41BF4B97E0074C9DD /* ASMapNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 92DD2FE21BF4B97E0074C9DD /* ASMapNode.mm */; };
@@ -531,7 +533,7 @@
531533
058D09D7195D050800B7D73C /* ASControlNode+Subclasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASControlNode+Subclasses.h"; sourceTree = "<group>"; };
532534
058D09D8195D050800B7D73C /* ASDisplayNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ASDisplayNode.h; sourceTree = "<group>"; };
533535
058D09D9195D050800B7D73C /* ASDisplayNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = ASDisplayNode.mm; sourceTree = "<group>"; };
534-
058D09DA195D050800B7D73C /* ASDisplayNode+Subclasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "ASDisplayNode+Subclasses.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
536+
058D09DA195D050800B7D73C /* ASDisplayNode+Subclasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "ASDisplayNode+Subclasses.h"; sourceTree = "<group>"; };
535537
058D09DB195D050800B7D73C /* ASDisplayNodeExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASDisplayNodeExtras.h; sourceTree = "<group>"; };
536538
058D09DC195D050800B7D73C /* ASDisplayNodeExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASDisplayNodeExtras.mm; sourceTree = "<group>"; };
537539
058D09DD195D050800B7D73C /* ASImageNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASImageNode.h; sourceTree = "<group>"; };
@@ -659,6 +661,7 @@
659661
4640521B1A3F83C40061C0BA /* ASFlowLayoutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASFlowLayoutController.h; sourceTree = "<group>"; };
660662
4640521C1A3F83C40061C0BA /* ASFlowLayoutController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASFlowLayoutController.mm; sourceTree = "<group>"; };
661663
4640521D1A3F83C40061C0BA /* ASLayoutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutController.h; sourceTree = "<group>"; };
664+
68B027791C1A79CC0041016B /* ASDisplayNode+Beta.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASDisplayNode+Beta.h"; sourceTree = "<group>"; };
662665
6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; path = AsyncDisplayKit.h; sourceTree = "<group>"; };
663666
92DD2FE11BF4B97E0074C9DD /* ASMapNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMapNode.h; sourceTree = "<group>"; };
664667
92DD2FE21BF4B97E0074C9DD /* ASMapNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASMapNode.mm; sourceTree = "<group>"; };
@@ -872,6 +875,7 @@
872875
058D09D7195D050800B7D73C /* ASControlNode+Subclasses.h */,
873876
058D09D8195D050800B7D73C /* ASDisplayNode.h */,
874877
058D09D9195D050800B7D73C /* ASDisplayNode.mm */,
878+
68B027791C1A79CC0041016B /* ASDisplayNode+Beta.h */,
875879
058D09DA195D050800B7D73C /* ASDisplayNode+Subclasses.h */,
876880
058D09DB195D050800B7D73C /* ASDisplayNodeExtras.h */,
877881
058D09DC195D050800B7D73C /* ASDisplayNodeExtras.mm */,
@@ -1257,6 +1261,7 @@
12571261
058D0A84195D060300B7D73C /* ASDisplayNodeExtraIvars.h in Headers */,
12581262
AC7A2C171BDE11DF0093FE1A /* ASTableViewInternal.h in Headers */,
12591263
058D0A4D195D05CB00B7D73C /* ASDisplayNodeExtras.h in Headers */,
1264+
68B0277A1C1A79CC0041016B /* ASDisplayNode+Beta.h in Headers */,
12601265
257754B11BEE44CD00737CA5 /* ASTextKitShadower.h in Headers */,
12611266
058D0A7B195D05F900B7D73C /* ASDisplayNodeInternal.h in Headers */,
12621267
0587F9BD1A7309ED00AFF0BA /* ASEditableTextNode.h in Headers */,
@@ -1419,6 +1424,7 @@
14191424
34EFC76E1B701CF400AD841F /* ASRatioLayoutSpec.h in Headers */,
14201425
34EFC7651B701CCC00AD841F /* ASRelativeSize.h in Headers */,
14211426
254C6B741BF94DF4003EC431 /* ASTextNodeWordKerner.h in Headers */,
1427+
68B0277B1C1A79D60041016B /* ASDisplayNode+Beta.h in Headers */,
14221428
B350622D1B010EFD0018CF92 /* ASScrollDirection.h in Headers */,
14231429
254C6B751BF94DF4003EC431 /* ASTextKitHelpers.h in Headers */,
14241430
B35062081B010EFD0018CF92 /* ASScrollNode.h in Headers */,
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* Copyright (c) 2014-present, Facebook, Inc.
2+
* All rights reserved.
3+
*
4+
* This source code is licensed under the BSD-style license found in the
5+
* LICENSE file in the root directory of this source tree. An additional grant
6+
* of patent rights can be found in the PATENTS file in the same directory.
7+
*/
8+
9+
@interface ASDisplayNode (Beta)
10+
11+
/** @name Layout */
12+
13+
14+
/**
15+
* @abstract Recursively ensures node and all subnodes are displayed.
16+
*/
17+
- (void)recursivelyEnsureDisplay;
18+
19+
@end

0 commit comments

Comments
 (0)