@mathers101/react-native-render-rich-text 0.1.10 → 0.1.14

package/ios/utils/ContextMenuUtils.h

@@ -1,76 +1,76 @@
-#pragma once
-
-#import "ENRMUIKit.h"
-#import <Foundation/Foundation.h>
-
-#ifdef __cplusplus
-#include <string>
-#include <vector>
-
-template <typename T>
-static bool ENRMContextMenuItemsChanged(const std::vector<T> &oldItems, const std::vector<T> &newItems)
-{
-  if (newItems.size() != oldItems.size()) {
-    return true;
-  }
-  for (size_t i = 0; i < newItems.size(); i++) {
-    if (newItems[i].text != oldItems[i].text || newItems[i].icon != oldItems[i].icon) {
-      return true;
-    }
-  }
-  return false;
-}
-
-template <typename T> static NSArray<NSString *> *ENRMContextMenuTextsFromItems(const std::vector<T> &items)
-{
-  NSMutableArray<NSString *> *result = [NSMutableArray new];
-  for (const auto &item : items) {
-    [result addObject:[NSString stringWithUTF8String:item.text.c_str()]];
-  }
-  return [result copy];
-}
-
-template <typename T> static NSArray<NSString *> *_Nullable ENRMContextMenuIconsFromItems(const std::vector<T> &items)
-{
-  NSMutableArray<NSString *> *result = [NSMutableArray arrayWithCapacity:items.size()];
-  bool hasAnyIcon = false;
-  for (const auto &item : items) {
-    NSString *iconName = @(item.icon.c_str());
-    hasAnyIcon = hasAnyIcon || iconName.length > 0;
-    [result addObject:iconName];
-  }
-  return hasAnyIcon ? [result copy] : nil;
-}
-
-#endif
-
-typedef void (^ENRMContextMenuPressHandler)(NSString *_Nonnull itemText, NSString *_Nonnull selectedText,
-                                            NSUInteger selectionStart, NSUInteger selectionEnd);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !TARGET_OS_OSX
-
-// TODO: Remove API_AVAILABLE(ios(16.0)) guard when the minimum iOS deployment target in RN is bumped to 16.
-NSMutableArray<UIAction *> *_Nullable ENRMBuildContextMenuActions(NSArray<NSString *> *_Nonnull itemTexts,
-                                                                  NSArray<NSString *> *_Nullable iconNames,
-                                                                  UITextView *_Nonnull textView, NSRange selectedRange,
-                                                                  ENRMContextMenuPressHandler _Nonnull handler)
-    API_AVAILABLE(ios(16.0));
-
-#else
-
-NSArray<NSMenuItem *> *_Nullable ENRMBuildContextMenuItems(NSArray<NSString *> *_Nonnull itemTexts,
-                                                           NSArray<NSString *> *_Nullable iconNames,
-                                                           NSTextView *_Nonnull textView,
-                                                           ENRMContextMenuPressHandler _Nonnull handler);
-
-void ENRMPrependMenuItems(NSMenu *_Nonnull menu, NSArray<NSMenuItem *> *_Nullable items);
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
+#pragma once
+
+#import "ENRMUIKit.h"
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#include <string>
+#include <vector>
+
+template <typename T>
+static bool ENRMContextMenuItemsChanged(const std::vector<T> &oldItems, const std::vector<T> &newItems)
+{
+  if (newItems.size() != oldItems.size()) {
+    return true;
+  }
+  for (size_t i = 0; i < newItems.size(); i++) {
+    if (newItems[i].text != oldItems[i].text || newItems[i].icon != oldItems[i].icon) {
+      return true;
+    }
+  }
+  return false;
+}
+
+template <typename T> static NSArray<NSString *> *ENRMContextMenuTextsFromItems(const std::vector<T> &items)
+{
+  NSMutableArray<NSString *> *result = [NSMutableArray new];
+  for (const auto &item : items) {
+    [result addObject:[NSString stringWithUTF8String:item.text.c_str()]];
+  }
+  return [result copy];
+}
+
+template <typename T> static NSArray<NSString *> *_Nullable ENRMContextMenuIconsFromItems(const std::vector<T> &items)
+{
+  NSMutableArray<NSString *> *result = [NSMutableArray arrayWithCapacity:items.size()];
+  bool hasAnyIcon = false;
+  for (const auto &item : items) {
+    NSString *iconName = @(item.icon.c_str());
+    hasAnyIcon = hasAnyIcon || iconName.length > 0;
+    [result addObject:iconName];
+  }
+  return hasAnyIcon ? [result copy] : nil;
+}
+
+#endif
+
+typedef void (^ENRMContextMenuPressHandler)(NSString *_Nonnull itemText, NSString *_Nonnull selectedText,
+                                            NSUInteger selectionStart, NSUInteger selectionEnd);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !TARGET_OS_OSX
+
+// TODO: Remove API_AVAILABLE(ios(16.0)) guard when the minimum iOS deployment target in RN is bumped to 16.
+NSMutableArray<UIAction *> *_Nullable ENRMBuildContextMenuActions(NSArray<NSString *> *_Nonnull itemTexts,
+                                                                  NSArray<NSString *> *_Nullable iconNames,
+                                                                  UITextView *_Nonnull textView, NSRange selectedRange,
+                                                                  ENRMContextMenuPressHandler _Nonnull handler)
+    API_AVAILABLE(ios(16.0));
+
+#else
+
+NSArray<NSMenuItem *> *_Nullable ENRMBuildContextMenuItems(NSArray<NSString *> *_Nonnull itemTexts,
+                                                           NSArray<NSString *> *_Nullable iconNames,
+                                                           NSTextView *_Nonnull textView,
+                                                           ENRMContextMenuPressHandler _Nonnull handler);
+
+void ENRMPrependMenuItems(NSMenu *_Nonnull menu, NSArray<NSMenuItem *> *_Nullable items);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif

