@triniwiz/nativescript-masonkit 1.0.0-beta.70 → 1.0.0-beta.71

package/index.d.ts

@@ -92,6 +92,9 @@ declare module '@nativescript/core/ui/styling/style' {
     gridRowEnd: string;
     gridTemplateRows: string;
     gridTemplateColumns: string;
+    gridTemplateAreas: string;
+    textOverflow: 'clip' | 'ellipsis' | string;
+    textWrap: 'nowrap' | 'wrap' | 'balance';
     overflow: Overflow | `${Overflow} ${Overflow}`;
     overflowX: Overflow;
     overflowY: Overflow;
@@ -164,6 +167,9 @@ interface Style {
   gridRowEnd: string;
   gridTemplateRows: string;
   gridTemplateColumns: string;
+  gridTemplateAreas: string;
+  textOverflow: 'clip' | 'ellipsis' | string;
+  textWrap: 'nowrap' | 'wrap' | 'balance';
   overflow: Overflow | `${Overflow} ${Overflow}`;
   overflowX: Overflow;
   overflowY: Overflow;
@@ -234,6 +240,9 @@ interface IViewBase {
   gridRowEnd: string;
   gridTemplateRows: string;
   gridTemplateColumns: string;
+  gridTemplateAreas: string;
+  textOverflow: 'clip' | 'ellipsis' | string;
+  textWrap: 'nowrap' | 'wrap' | 'balance';
   overflow: Overflow;
   overflowX: Overflow;
   overflowY: Overflow;

package/package.json

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

package/platforms/android/include.gradle

@@ -2,6 +2,7 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.10'
   implementation 'com.github.bumptech.glide:glide:4.14.2'
   annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
+  implementation 'org.nativescript:fontmanager:1.0.8'
 }
 
 android {

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

@@ -1,6 +1,6 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 6.2.3 effective-5.10 (swiftlang-6.2.3.3.21 clang-1700.6.3.2)
+// Generated by Apple Swift version 6.3.1 effective-5.10 (swiftlang-6.3.1.1.2 clang-2100.0.123.102)
 #ifndef MASON_SWIFT_H
 #define MASON_SWIFT_H
 #pragma clang diagnostic push
@@ -26,7 +26,7 @@
 #pragma clang diagnostic ignored "-Wauto-import"
 #if defined(__OBJC__)
 #include <Foundation/Foundation.h>
-#endif
+#endif // defined(__OBJC__)
 #if defined(__cplusplus)
 #include <cstdint>
 #include <cstddef>
@@ -195,13 +195,32 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # endif
 #endif
 #if !defined(SWIFT_ENUM)
-# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
-# if __has_feature(generalized_swift_name)
-#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
+# if (defined(__cplusplus) && __cplusplus >= 201103L) ||      (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) ||      __has_feature(objc_fixed_enum)
+#  define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
+#  if __has_feature(generalized_swift_name)
+#   define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
+#  else
+#   define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility)
+#  endif
 # else
+#  define SWIFT_ENUM(_type, _name, _extensibility) _type _name; enum 
 #  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility)
 # endif
 #endif
+#if !defined(SWIFT_ENUM_TAG)
+# if (defined(__cplusplus) && __cplusplus >= 201103L) ||      (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) ||      __has_feature(objc_fixed_enum)
+#  define SWIFT_ENUM_TAG enum
+# else
+#  define SWIFT_ENUM_TAG
+# endif
+#endif
+#if !defined(SWIFT_ENUM_FWD_DECL)
+# if (defined(__cplusplus) && __cplusplus >= 201103L) ||      (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) ||      __has_feature(objc_fixed_enum)
+#  define SWIFT_ENUM_FWD_DECL(_type, _name) enum _name : _type;
+# else
+#  define SWIFT_ENUM_FWD_DECL(_type, _name) typedef _type _name;
+# endif
+#endif
 #if !defined(SWIFT_UNAVAILABLE)
 # define SWIFT_UNAVAILABLE __attribute__((unavailable))
 #endif
@@ -211,6 +230,9 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #if !defined(SWIFT_AVAILABILITY)
 # define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
 #endif
+#if !defined(SWIFT_AVAILABILITY_DOMAIN)
+# define SWIFT_AVAILABILITY_DOMAIN(dom, ...) __attribute__((availability(domain: dom, __VA_ARGS__)))
+#endif
 #if !defined(SWIFT_WEAK_IMPORT)
 # define SWIFT_WEAK_IMPORT __attribute__((weak_import))
 #endif
@@ -276,6 +298,49 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # define SWIFT_IMPORT_STDLIB_SYMBOL 
 #endif
 #endif
+#if !__has_feature(nullability)
+# define _Nonnull
+# define _Nullable
+# define _Null_unspecified
+#elif !defined(__OBJC__)
+# pragma clang diagnostic ignored "-Wnullability-extension"
+#endif
+#if !__has_feature(nullability_nullable_result)
+# define _Nullable_result _Nullable
+#endif
+#if __has_feature(objc_modules)
+#if __has_warning("-Watimport-in-framework-header")
+#pragma clang diagnostic ignored "-Watimport-in-framework-header"
+#endif
+#endif
+
+#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
+#pragma clang diagnostic ignored "-Wduplicate-method-arg"
+#if __has_warning("-Wpragma-clang-attribute")
+# pragma clang diagnostic ignored "-Wpragma-clang-attribute"
+#endif
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wnullability"
+#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+
+#if __has_attribute(external_source_symbol)
+# pragma push_macro("any")
+# undef any
+# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="Mason",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol))
+# pragma pop_macro("any")
+#endif
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#if defined(__cplusplus)
+} // extern "C"
+#endif
+#if __has_attribute(external_source_symbol)
+# pragma clang attribute pop
+#endif
 #if defined(__OBJC__)
 #if __has_feature(objc_modules)
 #if __has_warning("-Watimport-in-framework-header")
@@ -289,7 +354,7 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 @import UIKit;
 #endif
 
-#endif
+#endif // defined(__OBJC__)
 #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
 #pragma clang diagnostic ignored "-Wduplicate-method-arg"
 #if __has_warning("-Wpragma-clang-attribute")
@@ -486,7 +551,7 @@ typedef SWIFT_ENUM_NAMED(NSInteger, MasonGridAutoFlowWrap, "GridAutoFlow", open)
   MasonGridAutoFlowWrapColumnDense = 3,
 };
 
-enum MasonGridPlacementCompatType : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonGridPlacementCompatType)
 SWIFT_CLASS_NAMED("GridPlacementCompat")
 @interface GridPlacementCompat : NSObject
 - (nonnull instancetype)initWithSpan:(int16_t)span OBJC_DESIGNATED_INITIALIZER;
