transformed style values into properties and removed enums that were implementation details

YogaKit/UIView+YogaKit.h

@@ -15,44 +15,47 @@
 /**
   The property that decides if we should include this view when calculating layout. Defaults to YES.
  */
-@property (nonatomic, readwrite, assign, setter=yk_setIncludeInLayout:) BOOL yk_includeInLayout;
+@property (nonatomic, setter=yk_setIncludeInLayout:) BOOL yk_includeInLayout;
 
 /**
  The property that decides during layout/sizing whether or not yk_* properties should be applied. Defaults to NO.
  */
-@property (nonatomic, readwrite, assign, setter=yk_setUsesYoga:) BOOL yk_usesYoga;
+@property (nonatomic, setter=yk_setUsesYoga:) BOOL yk_usesYoga;
 
-- (void)yk_setDirection:(YKDirection)direction;
-- (void)yk_setFlexDirection:(YKFlexDirection)flexDirection;
-- (void)yk_setJustifyContent:(YKJustify)justifyContent;
-- (void)yk_setAlignContent:(YKAlign)alignContent;
-- (void)yk_setAlignItems:(YKAlign)alignItems;
-- (void)yk_setAlignSelf:(YKAlign)alignSelf;
-- (void)yk_setPositionType:(YKPositionType)positionType;
-- (void)yk_setFlexWrap:(YKWrap)flexWrap;
+@property (nonatomic, setter=yk_setDirection:) YKDirection yk_direction;
+@property (nonatomic, setter=yk_setFlexDirection:) YKFlexDirection yk_flexDirection;
+@property (nonatomic, setter=yk_setJustifyContent:) YKJustify yk_justifyContent;
+@property (nonatomic, setter=yk_setAlignContent:) YKAlign yk_alignContent;
+@property (nonatomic, setter=yk_setAlignItems:) YKAlign yk_alignItems;
+@property (nonatomic, setter=yk_setAlignSelf:) YKAlign yk_alignSelf;
+@property (nonatomic, setter=yk_setPositionType:) YKPositionType yk_positionType;
+@property (nonatomic, setter=yk_setFlexWrap:) YKWrap yk_flexWrap;
 
-- (void)yk_setFlexGrow:(CGFloat)flexGrow;
-- (void)yk_setFlexShrink:(CGFloat)flexShrink;
-- (void)yk_setFlexBasis:(CGFloat)flexBasis;
+@property (nonatomic, setter=yk_setFlexGrow:) CGFloat yk_flexGrow;
+@property (nonatomic, setter=yk_setFlexShrink:) CGFloat yk_flexShrink;
+@property (nonatomic, setter=yk_setFlexBasis:) CGFloat yk_flexBasis;
 
+- (void)yk_positionForEdge:(YKEdge)edge;
 - (void)yk_setPosition:(CGFloat)position forEdge:(YKEdge)edge;
+- (void)yk_marginForEdge:(YKEdge)edge;
 - (void)yk_setMargin:(CGFloat)margin forEdge:(YKEdge)edge;
+- (void)yk_paddingForEdge:(YKEdge)edge;
 - (void)yk_setPadding:(CGFloat)padding forEdge:(YKEdge)edge;
 
-- (void)yk_setWidth:(CGFloat)width;
-- (void)yk_setHeight:(CGFloat)height;
-- (void)yk_setMinWidth:(CGFloat)minWidth;
-- (void)yk_setMinHeight:(CGFloat)minHeight;
-- (void)yk_setMaxWidth:(CGFloat)maxWidth;
-- (void)yk_setMaxHeight:(CGFloat)maxHeight;
+@property (nonatomic, setter=yk_setWidth:) CGFloat yk_width;
+@property (nonatomic, setter=yk_setHeight:) CGFloat yk_height;
+@property (nonatomic, setter=yk_setMinWidth:) CGFloat yk_minWidth;
+@property (nonatomic, setter=yk_setMinHeight:) CGFloat yk_minHeight;
+@property (nonatomic, setter=yk_setMaxWidth:) CGFloat yk_maxWidth;
+@property (nonatomic, setter=yk_setMaxHeight:) CGFloat yk_maxHeight;
 
 // Yoga specific properties, not compatible with flexbox specification
