@triniwiz/nativescript-masonkit 1.0.0-alpha.5 → 1.0.0-alpha.6

package/platforms/{ios/Mason.xcframework/ios-arm64/Mason.framework/PrivateHeaders → new_native_src/cpp/include}/mason_native.h

@@ -9,12 +9,28 @@
 #include <stdlib.h>
 
 typedef enum CMasonDimensionType {
-  Points,
-  Percent,
-  Auto,
-  Undefined,
+  MasonDimensionAuto,
+  MasonDimensionPoints,
+  MasonDimensionPercent,
 } CMasonDimensionType;
 
+typedef enum CMasonGridPlacementType {
+  MasonGridPlacementTypeAuto,
+  MasonGridPlacementTypeLine,
+  MasonGridPlacementTypeSpan,
+} CMasonGridPlacementType;
+
+typedef enum CMasonLengthPercentageAutoType {
+  MasonLengthPercentageAutoAuto,
+  MasonLengthPercentageAutoPoints,
+  MasonLengthPercentageAutoPercent,
+} CMasonLengthPercentageAutoType;
+
+typedef enum CMasonLengthPercentageType {
+  MasonLengthPercentagePoints,
+  MasonLengthPercentagePercent,
+} CMasonLengthPercentageType;
+
 typedef struct NodeArray {
   void **array;
   uintptr_t length;
@@ -35,11 +51,69 @@ typedef struct AvailableSpace {
   };
 } AvailableSpace;
 
