@triniwiz/nativescript-masonkit 1.0.0-alpha.35 → 1.0.0-alpha.36

package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/Mason-Swift.h

@@ -285,6 +285,7 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 @import CoreGraphics;
 @import Foundation;
 @import ObjectiveC;
+@import QuartzCore;
 @import UIKit;
 #endif
 
@@ -350,11 +351,28 @@ typedef SWIFT_ENUM_NAMED(NSInteger, MasonAlignSelf, "AlignSelf", open) {
   MasonAlignSelfFlexEnd = 6,
 };
 
+@class NSCoder;
+SWIFT_CLASS("_TtC5Mason17BackgroundCALayer")
+@interface BackgroundCALayer : CALayer
+- (void)drawInContext:(CGContextRef _Nonnull)ctx;
+- (void)layoutSublayers;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+- (nonnull instancetype)initWithLayer:(id _Nonnull)layer OBJC_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder OBJC_DESIGNATED_INITIALIZER;
+@end
+
 typedef SWIFT_ENUM_NAMED(NSInteger, MasonBoxSizing, "BoxSizing", open) {
   MasonBoxSizingBorderBox = 0,
   MasonBoxSizingContentBox = 1,
 };
 
+typedef SWIFT_ENUM_NAMED(NSInteger, MasonClear, "Clear", open) {
+  MasonClearNone = 0,
+  MasonClearLeft = 1,
+  MasonClearRight = 2,
+  MasonClearBoth = 3,
+};
+
 typedef SWIFT_ENUM_NAMED(NSInteger, MasonDecorationLine, "DecorationLine", open) {
   MasonDecorationLineNone = 0,
   MasonDecorationLineUnderline = 1,
@@ -451,7 +469,6 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MasonGridTra
 
 @class MasonStyle;
 @class MasonNode;
-@class UIView;
 SWIFT_PROTOCOL("_TtP5Mason16MasonElementObjc_")
 @protocol MasonElementObjc <NSObject>
 @property (nonatomic, readonly, strong) MasonStyle * _Nonnull style;
@@ -462,21 +479,22 @@ SWIFT_PROTOCOL("_TtP5Mason16MasonElementObjc_")
 @class NSCMason;
 enum MasonLoadingState : NSInteger;
 @class UIImage;
-@class NSCoder;
 SWIFT_CLASS_NAMED("Img")
-@interface MasonImg : UIImageView <MasonElementObjc>
+@interface MasonImg : UIView <MasonElementObjc>
 @property (nonatomic, readonly, strong) MasonNode * _Nonnull node;
 @property (nonatomic, readonly, strong) NSCMason * _Nonnull mason;
 @property (nonatomic, readonly, strong) UIView * _Nonnull uiView;
 @property (nonatomic, readonly, strong) MasonStyle * _Nonnull style;
 @property (nonatomic, copy) void (^ _Nullable didLayout)(void);
 @property (nonatomic, copy) void (^ _Nullable onStateChange)(enum MasonLoadingState, NSError * _Nullable);
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) Class _Nonnull layerClass;)
++ (Class _Nonnull)layerClass SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic, strong) UIImage * _Nullable image;
+- (void)requestLayout;
+- (void)setNeedsDisplay;
 @property (nonatomic, copy) NSString * _Nullable src;
 - (void)updateImage:(UIImage * _Nullable)image;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
-- (nonnull instancetype)initWithImage:(UIImage * _Nullable)image SWIFT_UNAVAILABLE;
-- (nonnull instancetype)initWithImage:(UIImage * _Nullable)image highlightedImage:(UIImage * _Nullable)highlightedImage SWIFT_UNAVAILABLE;
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
 
@@ -608,6 +626,20 @@ SWIFT_CLASS_NAMED("MasonDocument")
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
+typedef SWIFT_ENUM_NAMED(NSInteger, MasonFloat, "MasonFloat", open) {
+  MasonFloatNone = 0,
+  MasonFloatLeft = 1,
+  MasonFloatRight = 2,
+};
+
+SWIFT_CLASS("_TtC5Mason15MasonImageLayer")
+@interface MasonImageLayer : CALayer
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
+- (void)drawInContext:(CGContextRef _Nonnull)context;
+- (nonnull instancetype)initWithLayer:(id _Nonnull)layer SWIFT_UNAVAILABLE;
+@end
+
 SWIFT_CLASS_NAMED("MasonLayout")
 @interface MasonLayout : NSObject
 @property (nonatomic, readonly) NSInteger order;
