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

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

@@ -1,6 +1,6 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 5.7 (swiftlang-5.7.0.127.4 clang-1400.0.29.50)
+// Generated by Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100)
 #ifndef MASON_SWIFT_H
 #define MASON_SWIFT_H
 #pragma clang diagnostic push
@@ -23,7 +23,6 @@
 # include <swift/objc-prologue.h>
 #endif
 
-#pragma clang diagnostic ignored "-Wduplicate-method-match"
 #pragma clang diagnostic ignored "-Wauto-import"
 #if defined(__OBJC__)
 #include <Foundation/Foundation.h>
@@ -32,10 +31,24 @@
 #include <cstdint>
 #include <cstddef>
 #include <cstdbool>
+#include <cstring>
+#include <stdlib.h>
+#include <new>
+#include <type_traits>
 #else
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include <string.h>
+#endif
+#if defined(__cplusplus)
+#if __has_include(<ptrauth.h>)
+# include <ptrauth.h>
+#else
+# ifndef __ptrauth_swift_value_witness_function_pointer
+#  define __ptrauth_swift_value_witness_function_pointer(x)
+# endif
+#endif
 #endif
 
 #if !defined(SWIFT_TYPEDEFS)
@@ -71,53 +84,66 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # if __has_feature(objc_class_property)
 #  define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__
 # else
-#  define SWIFT_CLASS_PROPERTY(...)
+#  define SWIFT_CLASS_PROPERTY(...) 
 # endif
 #endif
-
-#if __has_attribute(objc_runtime_name)
-# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
-#else
-# define SWIFT_RUNTIME_NAME(X)
+#if !defined(SWIFT_RUNTIME_NAME)
+# if __has_attribute(objc_runtime_name)
+#  define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
+# else
+#  define SWIFT_RUNTIME_NAME(X) 
+# endif
 #endif
-#if __has_attribute(swift_name)
-# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X)))
-#else
-# define SWIFT_COMPILE_NAME(X)
+#if !defined(SWIFT_COMPILE_NAME)
+# if __has_attribute(swift_name)
+#  define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X)))
+# else
+#  define SWIFT_COMPILE_NAME(X) 
+# endif
 #endif
-#if __has_attribute(objc_method_family)
-# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
-#else
-# define SWIFT_METHOD_FAMILY(X)
+#if !defined(SWIFT_METHOD_FAMILY)
+# if __has_attribute(objc_method_family)
+#  define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
+# else
+#  define SWIFT_METHOD_FAMILY(X) 
+# endif
 #endif
-#if __has_attribute(noescape)
-# define SWIFT_NOESCAPE __attribute__((noescape))
-#else
-# define SWIFT_NOESCAPE
+#if !defined(SWIFT_NOESCAPE)
+# if __has_attribute(noescape)
+#  define SWIFT_NOESCAPE __attribute__((noescape))
+# else
+#  define SWIFT_NOESCAPE 
+# endif
 #endif
-#if __has_attribute(ns_consumed)
-# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
-#else
-# define SWIFT_RELEASES_ARGUMENT
+#if !defined(SWIFT_RELEASES_ARGUMENT)
+# if __has_attribute(ns_consumed)
+#  define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
+# else
+#  define SWIFT_RELEASES_ARGUMENT 
+# endif
 #endif
-#if __has_attribute(warn_unused_result)
-# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#else
-# define SWIFT_WARN_UNUSED_RESULT
+#if !defined(SWIFT_WARN_UNUSED_RESULT)
+# if __has_attribute(warn_unused_result)
+#  define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+# else
+#  define SWIFT_WARN_UNUSED_RESULT 
+# endif
 #endif
-#if __has_attribute(noreturn)
-# define SWIFT_NORETURN __attribute__((noreturn))
-#else
-# define SWIFT_NORETURN
+#if !defined(SWIFT_NORETURN)
+# if __has_attribute(noreturn)
+#  define SWIFT_NORETURN __attribute__((noreturn))
+# else
+#  define SWIFT_NORETURN 
+# endif
 #endif
 #if !defined(SWIFT_CLASS_EXTRA)
-# define SWIFT_CLASS_EXTRA
+# define SWIFT_CLASS_EXTRA 
 #endif
 #if !defined(SWIFT_PROTOCOL_EXTRA)
-# define SWIFT_PROTOCOL_EXTRA
+# define SWIFT_PROTOCOL_EXTRA 
 #endif
 #if !defined(SWIFT_ENUM_EXTRA)
-# define SWIFT_ENUM_EXTRA
+# define SWIFT_ENUM_EXTRA 
 #endif
 #if !defined(SWIFT_CLASS)
 # if __has_attribute(objc_subclassing_restricted)