+typedef struct CMasonMinMax {
+  int32_t min_type;
+  float min_value;
+  int32_t max_type;
+  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 CMasonLengthPercentageAuto {
+  float value;
+  enum CMasonLengthPercentageAutoType value_type;
+} CMasonLengthPercentageAuto;
+
+typedef struct CMasonLengthPercentage {
+  float value;
+  enum CMasonLengthPercentageType value_type;
+} CMasonLengthPercentage;
+
 typedef struct CMasonDimension {
   float value;
   enum CMasonDimensionType value_type;
 } CMasonDimension;
 
+typedef struct CMasonLengthPercentageSize {
+  struct CMasonLengthPercentage width;
+  struct CMasonLengthPercentage height;
+} CMasonLengthPercentageSize;
+
+typedef struct CMasonGridPlacement {
+  int16_t value;
+  enum CMasonGridPlacementType value_type;
+} CMasonGridPlacement;
+
 void *mason_init(void);
 
 void *mason_init_with_capacity(uintptr_t capacity);
@@ -48,24 +122,26 @@ void mason_destroy(void *mason);
 
 void mason_clear(void *mason);
 
+void *mason_node_get_style(void *mason, void *node);
+
+bool mason_node_is_equal(void *node_a, void *node_b);
+
 void mason_node_array_destroy(struct NodeArray array);
 
 void mason_node_destroy(void *node);
 
 void *mason_node_new_node(void *mason, void *style);
 
-void *mason_node_new_node_with_measure_func(void *mason,
-                                            void *style,
-                                            void *measure_data,
-                                            long long (*measure)(const void*, float, float, float, float));
+void *mason_node_new_node_with_context(void *mason,
+                                       void *style,
+                                       void *measure_data,
+                                       long long (*measure)(const void*, float, float, float, float));
 
 void *mason_node_new_node_with_children(void *mason,
                                         void *style,
                                         const void *children,
                                         uintptr_t children_size);
 
-uintptr_t mason_node_get_child_count(void *mason, void *node);
-
 void *mason_node_layout(void *mason, void *node, void *(*layout)(const float*));
 
 void mason_node_compute_wh(void *mason, void *node, float width, float height);
@@ -79,7 +155,7 @@ void mason_node_compute_max_content(void *mason, void *node);
 
 void mason_node_compute_min_content(void *mason, void *node);
 
-extern void mason_node_compute(void *mason, void *node);
+void mason_node_compute(void *mason, void *node);
 
 void mason_node_set_style(void *mason, void *node, void *style);
 
@@ -89,7 +165,7 @@ void mason_node_update_and_set_style_with_values(void *mason,
                                                  void *node,
                                                  void *style,
                                                  int display,
-                                                 int position_type,
+                                                 int position,
                                                  int direction,
                                                  int flex_direction,
                                                  int flex_wrap,
@@ -97,15 +173,17 @@ void mason_node_update_and_set_style_with_values(void *mason,
                                                  int align_items,
                                                  int align_self,
                                                  int align_content,
+                                                 int justify_items,
+                                                 int justify_self,
                                                  int justify_content,
-                                                 int position_left_type,
-                                                 float position_left_value,
-                                                 int position_right_type,
-                                                 float position_right_value,
-                                                 int position_top_type,
-                                                 float position_top_value,
-                                                 int position_bottom_type,
-                                                 float position_bottom_value,
+                                                 int inset_left_type,
+                                                 float inset_left_value,
+                                                 int inset_right_type,
+                                                 float inset_right_value,
+                                                 int inset_top_type,
+                                                 float inset_top_value,
+                                                 int inset_bottom_type,
+                                                 float inset_bottom_value,
                                                  int margin_left_type,
                                                  float margin_left_value,
                                                  int margin_right_type,
@@ -146,11 +224,27 @@ void mason_node_update_and_set_style_with_values(void *mason,
                                                  float max_width_value,
                                                  int max_height_type,
                                                  float max_height_value,
-                                                 int flex_gap_width_type,
-                                                 float flex_gap_width_value,
-                                                 int flex_gap_height_type,
-                                                 float flex_gap_height_value,
-                                                 float aspect_ratio);
+                                                 int gap_row_type,
+                                                 float gap_row_value,
+                                                 int gap_column_type,
+                                                 float gap_column_value,
+                                                 float aspect_ratio,
+                                                 struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_rows,
+                                                 struct CMasonNonRepeatedTrackSizingFunctionArray *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,
+                                                 int32_t overflow_x,
+                                                 int32_t overflow_y,
+                                                 float scrollbar_width);
 
 void *mason_node_update_style_with_values_compute_and_layout(void *mason,
                                                              void *node,
@@ -164,15 +258,17 @@ void *mason_node_update_style_with_values_compute_and_layout(void *mason,
                                                              int align_items,
                                                              int align_self,
                                                              int align_content,
+                                                             int justify_items,
+                                                             int justify_self,
                                                              int justify_content,
-                                                             int position_left_type,
-                                                             float position_left_value,
-                                                             int position_right_type,
-                                                             float position_right_value,
-                                                             int position_top_type,
-                                                             float position_top_value,
-                                                             int position_bottom_type,
-                                                             float position_bottom_value,
+                                                             int inset_left_type,
+                                                             float inset_left_value,
+                                                             int inset_right_type,
+                                                             float inset_right_value,
+                                                             int inset_top_type,
+                                                             float inset_top_value,
+                                                             int inset_bottom_type,
+                                                             float inset_bottom_value,
                                                              int margin_left_type,
                                                              float margin_left_value,
                                                              int margin_right_type,
@@ -213,11 +309,27 @@ void *mason_node_update_style_with_values_compute_and_layout(void *mason,
                                                              float max_width_value,
                                                              int max_height_type,
                                                              float max_height_value,
-                                                             int flex_gap_width_type,
-                                                             float flex_gap_width_value,
-                                                             int flex_gap_height_type,
-                                                             float flex_gap_height_value,
+                                                             int32_t gap_row_type,
+                                                             float gap_row_value,
+                                                             int32_t gap_column_type,
+                                                             float gap_column_value,
                                                              float aspect_ratio,
+                                                             struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_rows,
+                                                             struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_columns,
+                                                             int32_t grid_auto_flow,
+                                                             int32_t grid_column_start_type,
+                                                             int16_t grid_column_start_value,
+                                                             int32_t grid_column_end_type,
+                                                             int16_t grid_column_end_value,
+                                                             int32_t grid_row_start_type,
+                                                             int16_t grid_row_start_value,
+                                                             int32_t grid_row_end_type,
+                                                             int16_t grid_row_end_value,
+                                                             struct CMasonTrackSizingFunctionArray *grid_template_rows,
+                                                             struct CMasonTrackSizingFunctionArray *grid_template_columns,
+                                                             int32_t overflow_x,
+                                                             int32_t overflow_y,
+                                                             float scrollbar_width,
                                                              void *(*layout)(const float*));
 
 void *mason_node_update_style_with_values_size_compute_and_layout(void *mason,
@@ -226,7 +338,7 @@ void *mason_node_update_style_with_values_size_compute_and_layout(void *mason,
                                                                   float width,
                                                                   float height,
                                                                   int display,
-                                                                  int position_type,
+                                                                  int position,
                                                                   int direction,
                                                                   int flex_direction,
                                                                   int flex_wrap,
@@ -234,15 +346,17 @@ void *mason_node_update_style_with_values_size_compute_and_layout(void *mason,
                                                                   int align_items,
                                                                   int align_self,
                                                                   int align_content,
+                                                                  int justify_items,
+                                                                  int justify_self,
                                                                   int justify_content,
-                                                                  int position_left_type,
-                                                                  float position_left_value,
-                                                                  int position_right_type,
-                                                                  float position_right_value,
-                                                                  int position_top_type,
-                                                                  float position_top_value,
-                                                                  int position_bottom_type,
-                                                                  float position_bottom_value,
+                                                                  int inset_left_type,
+                                                                  float inset_left_value,
+                                                                  int inset_right_type,
+                                                                  float inset_right_value,
+                                                                  int inset_top_type,
+                                                                  float inset_top_value,
+                                                                  int inset_bottom_type,
+                                                                  float inset_bottom_value,
                                                                   int margin_left_type,
                                                                   float margin_left_value,
                                                                   int margin_right_type,
@@ -283,11 +397,27 @@ void *mason_node_update_style_with_values_size_compute_and_layout(void *mason,
                                                                   float max_width_value,
                                                                   int max_height_type,
                                                                   float max_height_value,
-                                                                  int flex_gap_width_type,
-                                                                  float flex_gap_width_value,
-                                                                  int flex_gap_height_type,
-                                                                  float flex_gap_height_value,
+                                                                  int32_t gap_row_type,
+                                                                  float gap_row_value,
+                                                                  int32_t gap_column_type,
+                                                                  float gap_column_value,
                                                                   float aspect_ratio,
+                                                                  struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_rows,
+                                                                  struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_columns,
+                                                                  int32_t grid_auto_flow,
+                                                                  int32_t grid_column_start_type,
+                                                                  int16_t grid_column_start_value,
+                                                                  int32_t grid_column_end_type,
+                                                                  int16_t grid_column_end_value,
+                                                                  int32_t grid_row_start_type,
+                                                                  int16_t grid_row_start_value,
+                                                                  int32_t grid_row_end_type,
+                                                                  int16_t grid_row_end_value,
+                                                                  struct CMasonTrackSizingFunctionArray *grid_template_rows,
+                                                                  struct CMasonTrackSizingFunctionArray *grid_template_columns,
+                                                                  int32_t overflow_x,
+                                                                  int32_t overflow_y,
+                                                                  float scrollbar_width,
                                                                   void *(*layout)(const float*));
 
 void *mason_node_update_set_style_compute_and_layout(void *mason,
@@ -341,12 +471,16 @@ void *mason_node_remove_child(void *mason, void *node, void *child);
 
 struct NodeArray mason_node_get_children(void *mason, void *node);
 
-void mason_node_set_measure_func(void *mason,
-                                 void *node,
-                                 void *measure_data,
-                                 long long (*measure)(const void*, float, float, float, float));
+void mason_node_set_context(void *mason,
+                            void *node,
+                            void *measure_data,
+                            long long (*measure)(const void*, float, float, float, float));
+
+void mason_node_remove_context(void *mason, void *node);
 
-void mason_node_remove_measure_func(void *mason, void *node);
+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_init(void);
 
@@ -354,196 +488,313 @@ void mason_style_destroy(void *style);
 
 int mason_style_get_display(void *style);
 
-void mason_style_set_display(int display, void *style);
+void mason_style_set_display(void *style, int display);
 
-void mason_style_set_position_type(int position_type, void *style);
+void mason_style_set_position(void *style, int position);
 
-int mason_style_get_position_type(void *style);
+int mason_style_get_position(void *style);
 
-void mason_style_set_direction(int _direction, void *_style);
+void mason_style_set_direction(void *_style, int _direction);
 
 int mason_style_get_direction(void *_style);
 
-void mason_style_set_flex_direction(int direction, void *style);
+void mason_style_set_flex_direction(void *style, int direction);
 
 int mason_style_get_flex_direction(void *style);
 
-void mason_style_set_flex_wrap(int wrap, void *style);
+void mason_style_set_flex_wrap(void *style, int wrap);
 
 int mason_style_get_flex_wrap(void *style);
 
-void mason_style_set_overflow(int _overflow, void *_style);
-
-int mason_style_get_overflow(void *_style);
-
-void mason_style_set_align_items(int align, void *style);
+void mason_style_set_align_items(void *style, int align);
 
 int mason_style_get_align_items(void *style);
 
-void mason_style_set_align_self(int align, void *style);
+void mason_style_set_align_self(void *style, int align);
 
 int mason_style_get_align_self(void *style);
 
-void mason_style_set_align_content(int align, void *style);
+void mason_style_set_align_content(void *style, int align);
 
 int mason_style_get_align_content(void *style);
 
-void mason_style_set_justify_content(int justify, void *style);
+void mason_style_set_justify_items(void *style, int align);
+
+int mason_style_get_justify_items(void *style);
+
+void mason_style_set_justify_self(void *style, int align);
+
+int mason_style_get_justify_self(void *style);
+
+void mason_style_set_justify_content(void *style, int justify);
 
 int mason_style_get_justify_content(void *style);
 
-void mason_style_set_position(float left_value,
-                              enum CMasonDimensionType left_value_type,
-                              float right_value,
-                              enum CMasonDimensionType right_value_type,
-                              float top_value,
-                              enum CMasonDimensionType top_value_type,
-                              float bottom_value,
-                              enum CMasonDimensionType bottom_value_type,
-                              void *style);
+void mason_style_set_inset(void *style,
+                           float value,
+                           enum CMasonLengthPercentageAutoType value_type);
+
+void mason_style_set_inset_lrtb(void *style,
+                                float left_value,
+                                enum CMasonLengthPercentageAutoType left_value_type,
+                                float right_value,
+                                enum CMasonLengthPercentageAutoType right_value_type,
+                                float top_value,
+                                enum CMasonLengthPercentageAutoType top_value_type,
+                                float bottom_value,
+                                enum CMasonLengthPercentageAutoType bottom_value_type);
 
-void mason_style_set_position_left(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_inset_left(void *style,
+                                float value,
+                                enum CMasonLengthPercentageAutoType value_type);
 
-struct CMasonDimension mason_style_get_position_left(void *style);
+struct CMasonLengthPercentageAuto mason_style_get_inset_left(void *style);
 
-void mason_style_set_position_right(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_inset_right(void *style,
+                                 float value,
+                                 enum CMasonLengthPercentageAutoType value_type);
 
-struct CMasonDimension mason_style_get_position_right(void *style);
+struct CMasonLengthPercentageAuto mason_style_get_inset_right(void *style);
 
-void mason_style_set_position_top(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_inset_top(void *style,
+                               float value,
+                               enum CMasonLengthPercentageAutoType value_type);
 
-struct CMasonDimension mason_style_get_position_top(void *style);
+struct CMasonLengthPercentageAuto mason_style_get_inset_top(void *style);
 
-void mason_style_set_position_bottom(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_inset_bottom(void *style,
+                                  float value,
+                                  enum CMasonLengthPercentageAutoType value_type);
 
-struct CMasonDimension mason_style_get_position_bottom(void *style);
+struct CMasonLengthPercentageAuto mason_style_get_inset_bottom(void *style);
 
-void mason_style_set_margin(float left_value,
-                            enum CMasonDimensionType left_value_type,
+void mason_style_set_margin(void *style,
+                            float left_value,
+                            enum CMasonLengthPercentageAutoType left_value_type,
                             float right_value,
-                            enum CMasonDimensionType right_value_type,
+                            enum CMasonLengthPercentageAutoType right_value_type,
                             float top_value,
-                            enum CMasonDimensionType top_value_type,
+                            enum CMasonLengthPercentageAutoType top_value_type,
                             float bottom_value,
-                            enum CMasonDimensionType bottom_value_type,
-                            void *style);
+                            enum CMasonLengthPercentageAutoType bottom_value_type);
 
-void mason_style_set_margin_left(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_margin_left(void *style,
+                                 float value,
+                                 enum CMasonLengthPercentageAutoType value_type);
 
-struct CMasonDimension mason_style_get_margin_left(void *style);
+struct CMasonLengthPercentageAuto mason_style_get_margin_left(void *style);
 
-void mason_style_set_margin_right(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_margin_right(void *style,
+                                  float value,
+                                  enum CMasonLengthPercentageAutoType value_type);
 
-struct CMasonDimension mason_style_get_margin_right(void *style);
+struct CMasonLengthPercentageAuto mason_style_get_margin_right(void *style);
 
-void mason_style_set_margin_top(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_margin_top(void *style,
+                                float value,
+                                enum CMasonLengthPercentageAutoType value_type);
 
-struct CMasonDimension mason_style_get_margin_top(void *style);
+struct CMasonLengthPercentageAuto mason_style_get_margin_top(void *style);
 
-void mason_style_set_margin_bottom(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_margin_bottom(void *style,
+                                   float value,
+                                   enum CMasonLengthPercentageAutoType value_type);
 
-struct CMasonDimension mason_style_get_margin_bottom(void *style);
+struct CMasonLengthPercentageAuto mason_style_get_margin_bottom(void *style);
 
-void mason_style_set_padding(float left_value,
-                             enum CMasonDimensionType left_value_type,
+void mason_style_set_padding(void *style,
+                             float left_value,
+                             enum CMasonLengthPercentageType left_value_type,
                              float right_value,
-                             enum CMasonDimensionType right_value_type,
+                             enum CMasonLengthPercentageType right_value_type,
                              float top_value,
-                             enum CMasonDimensionType top_value_type,
+                             enum CMasonLengthPercentageType top_value_type,
                              float bottom_value,
-                             enum CMasonDimensionType bottom_value_type,
-                             void *style);
+                             enum CMasonLengthPercentageType bottom_value_type);
 
-void mason_style_set_padding_left(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_padding_left(void *style,
+                                  float value,
+                                  enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_padding_left(void *style);
+struct CMasonLengthPercentage mason_style_get_padding_left(void *style);
 
-void mason_style_set_padding_right(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_padding_right(void *style,
+                                   float value,
+                                   enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_padding_right(void *style);
+struct CMasonLengthPercentage mason_style_get_padding_right(void *style);
 
-void mason_style_set_padding_top(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_padding_top(void *style,
+                                 float value,
+                                 enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_padding_top(void *style);
+struct CMasonLengthPercentage mason_style_get_padding_top(void *style);
 
-void mason_style_set_padding_bottom(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_padding_bottom(void *style,
+                                    float value,
+                                    enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_padding_bottom(void *style);
+struct CMasonLengthPercentage mason_style_get_padding_bottom(void *style);
 
-void mason_style_set_border(float left_value,
-                            enum CMasonDimensionType left_value_type,
+void mason_style_set_border(void *style,
+                            float left_value,
+                            enum CMasonLengthPercentageType left_value_type,
                             float right_value,
-                            enum CMasonDimensionType right_value_type,
+                            enum CMasonLengthPercentageType right_value_type,
                             float top_value,
-                            enum CMasonDimensionType top_value_type,
+                            enum CMasonLengthPercentageType top_value_type,
                             float bottom_value,
-                            enum CMasonDimensionType bottom_value_type,
-                            void *style);
+                            enum CMasonLengthPercentageType bottom_value_type);
 
-void mason_style_set_border_left(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_border_left(void *style,
+                                 float value,
+                                 enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_border_left(void *style);
+struct CMasonLengthPercentage mason_style_get_border_left(void *style);
 
-void mason_style_set_border_right(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_border_right(void *style,
+                                  float value,
+                                  enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_border_right(void *style);
+struct CMasonLengthPercentage mason_style_get_border_right(void *style);
 
-void mason_style_set_border_top(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_border_top(void *style,
+                                float value,
+                                enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_border_top(void *style);
+struct CMasonLengthPercentage mason_style_get_border_top(void *style);
 
-void mason_style_set_border_bottom(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_border_bottom(void *style,
+                                   float value,
+                                   enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_border_bottom(void *style);
+struct CMasonLengthPercentage mason_style_get_border_bottom(void *style);
 
-void mason_style_set_flex_grow(float grow);
+void mason_style_set_flex_grow(void *style, float grow);
 
 float mason_style_get_flex_grow(void *style);
 
-void mason_style_set_flex_shrink(float shrink);
+void mason_style_set_flex_shrink(void *style, float shrink);
 
 float mason_style_get_flex_shrink(void *style);
 
-void mason_style_set_flex_basis(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_flex_basis(void *style, float value, enum CMasonDimensionType value_type);
 
 struct CMasonDimension mason_style_get_flex_basis(void *style);
 
-void mason_style_set_width(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_width(void *style, float value, enum CMasonDimensionType value_type);
 
 struct CMasonDimension mason_style_get_width(void *style);
 
-void mason_style_set_height(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_height(void *style, float value, enum CMasonDimensionType value_type);
 
 struct CMasonDimension mason_style_get_height(void *style);
 
-void mason_style_set_min_width(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_min_width(void *style, float value, enum CMasonDimensionType value_type);
 
 struct CMasonDimension mason_style_get_min_width(void *style);
 
-void mason_style_set_min_height(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_min_height(void *style, float value, enum CMasonDimensionType value_type);
 
 struct CMasonDimension mason_style_get_min_height(void *style);
 
-void mason_style_set_max_width(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_max_width(void *style, float value, enum CMasonDimensionType value_type);
 
 struct CMasonDimension mason_style_get_max_width(void *style);
 
-void mason_style_set_max_height(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_max_height(void *style, float value, enum CMasonDimensionType value_type);
 
 struct CMasonDimension mason_style_get_max_height(void *style);
 
-void mason_style_set_gap_width(float value, enum CMasonDimensionType value_type, void *style);
+struct CMasonLengthPercentageSize mason_style_get_gap(void *style);
+
+void mason_style_set_gap(void *style,
+                         float width_value,
+                         enum CMasonLengthPercentageType width_type,
+                         float height_value,
+                         enum CMasonLengthPercentageType height_type);
+
+void mason_style_set_row_gap(void *style, float value, enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_gap_width(void *style);
+struct CMasonLengthPercentage mason_style_get_row_gap(void *style);
 
-void mason_style_set_gap_height(float value, enum CMasonDimensionType value_type, void *style);
+void mason_style_set_column_gap(void *style,
+                                float value,
+                                enum CMasonLengthPercentageType value_type);
 
-struct CMasonDimension mason_style_get_gap_height(void *style);
+struct CMasonLengthPercentage mason_style_get_column_gap(void *style);
 
-void mason_style_set_aspect_ratio(float ratio, void *style);
+void mason_style_set_aspect_ratio(void *style, float ratio);
 
 float mason_style_get_aspect_ratio(void *style);
 
+struct CMasonNonRepeatedTrackSizingFunctionArray *mason_style_get_grid_auto_rows(void *style);
+
+void mason_style_set_grid_auto_rows(void *style,
+                                    struct CMasonNonRepeatedTrackSizingFunctionArray *value);
+
+struct CMasonNonRepeatedTrackSizingFunctionArray *mason_style_get_grid_auto_columns(void *style);
+
+void mason_style_set_grid_auto_columns(void *style,
+                                       struct CMasonNonRepeatedTrackSizingFunctionArray *value);
+
+int32_t mason_style_get_grid_auto_flow(void *style);
+
+void mason_style_set_grid_auto_flow(void *style, int32_t value);
+
+void mason_style_set_grid_area(void *style,
+                               struct CMasonGridPlacement row_start,
+                               struct CMasonGridPlacement row_end,
+                               struct CMasonGridPlacement column_start,
+                               struct CMasonGridPlacement column_end);
+
+struct CMasonGridPlacement mason_style_get_grid_column_start(void *style);
+
+void mason_style_set_grid_column(void *style,
+                                 struct CMasonGridPlacement start,
+                                 struct CMasonGridPlacement end);
+
+void mason_style_set_grid_column_start(void *style, struct CMasonGridPlacement value);
+
+struct CMasonGridPlacement mason_style_get_grid_column_end(void *style);
+
+void mason_style_set_grid_column_end(void *style, struct CMasonGridPlacement value);
+
+struct CMasonGridPlacement mason_style_get_grid_row_start(void *style);
+
+void mason_style_set_grid_row(void *style,
+                              struct CMasonGridPlacement start,
+                              struct CMasonGridPlacement end);
+
+void mason_style_set_grid_row_start(void *style, struct CMasonGridPlacement value);
+
+struct CMasonGridPlacement mason_style_get_grid_row_end(void *style);
+
+void mason_style_set_grid_row_end(void *style, struct CMasonGridPlacement value);
+
+struct CMasonTrackSizingFunctionArray *mason_style_get_grid_template_rows(void *style);
+
+void mason_style_set_grid_template_rows(void *style, struct CMasonTrackSizingFunctionArray *value);
+
+struct CMasonTrackSizingFunctionArray *mason_style_get_grid_template_columns(void *style);
+
+void mason_style_set_grid_template_columns(void *style,
+                                           struct CMasonTrackSizingFunctionArray *value);
+
+void mason_style_set_scrollbar_width(void *style, float value);
+
+float mason_style_get_scrollbar_width(void *style);
+
+void mason_style_set_overflow(void *style, int32_t value);
+
+void mason_style_set_overflow_x(void *style, int32_t value);
+
+int32_t mason_style_get_overflow_x(void *style);
+
+void mason_style_set_overflow_y(void *style, int32_t value);
+
+int32_t mason_style_get_overflow_y(void *style);
+
 void *mason_style_init_with_values(int display,
                                    int position_type,
                                    int direction,
@@ -553,15 +804,17 @@ void *mason_style_init_with_values(int display,
                                    int align_items,
                                    int align_self,
                                    int align_content,
+                                   int justify_items,
+                                   int justify_self,
                                    int justify_content,
-                                   int position_left_type,
-                                   float position_left_value,
-                                   int position_right_type,
-                                   float position_right_value,
-                                   int position_top_type,
-                                   float position_top_value,
-                                   int position_bottom_type,
-                                   float position_bottom_value,
+                                   int inset_left_type,
+                                   float inset_left_value,
+                                   int inset_right_type,
+                                   float inset_right_value,
+                                   int inset_top_type,
+                                   float inset_top_value,
+                                   int inset_bottom_type,
+                                   float inset_bottom_value,
                                    int margin_left_type,
                                    float margin_left_value,
                                    int margin_right_type,
@@ -602,11 +855,27 @@ void *mason_style_init_with_values(int display,
                                    float max_width_value,
                                    int max_height_type,
                                    float max_height_value,
-                                   int flex_gap_width_type,
-                                   float flex_gap_width_value,
-                                   int flex_gap_height_type,
-                                   float flex_gap_height_value,
-                                   float aspect_ratio);
+                                   int32_t gap_row_type,
+                                   float gap_row_value,
+                                   int32_t gap_column_type,
+                                   float gap_column_value,
+                                   float aspect_ratio,
+                                   struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_rows,
+                                   struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_columns,
+                                   int32_t grid_auto_flow,
+                                   int32_t grid_column_start_type,
+                                   int16_t grid_column_start_value,
+                                   int32_t grid_column_end_type,
+                                   int16_t grid_column_end_value,
+                                   int32_t grid_row_start_type,
+                                   int16_t grid_row_start_value,
+                                   int32_t grid_row_end_type,
+                                   int16_t grid_row_end_value,
+                                   const struct CMasonTrackSizingFunctionArray *grid_template_rows,
+                                   const struct CMasonTrackSizingFunctionArray *grid_template_columns,
+                                   int32_t overflow_x,
+                                   int32_t overflow_y,
+                                   float scrollbar_width);
 
 void mason_style_update_with_values(void *style,
                                     int display,
@@ -618,15 +887,17 @@ void mason_style_update_with_values(void *style,
                                     int align_items,
                                     int align_self,
                                     int align_content,
+                                    int justify_items,
+                                    int justify_self,
                                     int justify_content,
-                                    int position_left_type,
-                                    float position_left_value,
-                                    int position_right_type,
-                                    float position_right_value,
-                                    int position_top_type,
-                                    float position_top_value,
-                                    int position_bottom_type,
-                                    float position_bottom_value,
+                                    int inset_left_type,
+                                    float inset_left_value,
+                                    int inset_right_type,
+                                    float inset_right_value,
+                                    int inset_top_type,
+                                    float inset_top_value,
+                                    int inset_bottom_type,
+                                    float inset_bottom_value,
                                     int margin_left_type,
                                     float margin_left_value,
                                     int margin_right_type,
@@ -667,10 +938,35 @@ void mason_style_update_with_values(void *style,
                                     float max_width_value,
                                     int max_height_type,
                                     float max_height_value,
-                                    int flex_gap_width_type,
-                                    float flex_gap_width_value,
-                                    int flex_gap_height_type,
-                                    float flex_gap_height_value,
-                                    float aspect_ratio);
+                                    int32_t gap_row_type,
+                                    float gap_row_value,
+                                    int32_t gap_column_type,
+                                    float gap_column_value,
+                                    float aspect_ratio,
+                                    struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_rows,
+                                    struct CMasonNonRepeatedTrackSizingFunctionArray *grid_auto_columns,
+                                    int32_t grid_auto_flow,
+                                    int32_t grid_column_start_type,
+                                    int16_t grid_column_start_value,
+                                    int32_t grid_column_end_type,
+                                    int16_t grid_column_end_value,
+                                    int32_t grid_row_start_type,
+                                    int16_t grid_row_start_value,
+                                    int32_t grid_row_end_type,
+                                    int16_t grid_row_end_value,
+                                    struct CMasonTrackSizingFunctionArray *grid_template_rows,
+                                    struct CMasonTrackSizingFunctionArray *grid_template_columns,
+                                    int32_t overflow_x,
+                                    int32_t overflow_y,
+                                    float scrollbar_width);
+
+struct CMasonMinMax mason_util_create_non_repeated_track_sizing_function_with_type_value(int32_t track_type,
+                                                                                         float track_value);
+
+char *mason_util_parse_non_repeated_track_sizing_function(struct CMasonNonRepeatedTrackSizingFunctionArray *value);
+
+char *mason_util_parse_auto_repeating_track_sizing_function(struct CMasonTrackSizingFunctionArray *value);
+
+void mason_util_destroy_string(char *string);
 
 #endif /* CBINDGEN_BINDINGS_H */