@@ -768,6 +800,7 @@ SWIFT_CLASS_NAMED("MasonOverflowPointCompat")
 
 @class NSCFontFace;
 @class NSMutableData;
+enum MasonObjectFit : NSInteger;
 @class UIColor;
 enum MasonTextJustify : NSInteger;
 @class MasonTextOverflowCompat;
@@ -776,16 +809,19 @@ enum MasonWhiteSpace : NSInteger;
 enum MasonTextWrap : NSInteger;
 enum MasonPosition : NSInteger;
 enum MasonTextAlign : NSInteger;
-@class MinMax;
-@class TrackSizingFunction;
 SWIFT_CLASS_NAMED("MasonStyle")
 @interface MasonStyle : NSObject
 @property (nonatomic, readonly, strong) NSCFontFace * _Nonnull font;
 @property (nonatomic, strong) NSMutableData * _Nonnull values;
 @property (nonatomic, strong) NSMutableData * _Nonnull textValues;
 - (nonnull instancetype)initWithNode:(MasonNode * _Nonnull)node OBJC_DESIGNATED_INITIALIZER;
+@property (nonatomic) enum MasonObjectFit objectFit;
+@property (nonatomic, getter=float, setter=setFloat:) enum MasonFloat float_;
+@property (nonatomic) enum MasonClear clear;
 @property (nonatomic) uint32_t color;
 - (void)setColorWithUi:(UIColor * _Nonnull)color;
+@property (nonatomic, copy) NSString * _Nonnull filter;
+@property (nonatomic, copy) NSString * _Nonnull background;
 @property (nonatomic) uint32_t backgroundColor;
 - (void)setBackgroundColorWithUi:(UIColor * _Nonnull)color;
 - (void)setLineHeight:(float)value :(BOOL)isRelative;
@@ -798,6 +834,7 @@ SWIFT_CLASS_NAMED("MasonStyle")
 - (void)setFontStyle:(enum MasonFontStyle)style :(int32_t)slant;
 @property (nonatomic) enum MasonTextJustify textJustify;
 @property (nonatomic) enum MasonFontStyle fontStyle;
+@property (nonatomic, copy) NSString * _Nonnull fontFamily;
 @property (nonatomic, copy) NSString * _Nonnull fontWeight;
 @property (nonatomic, strong) MasonTextOverflowCompat * _Nonnull textOverflowCompat;
 @property (nonatomic) enum MasonTextTransform textTransform;
@@ -835,12 +872,13 @@ SWIFT_CLASS_NAMED("MasonStyle")
 - (void)setPaddingTop:(float)value :(NSInteger)type;
 - (void)setPaddingBottom:(float)value :(NSInteger)type;
 - (void)setPaddingWithValueType:(float)value :(NSInteger)type;
-@property (nonatomic, strong) MasonLengthPercentageRectCompat * _Nonnull borderCompat;
-- (void)setBorderLeft:(float)value :(NSInteger)type;
-- (void)setBorderRight:(float)value :(NSInteger)type;
-- (void)setBorderTop:(float)value :(NSInteger)type;
-- (void)setBorderBottom:(float)value :(NSInteger)type;
-- (void)setBorderWithValueType:(float)value :(NSInteger)type;
+@property (nonatomic, copy) NSString * _Nonnull border;
+@property (nonatomic, strong) MasonLengthPercentageRectCompat * _Nonnull borderWidthCompat;
+- (void)setBorderLeftWidth:(float)value :(NSInteger)type;
+- (void)setBorderRightWidth:(float)value :(NSInteger)type;
+- (void)setBorderTopWidth:(float)value :(NSInteger)type;
+- (void)setBorderBottomWidth:(float)value :(NSInteger)type;
+- (void)setBorderWidth:(float)value :(NSInteger)type;
 @property (nonatomic) float flexGrow;
 @property (nonatomic) float flexShrink;
 - (void)setFlexBasis:(float)value :(NSInteger)type;
