@triniwiz/nativescript-masonkit 1.0.0-beta.61 → 1.0.0-beta.63

package/list/index.ios.js

@@ -0,0 +1,321 @@
+import { CSSType, ProxyViewContainer, Screen, StackLayout, Utils, View } from '@nativescript/core';
+import { ListBase } from './common';
+import { ViewBase } from '../common';
+import { isMasonView_, native_, style_ } from '../symbols';
+import { Tree } from '../tree/index';
+import { Style } from '../style';
+const ITEMLOADING = ListBase.itemLoadingEvent;
+var ListDelegateImpl = (function (_super) {
+    __extends(ListDelegateImpl, _super);
+    function ListDelegateImpl() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ListDelegateImpl.initWithOwner = function (owner) {
+        var delegate = ListDelegateImpl.new();
+        delegate._owner = owner;
+        return delegate;
+    };
+    ListDelegateImpl.prototype.listCellForItemAt = function (list, indexPath) {
+        var _a;
+        var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
+        if (!owner) {
+            return MasonListCell.initWithEmptyBackground();
+        }
+        var index = indexPath.item;
+        var template = owner._getItemTemplate(index);
+        var templateIndex = owner._itemTemplatesInternal.indexOf(template);
+        var identifier = "template-".concat(templateIndex);
+        var cell = list.dequeueReusableCellWithReuseIdentifierForIndexPath(identifier, indexPath);
+        console.log("Dequeued cell for index", index, "with template index", templateIndex, "and identifier", identifier);
+        owner._prepareCell(cell, indexPath);
+        return cell;
+    };
+    ListDelegateImpl.prototype.listWillDisplayForItemAt = function (list, cell, indexPath) {
+        var _a;
+        var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
+        if (!owner) {
+            return;
+        }
+        if (owner.items && indexPath.item === owner.items.length - 1) {
+            owner.notify({
+                eventName: ListBase.loadMoreItemsEvent,
+                object: owner,
+            });
+        }
+    };
+    ListDelegateImpl.ObjCProtocols = [MasonListDelegate];
+    return ListDelegateImpl;
+}(NSObject));
+const listState_ = Symbol('[[listState]]');
+export class List extends ListBase {
+    constructor(ordered = false) {
+        super();
+        this._inBatch = false;
+        this._preparingCell = false;
+        this._isDataDirty = false;
+        this._staticViews = [];
+        this.ordered = ordered ?? false;
+        this[isMasonView_] = true;
+        this._map = new Map();
+    }
+    get _view() {
+        if (!this[native_]) {
+            const view = Tree.instance.createList();
+            if (this.ordered) {
+                view.isOrdered = true;
+            }
+            this[native_] = view;
+            this[listState_] = new DataView(interop.bufferFromData(view.values));
+            return view;
+        }
+        return this[native_];
+    }
+    get _styleHelper() {
+        if (this[style_] === undefined) {
+            this[style_] = Style.fromView(this, this._view);
+        }
+        return this[style_];
+    }
+    createNativeView() {
+        if (this._staticViews.length > 0) {
+            for (const staticView of this._staticViews) {
+                staticView._setupUI(this._context);
+                this._view.addView(staticView._view);
+            }
+        }
+        return this._view;
+    }
+    initNativeView() {
+        super.initNativeView();
+        for (let i = 0; i < this._itemTemplatesInternal.length; i++) {
+            this._view.registerWithCellClassForCellWithReuseIdentifier(MasonListCell.class(), `template-${i}`);
+        }
+        this._delegate = ListDelegateImpl.initWithOwner(new WeakRef(this));
+        this._view.delegate = this._delegate;
+    }
+    onMeasure(widthMeasureSpec, heightMeasureSpec) {
+        const nativeView = this._view;
+        if (nativeView) {
+            const specWidth = Utils.layout.getMeasureSpecSize(widthMeasureSpec);
+            const widthMode = Utils.layout.getMeasureSpecMode(widthMeasureSpec);
+            const specHeight = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
+            const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
+            if (!this[isMasonView_]) {
+                const unconstrained = widthMode === Utils.layout.UNSPECIFIED || heightMode === Utils.layout.UNSPECIFIED || (widthMode === Utils.layout.AT_MOST && specWidth === 0) || (heightMode === Utils.layout.AT_MOST && specHeight === 0);
+                if (this.width === 'auto' && this.height === 'auto' && !unconstrained) {
+                    // @ts-ignore
+                    this.ios.mason_computeWithSize(specWidth, specHeight);
+                    // @ts-ignore
+                    const layout = this.ios.mason_layout();
+                    const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
+                    const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
+                    this.setMeasuredDimension(w, h);
+                    return;
+                }
+                else {
+                    // fallback to max-content when unconstrained or explicit sizes
+                    // are provided
+                    // @ts-ignore
+                    this.ios.mason_computeWithMaxContent();
+                    // @ts-ignore
+                    const layout = this.ios.node.computedLayout;
+                    const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
+                    const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
+                    this.setMeasuredDimension(w, h);
+                }
+            }
+            else {
+                // @ts-ignore
+                const layout = this.ios.node.computedLayout;
+                const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
+                const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
+                this.setMeasuredDimension(w, h);
+            }
+        }
+    }
+    disposeNativeView() {
+        this._delegate = null;
+        this._view.delegate = null;
+        super.disposeNativeView();
+    }
+    onLoaded() {
+        super.onLoaded();
+        if (this._isDataDirty) {
+            this.refresh();
+        }
+    }
+    _addChildFromBuilder(name, value) {
+        if (value instanceof View && !value.parent && !value.nativeView) {
+            this._staticViews.push(value);
+        }
+    }
+    get _childrenCount() {
+        return this._map.size + this._staticViews.length;
+    }
+    eachChildView(callback) {
+        this._map.forEach((view) => {
+            callback(view);
+        });
+    }
+    requestLayout() {
+        if (!this._preparingCell) {
+            super.requestLayout();
+        }
+    }
+    // @ts-ignore
+    _addViewToNativeVisualTree(child) {
+        return true;
+    }
+    _layoutCell(cellView) {
+        if (!cellView)
+            return;
+        const masonElement = cellView._view;
+        if (!masonElement)
+            return;
+        // Use the list's current bounds width as the available width
+        const listWidth = this._view.bounds.size.width;
+        if (listWidth <= 0)
+            return;
+        // @ts-ignore – compute mason layout
+        const scale = Screen.mainScreen.scale;
+        masonElement.mason_computeWithSize(listWidth * scale, -2);
+        // @ts-ignore
+        const layout = masonElement.mason_layout();
+        const w = layout.width;
+        const h = layout.height;
+        if (w <= 0 || h <= 0)
+            return;
+        const wSpec = Utils.layout.makeMeasureSpec(w, Utils.layout.EXACTLY);
+        const hSpec = Utils.layout.makeMeasureSpec(h, Utils.layout.EXACTLY);
+        ViewBase.measureChild(this, cellView, wSpec, hSpec);
+        View.layoutChild(this, cellView, 0, 0, w, h);
+    }
+    _prepareCell(cell, indexPath) {
+        try {
+            this._preparingCell = true;
+            const index = indexPath.item;
+            let view = cell['nsView'];
+            const template = this._getItemTemplate(index);
+            if (!view) {
+                view = template.createView();
+            }
+            const args = {
+                eventName: ITEMLOADING,
+                object: this,
+                index,
+                android: undefined,
+                ios: cell,
+                view,
+            };
+            this.notify(args);
+            view = args.view || this._getDefaultItemContent(index);
+            if (view instanceof ProxyViewContainer) {
+                const sp = new StackLayout();
+                sp.addChild(view);
+                view = sp;
+            }
+            if (!cell['nsView']) {
+                cell['nsView'] = view;
+            }
+            else if (cell['nsView'] !== view) {
+                this._removeContainer(cell);
+                cell['nsView'] = view;
+            }
+            this._prepareItem(view, index);
+            this._map.set(cell, view);
+            if (view && !view.parent) {
+                this._addView(view);
+                const masonElement = view._view;
+                if (masonElement) {
+                    cell.setViewWithCompat(masonElement);
+                }
+            }
+            this._layoutCell(view);
+            // Set up willMove callback for cleanup
+            cell.willMove = (c) => {
+                // When cell is removed from superview (newSuperview == nil),
+                // willMove fires. Check if the cell still has a superview.
+                // If not, clean up.
+                const parent = c['nsView']?.parent;
+                if (parent === this && !c.superview) {
+                    this._removeContainer(c);
+                }
+            };
+        }
+        finally {
+            this._preparingCell = false;
+        }
+    }
+    _removeContainer(cell) {
+        const view = cell['nsView'];
+        if (!view) {
+            this._map.delete(cell);
+            return;
+        }
+        if (view.parent) {
+            if (!(view.parent instanceof List)) {
+                this._removeView(view.parent);
+            }
+            const preparing = this._preparingCell;
+            this._preparingCell = true;
+            view.parent._removeView(view);
+            this._preparingCell = preparing;
+        }
+        cell['nsView'] = null;
+        this._map.delete(cell);
+    }
+    get _stateView() {
+        return this[listState_];
+    }
+    _onItemsChanged(args) {
+        this.refresh();
+    }
+    _updateItemsCount() {
+        if (!this[listState_]) {
+            this._view.count = this.items ? this.items.length : 0;
+        }
+        else {
+            this._stateView.setInt32(0, this.items ? this.items.length : 0, true);
+        }
+        this._view.reload();
+    }
+    refresh() {
+        if (this[native_]) {
+            // Clear binding context for non-observable items
+            this._map.forEach((view) => {
+                if (view.bindingContext && !(view.bindingContext instanceof Object)) {
+                    view.bindingContext = null;
+                }
+            });
+            if (this.isLoaded) {
+                this._view.reload();
+                this.requestLayout();
+                this._isDataDirty = false;
+            }
+            else {
+                this._isDataDirty = true;
+            }
+        }
+    }
+}
+let UnorderedList = class UnorderedList extends List {
+    constructor() {
+        super(false);
+    }
+};
+UnorderedList = __decorate([
+    CSSType('ul'),
+    __metadata("design:paramtypes", [])
+], UnorderedList);
+export { UnorderedList };
+let OrderedList = class OrderedList extends List {
+    constructor() {
+        super(true);
+    }
+};
+OrderedList = __decorate([
+    CSSType('ol'),
+    __metadata("design:paramtypes", [])
+], OrderedList);
+export { OrderedList };
+//# sourceMappingURL=index.ios.js.map