@@ -530,7 +595,7 @@ SWIFT_CLASS_NAMED("HTMLParser")
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
-enum MasonLoadingState : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonLoadingState)
 @class UIImage;
 SWIFT_CLASS_NAMED("Img")
 @interface MasonImg : UIView <MasonElementObjc>
@@ -644,7 +709,7 @@ SWIFT_PROTOCOL("_TtP5Mason18MasonCharacterData_")
 - (nonnull instancetype)replaceDataWithRange:(NSRange)range with:(NSString * _Nonnull)s;
 @end
 
-enum MasonDimensionCompatType : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonDimensionCompatType)
 SWIFT_CLASS_NAMED("MasonDimensionCompat")
 @interface MasonDimensionCompat : NSObject
 - (nonnull instancetype)initWithPoints:(float)points OBJC_DESIGNATED_INITIALIZER;
@@ -756,7 +821,7 @@ SWIFT_CLASS("_TtC5Mason15MasonImageLayer")
 - (void)layoutSublayers;
 @end
 
-enum MasonInputType : int8_t;
+SWIFT_ENUM_FWD_DECL(int8_t, MasonInputType)
 @class NSDate;
 SWIFT_CLASS_NAMED("MasonInput")
 @interface MasonInput : UIView
@@ -844,7 +909,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MasonLayout
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
-enum MasonLengthPercentageAutoCompatType : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonLengthPercentageAutoCompatType)
 SWIFT_CLASS_NAMED("MasonLengthPercentageAutoCompat")
 @interface MasonLengthPercentageAutoCompat : NSObject
 - (nonnull instancetype)initWithPoints:(float)points OBJC_DESIGNATED_INITIALIZER;