-- (void)yk_setAspectRatio:(CGFloat)aspectRatio;
+@property (nonatomic, setter=yk_setAspectRatio:) CGFloat yk_aspectRatio;
 
 /**
  Get the resolved direction of this node. This won't be YGDirectionInherit
  */
-- (YKDirection)yk_resolvedDirection;
+@property (nonatomic, readonly) CGFloat yk_resolvedDirection;
 
 /**
  Perform a layout calculation and update the frames of the views in the hierarchy with the results
@@ -62,11 +65,11 @@
 /**
  Returns the size of the view if no constraints were given. This could equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
  */
-- (CGSize)yk_intrinsicSize;
+@property (nonatomic, readonly) CGSize yk_intrinsicSize;
 
 /**
  Returns the number of children that are using Flexbox.
  */
-- (NSUInteger)yk_numberOfChildren;
+@property (nonatomic, readonly) NSUInteger yk_numberOfChildren;
 
 @end

YogaKit/UIView+YogaKit.m

@@ -76,106 +76,211 @@
     OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
+- (YKDirection)yk_direction
+{
+  return (YKDirection)YGNodeStyleGetDirection([self ygNode]);
+}
+
 - (void)yk_setDirection:(YKDirection)direction
 {
   YGNodeStyleSetDirection([self ygNode], (YGDirection)direction);
 }
 
+- (YKFlexDirection)yk_flexDirection
+{
+  return (YKFlexDirection)YGNodeStyleGetFlexDirection([self ygNode]);
+}
+
 - (void)yk_setFlexDirection:(YKFlexDirection)flexDirection
 {
   YGNodeStyleSetFlexDirection([self ygNode], (YGFlexDirection)flexDirection);
 }
 
+- (YKJustify)yk_justifyContent
+{
+  return (YKJustify)YGNodeStyleGetJustifyContent([self ygNode]);
+}
+
 - (void)yk_setJustifyContent:(YKJustify)justifyContent
 {
   YGNodeStyleSetJustifyContent([self ygNode], (YGJustify)justifyContent);
 }
 
+- (YKAlign)yk_alignContent
+{
+  return (YKAlign)YGNodeStyleGetAlignContent([self ygNode]);
+}
+
 - (void)yk_setAlignContent:(YKAlign)alignContent
 {
   YGNodeStyleSetAlignContent([self ygNode], (YGAlign)alignContent);
 }
 
+- (YKAlign)yk_alignItems
+{
+  return (YKAlign)YGNodeStyleGetAlignItems([self ygNode]);
+}
+
 - (void)yk_setAlignItems:(YKAlign)alignItems
 {
   YGNodeStyleSetAlignItems([self ygNode], (YGAlign)alignItems);
 }
 
+- (YKAlign)yk_alignSelf
+{
+  return (YKAlign)YGNodeStyleGetAlignSelf([self ygNode]);
+}
+
 - (void)yk_setAlignSelf:(YKAlign)alignSelf
 {
   YGNodeStyleSetAlignSelf([self ygNode], (YGAlign)alignSelf);
 }
 
+- (YKPositionType)yk_positionType
+{
+  return (YKPositionType)YGNodeStyleGetPositionType([self ygNode]);
+}
+
 - (void)yk_setPositionType:(YKPositionType)positionType
 {
   YGNodeStyleSetPositionType([self ygNode], (YGPositionType)positionType);
 }
 
+- (YKWrap)yk_flexWrap
+{
+  return (YKWrap)YGNodeStyleGetFlexWrap([self ygNode]);
+}
+
 - (void)yk_setFlexWrap:(YKWrap)flexWrap
 {
   YGNodeStyleSetFlexWrap([self ygNode], (YGWrap)flexWrap);
 }
 