package/list/index.ios.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/list/index.ios.ts"],"names":[],"mappings":"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"}

package/package.json

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

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

@@ -372,7 +372,7 @@ SWIFT_PROTOCOL_NAMED("TextContainer")
 @protocol MasonTextContainer <NSObject>
 @property (nonatomic, readonly, strong) MasonTextEngine * _Nonnull engine;
 @property (nonatomic, readonly, strong) MasonNode * _Nonnull node;
-- (void)onTextStyleChangedWithChange:(int64_t)change;
+- (void)onStyleChange:(uint64_t)low :(uint64_t)high;
 @end
 
 @class MasonStyle;
@@ -399,9 +399,10 @@ SWIFT_CLASS_NAMED("Button")
 - (void)requestLayout;
 - (void)addView:(UIView * _Nonnull)view;
 - (void)addView:(UIView * _Nonnull)view at:(NSInteger)at;
+- (void)layoutSubviews;
 - (void)drawRect:(CGRect)rect;
 @property (nonatomic, readonly, strong) NSMutableData * _Nonnull textValues;
-- (void)onTextStyleChangedWithChange:(int64_t)change;
+- (void)onStyleChange:(uint64_t)low :(uint64_t)high;
 - (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
 @end
@@ -410,9 +411,9 @@ SWIFT_CLASS_NAMED("Button")
 @class UIEvent;
 @interface MasonButton (SWIFT_EXTENSION(Mason))
 - (void)touchesBegan:(NSSet<UITouch *> * _Nonnull)touches withEvent:(UIEvent * _Nullable)event;
-- (void)touchesMoved:(NSSet<UITouch *> * _Nonnull)touches withEvent:(UIEvent * _Nullable)event;
 - (void)touchesEnded:(NSSet<UITouch *> * _Nonnull)touches withEvent:(UIEvent * _Nullable)event;
 - (void)touchesCancelled:(NSSet<UITouch *> * _Nonnull)touches withEvent:(UIEvent * _Nullable)event;
+- (void)touchesMoved:(NSSet<UITouch *> * _Nonnull)touches withEvent:(UIEvent * _Nullable)event;
 @end
 
 typedef SWIFT_ENUM_NAMED(NSInteger, MasonClear, "Clear", open) {
@@ -531,6 +532,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) Class _Nonnull layer
 - (void)requestLayout;
 @property (nonatomic, copy) NSString * _Nullable src;
 - (void)updateImage:(UIImage * _Nullable)image;
+- (void)layoutSubviews;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
 - (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE;
 @end
@@ -787,40 +789,43 @@ typedef SWIFT_ENUM_NAMED(int8_t, MasonInputType, "MasonInputType", open) {
   MasonInputTypeSubmit = 13,
 };
 
+@class MasonRectHelper;
+@class MasonSizeHelper;
 SWIFT_CLASS_NAMED("MasonLayout")
 @interface MasonLayout : NSObject
-@property (nonatomic, readonly) NSInteger order;
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MasonLayout * _Nonnull empty;)
++ (MasonLayout * _Nonnull)empty SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic, readonly) float x;
 @property (nonatomic, readonly) float y;
 @property (nonatomic, readonly) float width;
 @property (nonatomic, readonly) float height;