package/ios/utils/ContextMenuUtils.mm

@@ -1,75 +1,75 @@
-#import "ContextMenuUtils.h"
-#import "ENRMLinkPillText.h"
-#import "ENRMMenuAction.h"
-
-#if !TARGET_OS_OSX
-
-// TODO: Remove API_AVAILABLE(ios(16.0)) guard when the minimum iOS deployment target in RN is bumped to 16.
-NSMutableArray<UIAction *> *_Nullable ENRMBuildContextMenuActions(NSArray<NSString *> *itemTexts,
-                                                                  NSArray<NSString *> *_Nullable iconNames,
-                                                                  UITextView *textView, NSRange selectedRange,
-                                                                  ENRMContextMenuPressHandler handler)
-    API_AVAILABLE(ios(16.0))
-{
-  if (itemTexts.count == 0) {
-    return nil;
-  }
-
-  NSString *selectedText =
-      ENRMStringByExpandingLinkPills([textView.textStorage attributedSubstringFromRange:selectedRange]);
-  NSUInteger selectionStart = selectedRange.location;
-  NSUInteger selectionEnd = NSMaxRange(selectedRange);
-
-  NSMutableArray<UIAction *> *actions = [NSMutableArray arrayWithCapacity:itemTexts.count];
-  [itemTexts enumerateObjectsUsingBlock:^(NSString *itemText, NSUInteger index, BOOL *_) {
-    NSString *iconName = iconNames ? iconNames[index] : nil;
-    UIImage *image = iconName.length > 0 ? [UIImage systemImageNamed:iconName] : nil;
-    [actions addObject:[UIAction actionWithTitle:itemText
-                                           image:image
-                                      identifier:nil
-                                         handler:^(__kindof UIAction *_) {
-                                           handler(itemText, selectedText, selectionStart, selectionEnd);
-                                         }]];
-  }];
-  return actions;
-}
-
-#else
-
-NSArray<NSMenuItem *> *_Nullable ENRMBuildContextMenuItems(NSArray<NSString *> *itemTexts,
-                                                           NSArray<NSString *> *_Nullable iconNames,
-                                                           NSTextView *textView, ENRMContextMenuPressHandler handler)
-{
-  if (itemTexts.count == 0) {
-    return nil;
-  }
-
-  NSRange selectedRange = textView.selectedRange;
-  NSString *selectedText = [textView.string substringWithRange:selectedRange];
-  NSUInteger selectionStart = selectedRange.location;
-  NSUInteger selectionEnd = NSMaxRange(selectedRange);
-
-  NSMutableArray<NSMenuItem *> *items = [NSMutableArray arrayWithCapacity:itemTexts.count];
-  [itemTexts enumerateObjectsUsingBlock:^(NSString *itemText, NSUInteger index, BOOL *_) {
-    NSMenuItem *item =
-        ENRMCreateMenuItem(itemText, ^{ handler(itemText, selectedText, selectionStart, selectionEnd); });
-    NSString *iconName = iconNames ? iconNames[index] : nil;
-    if (iconName.length > 0) {
-      item.image = [NSImage imageWithSystemSymbolName:iconName accessibilityDescription:nil];
-    }
-    [items addObject:item];
-  }];
-  return items;
-}
-
-void ENRMPrependMenuItems(NSMenu *menu, NSArray<NSMenuItem *> *items)
-{
-  if (items.count == 0) {
-    return;
-  }
-  [menu insertItem:[NSMenuItem separatorItem] atIndex:0];
-  [items enumerateObjectsWithOptions:NSEnumerationReverse
-                          usingBlock:^(NSMenuItem *item, NSUInteger _, BOOL *__) { [menu insertItem:item atIndex:0]; }];
-}
-
-#endif
+#import "ContextMenuUtils.h"
+#import "ENRMLinkPillText.h"
+#import "ENRMMenuAction.h"
+
+#if !TARGET_OS_OSX
+
+// TODO: Remove API_AVAILABLE(ios(16.0)) guard when the minimum iOS deployment target in RN is bumped to 16.
+NSMutableArray<UIAction *> *_Nullable ENRMBuildContextMenuActions(NSArray<NSString *> *itemTexts,
+                                                                  NSArray<NSString *> *_Nullable iconNames,
+                                                                  UITextView *textView, NSRange selectedRange,
+                                                                  ENRMContextMenuPressHandler handler)
+    API_AVAILABLE(ios(16.0))
+{
+  if (itemTexts.count == 0) {
+    return nil;
+  }
+
+  NSString *selectedText =
+      ENRMStringByExpandingLinkPills([textView.textStorage attributedSubstringFromRange:selectedRange]);
+  NSUInteger selectionStart = selectedRange.location;
+  NSUInteger selectionEnd = NSMaxRange(selectedRange);
+
+  NSMutableArray<UIAction *> *actions = [NSMutableArray arrayWithCapacity:itemTexts.count];
+  [itemTexts enumerateObjectsUsingBlock:^(NSString *itemText, NSUInteger index, BOOL *_) {
+    NSString *iconName = iconNames ? iconNames[index] : nil;
+    UIImage *image = iconName.length > 0 ? [UIImage systemImageNamed:iconName] : nil;
+    [actions addObject:[UIAction actionWithTitle:itemText
+                                           image:image
+                                      identifier:nil
+                                         handler:^(__kindof UIAction *_) {
+                                           handler(itemText, selectedText, selectionStart, selectionEnd);
+                                         }]];
+  }];
+  return actions;
+}
+
+#else
+
+NSArray<NSMenuItem *> *_Nullable ENRMBuildContextMenuItems(NSArray<NSString *> *itemTexts,
+                                                           NSArray<NSString *> *_Nullable iconNames,
+                                                           NSTextView *textView, ENRMContextMenuPressHandler handler)
+{
+  if (itemTexts.count == 0) {
+    return nil;
+  }
+
+  NSRange selectedRange = textView.selectedRange;
+  NSString *selectedText = [textView.string substringWithRange:selectedRange];
+  NSUInteger selectionStart = selectedRange.location;
+  NSUInteger selectionEnd = NSMaxRange(selectedRange);
+
+  NSMutableArray<NSMenuItem *> *items = [NSMutableArray arrayWithCapacity:itemTexts.count];
+  [itemTexts enumerateObjectsUsingBlock:^(NSString *itemText, NSUInteger index, BOOL *_) {
+    NSMenuItem *item =
+        ENRMCreateMenuItem(itemText, ^{ handler(itemText, selectedText, selectionStart, selectionEnd); });
+    NSString *iconName = iconNames ? iconNames[index] : nil;
+    if (iconName.length > 0) {
+      item.image = [NSImage imageWithSystemSymbolName:iconName accessibilityDescription:nil];
+    }
+    [items addObject:item];
+  }];
+  return items;
+}
+
+void ENRMPrependMenuItems(NSMenu *menu, NSArray<NSMenuItem *> *items)
+{
+  if (items.count == 0) {
+    return;
+  }
+  [menu insertItem:[NSMenuItem separatorItem] atIndex:0];
+  [items enumerateObjectsWithOptions:NSEnumerationReverse
+                          usingBlock:^(NSMenuItem *item, NSUInteger _, BOOL *__) { [menu insertItem:item atIndex:0]; }];
+}
+
+#endif