@@ -894,7 +959,7 @@ SWIFT_CLASS_NAMED("MasonLengthPercentageAutoSizeCompat")
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
-enum MasonLengthPercentageCompatType : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonLengthPercentageCompatType)
 SWIFT_CLASS_NAMED("MasonLengthPercentageCompat")
 @interface MasonLengthPercentageCompat : NSObject
 - (nonnull instancetype)initWithPoints:(float)points OBJC_DESIGNATED_INITIALIZER;
@@ -1049,8 +1114,8 @@ SWIFT_CLASS_NAMED("MasonMouseEventOptions")
 - (nonnull instancetype)initWithIsComposing:(BOOL)isComposing OBJC_DESIGNATED_INITIALIZER;
 @end
 
-enum PseudoState : uint16_t;
-enum MasonNodeType : int32_t;
+SWIFT_ENUM_FWD_DECL(uint16_t, PseudoState)
+SWIFT_ENUM_FWD_DECL(int32_t, MasonNodeType)
 SWIFT_CLASS_NAMED("MasonNode")
 @interface MasonNode : NSObject
 @property (nonatomic, readonly, strong) NSCMason * _Nonnull mason;
@@ -1103,7 +1168,7 @@ typedef SWIFT_ENUM_NAMED(int32_t, MasonNodeType, "MasonNodeType", open) {
   MasonNodeTypeDocument = 2,
 };
 
-enum MasonOverflow : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonOverflow)
 SWIFT_CLASS_NAMED("MasonOverflowPointCompat")
 @interface MasonOverflowPointCompat : NSObject
 @property (nonatomic) enum MasonOverflow x;
@@ -1134,15 +1199,15 @@ SWIFT_CLASS_NAMED("MasonSizeHelper")
 
 @class NSCFontFace;
 @class MasonVerticalAlignValue;
-enum MasonObjectFit : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonObjectFit)
 @class UIColor;
-enum MasonTextJustify : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonTextJustify)
 @class MasonTextOverflowCompat;
-enum MasonTextTransform : NSInteger;
-enum MasonWhiteSpace : NSInteger;
-enum MasonTextWrap : NSInteger;
-enum MasonPosition : NSInteger;
-enum MasonTextAlign : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonTextTransform)
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonWhiteSpace)
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonTextWrap)
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonPosition)
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonTextAlign)
 SWIFT_CLASS_NAMED("MasonStyle")
 @interface MasonStyle : NSObject
 @property (nonatomic, readonly, strong) NSCFontFace * _Null_unspecified font;
@@ -1292,7 +1357,7 @@ SWIFT_CLASS_NAMED("MasonStyle")
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
-enum MasonTextType : NSInteger;
+SWIFT_ENUM_FWD_DECL(NSInteger, MasonTextType)
 SWIFT_CLASS_NAMED("MasonText")
 @interface MasonText : UIView <MasonElementObjc, MasonTextContainer>
 @property (nonatomic, readonly, strong) MasonNode * _Nonnull node;
@@ -1451,12 +1516,15 @@ SWIFT_CLASS_NAMED("MasonUIView")
 - (BOOL)isNodeDirty SWIFT_WARN_UNUSED_RESULT;
 - (void)layoutSubviews;
 - (void)willMoveToWindow:(UIWindow * _Nullable)newWindow;