@@ -867,19 +905,19 @@ SWIFT_CLASS_NAMED("MasonStyle")
 - (void)setGapColumn:(float)value :(NSInteger)type;
 - (void)setRowGap:(float)value :(NSInteger)type;
 - (void)setColumnGap:(float)value :(NSInteger)type;
-@property (nonatomic, copy) NSArray<MinMax *> * _Nonnull gridAutoRows;
-@property (nonatomic, copy) NSArray<MinMax *> * _Nonnull gridAutoColumns;
+@property (nonatomic, copy) NSString * _Nonnull gridArea;
+@property (nonatomic, copy) NSString * _Nonnull gridTemplateAreas;
+@property (nonatomic, copy) NSString * _Nonnull gridAutoRows;
+@property (nonatomic, copy) NSString * _Nonnull gridAutoColumns;
 @property (nonatomic) enum MasonGridAutoFlowWrap gridAutoFlow;
-@property (nonatomic, strong) LineGridPlacementCompat * _Nonnull gridColumnCompat;
-@property (nonatomic, strong) GridPlacementCompat * _Nonnull gridColumnStartCompat;
-@property (nonatomic, strong) GridPlacementCompat * _Nonnull gridColumnEndCompat;
-@property (nonatomic, strong) LineGridPlacementCompat * _Nonnull gridRowCompat;
-@property (nonatomic, strong) GridPlacementCompat * _Nonnull gridRowStartCompat;
-@property (nonatomic, strong) GridPlacementCompat * _Nonnull gridRowEndCompat;
-@property (nonatomic, readonly, copy) NSString * _Nonnull gridTemplateRowsCSS;
-@property (nonatomic, copy) NSArray<TrackSizingFunction *> * _Nonnull gridTemplateRows;
-@property (nonatomic, readonly, copy) NSString * _Nonnull gridTemplateColumnsCSS;
-@property (nonatomic, copy) NSArray<TrackSizingFunction *> * _Nonnull gridTemplateColumns;
+@property (nonatomic, copy) NSString * _Nonnull gridColumn;
+@property (nonatomic, copy) NSString * _Nonnull gridColumnStart;
+@property (nonatomic, copy) NSString * _Nonnull gridColumnEnd;
+@property (nonatomic, copy) NSString * _Nonnull gridRow;
+@property (nonatomic, copy) NSString * _Nonnull gridRowStart;
+@property (nonatomic, copy) NSString * _Nonnull gridRowEnd;
+@property (nonatomic, copy) NSString * _Nonnull gridTemplateRows;
+@property (nonatomic, copy) NSString * _Nonnull gridTemplateColumns;
 - (void)updateNativeStyle;
 @property (nonatomic, readonly, copy) NSString * _Nonnull description;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
@@ -891,6 +929,8 @@ SWIFT_CLASS_NAMED("MasonText")
 @interface MasonText : UIView <MasonElementObjc>
 @property (nonatomic, readonly, strong) MasonNode * _Nonnull node;
 @property (nonatomic, readonly) enum MasonTextType type;
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) Class _Nonnull layerClass;)
++ (Class _Nonnull)layerClass SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic, readonly, strong) NSMutableData * _Nonnull textValues;
 @property (nonatomic, readonly, strong) UIView * _Nonnull uiView;
 @property (nonatomic, readonly, strong) MasonStyle * _Nonnull style;
@@ -917,6 +957,8 @@ SWIFT_CLASS_NAMED("MasonText")
 @property (nonatomic) enum MasonWhiteSpace whiteSpace;
 @property (nonatomic) enum MasonTextWrap textWrap;
 @property (nonatomic) float lineHeight;
+/// Text content - sets or gets the concatenated text from all text nodes
+@property (nonatomic, copy) NSString * _Nonnull textContent;
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
 
