From 68f7001ed4cd8f19f7e20e714dfe2f5d0a1190ab Mon Sep 17 00:00:00 2001 From: CangZhu Date: Tue, 29 Jan 2019 12:20:33 -0800 Subject: [PATCH] feat: expose flex prop to YogaKit (#844) Summary: This exposes `yoga` property to `YogaKit` Pull Request resolved: https://github.com/facebook/yoga/pull/844 Reviewed By: SidharthGuglani Differential Revision: D13849076 Pulled By: davidaurelio fbshipit-source-id: 560986c2235dfd28d287f61b2e784c9eef6c5eda --- YogaKit/Source/YGLayout.h | 1 + YogaKit/Source/YGLayout.m | 1 + 2 files changed, 2 insertions(+) diff --git a/YogaKit/Source/YGLayout.h b/YogaKit/Source/YGLayout.h index 8aff3b5e..c8ee2e84 100644 --- a/YogaKit/Source/YGLayout.h +++ b/YogaKit/Source/YGLayout.h @@ -62,6 +62,7 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) { @property (nonatomic, readwrite, assign) YGOverflow overflow; @property (nonatomic, readwrite, assign) YGDisplay display; +@property (nonatomic, readwrite, assign) CGFloat flex; @property (nonatomic, readwrite, assign) CGFloat flexGrow; @property (nonatomic, readwrite, assign) CGFloat flexShrink; @property (nonatomic, readwrite, assign) YGValue flexBasis; diff --git a/YogaKit/Source/YGLayout.m b/YogaKit/Source/YGLayout.m index 7779c437..e333765f 100644 --- a/YogaKit/Source/YGLayout.m +++ b/YogaKit/Source/YGLayout.m @@ -229,6 +229,7 @@ YG_PROPERTY(YGWrap, flexWrap, FlexWrap) YG_PROPERTY(YGOverflow, overflow, Overflow) YG_PROPERTY(YGDisplay, display, Display) +YG_PROPERTY(CGFloat, flex, Flex) YG_PROPERTY(CGFloat, flexGrow, FlexGrow) YG_PROPERTY(CGFloat, flexShrink, FlexShrink) YG_AUTO_VALUE_PROPERTY(flexBasis, FlexBasis)