-@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) BOOL borderIsEmpty;
 @property (nonatomic, readonly) float borderTop;
 @property (nonatomic, readonly) float borderRight;
 @property (nonatomic, readonly) float borderBottom;
 @property (nonatomic, readonly) float borderLeft;
-@property (nonatomic, readonly) BOOL marginIsEmpty;
 @property (nonatomic, readonly) float marginTop;
 @property (nonatomic, readonly) float marginRight;
 @property (nonatomic, readonly) float marginBottom;
 @property (nonatomic, readonly) float marginLeft;
-@property (nonatomic, readonly) BOOL paddingIsEmpty;
 @property (nonatomic, readonly) float paddingTop;
 @property (nonatomic, readonly) float paddingRight;
 @property (nonatomic, readonly) float paddingBottom;
 @property (nonatomic, readonly) float paddingLeft;
+@property (nonatomic, readonly) float contentWidth;
+@property (nonatomic, readonly) float contentHeight;
+@property (nonatomic, readonly) float scrollbarWidth;
+@property (nonatomic, readonly) float scrollbarHeight;
 @property (nonatomic, readonly) BOOL sizeIsEmpty;
-@property (nonatomic, readonly) BOOL contentSizeIsEmpty;
-@property (nonatomic, readonly) float contentSizeWidth;
-@property (nonatomic, readonly) float contentSizeHeight;
-@property (nonatomic, readonly) BOOL scrollbarSizeIsEmpty;
-@property (nonatomic, readonly) float scrollbarSizeWidth;
-@property (nonatomic, readonly) float scrollbarSizeHeight;
-@property (nonatomic, readonly, copy) NSString * _Nonnull description;
+@property (nonatomic, readonly) BOOL paddingIsEmpty;
+@property (nonatomic, readonly) BOOL marginIsEmpty;
+@property (nonatomic, readonly) BOOL borderIsEmpty;
+@property (nonatomic, readonly, strong) MasonRectHelper * _Nonnull border;
+@property (nonatomic, readonly, strong) MasonRectHelper * _Nonnull margin;
+@property (nonatomic, readonly, strong) MasonRectHelper * _Nonnull padding;
+@property (nonatomic, readonly, strong) MasonSizeHelper * _Nonnull contentSize;
+@property (nonatomic, readonly, strong) MasonSizeHelper * _Nonnull scrollbarSize;
+@property (nonatomic, readonly) BOOL hasChildren;
+@property (nonatomic, readonly, copy) NSArray<MasonLayout *> * _Nonnull children;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
@@ -945,20 +950,34 @@ SWIFT_CLASS_NAMED("MasonLi")
 @class NSIndexPath;
 @class UICollectionViewCell;
 SWIFT_CLASS_NAMED("MasonList")