@@ -924,20 +966,19 @@ SWIFT_CLASS_NAMED("MasonText")
 - (void)addChild:(MasonNode * _Nonnull)child;
 @end
 
-@interface MasonText (SWIFT_EXTENSION(Mason))
-/// Text content - sets or gets the concatenated text from all text nodes
-@property (nonatomic, copy) NSString * _Nonnull text;
-@end
-
-@interface MasonText (SWIFT_EXTENSION(Mason))
-- (void)drawRect:(CGRect)rect;
-@end
-
 @interface MasonText (SWIFT_EXTENSION(Mason))
 /// Remove child from text container
 - (MasonNode * _Nullable)removeChild:(MasonNode * _Nonnull)child;
 @end
 
+SWIFT_CLASS("_TtC5Mason14MasonTextLayer")
+@interface MasonTextLayer : CALayer
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
+- (void)drawInContext:(CGContextRef _Nonnull)context;
+- (nonnull instancetype)initWithLayer:(id _Nonnull)layer SWIFT_UNAVAILABLE;
+@end
+
 SWIFT_CLASS_NAMED("MasonTextNode")
 @interface MasonTextNode : MasonNode <MasonCharacterData>
 @property (nonatomic, copy) NSString * _Nonnull data;
@@ -994,6 +1035,7 @@ SWIFT_CLASS_NAMED("MasonUIView")
 - (void)addSubviews:(NSArray<UIView *> * _Nonnull)views;
 - (void)addSubviews:(NSArray<UIView *> * _Nonnull)views at:(NSInteger)index;
 @property (nonatomic) BOOL inBatch;
+@property (nonatomic, copy) NSString * _Nonnull background;
 @property (nonatomic) enum MasonDisplay display;
 @property (nonatomic) enum MasonPosition _position;
 @property (nonatomic) enum MasonDirection direction;
@@ -1012,17 +1054,19 @@ SWIFT_CLASS_NAMED("MasonUIView")
 @property (nonatomic, strong) MasonDimensionCompat * _Nonnull scrollBarWidthCompat;
 @property (nonatomic, strong) MasonDimensionCompat * _Nonnull flexBasisCompat;
 @property (nonatomic) float aspectRatio;
-@property (nonatomic, copy) NSArray<MinMax *> * _Nonnull gridAutoRows;
-@property (nonatomic, copy) NSArray<MinMax *> * _Nonnull gridAutoColumns;
+@property (nonatomic, copy) NSString * _Nonnull gridArea;
+@property (nonatomic, copy) NSString * _Nonnull gridTemplateAreas;
+@property (nonatomic, copy) NSString * _Nonnull gridAutoRows;
+@property (nonatomic, copy) NSString * _Nonnull gridAutoColumns;
 @property (nonatomic) enum MasonGridAutoFlowWrap gridAutoFlow;
-@property (nonatomic, strong) LineGridPlacementCompat * _Nonnull gridColumnCompat;
-@property (nonatomic, strong) GridPlacementCompat * _Nonnull gridColumnStartCompat;
-@property (nonatomic, strong) GridPlacementCompat * _Nonnull gridColumnEndCompat;
-@property (nonatomic, strong) LineGridPlacementCompat * _Nonnull gridRowCompat;
-@property (nonatomic, strong) GridPlacementCompat * _Nonnull gridRowStartCompat;
-@property (nonatomic, strong) GridPlacementCompat * _Nonnull gridRowEndCompat;
-@property (nonatomic, copy) NSArray<TrackSizingFunction *> * _Nonnull gridTemplateRows;
-@property (nonatomic, copy) NSArray<TrackSizingFunction *> * _Nonnull gridTemplateColumns;
+@property (nonatomic, copy) NSString * _Nonnull gridColumn;
+@property (nonatomic, copy) NSString * _Nonnull gridColumnStart;
+@property (nonatomic, copy) NSString * _Nonnull gridColumnEnd;
+@property (nonatomic, copy) NSString * _Nonnull gridRow;
+@property (nonatomic, copy) NSString * _Nonnull gridRowStart;
+@property (nonatomic, copy) NSString * _Nonnull gridRowEnd;
+@property (nonatomic, copy) NSString * _Nonnull gridTemplateRows;
+@property (nonatomic, copy) NSString * _Nonnull gridTemplateColumns;
 - (void)setPadding:(float)left :(float)right :(float)top :(float)bottom;
 - (MasonLengthPercentageRectCompat * _Nonnull)getPadding SWIFT_WARN_UNUSED_RESULT;
 - (void)setPaddingLeft:(float)left :(NSInteger)type;