+- (CGFloat)yk_flexGrow
+{
+  return YGNodeStyleGetFlexGrow([self ygNode]);
+}
+
 - (void)yk_setFlexGrow:(CGFloat)flexGrow
 {
   YGNodeStyleSetFlexGrow([self ygNode], flexGrow);
 }
 
+- (CGFloat)yk_flexShrink
+{
+  return YGNodeStyleGetFlexShrink([self ygNode]);
+}
+
 - (void)yk_setFlexShrink:(CGFloat)flexShrink
 {
   YGNodeStyleSetFlexShrink([self ygNode], flexShrink);
 }
 
+- (CGFloat)yk_flexBasis
+{
+  return YGNodeStyleGetFlexBasis([self ygNode]);
+}
+
 - (void)yk_setFlexBasis:(CGFloat)flexBasis
 {
   YGNodeStyleSetFlexBasis([self ygNode], flexBasis);
 }
 
+- (CGFloat)yk_positionForEdge:(YKEdge)edge
+{
+  return YGNodeStyleGetPosition([self ygNode], (YGEdge)edge);
+}
+
 - (void)yk_setPosition:(CGFloat)position forEdge:(YKEdge)edge
 {
   YGNodeStyleSetPosition([self ygNode], (YGEdge)edge, position);
 }
 
+- (CGFloat)yk_marginForEdge:(YKEdge)edge
+{
+  return YGNodeStyleGetMargin([self ygNode], (YGEdge)edge);
+}
+
 - (void)yk_setMargin:(CGFloat)margin forEdge:(YKEdge)edge
 {
   YGNodeStyleSetMargin([self ygNode], (YGEdge)edge, margin);
 }
 
+- (CGFloat)yk_paddingForEdge:(YKEdge)edge
+{
+  return YGNodeStyleGetPadding([self ygNode], (YGEdge)edge);
+}
+
 - (void)yk_setPadding:(CGFloat)padding forEdge:(YKEdge)edge
 {
   YGNodeStyleSetPadding([self ygNode], (YGEdge)edge, padding);
 }
 
+- (CGFloat)yk_width
+{
+  return YGNodeStyleGetWidth([self ygNode]);
+}
+
 - (void)yk_setWidth:(CGFloat)width
 {
   YGNodeStyleSetWidth([self ygNode], width);
 }
 
+- (CGFloat)yk_height
+{
+  return YGNodeStyleGetHeight([self ygNode]);
+}
+
 - (void)yk_setHeight:(CGFloat)height
 {
   YGNodeStyleSetHeight([self ygNode], height);
 }
 
+- (CGFloat)yk_minWidth
+{
+  return YGNodeStyleGetMinWidth([self ygNode]);
+}
+
 - (void)yk_setMinWidth:(CGFloat)minWidth
 {
   YGNodeStyleSetMinWidth([self ygNode], minWidth);
 }
 
+- (CGFloat)yk_minHeight
+{
+  return YGNodeStyleGetMinHeight([self ygNode]);
+}
+
 - (void)yk_setMinHeight:(CGFloat)minHeight
 {
   YGNodeStyleSetMinHeight([self ygNode], minHeight);
 }
 
+- (CGFloat)yk_maxWidth
+{
+  return YGNodeStyleGetMaxWidth([self ygNode]);
+}
+
 - (void)yk_setMaxWidth:(CGFloat)maxWidth
 {
   YGNodeStyleSetMaxWidth([self ygNode], maxWidth);
 }
 
+- (CGFloat)yk_maxHeight
+{
+  return YGNodeStyleGetMaxHeight([self ygNode]);
+}
+
 - (void)yk_setMaxHeight:(CGFloat)maxHeight
 {
   YGNodeStyleSetMaxHeight([self ygNode], maxHeight);
 }
 