-@interface MasonList : UIView <MasonElementObjc, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
+@interface MasonList : UIView <MasonElementObjc, UICollectionViewDataSource, UICollectionViewDataSourcePrefetching, UICollectionViewDelegateFlowLayout>
 @property (nonatomic, strong) id <MasonListDelegate> _Nullable delegate;
 - (void)drawRect:(CGRect)rect;
 @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;
+/// Static items keyed by their position in the overall list.
+/// Positions not in this dictionary are virtual (recycled via delegate).
+@property (nonatomic, readonly, copy) NSDictionary<NSNumber *, MasonLi *> * _Nonnull staticItems;
+/// Backward-compat: flat array of static views (unpositioned).
+/// Setting this clears staticItems and assigns positions 0..<array.count.
+@property (nonatomic, copy) NSArray<MasonLi *> * _Nonnull staticViews;
 @property (nonatomic, strong) NSMutableData * _Nonnull values;
+/// Virtual item count (set by user). Total count = staticItems.count + this value.
 @property (nonatomic) NSInteger count;
 - (void)layoutSubviews;
 - (void)registerWithCellClass:(Class _Nullable)cellClass forCellWithReuseIdentifier:(NSString * _Nonnull)identifier;
+/// Appends a static item at the end of the list (position = current count).
+- (void)addView:(MasonLi * _Nonnull)item;
+/// Inserts a static item at the given position, shifting existing entries at >= index.
+- (void)addView:(MasonLi * _Nonnull)item at:(NSInteger)index;
 - (void)reload;
 @property (nonatomic) BOOL isOrdered;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