+- (void)willMoveToSuperview:(UIView * _Nullable)newSuperview;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
 + (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;
 - (void)addView:(UIView * _Nonnull)view;
 - (void)addView:(UIView * _Nonnull)view at:(NSInteger)at;
+- (void)removeView:(UIView * _Nonnull)view;
+- (void)removeViewAt:(NSInteger)index;
 - (void)addSubviews:(NSArray<UIView *> * _Nonnull)views;
 - (void)addSubviews:(NSArray<UIView *> * _Nonnull)views at:(NSInteger)index;
 @property (nonatomic) BOOL inBatch;
@@ -1626,101 +1694,6 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MinSizing *
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
-SWIFT_CLASS_NAMED("NSCFontDescriptors")
-@interface NSCFontDescriptors : NSObject <NSMutableCopying>
-- (id _Nonnull)mutableCopyWithZone:(struct _NSZone * _Nullable)zone SWIFT_WARN_UNUSED_RESULT;
-- (nonnull instancetype)initWithFamily:(NSString * _Nonnull)family OBJC_DESIGNATED_INITIALIZER;
-- (void)update:(NSString * _Nonnull)value;
-- (void)setFontWeight:(NSString * _Nonnull)value;
-- (void)setFontStyle:(NSString * _Nonnull)value;
-- (nonnull instancetype)init SWIFT_UNAVAILABLE;
-+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
-@end
-
-typedef SWIFT_ENUM_NAMED(NSInteger, NSCFontDisplay, "NSCFontDisplay", open) {
-  NSCFontDisplayAuto = 0,
-  NSCFontDisplayBlock = 1,
-  NSCFontDisplayFallback = 2,
-  NSCFontDisplayOptional = 3,
-  NSCFontDisplaySwap = 4,
-};
-
-@class NSData;
-enum NSCFontFaceStatus : NSInteger;
-enum NSCFontWeight : NSInteger;
-SWIFT_CLASS_NAMED("NSCFontFace")
-@interface NSCFontFace : NSObject
-@property (nonatomic, readonly) CGFontRef _Nullable font;
-@property (nonatomic, readonly, strong) NSData * _Nullable fontData;
-- (void)updateDescriptorWithValue:(NSString * _Nonnull)value;
-+ (NSCFontFace * _Nullable)loadFromStyleWithStyle:(NSString * _Nonnull)style SWIFT_WARN_UNUSED_RESULT;
-+ (void)importFromRemoteWithUrl:(NSString * _Nonnull)url load:(BOOL)load callback:(void (^ _Nonnull)(NSArray<NSCFontFace *> * _Nullable, NSString * _Nullable))callback;
-- (nonnull instancetype)initWithFamily:(NSString * _Nonnull)family OBJC_DESIGNATED_INITIALIZER;
-- (nonnull instancetype)initWithFamily:(NSString * _Nonnull)family owner:(MasonStyle * _Nonnull)style OBJC_DESIGNATED_INITIALIZER;
-- (nonnull instancetype)initWithFamily:(NSString * _Nonnull)family source:(NSString * _Nonnull)source OBJC_DESIGNATED_INITIALIZER;
-- (nonnull instancetype)initWithFamily:(NSString * _Nonnull)family data:(NSData * _Nonnull)source OBJC_DESIGNATED_INITIALIZER;
-- (nonnull instancetype)init:(NSString * _Nonnull)family :(NSString * _Nullable)source :(NSCFontDescriptors * _Nullable)descriptors OBJC_DESIGNATED_INITIALIZER;
-- (nonnull instancetype)init:(NSString * _Nonnull)family data:(NSData * _Nullable)data :(NSCFontDescriptors * _Nullable)descriptors OBJC_DESIGNATED_INITIALIZER;
-@property (nonatomic) enum NSCFontFaceStatus status;
-@property (nonatomic) enum NSCFontDisplay display;
-- (void)setFontDisplayWithValue:(NSString * _Nonnull)value;
-@property (nonatomic, copy) NSString * _Nonnull style;
-- (void)setFontStyleWithValue:(NSString * _Nonnull)value angle:(NSString * _Nullable)angle;
-@property (nonatomic) enum NSCFontWeight weight;
-- (void)setFontWeightWithValue:(NSString * _Nonnull)value;
-@property (nonatomic, readonly, copy) NSString * _Nonnull family;
-@property (nonatomic, readonly, copy) NSString * _Nonnull ascentOverride;
-@property (nonatomic, readonly, copy) NSString * _Nonnull descentOverride;
-- (void)load:(void (^ _Nonnull)(NSString * _Nullable))callback;
-- (nonnull instancetype)init SWIFT_UNAVAILABLE;
-+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
-@end
-
-enum NSCFontFaceSetStatus : NSInteger;
-@class NSEnumerator;
-SWIFT_CLASS_NAMED("NSCFontFaceSet")
-@interface NSCFontFaceSet : NSObject
-SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) NSCFontFaceSet * _Nonnull instance;)
-+ (NSCFontFaceSet * _Nonnull)instance SWIFT_WARN_UNUSED_RESULT;
-@property (nonatomic) enum NSCFontFaceSetStatus status;
-@property (nonatomic, copy) void (^ _Nullable onStatus)(enum NSCFontFaceSetStatus);
-- (NSEnumerator * _Nonnull)iter SWIFT_WARN_UNUSED_RESULT;
-- (NSArray * _Nonnull)array SWIFT_WARN_UNUSED_RESULT;
-- (NSCFontFace * _Nonnull)get:(NSString * _Nonnull)fontFamily SWIFT_WARN_UNUSED_RESULT;
-- (NSCFontFace * _Nullable)getOrNil:(NSString * _Nonnull)fontFamily SWIFT_WARN_UNUSED_RESULT;
-- (void)add:(NSCFontFace * _Nonnull)font;
-- (void)clear;
-- (void)delete:(NSCFontFace * _Nonnull)font;
-- (BOOL)check:(NSString * _Nonnull)font :(NSString * _Nullable)text SWIFT_WARN_UNUSED_RESULT;
-- (void)load:(NSString * _Nonnull)font :(NSString * _Nullable)text :(void (^ _Nonnull)(NSArray<NSCFontFace *> * _Nonnull, NSString * _Nullable))callback;
-@property (nonatomic, readonly) NSInteger size;
-- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
-@end
-
-typedef SWIFT_ENUM_NAMED(NSInteger, NSCFontFaceSetStatus, "NSCFontFaceSetStatus", open) {
-  NSCFontFaceSetStatusLoading = 0,
-  NSCFontFaceSetStatusLoaded = 1,
-};
-
-typedef SWIFT_ENUM_NAMED(NSInteger, NSCFontFaceStatus, "NSCFontFaceStatus", open) {
-  NSCFontFaceStatusUnloaded = 0,
-  NSCFontFaceStatusLoading = 1,
-  NSCFontFaceStatusLoaded = 2,
-  NSCFontFaceStatusError = 3,
-};
-
-typedef SWIFT_ENUM_NAMED(NSInteger, NSCFontWeight, "NSCFontWeight", open) {
-  NSCFontWeightThin = 0,
-  NSCFontWeightExtraLight = 1,
-  NSCFontWeightLight = 2,
-  NSCFontWeightNormal = 3,
-  NSCFontWeightMedium = 4,
-  NSCFontWeightSemiBold = 5,
-  NSCFontWeightBold = 6,
-  NSCFontWeightExtraBold = 7,
-  NSCFontWeightBlack = 8,
-};
-
 @class NSUUID;
 @class MasonScroll;
 SWIFT_CLASS_NAMED("NSCMason")