package/ios/utils/ENRMAccessibilityLabels.h

@@ -1,40 +1,40 @@
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ENRMAccessibilityLabels : NSObject
-
-@property (nonatomic, copy) NSString *bulletPoint;
-@property (nonatomic, copy) NSString *nestedBulletPoint;
-@property (nonatomic, copy) NSString *orderedItem;
-@property (nonatomic, copy) NSString *nestedOrderedItem;
-@property (nonatomic, copy) NSString *blockquote;
-@property (nonatomic, copy) NSString *nestedBlockquote;
-@property (nonatomic, copy) NSString *tableRow;
-@property (nonatomic, copy) NSString *mathEquation;
-@property (nonatomic, copy) NSString *codeBlockWrap;
-@property (nonatomic, copy) NSString *codeBlockUnwrap;
-@property (nonatomic, copy) NSString *rotorHeadings;
-@property (nonatomic, copy) NSString *rotorLinks;
-@property (nonatomic, copy) NSString *rotorImages;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#ifdef __cplusplus
-template <typename T> static bool ENRMAccessibilityLabelsChanged(const T &oldLabels, const T &newLabels)
-{
-  return oldLabels.list.bulletPoint != newLabels.list.bulletPoint ||
-         oldLabels.list.nestedBulletPoint != newLabels.list.nestedBulletPoint ||
-         oldLabels.list.orderedItem != newLabels.list.orderedItem ||
-         oldLabels.list.nestedOrderedItem != newLabels.list.nestedOrderedItem ||
-         oldLabels.blockquote.quote != newLabels.blockquote.quote ||
-         oldLabels.blockquote.nestedQuote != newLabels.blockquote.nestedQuote ||
-         oldLabels.table.row != newLabels.table.row || oldLabels.math.equation != newLabels.math.equation ||
-         oldLabels.codeBlock.wrap != newLabels.codeBlock.wrap ||
-         oldLabels.codeBlock.unwrap != newLabels.codeBlock.unwrap ||
-         oldLabels.rotor.headings != newLabels.rotor.headings || oldLabels.rotor.links != newLabels.rotor.links ||
-         oldLabels.rotor.images != newLabels.rotor.images;
-}
-#endif
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ENRMAccessibilityLabels : NSObject
+
+@property (nonatomic, copy) NSString *bulletPoint;
+@property (nonatomic, copy) NSString *nestedBulletPoint;
+@property (nonatomic, copy) NSString *orderedItem;
+@property (nonatomic, copy) NSString *nestedOrderedItem;
+@property (nonatomic, copy) NSString *blockquote;
+@property (nonatomic, copy) NSString *nestedBlockquote;
+@property (nonatomic, copy) NSString *tableRow;
+@property (nonatomic, copy) NSString *mathEquation;
+@property (nonatomic, copy) NSString *codeBlockWrap;
+@property (nonatomic, copy) NSString *codeBlockUnwrap;
+@property (nonatomic, copy) NSString *rotorHeadings;
+@property (nonatomic, copy) NSString *rotorLinks;
+@property (nonatomic, copy) NSString *rotorImages;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#ifdef __cplusplus
+template <typename T> static bool ENRMAccessibilityLabelsChanged(const T &oldLabels, const T &newLabels)
+{
+  return oldLabels.list.bulletPoint != newLabels.list.bulletPoint ||
+         oldLabels.list.nestedBulletPoint != newLabels.list.nestedBulletPoint ||
+         oldLabels.list.orderedItem != newLabels.list.orderedItem ||
+         oldLabels.list.nestedOrderedItem != newLabels.list.nestedOrderedItem ||
+         oldLabels.blockquote.quote != newLabels.blockquote.quote ||
+         oldLabels.blockquote.nestedQuote != newLabels.blockquote.nestedQuote ||
+         oldLabels.table.row != newLabels.table.row || oldLabels.math.equation != newLabels.math.equation ||
+         oldLabels.codeBlock.wrap != newLabels.codeBlock.wrap ||
+         oldLabels.codeBlock.unwrap != newLabels.codeBlock.unwrap ||
+         oldLabels.rotor.headings != newLabels.rotor.headings || oldLabels.rotor.links != newLabels.rotor.links ||
+         oldLabels.rotor.images != newLabels.rotor.images;
+}
+#endif