+- (void)invalidateSizeCache;
+- (void)invalidateSizeCacheAt:(NSInteger)index;
+- (void)collectionView:(UICollectionView * _Nonnull)collectionView prefetchItemsAtIndexPaths:(NSArray<NSIndexPath *> * _Nonnull)indexPaths;
 - (NSInteger)collectionView:(UICollectionView * _Nonnull)collectionView numberOfItemsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT;
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView * _Nonnull)collectionView SWIFT_WARN_UNUSED_RESULT;
 - (UICollectionViewCell * _Nonnull)collectionView:(UICollectionView * _Nonnull)collectionView cellForItemAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT;
@@ -972,6 +991,20 @@ SWIFT_PROTOCOL_NAMED("MasonListDelegate")
 - (void)list:(UICollectionView * _Nonnull)list willDisplay:(UICollectionViewCell * _Nonnull)cell forItemAt:(NSIndexPath * _Nonnull)indexPath;
 @end
 
+@class UICollectionViewLayoutAttributes;
+SWIFT_CLASS_NAMED("MasonListCell")
+@interface MasonListCell : UICollectionViewCell
+@property (nonatomic, copy) void (^ _Nullable willMove)(MasonListCell * _Nonnull);
++ (MasonListCell * _Nonnull)initWithEmptyBackground SWIFT_METHOD_FAMILY(none) SWIFT_WARN_UNUSED_RESULT;
+- (void)setViewWithCompat:(id <MasonElementObjc> _Nullable)view;
+- (void)willMoveToSuperview:(UIView * _Nullable)newSuperview;
+- (void)prepareForReuse;
+- (UICollectionViewLayoutAttributes * _Nonnull)preferredLayoutAttributesFittingAttributes:(UICollectionViewLayoutAttributes * _Nonnull)layoutAttributes SWIFT_WARN_UNUSED_RESULT;
+- (void)layoutSubviews;
+- (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder OBJC_DESIGNATED_INITIALIZER;
+@end
+
 @class MasonMouseEventOptions;
 SWIFT_CLASS_NAMED("MasonMouseEvent")
 @interface MasonMouseEvent : MasonEvent
@@ -1011,6 +1044,9 @@ SWIFT_CLASS_NAMED("MasonNode")
 @property (nonatomic, readonly) void * _Nullable nativePtr;
 @property (nonatomic, readonly, strong) MasonLayout * _Nonnull computedLayout;
 @property (nonatomic, readonly, strong) MasonDocument * _Nullable document;
+- (void)setPseudoString:(uint16_t)pseudoState key:(NSString * _Nonnull)key value:(NSString * _Nonnull)value;
+- (NSString * _Nullable)getPseudoString:(uint16_t)pseudoState key:(NSString * _Nonnull)key SWIFT_WARN_UNUSED_RESULT;
+- (void)clearPseudoString:(uint16_t)pseudoState key:(NSString * _Nonnull)key;
 - (MasonNode * _Nonnull)getRootNode SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic, readonly, strong) MasonNode * _Nullable parent;
 @property (nonatomic, readonly, strong) MasonNode * _Nullable parentNode;