@@ -1033,12 +1077,12 @@ SWIFT_CLASS_NAMED("MasonUIView")
 - (MasonLengthPercentageCompat * _Nonnull)getPaddingRight SWIFT_WARN_UNUSED_RESULT;
 - (MasonLengthPercentageCompat * _Nonnull)getPaddingTop SWIFT_WARN_UNUSED_RESULT;
 - (MasonLengthPercentageCompat * _Nonnull)getPaddingBottom SWIFT_WARN_UNUSED_RESULT;
-- (void)setBorder:(float)left :(float)top :(float)right :(float)bottom;
-- (MasonLengthPercentageRectCompat * _Nonnull)getBorder SWIFT_WARN_UNUSED_RESULT;
-- (void)setBorderLeft:(float)left :(NSInteger)type;
-- (void)setBorderRight:(float)right :(NSInteger)type;
-- (void)setBorderTop:(float)top :(NSInteger)type;
-- (void)setBorderBottom:(float)bottom :(NSInteger)type;
+- (void)setBorderWidth:(float)left :(float)top :(float)right :(float)bottom;
+- (MasonLengthPercentageRectCompat * _Nonnull)getBorderWidth SWIFT_WARN_UNUSED_RESULT;
+- (void)setBorderLeftWidth:(float)left :(NSInteger)type;
+- (void)setBorderRightWidth:(float)right :(NSInteger)type;
+- (void)setBorderTopWidth:(float)top :(NSInteger)type;
+- (void)setBorderBottomWidth:(float)bottom :(NSInteger)type;
 - (MasonLengthPercentageCompat * _Nonnull)getBorderLeft SWIFT_WARN_UNUSED_RESULT;
 - (MasonLengthPercentageCompat * _Nonnull)getBorderRight SWIFT_WARN_UNUSED_RESULT;
 - (MasonLengthPercentageCompat * _Nonnull)getBorderBottom SWIFT_WARN_UNUSED_RESULT;
@@ -1250,6 +1294,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) NSCMason * _Nonnull sh
 + (NSCMason * _Nonnull)shared SWIFT_WARN_UNUSED_RESULT;
 + (void)setShared:(NSCMason * _Nonnull)value;
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+- (void)setDeviceScale:(float)value;
 - (MasonNode * _Nonnull)nodeForView:(UIView * _Nonnull)view :(BOOL)isLeaf SWIFT_WARN_UNUSED_RESULT;
 - (void)configureStyleForView:(UIView * _Nonnull)view :(SWIFT_NOESCAPE void (^ _Nonnull)(MasonStyle * _Nonnull))block;
 - (MasonStyle * _Nonnull)styleForView:(UIView * _Nonnull)view SWIFT_WARN_UNUSED_RESULT;
@@ -1307,6 +1352,14 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) NSCMason * _Nonnull sh
 - (void)mason_replaceChildAtNode:(MasonNode * _Nonnull)node :(NSInteger)index;
 @end
 
+typedef SWIFT_ENUM_NAMED(NSInteger, MasonObjectFit, "ObjectFit", open) {
+  MasonObjectFitContain = 0,
+  MasonObjectFitCover = 1,
+  MasonObjectFitFill = 2,
+  MasonObjectFitNone = 3,
+  MasonObjectFitScaleDown = 4,
+};
+
 typedef SWIFT_ENUM_NAMED(NSInteger, MasonOverflow, "Overflow", open) {
   MasonOverflowVisible = 0,
   MasonOverflowHidden = 1,

package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/mason_native.h

@@ -60,6 +60,11 @@ typedef struct AvailableSpace {
   };
 } AvailableSpace;
 