package/ios/utils/ENRMAccessibilityLabels.m

@@ -1,5 +1,5 @@
-#import "ENRMAccessibilityLabels.h"
-
-@implementation ENRMAccessibilityLabels
-
-@end
+#import "ENRMAccessibilityLabels.h"
+
+@implementation ENRMAccessibilityLabels
+
+@end

package/ios/utils/ENRMAsyncRenderCoordinator.h

@@ -1,24 +1,24 @@
-#pragma once
-#import <Foundation/Foundation.h>
-
-/// Owns the serial render queue and render-ID counter used by async render pipelines.
-/// Handles stale-result cancellation and main-thread dispatch automatically.
-/// Set blockAsyncRender = YES before synchronous rendering to suppress queued dispatches.
-@interface ENRMAsyncRenderCoordinator : NSObject
-
-@property (nonatomic) BOOL blockAsyncRender;
-
-- (instancetype)initWithQueueLabel:(const char *)label NS_DESIGNATED_INITIALIZER;
-- (instancetype)init NS_UNAVAILABLE;
-
-/// Dispatches renderBlock on the serial queue.
-/// If renderBlock returns YES, applyBlock is dispatched on the main queue,
-/// provided the render ID has not been superseded by a newer call.
-- (void)scheduleRender:(BOOL (^)(void))renderBlock apply:(dispatch_block_t)applyBlock;
-
-/// Advances the render ID so any in-flight render's apply block is discarded
-/// by the renderId == currentRenderId check when it lands on the main queue.
-/// Use before recycling or otherwise resetting a host that owns this coordinator.
-- (void)invalidate;
-
-@end
+#pragma once
+#import <Foundation/Foundation.h>
+
+/// Owns the serial render queue and render-ID counter used by async render pipelines.
+/// Handles stale-result cancellation and main-thread dispatch automatically.
+/// Set blockAsyncRender = YES before synchronous rendering to suppress queued dispatches.
+@interface ENRMAsyncRenderCoordinator : NSObject
+
+@property (nonatomic) BOOL blockAsyncRender;
+
+- (instancetype)initWithQueueLabel:(const char *)label NS_DESIGNATED_INITIALIZER;
+- (instancetype)init NS_UNAVAILABLE;
+
+/// Dispatches renderBlock on the serial queue.
+/// If renderBlock returns YES, applyBlock is dispatched on the main queue,
+/// provided the render ID has not been superseded by a newer call.
+- (void)scheduleRender:(BOOL (^)(void))renderBlock apply:(dispatch_block_t)applyBlock;
+
+/// Advances the render ID so any in-flight render's apply block is discarded
+/// by the renderId == currentRenderId check when it lands on the main queue.
+/// Use before recycling or otherwise resetting a host that owns this coordinator.
+- (void)invalidate;
+
+@end

