@triniwiz/nativescript-masonkit 1.0.0-alpha.24 → 1.0.0-alpha.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triniwiz/nativescript-masonkit",
-  "version": "1.0.0-alpha.24",
+  "version": "1.0.0-alpha.26",
   "description": "Web Inspired Layout",
   "main": "index",
   "typings": "index.d.ts",

package/platforms/ios/Mason.xcframework/Info.plist

@@ -10,15 +10,18 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Mason.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -26,18 +29,15 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>Mason.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

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

@@ -434,21 +434,33 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MasonGridTra
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
-@class UIView;
+@class MasonStyle;
 @class MasonNode;
+@class UIView;
+SWIFT_PROTOCOL("_TtP5Mason16MasonElementObjc_")
+@protocol MasonElementObjc <NSObject>
+@property (nonatomic, readonly, strong) MasonStyle * _Nonnull style;
+@property (nonatomic, readonly, strong) MasonNode * _Nonnull node;
+@property (nonatomic, readonly, strong) UIView * _Nonnull uiView;
+@end
+
 @class NSCMason;
+enum MasonLoadingState : NSInteger;
 @class UIImage;
 @class NSCoder;
 SWIFT_CLASS_NAMED("Img")
-@interface MasonImg : UIImageView
-@property (nonatomic, readonly, strong) UIView * _Nonnull uiView;
+@interface MasonImg : UIImageView <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);
 @property (nonatomic, strong) UIImage * _Nullable image;
 @property (nonatomic, copy) NSString * _Nullable src;
 - (void)updateImage:(UIImage * _Nullable)image;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
+- (void)syncStyle:(NSString * _Nonnull)state;
 - (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;
@@ -504,6 +516,12 @@ typedef SWIFT_ENUM_NAMED(NSInteger, MasonLineHeight, "LineHeight", open) {
   MasonLineHeightPreLine = 3,
 };
 
+typedef SWIFT_ENUM_NAMED(NSInteger, MasonLoadingState, "LoadingState", open) {
+  MasonLoadingStateLoading = 0,
+  MasonLoadingStateLoaded = 1,
+  MasonLoadingStateError = 2,
+};
+
 SWIFT_PROTOCOL("_TtP5Mason18MasonCharacterData_")
 @protocol MasonCharacterData
 @property (nonatomic, copy) NSString * _Nonnull data;
@@ -586,6 +604,7 @@ SWIFT_CLASS_NAMED("MasonLayout")
 @property (nonatomic, readonly, copy) NSArray<MasonLayout *> * _Nonnull children;
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MasonLayout * _Nonnull zero;)
 + (MasonLayout * _Nonnull)zero SWIFT_WARN_UNUSED_RESULT;
+@property (nonatomic, readonly) BOOL hasChildren;
 @property (nonatomic, readonly, copy) NSString * _Nonnull description;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@@ -688,15 +707,20 @@ SWIFT_CLASS_NAMED("MasonLengthPercentageSizeCompat")
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
+enum MasonNodeType : int32_t;
 SWIFT_CLASS_NAMED("MasonNode")
 @interface MasonNode : NSObject
+@property (nonatomic, readonly, strong) NSCMason * _Nonnull mason;
 @property (nonatomic, readonly) void * _Nullable nativePtr;
 @property (nonatomic, readonly, strong) MasonLayout * _Nonnull computedLayout;
+@property (nonatomic, readonly, strong) MasonDocument * _Nullable document;
 - (MasonNode * _Nonnull)getRootNode SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic, readonly, strong) MasonNode * _Nullable parent;
 @property (nonatomic, readonly, strong) MasonNode * _Nullable parentNode;
+@property (nonatomic, readonly) enum MasonNodeType type;
 - (NSArray<MasonNode *> * _Nonnull)getChildren SWIFT_WARN_UNUSED_RESULT;
 - (NSArray<MasonNode *> * _Nonnull)getLayoutChildren SWIFT_WARN_UNUSED_RESULT;
+@property (nonatomic) BOOL inBatch;
 - (nonnull instancetype)initWithMason:(NSCMason * _Nonnull)doc children:(NSArray<MasonNode *> * _Nonnull)nodes OBJC_DESIGNATED_INITIALIZER;
 @property (nonatomic, readonly) BOOL isDirty;
 - (void)markDirty;
@@ -710,6 +734,12 @@ SWIFT_CLASS_NAMED("MasonNode")
 - (void)appendChild:(MasonNode * _Nonnull)child;
 @end
 
+typedef SWIFT_ENUM_NAMED(int32_t, MasonNodeType, "MasonNodeType", open) {
+  MasonNodeTypeElement = 0,
+  MasonNodeTypeText = 1,
+  MasonNodeTypeDocument = 2,
+};
+
 enum MasonOverflow : NSInteger;
 SWIFT_CLASS_NAMED("MasonOverflowPointCompat")
 @interface MasonOverflowPointCompat : NSObject