@@ -137,28 +163,25 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #  define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
 # endif
 #endif
-
 #if !defined(SWIFT_PROTOCOL)
 # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
 # define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
 #endif
-
 #if !defined(SWIFT_EXTENSION)
 # define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__)
 #endif
-
 #if !defined(OBJC_DESIGNATED_INITIALIZER)
 # if __has_attribute(objc_designated_initializer)
 #  define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
 # else
-#  define OBJC_DESIGNATED_INITIALIZER
+#  define OBJC_DESIGNATED_INITIALIZER 
 # endif
 #endif
 #if !defined(SWIFT_ENUM_ATTR)
-# if defined(__has_attribute) && __has_attribute(enum_extensibility)
+# if __has_attribute(enum_extensibility)
 #  define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility)))
 # else
-#  define SWIFT_ENUM_ATTR(_extensibility)
+#  define SWIFT_ENUM_ATTR(_extensibility) 
 # endif
 #endif
 #if !defined(SWIFT_ENUM)
@@ -187,14 +210,16 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #if !defined(SWIFT_DEPRECATED_MSG)
 # define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
 #endif
-#if __has_feature(attribute_diagnose_if_objc)
-# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning")))
-#else
-# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
+#if !defined(SWIFT_DEPRECATED_OBJC)
+# if __has_feature(attribute_diagnose_if_objc)
+#  define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning")))
+# else
+#  define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
+# endif
 #endif
 #if defined(__OBJC__)
 #if !defined(IBSegueAction)
-# define IBSegueAction
+# define IBSegueAction 
 #endif
 #endif
 #if !defined(SWIFT_EXTERN)
@@ -207,26 +232,31 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #if !defined(SWIFT_CALL)
 # define SWIFT_CALL __attribute__((swiftcall))
 #endif
+#if !defined(SWIFT_INDIRECT_RESULT)
+# define SWIFT_INDIRECT_RESULT __attribute__((swift_indirect_result))
+#endif
+#if !defined(SWIFT_CONTEXT)
+# define SWIFT_CONTEXT __attribute__((swift_context))
+#endif
+#if !defined(SWIFT_ERROR_RESULT)
+# define SWIFT_ERROR_RESULT __attribute__((swift_error_result))
+#endif
 #if defined(__cplusplus)
-#if !defined(SWIFT_NOEXCEPT)
 # define SWIFT_NOEXCEPT noexcept
-#endif
 #else
-#if !defined(SWIFT_NOEXCEPT)
 # define SWIFT_NOEXCEPT 
 #endif
+#if defined(_WIN32)
+#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
+# define SWIFT_IMPORT_STDLIB_SYMBOL __declspec(dllimport)
 #endif
-#if defined(__cplusplus)
-#if !defined(SWIFT_CXX_INT_DEFINED)
-#define SWIFT_CXX_INT_DEFINED
-namespace swift {
-using Int = ptrdiff_t;
-using UInt = size_t;
-}
+#else
+#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
+# define SWIFT_IMPORT_STDLIB_SYMBOL 
 #endif
 #endif
 #if defined(__OBJC__)
-#if __has_feature(modules)
+#if __has_feature(objc_modules)
 #if __has_warning("-Watimport-in-framework-header")
 #pragma clang diagnostic ignored "-Watimport-in-framework-header"
 #endif
