This commit is contained in:
Ali 2019-11-05 00:23:36 +04:00
parent 0b18cddbb8
commit 3b4177a2af
3 changed files with 10 additions and 6 deletions

View File

@ -6,13 +6,14 @@ ASYNCDISPLAYKIT_EXPORTED_HEADERS = glob([
"Source/Base/*.h", "Source/Base/*.h",
"Source/Debug/AsyncDisplayKit+Debug.h", "Source/Debug/AsyncDisplayKit+Debug.h",
"Source/TextKit/ASTextNodeTypes.h", "Source/TextKit/ASTextNodeTypes.h",
"Source/TextKit/ASTextKitComponents.h" "Source/TextKit/ASTextKitComponents.h",
], exclude = ["Source/AsyncDisplayKit.h"]) ], exclude = ["_Source/AsyncDisplayKit.h"]
)
ASYNCDISPLAYKIT_PRIVATE_HEADERS = glob([ ASYNCDISPLAYKIT_PRIVATE_HEADERS = glob([
"Source/**/*.h" "Source/**/*.h"
], ],
exclude = ASYNCDISPLAYKIT_EXPORTED_HEADERS + ["Source/AsyncDisplayKit.h"], exclude = ASYNCDISPLAYKIT_EXPORTED_HEADERS + ["_Source/AsyncDisplayKit.h"],
) )
exported_headers_rule_name = "AsyncDisplayKit_ExportedHeaders" exported_headers_rule_name = "AsyncDisplayKit_ExportedHeaders"
@ -48,7 +49,7 @@ objc_library(
"Source/**/*.m", "Source/**/*.m",
"Source/**/*.mm", "Source/**/*.mm",
"Source/Base/*.m", "Source/Base/*.m",
]) + private_headers, ]) + ASYNCDISPLAYKIT_EXPORTED_HEADERS + ASYNCDISPLAYKIT_PRIVATE_HEADERS + private_headers,
hdrs = exported_headers, hdrs = exported_headers,
defines = [ defines = [
"MINIMAL_ASDK", "MINIMAL_ASDK",

View File

@ -6,6 +6,8 @@
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
// //
#if YOGA
#import "AsyncDisplayKit/ASAvailability.h" #import "AsyncDisplayKit/ASAvailability.h"
#import "ASButtonNode+Yoga.h" #import "ASButtonNode+Yoga.h"
#import <AsyncDisplayKit/ASButtonNode+Private.h> #import <AsyncDisplayKit/ASButtonNode+Private.h>
@ -13,7 +15,6 @@
#import <AsyncDisplayKit/ASStackLayoutSpecUtilities.h> #import <AsyncDisplayKit/ASStackLayoutSpecUtilities.h>
#import <AsyncDisplayKit/ASThread.h> #import <AsyncDisplayKit/ASThread.h>
#if YOGA
static void ASButtonNodeResolveHorizontalAlignmentForStyle(ASLayoutElementStyle *style, ASStackLayoutDirection _direction, ASHorizontalAlignment _horizontalAlignment, ASStackLayoutJustifyContent _justifyContent, ASStackLayoutAlignItems _alignItems) { static void ASButtonNodeResolveHorizontalAlignmentForStyle(ASLayoutElementStyle *style, ASStackLayoutDirection _direction, ASHorizontalAlignment _horizontalAlignment, ASStackLayoutJustifyContent _justifyContent, ASStackLayoutAlignItems _alignItems) {
if (_direction == ASStackLayoutDirectionHorizontal) { if (_direction == ASStackLayoutDirectionHorizontal) {
style.justifyContent = justifyContent(_horizontalAlignment, _justifyContent); style.justifyContent = justifyContent(_horizontalAlignment, _justifyContent);
@ -97,6 +98,8 @@ static void ASButtonNodeResolveVerticalAlignmentForStyle(ASLayoutElementStyle *s
#else #else
#import <AsyncDisplayKit/ASButtonNode+Private.h>
@implementation ASButtonNode (Yoga) @implementation ASButtonNode (Yoga)
- (void)updateYogaLayoutIfNeeded {} - (void)updateYogaLayoutIfNeeded {}

View File

@ -7,7 +7,7 @@
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0 // Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
// //
#import <AsyncDisplayKit/Base/ASAvailability.h> #import <AsyncDisplayKit/ASAvailability.h>
#import <AsyncDisplayKit/ASAvailability.h> #import <AsyncDisplayKit/ASAvailability.h>
#import <AsyncDisplayKit/ASHashing.h> #import <AsyncDisplayKit/ASHashing.h>
#import <AsyncDisplayKit/ASTraitCollection.h> #import <AsyncDisplayKit/ASTraitCollection.h>