@@ -821,16 +851,21 @@ enum MasonTextTransform : NSInteger;
 enum MasonWhiteSpace : NSInteger;
 enum MasonTextWrap : NSInteger;
 SWIFT_CLASS_NAMED("MasonText")
-@interface MasonText : UIView
+@interface MasonText : UIView <MasonElementObjc>
 @property (nonatomic, readonly, strong) MasonNode * _Nonnull node;
 @property (nonatomic, readonly) enum MasonTextType type;
 @property (nonatomic, readonly, strong) NSMutableData * _Nonnull textValues;
 @property (nonatomic, readonly, strong) NSCFontFace * _Nonnull font;
 @property (nonatomic, readonly, strong) UIView * _Nonnull uiView;
+@property (nonatomic, readonly, strong) MasonStyle * _Nonnull style;
 @property (nonatomic, strong) MasonTextOverflowCompat * _Nonnull textOverflowCompat;
 - (nonnull instancetype)initWithMason:(NSCMason * _Nonnull)mason type:(enum MasonTextType)textType OBJC_DESIGNATED_INITIALIZER;
 - (nonnull instancetype)initWithMason:(NSCMason * _Nonnull)mason OBJC_DESIGNATED_INITIALIZER;
+- (void)setNeedsDisplay;
+- (void)requestLayout;
 - (void)syncStyle:(NSString * _Nonnull)state textState:(NSString * _Nonnull)textState;
+- (void)addView:(UIView * _Nonnull)view;
+- (void)addView:(UIView * _Nonnull)view at:(NSInteger)at;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
 @property (nonatomic) uint32_t color;
 @property (nonatomic) uint32_t backgroundColorValue;
@@ -868,8 +903,6 @@ SWIFT_CLASS_NAMED("MasonText")
 @interface MasonText (SWIFT_EXTENSION(Mason))
 /// Remove child from text container
 - (MasonNode * _Nullable)removeChild:(MasonNode * _Nonnull)child;
-/// Insert child at specific index
-- (void)insertChild:(MasonNode * _Nonnull)child at:(NSInteger)index;
 @end
 
 SWIFT_CLASS_NAMED("MasonTextNode")
@@ -913,13 +946,15 @@ typedef SWIFT_ENUM_NAMED(NSInteger, MasonTextType, "MasonTextType", open) {
 };
 
 SWIFT_CLASS_NAMED("MasonUIView")
-@interface MasonUIView : UIView
+@interface MasonUIView : 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;
 - (void)markNodeDirty;
 - (BOOL)isNodeDirty SWIFT_WARN_UNUSED_RESULT;
-@property (nonatomic, readonly, strong) MasonNode * _Nonnull node;
-@property (nonatomic, readonly, strong) NSCMason * _Nonnull mason;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
+- (void)syncStyle:(NSString * _Nonnull)state;
 + (MasonUIView * _Nonnull)createGridView:(NSCMason * _Nonnull)mason SWIFT_WARN_UNUSED_RESULT;
 + (MasonUIView * _Nonnull)createFlexView:(NSCMason * _Nonnull)mason SWIFT_WARN_UNUSED_RESULT;
 + (MasonUIView * _Nonnull)createBlockView:(NSCMason * _Nonnull)mason SWIFT_WARN_UNUSED_RESULT;
@@ -1200,6 +1235,45 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) NSCMason * _Nonnull sh
 - (MasonNode * _Nonnull)createTextNode SWIFT_WARN_UNUSED_RESULT;
 @end
 