package/ios/utils/ENRMAsyncRenderCoordinator.m

@@ -1,37 +1,37 @@
-#import "ENRMAsyncRenderCoordinator.h"
-
-@implementation ENRMAsyncRenderCoordinator {
-  dispatch_queue_t _queue;
-  NSUInteger _currentRenderId;
-}
-
-- (instancetype)initWithQueueLabel:(const char *)label
-{
-  if (self = [super init]) {
-    _queue = dispatch_queue_create(label, DISPATCH_QUEUE_SERIAL);
-  }
-  return self;
-}
-
-- (void)scheduleRender:(BOOL (^)(void))renderBlock apply:(dispatch_block_t)applyBlock
-{
-  if (_blockAsyncRender)
-    return;
-  NSUInteger renderId = ++_currentRenderId;
-  dispatch_async(_queue, ^{
-    if (!renderBlock())
-      return;
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (renderId == self->_currentRenderId) {
-        applyBlock();
-      }
-    });
-  });
-}
-
-- (void)invalidate
-{
-  ++_currentRenderId;
-}
-
-@end
+#import "ENRMAsyncRenderCoordinator.h"
+
+@implementation ENRMAsyncRenderCoordinator {
+  dispatch_queue_t _queue;
+  NSUInteger _currentRenderId;
+}
+
+- (instancetype)initWithQueueLabel:(const char *)label
+{
+  if (self = [super init]) {
+    _queue = dispatch_queue_create(label, DISPATCH_QUEUE_SERIAL);
+  }
+  return self;
+}
+
+- (void)scheduleRender:(BOOL (^)(void))renderBlock apply:(dispatch_block_t)applyBlock
+{
+  if (_blockAsyncRender)
+    return;
+  NSUInteger renderId = ++_currentRenderId;
+  dispatch_async(_queue, ^{
+    if (!renderBlock())
+      return;
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if (renderId == self->_currentRenderId) {
+        applyBlock();
+      }
+    });
+  });
+}
+
+- (void)invalidate
+{
+  ++_currentRenderId;
+}
+
+@end