+typedef struct CMasonBuffer {
+  uint8_t *data;
+  uintptr_t size;
+} CMasonBuffer;
+
 typedef struct CMasonMinMax {
   int32_t min_type;
   float min_value;
@@ -67,42 +72,6 @@ typedef struct CMasonMinMax {
   float max_value;
 } CMasonMinMax;
 
-typedef struct CMasonNonRepeatedTrackSizingFunctionArray {
-  struct CMasonMinMax *array;
-  uintptr_t length;
-} CMasonNonRepeatedTrackSizingFunctionArray;
-
-typedef enum CMasonTrackSizingFunction_Tag {
-  Single,
-  Repeat,
-} CMasonTrackSizingFunction_Tag;
-
-typedef struct Repeat_Body {
-  int32_t _0;
-  uint16_t _1;
-  struct CMasonNonRepeatedTrackSizingFunctionArray *_2;
-} Repeat_Body;
-
-typedef struct CMasonTrackSizingFunction {
-  CMasonTrackSizingFunction_Tag tag;
-  union {
-    struct {
-      struct CMasonMinMax single;
-    };
-    Repeat_Body repeat;
-  };
-} CMasonTrackSizingFunction;
-
-typedef struct CMasonTrackSizingFunctionArray {
-  struct CMasonTrackSizingFunction *array;
-  uintptr_t length;
-} CMasonTrackSizingFunctionArray;
-
-typedef struct CMasonBuffer {
-  uint8_t *data;
-  uintptr_t size;
-} CMasonBuffer;
-
 struct CMason *mason_init(void);
 
 void mason_clear(struct CMason *mason);
@@ -111,6 +80,8 @@ void mason_release(struct CMason *mason);
 
 void mason_print_tree(struct CMason *mason, struct CMasonNode *node);
 
+void mason_set_device_scale(struct CMason *mason, float scale);
+
 void mason_node_set_segments(struct CMason *mason,
                              struct CMasonNode *node,
                              struct CMasonSegment *segments,
@@ -255,9 +226,20 @@ void mason_node_remove_context(struct CMason *mason, struct CMasonNode *node);
 void mason_node_set_apple_node(struct CMason *mason, struct CMasonNode *node, void *apple_node);
 #endif
 
-void mason_destroy_non_repeated_track_sizing_function_array(struct CMasonNonRepeatedTrackSizingFunctionArray *array);
-
-void mason_destroy_track_sizing_function_array(struct CMasonTrackSizingFunctionArray *array);
+void mason_style_update_non_buffer_data(struct CMason *mason,
+                                        struct CMasonNode *node,
+                                        const char *grid_auto_rows,
+                                        const char *grid_auto_columns,
+                                        const char *grid_column,
+                                        const char *grid_column_start,
+                                        const char *grid_column_end,
+                                        const char *grid_row,
+                                        const char *grid_row_start,
+                                        const char *grid_row_end,
+                                        const char *grid_template_rows,
+                                        const char *grid_template_columns,
+                                        const char *grid_area,
+                                        const char *grid_template_areas);
 
 void mason_style_set_with_values(struct CMason *mason,
                                  struct CMasonNode *node,
@@ -326,24 +308,24 @@ void mason_style_set_with_values(struct CMason *mason,
                                  int gap_column_type,
                                  float gap_column_value,
                                  float aspect_ratio,
-                                 struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_rows,
-                                 struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_columns,
+                                 const char *grid_auto_rows,
+                                 const char *grid_auto_columns,
                                  int grid_auto_flow,
-                                 int grid_column_start_type,
-                                 short grid_column_start_value,
-                                 int grid_column_end_type,
-                                 short grid_column_end_value,
-                                 int grid_row_start_type,
-                                 short grid_row_start_value,
-                                 int grid_row_end_type,
-                                 short grid_row_end_value,
-                                 struct CMasonTrackSizingFunctionArray *grid_template_rows,
-                                 struct CMasonTrackSizingFunctionArray *grid_template_columns,
+                                 const char *grid_column,
+                                 const char *grid_column_start,
+                                 const char *grid_column_end,
+                                 const char *grid_row,
+                                 const char *grid_row_start,
+                                 const char *grid_row_end,
+                                 const char *grid_template_rows,
+                                 const char *grid_template_columns,
                                  int32_t overflow_x,
                                  int32_t overflow_y,
                                  float scrollbar_width,
                                  int32_t text_align,
-                                 int32_t box_sizing);
+                                 int32_t box_sizing,
+                                 const char *grid_area,
+                                 const char *grid_template_areas);
 
 void mason_style_release_style_buffer(struct CMasonBuffer *buffer);
 
@@ -351,40 +333,32 @@ struct CMasonBuffer *mason_style_get_style_buffer(struct CMason *mason, struct C
 
 void *mason_style_get_style_buffer_apple(struct CMason *mason, struct CMasonNode *node);
 
-struct CMasonNonRepeatedTrackSizingFunctionArray *mason_style_get_grid_auto_rows(struct CMason *mason,
-                                                                                 struct CMasonNode *node);
+char *mason_style_get_grid_area_css(struct CMason *mason, struct CMasonNode *node);
 
-void mason_style_set_grid_auto_rows(struct CMason *mason,
-                                    struct CMasonNode *node,
-                                    struct CMasonNonRepeatedTrackSizingFunctionArray *value);
+char *mason_style_get_grid_template_areas_css(struct CMason *mason, struct CMasonNode *node);
 
-struct CMasonNonRepeatedTrackSizingFunctionArray *mason_style_get_grid_auto_columns(struct CMason *mason,
-                                                                                    struct CMasonNode *node);
+char *mason_style_get_grid_auto_rows_css(struct CMason *mason, struct CMasonNode *node);
 
-void mason_style_set_grid_auto_columns(struct CMason *mason,
-                                       struct CMasonNode *node,
-                                       struct CMasonNonRepeatedTrackSizingFunctionArray *value);
+char *mason_style_get_grid_auto_columns_css(struct CMason *mason, struct CMasonNode *node);
 
-struct CMasonTrackSizingFunctionArray *mason_style_get_grid_template_rows(struct CMason *mason,
-                                                                          struct CMasonNode *node);
+char *mason_style_get_grid_column_css(struct CMason *mason, struct CMasonNode *node);
 
-void mason_style_set_grid_template_rows(struct CMason *mason,
-                                        struct CMasonNode *node,
-                                        struct CMasonTrackSizingFunctionArray *value);
+char *mason_style_get_grid_column_start_css(struct CMason *mason, struct CMasonNode *node);
 
-struct CMasonTrackSizingFunctionArray *mason_style_get_grid_template_columns(struct CMason *mason,
-                                                                             struct CMasonNode *node);
+char *mason_style_get_grid_column_end_css(struct CMason *mason, struct CMasonNode *node);
 
-void mason_style_set_grid_template_columns(struct CMason *mason,
-                                           struct CMasonNode *node,
-                                           struct CMasonTrackSizingFunctionArray *value);
+char *mason_style_get_grid_row_css(struct CMason *mason, struct CMasonNode *node);
+
+char *mason_style_get_grid_row_start_css(struct CMason *mason, struct CMasonNode *node);
+
+char *mason_style_get_grid_row_end_css(struct CMason *mason, struct CMasonNode *node);
 
-struct CMasonMinMax mason_util_create_non_repeated_track_sizing_function_with_type_value(int32_t track_type,
-                                                                                         float track_value);
+char *mason_style_get_grid_template_rows_css(struct CMason *mason, struct CMasonNode *node);
 
-char *mason_util_parse_non_repeated_track_sizing_function(struct CMasonNonRepeatedTrackSizingFunctionArray *value);
+char *mason_style_get_grid_template_columns_css(struct CMason *mason, struct CMasonNode *node);
 
-char *mason_util_parse_auto_repeating_track_sizing_function(struct CMasonTrackSizingFunctionArray *value);
+struct CMasonMinMax mason_util_create_track_sizing_function_with_type_value(int32_t track_type,
+                                                                            float track_value);
 
 void mason_util_destroy_string(char *string);