+@interface NSObject (SWIFT_EXTENSION(Mason))
+- (void)mason_addView:(UIView * _Nonnull)view;
+- (void)mason_addView:(UIView * _Nonnull)view at:(NSInteger)at;
+- (void)mason_markNodeDirty;
+- (BOOL)mason_isNodeDirty SWIFT_WARN_UNUSED_RESULT;
+- (void)mason_configure:(SWIFT_NOESCAPE void (^ _Nonnull)(MasonStyle * _Nonnull))block;
+- (MasonLayout * _Nonnull)mason_layout;
+- (void)mason_compute;
+- (void)mason_computeWithWidth:(float)width height:(float)height;
+- (void)mason_computeMaxContent;
+- (void)mason_computeMinContent;
+- (void)mason_computeWithSize:(float)width :(float)height;
+- (void)mason_computeWithViewSize;
+- (void)mason_computeWithViewSizeWithLayout:(BOOL)layout;
+- (void)mason_computeWithMaxContent;
+- (void)mason_computeWithMinContent;
+- (void)mason_attachAndApply;
+- (void)mason_requestLayout;
+- (void)mason_invalidateLayout;
+- (void)mason_append:(id <MasonElementObjc> _Nonnull)element;
+- (void)mason_appendWithText:(NSString * _Nonnull)text;
+- (void)mason_appendWithNode:(MasonNode * _Nonnull)node;
+- (void)mason_appendWithTexts:(NSArray<NSString *> * _Nonnull)texts;
+- (void)mason_appendWithElements:(NSArray<id <MasonElementObjc>> * _Nonnull)elements;
+- (void)mason_appendWithNodes:(NSArray<MasonNode *> * _Nonnull)nodes;
+- (void)mason_prepend:(id <MasonElementObjc> _Nonnull)element;
+- (void)mason_prependWithText:(NSString * _Nonnull)text;
+- (void)mason_prependWithNode:(MasonNode * _Nonnull)node;
+- (void)mason_prependWithTexts:(NSArray<NSString *> * _Nonnull)texts;
+- (void)mason_prependWithElements:(NSArray<id <MasonElementObjc>> * _Nonnull)elements;
+- (void)mason_prependWithNodes:(NSArray<MasonNode *> * _Nonnull)nodes;
+- (void)mason_addChildAtText:(NSString * _Nonnull)text :(NSInteger)index;
+- (void)mason_addChildAtElement:(id <MasonElementObjc> _Nonnull)element :(NSInteger)index;
+- (void)mason_addChildAtNode:(MasonNode * _Nonnull)node :(NSInteger)index;
+- (void)mason_replaceChildAtText:(NSString * _Nonnull)text :(NSInteger)index;
+- (void)mason_replaceChildAtElement:(id <MasonElementObjc> _Nonnull)element :(NSInteger)index;
+- (void)mason_replaceChildAtNode:(MasonNode * _Nonnull)node :(NSInteger)index;
+@end
+
 typedef SWIFT_ENUM_NAMED(NSInteger, MasonOverflow, "Overflow", open) {
   MasonOverflowVisible = 0,
   MasonOverflowHidden = 1,
@@ -1214,10 +1288,12 @@ typedef SWIFT_ENUM_NAMED(NSInteger, MasonPosition, "Position", open) {
 };
 
 SWIFT_CLASS_NAMED("Scroll")
-@interface MasonScroll : UIScrollView <UIScrollViewDelegate>
-@property (nonatomic, readonly, strong) UIView * _Nonnull uiView;
+@interface MasonScroll : UIScrollView <MasonElementObjc, UIScrollViewDelegate>
 @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;
+- (void)syncStyle:(NSString * _Nonnull)state;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
 - (void)scrollViewWillBeginDragging:(UIScrollView * _Nonnull)scrollView;
 - (void)scrollViewDidScroll:(UIScrollView * _Nonnull)scrollView;
@@ -1227,6 +1303,41 @@ SWIFT_CLASS_NAMED("Scroll")
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
 
+SWIFT_CLASS_NAMED("SwiftHelpers")
+@interface MasonSwiftHelpers : NSObject
++ (void)markNodeDirty:(id <MasonElementObjc> _Nonnull)element;
++ (BOOL)isNodeDirty:(id <MasonElementObjc> _Nonnull)element SWIFT_WARN_UNUSED_RESULT;
++ (void)configure:(id <MasonElementObjc> _Nonnull)element :(SWIFT_NOESCAPE void (^ _Nonnull)(MasonStyle * _Nonnull))block;
++ (MasonLayout * _Nonnull)layout:(id <MasonElementObjc> _Nonnull)element;
++ (void)compute:(id <MasonElementObjc> _Nonnull)element;
++ (void)compute:(id <MasonElementObjc> _Nonnull)element :(float)width :(float)height;
++ (void)computeMaxContent:(id <MasonElementObjc> _Nonnull)element;
++ (void)computeMinContent:(id <MasonElementObjc> _Nonnull)element;
++ (void)computeWithSize:(id <MasonElementObjc> _Nonnull)element :(float)width :(float)height;
++ (void)computeWithViewSize:(id <MasonElementObjc> _Nonnull)element;
++ (void)computeWithViewSize:(id <MasonElementObjc> _Nonnull)element layout:(BOOL)layout;
++ (void)computeWithMaxContent:(id <MasonElementObjc> _Nonnull)element;
++ (void)computeWithMinContent:(id <MasonElementObjc> _Nonnull)element;
++ (void)attachAndApply:(id <MasonElementObjc> _Nonnull)element;
++ (void)requestLayout:(id <MasonElementObjc> _Nonnull)element;
++ (void)append:(id <MasonElementObjc> _Nonnull)parent :(id <MasonElementObjc> _Nonnull)element;
++ (void)append:(id <MasonElementObjc> _Nonnull)parent text:(NSString * _Nonnull)text;
++ (void)append:(id <MasonElementObjc> _Nonnull)parent node:(MasonNode * _Nonnull)node;
++ (void)append:(id <MasonElementObjc> _Nonnull)parent texts:(NSArray<NSString *> * _Nonnull)texts;
++ (void)append:(id <MasonElementObjc> _Nonnull)parent elements:(NSArray<id <MasonElementObjc>> * _Nonnull)elements;
++ (void)append:(id <MasonElementObjc> _Nonnull)parent nodes:(NSArray<MasonNode *> * _Nonnull)nodes;
++ (void)prepend:(id <MasonElementObjc> _Nonnull)parent :(id <MasonElementObjc> _Nonnull)element;
++ (void)prepend:(id <MasonElementObjc> _Nonnull)parent string:(NSString * _Nonnull)string;
++ (void)prepend:(id <MasonElementObjc> _Nonnull)parent node:(MasonNode * _Nonnull)node;
++ (void)prepend:(id <MasonElementObjc> _Nonnull)parent strings:(NSArray<NSString *> * _Nonnull)strings;
++ (void)prepend:(id <MasonElementObjc> _Nonnull)parent elements:(NSArray<id <MasonElementObjc>> * _Nonnull)elements;
++ (void)prepend:(id <MasonElementObjc> _Nonnull)parent nodes:(NSArray<MasonNode *> * _Nonnull)nodes;
++ (void)addChildAt:(id <MasonElementObjc> _Nonnull)parent text:(NSString * _Nonnull)text :(NSInteger)index;
++ (void)addChildAt:(id <MasonElementObjc> _Nonnull)parent element:(id <MasonElementObjc> _Nonnull)element :(NSInteger)index;
++ (void)addChildAt:(id <MasonElementObjc> _Nonnull)parent node:(MasonNode * _Nonnull)node :(NSInteger)index;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+@end
+
 typedef SWIFT_ENUM_NAMED(NSInteger, MasonTextAlign, "TextAlign", open) {
   MasonTextAlignAuto = 0,
   MasonTextAlignLeft = 1,

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

@@ -6,7 +6,6 @@
 //
 
 #import <Foundation/Foundation.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -15,10 +14,6 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-
-
-
 //! Project version number for Mason.
 FOUNDATION_EXPORT double MasonVersionNumber;
 

package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/NSObject+MasonElement_Defaults.h

@@ -0,0 +1,100 @@
+//
+//  NSObject+MasonElement_Defaults.h
+//  Mason
+//
+//  Created by Osei Fortune on 20/10/2025.
+//
+
+#import <Foundation/Foundation.h>
+#import <Mason/Mason-Swift.h>
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSObject (MasonElement_Defaults)<MasonElement>
+-(void)objc_markNodeDirty;
+
+-(BOOL)objc_isNodeDirty;
+
+-(void)objc_configure:(void (^)(MasonStyle* style))block;
+
+-(MasonLayout*)objc_layout;
+
+-(void)objc_compute;
+
+
+-(void)objc_computeWithWidth:(float)width height:(float)height;
+
+
+-(void)objc_computeMaxContent;
+
+
+-(void)objc_computeMinContent;
+
+
+-(void)objc_computeWithSize:(float)width height:(float)height;
+
+
+-(void)objc_computeWithViewSize;
+
+
+-(void)objc_computeWithViewSizeAndLayout:(BOOL)layout;
+
+
+-(void)objc_computeWithMaxContent;
+
+
+-(void)objc_computeWithMinContent;
+
+
+-(void)objc_attachAndApply;
+
+-(void)objc_requestLayout;
+
+-(void)objc_invalidateLayout;
+
+-(void)objc_append:(id<MasonElement>)element;
+
+
+-(void)objc_appendText:(NSString *)text;
+
+
+-(void)objc_appendNode:(MasonNode *)node;
+
+
+-(void)objc_appendTexts:(NSArray<NSString *> *)texts;
+
+
+-(void)objc_appendElements:(NSArray<id<MasonElement>> *)elements;
+
+
+-(void)objc_appendNodes:(NSArray<MasonNode*> *)nodes;
+
+
+-(void)objc_prepend:(id<MasonElement>)element;
+
+
+-(void)objc_prependText:(NSString *)text;
+
+
+-(void)objc_prependNode:(MasonNode *)node;
+
+
+-(void)objc_prependTexts:(NSArray<NSString *> *)texts;
+
+
+-(void)objc_prependElements:(NSArray<id<MasonElement>> *)elements;
+
+
+-(void)objc_prependNodes:(NSArray<MasonNode *> *)nodes;
+
+
+- (void)objc_addChildAt:(id<MasonElement>)element atIndex:(NSInteger)index;
+
+
+- (void)objc_addChildAtWithString:(NSString *)text atIndex:(NSInteger)index;
+
+
+- (void)objc_addChildAtWithNode:(MasonNode *)node atIndex:(NSInteger)index;
+
+@end
+
+NS_ASSUME_NONNULL_END