package/ios/utils/ENRMAtomicSize.h

@@ -1,65 +1,65 @@
-#pragma once
-
-#include <CoreGraphics/CGGeometry.h>
-#include <atomic>
-#include <cstdint>
-#include <cstring>
-
-/**
- * Lock-free size mailbox (issue #550).
- *
- * `measureContent` may run on the JS/layout thread while React Native holds
- * the ShadowTree revision mutex (`preventShadowTreeCommitExhaustion` re-runs
- * the entire commit — layout included — under `revisionMutexRecursive_` after
- * three failed optimistic commits). A main-thread committer (e.g. Reanimated)
- * can already be blocked on that same mutex, so any `dispatch_sync` to main
- * from the measure path can deadlock: JS waits for main, main waits for the
- * mutex JS holds. iOS kills the frozen app ~60s later (watchdog 0x8BADF00D).
- *
- * Reading `view.bounds` from a background thread is not safe either, so the
- * component view *publishes* its last committed size here (from
- * `updateLayoutMetrics:`, always on main) and the measure path *loads* it
- * wait-free from any thread.
- *
- * Both dimensions are packed as IEEE-754 floats into one `uint64_t` so a
- * single lock-free atomic covers the pair — a reader can never observe a new
- * width with an old height (no torn reads). Relaxed memory ordering suffices:
- * the value is self-contained and no other memory is published through it.
- */
-class ENRMAtomicSize {
-public:
-  void store(CGSize size)
-  {
-    bits_.store(pack(size), std::memory_order_relaxed);
-  }
-
-  CGSize load() const
-  {
-    return unpack(bits_.load(std::memory_order_relaxed));
-  }
-
-private:
-  static uint64_t pack(CGSize size)
-  {
-    float width = (float)size.width;
-    float height = (float)size.height;
-    uint32_t widthBits;
-    uint32_t heightBits;
-    memcpy(&widthBits, &width, sizeof(widthBits));
-    memcpy(&heightBits, &height, sizeof(heightBits));
-    return ((uint64_t)widthBits << 32) | heightBits;
-  }
-
-  static CGSize unpack(uint64_t bits)
-  {
-    uint32_t widthBits = (uint32_t)(bits >> 32);
-    uint32_t heightBits = (uint32_t)bits;
-    float width;
-    float height;
-    memcpy(&width, &widthBits, sizeof(width));
-    memcpy(&height, &heightBits, sizeof(height));
-    return CGSizeMake(width, height);
-  }
-
-  std::atomic<uint64_t> bits_{0};
-};
+#pragma once
+
+#include <CoreGraphics/CGGeometry.h>
+#include <atomic>
+#include <cstdint>
+#include <cstring>
+
+/**
+ * Lock-free size mailbox (issue #550).
+ *
+ * `measureContent` may run on the JS/layout thread while React Native holds
+ * the ShadowTree revision mutex (`preventShadowTreeCommitExhaustion` re-runs
+ * the entire commit — layout included — under `revisionMutexRecursive_` after
+ * three failed optimistic commits). A main-thread committer (e.g. Reanimated)
+ * can already be blocked on that same mutex, so any `dispatch_sync` to main
+ * from the measure path can deadlock: JS waits for main, main waits for the
+ * mutex JS holds. iOS kills the frozen app ~60s later (watchdog 0x8BADF00D).
+ *
+ * Reading `view.bounds` from a background thread is not safe either, so the
+ * component view *publishes* its last committed size here (from
+ * `updateLayoutMetrics:`, always on main) and the measure path *loads* it
+ * wait-free from any thread.
+ *
+ * Both dimensions are packed as IEEE-754 floats into one `uint64_t` so a
+ * single lock-free atomic covers the pair — a reader can never observe a new
+ * width with an old height (no torn reads). Relaxed memory ordering suffices:
+ * the value is self-contained and no other memory is published through it.
+ */
+class ENRMAtomicSize {
+public:
+  void store(CGSize size)
+  {
+    bits_.store(pack(size), std::memory_order_relaxed);
+  }
+
+  CGSize load() const
+  {
+    return unpack(bits_.load(std::memory_order_relaxed));
+  }
+
+private:
+  static uint64_t pack(CGSize size)
+  {
+    float width = (float)size.width;
+    float height = (float)size.height;
+    uint32_t widthBits;
+    uint32_t heightBits;
+    memcpy(&widthBits, &width, sizeof(widthBits));
+    memcpy(&heightBits, &height, sizeof(heightBits));
+    return ((uint64_t)widthBits << 32) | heightBits;
+  }
+
+  static CGSize unpack(uint64_t bits)
+  {
+    uint32_t widthBits = (uint32_t)(bits >> 32);
+    uint32_t heightBits = (uint32_t)bits;
+    float width;
+    float height;
+    memcpy(&width, &widthBits, sizeof(width));
+    memcpy(&height, &heightBits, sizeof(height));
+    return CGSizeMake(width, height);
+  }
+
+  std::atomic<uint64_t> bits_{0};
+};