@@ -1810,6 +1783,13 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) float scale;)
 - (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;
+/// Remove the child node (view or text node) at <code>index</code> from the mason tree.
+/// Counterpart to <code>mason_addChildAt</code>; <code>MasonNode.removeChildAt</code> already
+/// handles both <code>MasonTextNode</code> and element children.
+- (void)mason_removeChildAt:(NSInteger)index;
+/// Remove a specific child node (e.g. the <code>MasonTextNode</code> a framework stamped
+/// onto its JS text node) without needing its index.
+- (void)mason_removeChildNode:(MasonNode * _Nonnull)node;
 @end
 
 typedef SWIFT_ENUM_NAMED(NSInteger, MasonObjectFit, "ObjectFit", open) {
@@ -1857,6 +1837,8 @@ SWIFT_CLASS_NAMED("Scroll")
 - (void)scrollViewDidScroll:(UIScrollView * _Nonnull)scrollView;
 - (void)addView:(UIView * _Nonnull)view;
 - (void)addView:(UIView * _Nonnull)view at:(NSInteger)at;
+- (void)removeView:(UIView * _Nonnull)view;
+- (void)removeViewAt:(NSInteger)index;
 - (void)setSize:(float)width :(float)height;
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
@@ -1981,7 +1963,7 @@ typedef SWIFT_ENUM_NAMED(NSInteger, MasonWhiteSpace, "WhiteSpace", open) {
   MasonWhiteSpaceBreakSpaces = 5,
 };
 
-#endif
+#endif // defined(__OBJC__)
 #if __has_attribute(external_source_symbol)
 # pragma clang attribute pop
 #endif