+- (CGFloat)yk_aspectRatio
+{
+  return YGNodeStyleGetAspectRatio([self ygNode]);
+}
+
 - (void)yk_setAspectRatio:(CGFloat)aspectRatio
 {
   YGNodeStyleSetAspectRatio([self ygNode], aspectRatio);

YogaKit/YKEnums.h

@@ -14,18 +14,6 @@ typedef NS_ENUM(NSInteger, YKFlexDirection) {
   YKFlexDirectionRowReverse,
 };
 
-typedef NS_ENUM(NSInteger, YKMeasureMode) {
-  YKMeasureModeUndefined,
-  YKMeasureModeExactly,
-  YKMeasureModeAtMost,
-};
-
-typedef NS_ENUM(NSInteger, YKPrintOptions) {
-  YKPrintOptionsLayout = 1,
-  YKPrintOptionsStyle = 2,
-  YKPrintOptionsChildren = 4,
-};
-
 typedef NS_ENUM(NSInteger, YKEdge) {
   YKEdgeLeft,
   YKEdgeTop,
@@ -43,11 +31,6 @@ typedef NS_ENUM(NSInteger, YKPositionType) {
   YKPositionTypeAbsolute,
 };
 
-typedef NS_ENUM(NSInteger, YKDimension) {
-  YKDimensionWidth,
-  YKDimensionHeight,
-};
-
 typedef NS_ENUM(NSInteger, YKJustify) {
   YKJustifyFlexStart,
   YKJustifyCenter,
@@ -62,30 +45,11 @@ typedef NS_ENUM(NSInteger, YKDirection) {
   YKDirectionRightToLeft,
 };
 
-typedef NS_ENUM(NSInteger, YKLogLevel) {
-  YKLogLevelError,
-  YKLogLevelWarn,
-  YKLogLevelInfo,
-  YKLogLevelDebug,
-  YKLogLevelVerbose,
-};
-
 typedef NS_ENUM(NSInteger, YKWrap) {
   YKWrapNoWrap,
   YKWrapWrap,
 };
 
-typedef NS_ENUM(NSInteger, YKOverflow) {
-  YKOverflowVisible,
-  YKOverflowHidden,
-  YKOverflowScroll,
-};
-
-typedef NS_ENUM(NSInteger, YKExperimentalFeature) {
-  YKExperimentalFeatureRounding,
-  YKExperimentalFeatureWebFlexBasis,
-};
-
 typedef NS_ENUM(NSInteger, YKAlign) {
   YKAlignAuto,
   YKAlignFlexStart,

YogaKit/YogaKit/YogaKit/YogaKit.h

@@ -15,3 +15,4 @@ FOUNDATION_EXPORT double YogaKitVersionNumber;
 FOUNDATION_EXPORT const unsigned char YogaKitVersionString[];
 
 #import <YogaKit/UIView+YogaKit.h>
+#import <YogaKit/YKEnums.h>

enums.py

@@ -94,7 +94,13 @@ OBJC_ENUMS = {
         'Inherit',
         'LeftToRight',
         'RightToLeft',
-    ]
+    ],
+    'MeasureMode': None,
+    'PrintOptions': None,
+    'Dimension': None,
+    'LogLevel': None,
+    'Overflow': None,
+    'ExperimentalFeature': None
 }
 
 LICENSE = """/**
@@ -202,11 +208,12 @@ with open(root + '/YogaKit/YKEnums.h', 'w') as f:
     objc_enums.update(OBJC_ENUMS)
     f.write(LICENSE)
     for name, values in objc_enums.items():
-        f.write('typedef NS_ENUM(NSInteger, YK%s) {\n' % name)
-        for value in values:
-            if isinstance(value, tuple):
-                f.write('  YK%s%s = %d,\n' % (name, value[0], value[1]))
-            else:
-                f.write('  YK%s%s,\n' % (name, value))
-        f.write('};\n')
-        f.write('\n')
+        if values is not None:
+            f.write('typedef NS_ENUM(NSInteger, YK%s) {\n' % name)
+            for value in values:
+                if isinstance(value, tuple):
+                    f.write('  YK%s%s = %d,\n' % (name, value[0], value[1]))
+                else:
+                    f.write('  YK%s%s,\n' % (name, value))
+            f.write('};\n')
+            f.write('\n')