@@ -1031,6 +1067,15 @@ SWIFT_CLASS_NAMED("MasonNode")
 @interface MasonNode (SWIFT_EXTENSION(Mason))
 - (void)setChildrenWithValue:(NSArray<MasonNode *> * _Nonnull)value;
 - (void)appendChild:(MasonNode * _Nonnull)child;
+- (void)removeAllChildren;
+@end
+
+enum PseudoState : uint16_t;
+@interface MasonNode (SWIFT_EXTENSION(Mason))
+/// Current active pseudo state bitmask read from the native state buffer.
+@property (nonatomic, readonly) uint16_t pseudoMask;
+- (BOOL)hasPseudo:(enum PseudoState)state SWIFT_WARN_UNUSED_RESULT;
+- (void)setPseudo:(enum PseudoState)state :(BOOL)enabled autoDirty:(BOOL)autoDirty;
 @end
 
 typedef SWIFT_ENUM_NAMED(int32_t, MasonNodeType, "MasonNodeType", open) {
@@ -1049,6 +1094,25 @@ SWIFT_CLASS_NAMED("MasonOverflowPointCompat")
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
+SWIFT_CLASS_NAMED("MasonRectHelper")
+@interface MasonRectHelper : NSObject
+@property (nonatomic, readonly) float top;
+@property (nonatomic, readonly) float right;
+@property (nonatomic, readonly) float bottom;
+@property (nonatomic, readonly) float left;
+- (BOOL)isEmpty SWIFT_WARN_UNUSED_RESULT;
+- (nonnull instancetype)init SWIFT_UNAVAILABLE;
++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
+@end
+
+SWIFT_CLASS_NAMED("MasonSizeHelper")
+@interface MasonSizeHelper : NSObject
+@property (nonatomic, readonly) float width;
+@property (nonatomic, readonly) float height;
+- (nonnull instancetype)init SWIFT_UNAVAILABLE;
++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
+@end
+
 @class NSCFontFace;
 @class MasonVerticalAlignValue;
 enum MasonObjectFit : NSInteger;
@@ -1065,7 +1129,6 @@ SWIFT_CLASS_NAMED("MasonStyle")
 @property (nonatomic, readonly, strong) NSCFontFace * _Null_unspecified font;
 - (void)prepareMut;
 @property (nonatomic, readonly, strong) NSMutableData * _Nonnull values;
-@property (nonatomic, strong) NSMutableData * _Nonnull textValues;
 - (nonnull instancetype)initWithNode:(MasonNode * _Nonnull)node OBJC_DESIGNATED_INITIALIZER;
 @property (nonatomic) enum MasonListStylePosition listStylePosition;
 @property (nonatomic) enum MasonListStyleType listStyleType;
@@ -1091,8 +1154,10 @@ SWIFT_CLASS_NAMED("MasonStyle")
 - (void)setLineHeight:(float)value :(BOOL)isRelative;
 @property (nonatomic) float lineHeight;
 @property (nonatomic) float letterSpacing;
+@property (nonatomic, copy) NSString * _Nonnull fontVariantNumericString;
 @property (nonatomic) uint32_t decorationColor;
 - (void)setDecorationColorWithUi:(UIColor * _Nonnull)color;
+- (void)setDecorationColorWithCss:(NSString * _Nonnull)color;
 @property (nonatomic) enum MasonDecorationLine decorationLine;
 @property (nonatomic) int32_t fontSize;
 - (void)setFontStyle:(enum MasonFontStyle)style :(int32_t)slant;
@@ -1137,7 +1202,13 @@ SWIFT_CLASS_NAMED("MasonStyle")
 - (void)setPaddingBottom:(float)value :(NSInteger)type;
 - (void)setPaddingWithValueType:(float)value :(NSInteger)type;
 @property (nonatomic, copy) NSString * _Nonnull textShadow;
+@property (nonatomic, copy) NSString * _Nonnull boxShadow;
 @property (nonatomic, copy) NSString * _Nonnull borderRadius;
+@property (nonatomic, copy) NSString * _Nonnull cornerShape;
+@property (nonatomic, copy) NSString * _Nonnull cornerShapeTopLeft;
+@property (nonatomic, copy) NSString * _Nonnull cornerShapeTopRight;
+@property (nonatomic, copy) NSString * _Nonnull cornerShapeBottomRight;
+@property (nonatomic, copy) NSString * _Nonnull cornerShapeBottomLeft;
 @property (nonatomic, copy) NSString * _Nonnull border;
 @property (nonatomic, strong) MasonLengthPercentageRectCompat * _Nonnull borderWidthCompat;
 - (void)setBorderLeftWidth:(float)value :(NSInteger)type;
@@ -1199,13 +1270,14 @@ SWIFT_CLASS_NAMED("MasonText")
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) Class _Nonnull layerClass;)
 + (Class _Nonnull)layerClass SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic, readonly, strong) NSMutableData * _Nonnull textValues;