@@ -300,6 +330,7 @@ typedef SWIFT_ENUM_NAMED(NSInteger, Display, "Display", open) {
   DisplayNone = 0,
   DisplayFlex = 1,
   DisplayGrid = 2,
+  DisplayBlock = 3,
 };
 
 typedef SWIFT_ENUM_NAMED(NSInteger, FlexDirection, "FlexDirection", open) {
@@ -611,8 +642,11 @@ SWIFT_CLASS_NAMED("MasonReexports")
 + (void)style_set_flex_direction:(void * _Nonnull)style :(int32_t)flex_direction;
 + (int32_t)style_get_flex_wrap:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
 + (void)style_set_flex_wrap:(void * _Nonnull)style :(int32_t)flex_wrap;
-+ (int32_t)style_get_overflow:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
 + (void)style_set_overflow:(void * _Nonnull)style :(int32_t)overflow;
++ (void)style_set_overflow_x:(void * _Nonnull)style :(int32_t)overflow;
++ (void)style_set_overflow_y:(void * _Nonnull)style :(int32_t)overflow;
++ (int32_t)style_get_overflow_x:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
++ (int32_t)style_get_overflow_y:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
 + (int32_t)style_get_align_items:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
 + (void)style_set_align_items:(void * _Nonnull)style :(int32_t)align_items;
 + (int32_t)style_get_align_self:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
@@ -668,6 +702,8 @@ SWIFT_CLASS_NAMED("MasonReexports")
 + (void)style_set_flex_shrink:(void * _Nonnull)style :(float)value;
 + (void)style_set_flex_basis:(void * _Nonnull)style :(float)value :(CMasonDimensionType)value_type;
 + (CMasonDimension)style_get_flex_basis:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
++ (void)style_set_scrollbar_width:(void * _Nonnull)style :(float)value;
++ (float)style_get_scrollbar_width:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
 + (CMasonDimension)style_get_width:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
 + (void)style_set_width:(void * _Nonnull)style :(float)value :(CMasonDimensionType)value_type;
 + (CMasonDimension)style_get_height:(void * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
@@ -714,7 +750,7 @@ SWIFT_CLASS_NAMED("MasonReexports")
 + (NSString * _Nonnull)util_parse_non_repeated_track_sizing_function:(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)value SWIFT_WARN_UNUSED_RESULT;
 + (NSString * _Nonnull)util_parse_auto_repeating_track_sizing_function:(CMasonTrackSizingFunctionArray * _Nonnull)value SWIFT_WARN_UNUSED_RESULT;
 + (CMasonMinMax)util_create_non_repeated_track_sizing_function_with_type_value:(int32_t)track_type :(float)track_value SWIFT_WARN_UNUSED_RESULT;
-+ (void)style_update_with_values:(void * _Nonnull)style :(int32_t)display :(int32_t)position :(int32_t)direction :(int32_t)flexDirection :(int32_t)flexWrap :(int32_t)overflow :(int32_t)alignItems :(int32_t)alignSelf :(int32_t)alignContent :(int32_t)justifyItems :(int32_t)justifySelf :(int32_t)justifyContent :(int32_t)insetLeftType :(float)insetLeftValue :(int32_t)insetRightType :(float)insetRightValue :(int32_t)insetTopType :(float)insetTopValue :(int32_t)insetBottomType :(float)insetBottomValue :(int32_t)marginLeftType :(float)marginLeftValue :(int32_t)marginRightType :(float)marginRightValue :(int32_t)marginTopType :(float)marginTopValue :(int32_t)marginBottomType :(float)marginBottomValue :(int32_t)paddingLeftType :(float)paddingLeftValue :(int32_t)paddingRightType :(float)paddingRightValue :(int32_t)paddingTopType :(float)paddingTopValue :(int32_t)paddingBottomType :(float)paddingBottomValue :(int32_t)borderLeftType :(float)borderLeftValue :(int32_t)borderRightType :(float)borderRightValue :(int32_t)borderTopType :(float)borderTopValue :(int32_t)borderBottomType :(float)borderBottomValue :(float)flexGrow :(float)flexShrink :(int32_t)flexBasisType :(float)flexBasisValue :(int32_t)widthType :(float)widthValue :(int32_t)heightType :(float)heightValue :(int32_t)minWidthType :(float)minWidthValue :(int32_t)minHeightType :(float)minHeightValue :(int32_t)maxWidthType :(float)maxWidthValue :(int32_t)maxHeightType :(float)maxHeightValue :(int32_t)gapRowType :(float)gapRowValue :(int32_t)gapColumnType :(float)gapColumnValue :(float)aspectRatio :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoRows :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoColumns :(int32_t)gridAutoFlow :(int32_t)gridColumnStartType :(int16_t)gridColumnStartValue :(int32_t)gridColumnEndType :(int16_t)gridColumnEndValue :(int32_t)gridRowStartType :(int16_t)gridRowStartValue :(int32_t)gridRowEndType :(int16_t)gridRowEndValue :(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateRows gridTemplateColumns:(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateColumns;
++ (void)style_update_with_values:(void * _Nonnull)style :(int32_t)display :(int32_t)position :(int32_t)direction :(int32_t)flexDirection :(int32_t)flexWrap :(int32_t)overflow :(int32_t)alignItems :(int32_t)alignSelf :(int32_t)alignContent :(int32_t)justifyItems :(int32_t)justifySelf :(int32_t)justifyContent :(int32_t)insetLeftType :(float)insetLeftValue :(int32_t)insetRightType :(float)insetRightValue :(int32_t)insetTopType :(float)insetTopValue :(int32_t)insetBottomType :(float)insetBottomValue :(int32_t)marginLeftType :(float)marginLeftValue :(int32_t)marginRightType :(float)marginRightValue :(int32_t)marginTopType :(float)marginTopValue :(int32_t)marginBottomType :(float)marginBottomValue :(int32_t)paddingLeftType :(float)paddingLeftValue :(int32_t)paddingRightType :(float)paddingRightValue :(int32_t)paddingTopType :(float)paddingTopValue :(int32_t)paddingBottomType :(float)paddingBottomValue :(int32_t)borderLeftType :(float)borderLeftValue :(int32_t)borderRightType :(float)borderRightValue :(int32_t)borderTopType :(float)borderTopValue :(int32_t)borderBottomType :(float)borderBottomValue :(float)flexGrow :(float)flexShrink :(int32_t)flexBasisType :(float)flexBasisValue :(int32_t)widthType :(float)widthValue :(int32_t)heightType :(float)heightValue :(int32_t)minWidthType :(float)minWidthValue :(int32_t)minHeightType :(float)minHeightValue :(int32_t)maxWidthType :(float)maxWidthValue :(int32_t)maxHeightType :(float)maxHeightValue :(int32_t)gapRowType :(float)gapRowValue :(int32_t)gapColumnType :(float)gapColumnValue :(float)aspectRatio :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoRows :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoColumns :(int32_t)gridAutoFlow :(int32_t)gridColumnStartType :(int16_t)gridColumnStartValue :(int32_t)gridColumnEndType :(int16_t)gridColumnEndValue :(int32_t)gridRowStartType :(int16_t)gridRowStartValue :(int32_t)gridRowEndType :(int16_t)gridRowEndValue :(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateRows :(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateColumns :(int32_t)overflowX :(int32_t)overflowY scrollBarWidth:(float)scrollBarWidth;
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
@@ -733,6 +769,8 @@ SWIFT_CLASS_NAMED("MasonStyle")
 @property (nonatomic) enum FlexDirection flexDirection;
 @property (nonatomic) enum FlexWrap flexWrap;
 @property (nonatomic) enum Overflow overflow;
+@property (nonatomic) enum Overflow overflowX;
+@property (nonatomic) enum Overflow overflowY;
 @property (nonatomic) enum AlignItems alignItems;
 @property (nonatomic) enum AlignSelf alignSelf;
 @property (nonatomic) enum AlignContent alignContent;
@@ -766,6 +804,7 @@ SWIFT_CLASS_NAMED("MasonStyle")
 @property (nonatomic) float flexGrow;
 @property (nonatomic) float flexShrink;
 - (void)setFlexBasis:(float)value :(NSInteger)type;
+- (void)setScrollBarWidth:(float)value;
 @property (nonatomic, strong) MasonDimensionSizeCompat * _Nonnull minSizeCompat;
 - (void)setMinSizeWidth:(float)value :(NSInteger)type;
 - (void)setMinSizeHeight:(float)value :(NSInteger)type;
@@ -807,7 +846,7 @@ SWIFT_CLASS_NAMED("MaxSizing")
 + (MaxSizing * _Nonnull)Percent:(float)percent SWIFT_WARN_UNUSED_RESULT;
 + (MaxSizing * _Nonnull)FitContent:(float)fit SWIFT_WARN_UNUSED_RESULT;
 + (MaxSizing * _Nonnull)FitContentPercent:(float)fit SWIFT_WARN_UNUSED_RESULT;
-+ (MaxSizing * _Nonnull)Flex:(float)flex SWIFT_WARN_UNUSED_RESULT;
++ (MaxSizing * _Nonnull)Fraction:(float)flex SWIFT_WARN_UNUSED_RESULT;
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MaxSizing * _Nonnull Auto;)
 + (MaxSizing * _Nonnull)Auto SWIFT_WARN_UNUSED_RESULT;
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MaxSizing * _Nonnull MinContent;)
@@ -864,9 +903,10 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MinSizing *
 @end
 
 typedef SWIFT_ENUM_NAMED(NSInteger, Overflow, "Overflow", open) {
-  OverflowVisible = 0,
-  OverflowHidden = 1,
-  OverflowScroll = 2,
+  OverflowUnset = 0,
+  OverflowVisible = 1,
+  OverflowHidden = 2,
+  OverflowScroll = 3,
 };
 
 typedef SWIFT_ENUM_NAMED(NSInteger, Position, "Position", open) {
@@ -906,6 +946,7 @@ SWIFT_CLASS_NAMED("TrackSizingFunction")
 @property (nonatomic, readonly, strong) UIView * _Nullable rootView;
 + (UIView * _Nonnull)createGridView SWIFT_WARN_UNUSED_RESULT;
 + (UIView * _Nonnull)createFlexView SWIFT_WARN_UNUSED_RESULT;
++ (UIView * _Nonnull)createBlockView SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic, readonly, strong) MasonNode * _Nonnull mason;
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger masonPtr;)
 + (NSInteger)masonPtr SWIFT_WARN_UNUSED_RESULT;
@@ -918,11 +959,13 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger masonPtr;)
 - (void)configure:(SWIFT_NOESCAPE void (^ _Nonnull)(MasonNode * _Nonnull))block;
 @property (nonatomic) BOOL inBatch;
 @property (nonatomic) enum Display display;
-@property (nonatomic) enum Position position;
+@property (nonatomic) enum Position _position;
 @property (nonatomic) enum Direction direction;
 @property (nonatomic) enum FlexDirection flexDirection;
 @property (nonatomic) enum FlexWrap flexWrap;
 @property (nonatomic) enum Overflow overflow;
+@property (nonatomic) enum Overflow overflowX;
+@property (nonatomic) enum Overflow overflowY;
 @property (nonatomic) enum AlignItems alignItems;
 @property (nonatomic) enum AlignSelf alignSelf;
 @property (nonatomic) enum AlignContent alignContent;
@@ -931,6 +974,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger masonPtr;)
 @property (nonatomic) enum JustifyContent justifyContent;
 @property (nonatomic) float flexGrow;
 @property (nonatomic) float flexShrink;
+@property (nonatomic, strong) MasonDimensionCompat * _Nonnull scrollBarWidthCompat;
 @property (nonatomic, strong) MasonDimensionCompat * _Nonnull flexBasisCompat;
 @property (nonatomic) float aspectRatio;
 @property (nonatomic, copy) NSArray<MinMax *> * _Nonnull gridAutoRows;

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

@@ -9,9 +9,9 @@
 #include <stdlib.h>
 
 typedef enum CMasonDimensionType {
+  MasonDimensionAuto,
   MasonDimensionPoints,
   MasonDimensionPercent,
-  MasonDimensionAuto,
 } CMasonDimensionType;
 
 typedef enum CMasonGridPlacementType {
@@ -21,9 +21,9 @@ typedef enum CMasonGridPlacementType {
 } CMasonGridPlacementType;
 
 typedef enum CMasonLengthPercentageAutoType {
+  MasonLengthPercentageAutoAuto,
   MasonLengthPercentageAutoPoints,
   MasonLengthPercentageAutoPercent,
-  MasonLengthPercentageAutoAuto,
 } CMasonLengthPercentageAutoType;
 
 typedef enum CMasonLengthPercentageType {
@@ -122,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);
@@ -239,7 +241,10 @@ void mason_node_update_and_set_style_with_values(void *mason,
                                                  int grid_row_end_type,
                                                  short grid_row_end_value,
                                                  struct CMasonTrackSizingFunctionArray *grid_template_rows,
-                                                 struct CMasonTrackSizingFunctionArray *grid_template_columns);
+                                                 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,
@@ -322,6 +327,9 @@ void *mason_node_update_style_with_values_compute_and_layout(void *mason,
                                                              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,
@@ -407,6 +415,9 @@ void *mason_node_update_style_with_values_size_compute_and_layout(void *mason,
                                                                   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,
@@ -460,12 +471,12 @@ 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_measure_func(void *mason, void *node);
+void mason_node_remove_context(void *mason, void *node);
 
 void mason_destroy_non_repeated_track_sizing_function_array(struct CMasonNonRepeatedTrackSizingFunctionArray *array);
 
@@ -495,10 +506,6 @@ void mason_style_set_flex_wrap(void *style, int wrap);
 
 int mason_style_get_flex_wrap(void *style);
 
-void mason_style_set_overflow(void *_style, int _overflow);
-
-int mason_style_get_overflow(void *_style);
-
 void mason_style_set_align_items(void *style, int align);
 
 int mason_style_get_align_items(void *style);
@@ -774,6 +781,20 @@ struct CMasonTrackSizingFunctionArray *mason_style_get_grid_template_columns(voi
 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,
@@ -851,7 +872,10 @@ void *mason_style_init_with_values(int display,
                                    int32_t grid_row_end_type,
                                    int16_t grid_row_end_value,
                                    const struct CMasonTrackSizingFunctionArray *grid_template_rows,
-                                   const struct CMasonTrackSizingFunctionArray *grid_template_columns);
+                                   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,
@@ -931,7 +955,10 @@ void mason_style_update_with_values(void *style,
                                     int32_t grid_row_end_type,
                                     int16_t grid_row_end_value,
                                     struct CMasonTrackSizingFunctionArray *grid_template_rows,
-                                    struct CMasonTrackSizingFunctionArray *grid_template_columns);
+                                    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);