-- (void)onTextStyleChangedWithChange:(int64_t)change;
+- (void)onStyleChange:(uint64_t)low :(uint64_t)high;
 @property (nonatomic, readonly, strong) UIView * _Nonnull uiView;
 @property (nonatomic, readonly, strong) MasonStyle * _Nonnull style;
 - (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)layoutSubviews;
 - (void)addView:(UIView * _Nonnull)view;
 - (void)addView:(UIView * _Nonnull)view at:(NSInteger)at;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
@@ -1299,6 +1371,7 @@ SWIFT_CLASS_NAMED("MasonUIView")
 @property (nonatomic, readonly, strong) MasonStyle * _Nonnull style;
 - (void)markNodeDirty;
 - (BOOL)isNodeDirty SWIFT_WARN_UNUSED_RESULT;
+- (void)layoutSubviews;
 - (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;
@@ -1340,7 +1413,7 @@ SWIFT_CLASS_NAMED("MasonUIView")
 @property (nonatomic, copy) NSString * _Nonnull gridRowEnd;
 @property (nonatomic, copy) NSString * _Nonnull gridTemplateRows;
 @property (nonatomic, copy) NSString * _Nonnull gridTemplateColumns;
-- (void)setPadding:(float)left :(float)right :(float)top :(float)bottom;
+- (void)setPadding:(float)left :(float)top :(float)right :(float)bottom;
 - (MasonLengthPercentageRectCompat * _Nonnull)getPadding SWIFT_WARN_UNUSED_RESULT;
 - (void)setPaddingLeft:(float)left :(NSInteger)type;
 - (void)setPaddingRight:(float)right :(NSInteger)type;
@@ -1475,7 +1548,8 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) MinSizing *
 @end
 
 SWIFT_CLASS_NAMED("NSCFontDescriptors")
-@interface NSCFontDescriptors : NSObject
+@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;
@@ -1613,7 +1687,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) NSCMason * _Nonnull sh
 - (BOOL)mason_removeEventListener:(NSString * _Nonnull)event id:(NSUUID * _Nonnull)id;
 - (BOOL)mason_removeEventListener:(NSString * _Nonnull)event;
 - (void)mason_dispatch:(MasonEvent * _Nonnull)event;
-- (void)mason_syncStyle:(NSString * _Nonnull)state :(NSString * _Nonnull)textState;
+- (void)mason_syncStyle:(NSString * _Nonnull)low :(NSString * _Nonnull)high;
 - (void)mason_addView:(UIView * _Nonnull)view;
 - (void)mason_addView:(UIView * _Nonnull)view at:(NSInteger)at;
 - (void)mason_markNodeDirty;
@@ -1673,9 +1747,21 @@ typedef SWIFT_ENUM_NAMED(NSInteger, MasonPosition, "Position", open) {
   MasonPositionAbsolute = 1,
 };
 
+typedef SWIFT_ENUM_NAMED(uint16_t, PseudoState, "PseudoState", open) {
+  PseudoStateDefault = 0,
+  PseudoStateHover = 0x01,
+  PseudoStateActive = 0x02,
+  PseudoStateFocus = 0x04,
+  PseudoStateFocusWithin = 0x08,
+  PseudoStateFocusVisible = 0x10,
+  PseudoStateDisabled = 0x40,
+  PseudoStateChecked = 0x80,
+};
+
 SWIFT_CLASS_NAMED("Scroll")
 @interface MasonScroll : UIScrollView <MasonElementObjc, UIScrollViewDelegate>
 - (void)drawRect:(CGRect)rect;
+- (void)layoutSubviews;
 @property (nonatomic, readonly, strong) MasonNode * _Nonnull node;
 @property (nonatomic, readonly, strong) NSCMason * _Nonnull mason;
 @property (nonatomic, readonly, strong) UIView * _Nonnull uiView;