react-native-platform-components 1.2.0 → 1.4.0

package/lib/typescript/module/src/labelStyle.d.ts

@@ -0,0 +1,20 @@
+import type { TextStyle } from 'react-native';
+/**
+ * Font for a control's labels. Each field falls back to the platform default.
+ */
+export interface LabelStyle {
+    fontFamily?: string;
+    fontSize?: number;
+    fontWeight?: TextStyle['fontWeight'];
+    fontStyle?: 'normal' | 'italic';
+}
+/** The flat font fields the native specs expect; empty / 0 = default. */
+export type NativeLabelStyle = {
+    fontFamily: string;
+    fontSize: number;
+    fontWeight: string;
+    fontStyle: string;
+};
+/** Normalizes a label font for native; `undefined` keeps the platform font. */
+export declare function normalizeLabelStyle(labelStyle: LabelStyle | undefined): NativeLabelStyle | undefined;
+//# sourceMappingURL=labelStyle.d.ts.map

package/lib/typescript/module/src/labelStyle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"labelStyle.d.ts","sourceRoot":"","sources":["../../../../src/labelStyle.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IACrC,SAAS,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CACjC;AAED,yEAAyE;AACzE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC,gBAAgB,GAAG,SAAS,CAS9B"}

package/lib/typescript/module/src/sharedTypes.d.ts

@@ -1,12 +1,17 @@
-import type { CodegenTypes } from 'react-native';
+import type { BubblingEventHandler } from './codegenTypes.js';
 /** Shared "open/closed" control state. */
 export type Visible = 'open' | 'closed';
 /** Shared presentation mode for pickers/menus. */
 export type Presentation = 'modal' | 'embedded';
-/** Shared Material preference (Android). */
+/** Shared Material preference (Android): the platform widget or the Material one. */
 export type AndroidMaterialMode = 'system' | 'm3';
+/**
+ * Shared Material style for the Material-only components (Android):
+ * Material 3, or Material 3 Expressive (the default).
+ */
+export type AndroidMaterialStyle = 'm3' | 'expressive';
 /** Common event empty payload type. */
 export type EmptyEvent = Readonly<{}>;
 /** Convenience alias (optional). */
-export type Bubbling<T> = CodegenTypes.BubblingEventHandler<T>;
+export type Bubbling<T> = BubblingEventHandler<T>;
 //# sourceMappingURL=sharedTypes.d.ts.map

package/lib/typescript/module/src/sharedTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sharedTypes.d.ts","sourceRoot":"","sources":["../../../../src/sharedTypes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,0CAA0C;AAC1C,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;AAExC,kDAAkD;AAClD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,UAAU,CAAC;AAEhD,4CAA4C;AAC5C,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,IAAI,CAAC;AAElD,uCAAuC;AACvC,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;AAEtC,oCAAoC;AACpC,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,YAAY,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"sharedTypes.d.ts","sourceRoot":"","sources":["../../../../src/sharedTypes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAgB,CAAC;AAE3D,0CAA0C;AAC1C,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;AAExC,kDAAkD;AAClD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,UAAU,CAAC;AAEhD,qFAAqF;AACrF,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,IAAI,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,GAAG,YAAY,CAAC;AAEvD,uCAAuC;AACvC,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;AAEtC,oCAAoC;AACpC,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-platform-components",
-  "version": "1.2.0",
-  "description": "Native UI components for React Native that are native on Android too: DatePicker, ContextMenu, SelectionMenu, SegmentedControl (Material 3) and LiquidGlass (iOS 26). Fabric, typed, Expo config plugin.",
+  "version": "1.4.0",
+  "description": "Native UI components for React Native, the real platform widgets on both iOS and Android: TextField, DatePicker, ContextMenu, SelectionMenu, SegmentedControl, Button, ButtonGroup, FloatingToolbar and LiquidGlass. UIKit and SwiftUI on iOS, Material 3 Expressive on Android. Fabric, TypeScript, Expo config plugin.",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",
   "browser": "./lib/module/index.web.js",
@@ -28,7 +28,8 @@
       }
     },
     "./package.json": "./package.json",
-    "./app.plugin": "./app.plugin.cjs"
+    "./app.plugin": "./app.plugin.js",
+    "./app.plugin.js": "./app.plugin.js"
   },
   "files": [
     "src",
@@ -40,7 +41,7 @@
     "plugin",
     "*.podspec",
     "react-native.config.js",
-    "app.plugin.cjs",
+    "app.plugin.js",
     "expo-module.config.json",
     "!ios/build",
     "!android/build",
@@ -68,7 +69,8 @@
     "test": "jest",
     "upgrade:check": "yarn dlx npm-check-updates",
     "upgrade:apply": "yarn dlx npm-check-updates -u && rm -rf node_modules && rm -rf package-lock.json && yarn install",
-    "generate:gifs": "./scripts/generate-readme-gifs.sh"
+    "generate:gifs": "./scripts/generate-readme-gifs.sh",
+    "generate:visuals": "node scripts/visuals/stills.mjs && node scripts/visuals/showreel.mjs"
   },
   "keywords": [
     "react-native",
@@ -80,6 +82,12 @@
     "new-architecture",
     "native-ui",
     "ui-components",
+    "textfield",
+    "text-field",
+    "textinput",
+    "text-input",
+    "textinputlayout",
+    "uitextfield",
     "datepicker",
     "date-picker",
     "time-picker",
@@ -100,6 +108,16 @@
     "segmentedbuttons",
     "uisegmentedcontrol",
     "tabs",
+    "button",
+    "buttons",
+    "button-group",
+    "toggle-buttons",
+    "floating-toolbar",
+    "toolbar",
+    "uibutton",
+    "material3-expressive",
+    "material-3-expressive",
+    "expressive",
     "liquid-glass",
     "liquidglass",
     "glass-effect",
@@ -202,7 +220,11 @@
         "PCDatePicker": "PCDatePicker",
         "PCContextMenu": "PCContextMenu",
         "PCSegmentedControl": "PCSegmentedControl",
-        "PCLiquidGlass": "PCLiquidGlass"
+        "PCButton": "PCButton",
+        "PCButtonGroup": "PCButtonGroup",
+        "PCFloatingToolbar": "PCFloatingToolbar",
+        "PCLiquidGlass": "PCLiquidGlass",
+        "PCTextField": "PCTextField"
       }
     }
   },

package/react-native.config.js

@@ -6,6 +6,9 @@ module.exports = {
           'MeasuringPCSelectionMenuComponentDescriptor',
           'MeasuringPCDatePickerComponentDescriptor',
           'MeasuringPCSegmentedControlComponentDescriptor',
+          'MeasuringPCButtonComponentDescriptor',
+          'MeasuringPCButtonGroupComponentDescriptor',
+          'MeasuringPCTextFieldComponentDescriptor',
         ],
         cmakeListsPath: 'src/main/jni/CMakeLists.txt',
       },

package/shared/PCButtonComponentDescriptors-custom.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+// Forward declaration to avoid circular includes
+namespace facebook::react {
+class MeasuringPCButtonShadowNode;
+}
+
+// Include the actual shadow node definition
+#include "PCButtonShadowNode-custom.h"
+
+namespace facebook::react {
+
+/**
+ * Custom component descriptor that uses our measuring shadow node
+ * instead of the generated one.
+ */
+using MeasuringPCButtonComponentDescriptor =
+    ConcreteComponentDescriptor<MeasuringPCButtonShadowNode>;
+
+} // namespace facebook::react

package/shared/PCButtonGroupComponentDescriptors-custom.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+// Forward declaration to avoid circular includes
+namespace facebook::react {
+class MeasuringPCButtonGroupShadowNode;
+}
+
+// Include the actual shadow node definition
+#include "PCButtonGroupShadowNode-custom.h"
+
+namespace facebook::react {
+
+/**
+ * Custom component descriptor that uses our measuring shadow node
+ * instead of the generated one.
+ */
+using MeasuringPCButtonGroupComponentDescriptor =
+    ConcreteComponentDescriptor<MeasuringPCButtonGroupShadowNode>;
+
+} // namespace facebook::react

package/shared/PCButtonGroupShadowNode-custom.cpp

@@ -0,0 +1,48 @@
+#include "PCButtonGroupShadowNode-custom.h"
+
+#include <react/renderer/core/LayoutConstraints.h>
+#include <algorithm>
+
+namespace facebook::react {
+
+Size MeasuringPCButtonGroupShadowNode::measureContent(
+    const LayoutContext& /*layoutContext*/,
+    const LayoutConstraints& layoutConstraints) const {
+
+  // Native measures the actual group and reports its intrinsic size
+  const auto& stateData = this->getStateData();
+  Float measuredW = stateData.frameSize.width;
+  Float measuredH = stateData.frameSize.height;
+
+  const Float fallbackHeight =
+#ifdef __ANDROID__
+      static_cast<Float>(kFallbackHeightAndroid);
+#else
+      static_cast<Float>(kFallbackHeightIOS);
+#endif
+
+  const bool usingFallback = (measuredH <= 0);
+  if (usingFallback) {
+    measuredH = fallbackHeight;
+  }
+  if (measuredW <= 0) {
+    measuredW = static_cast<Float>(kFallbackWidth);
+  }
+
+  const Float kHuge = static_cast<Float>(1.0e9);
+
+  measuredW = std::max<Float>(measuredW, layoutConstraints.minimumSize.width);
+  if (layoutConstraints.maximumSize.width > 0 && layoutConstraints.maximumSize.width < kHuge) {
+    measuredW = std::min<Float>(measuredW, layoutConstraints.maximumSize.width);
+  }
+
+  measuredH = std::max<Float>(measuredH, layoutConstraints.minimumSize.height);
+  // Only clamp to max height if we have real measured data (not fallback)
+  if (!usingFallback && layoutConstraints.maximumSize.height > 0 && layoutConstraints.maximumSize.height < kHuge) {
+    measuredH = std::min<Float>(measuredH, layoutConstraints.maximumSize.height);
+  }
+
+  return Size{measuredW, measuredH};
+}
+
+} // namespace facebook::react

package/shared/PCButtonGroupShadowNode-custom.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+
+// Only include what we need for the shadow node definition
+// Do NOT include ComponentDescriptors.h here to avoid circular dependency
+#include <react/renderer/components/PlatformComponentsViewSpec/EventEmitters.h>
+#include <react/renderer/components/PlatformComponentsViewSpec/Props.h>
+
+#include "PCButtonGroupState-custom.h"
+
+namespace facebook::react {
+
+extern const char PCButtonGroupComponentName[];
+
+/**
+ * Custom ShadowNode for ButtonGroup that supports Yoga measurement.
+ *
+ * - Native measures the actual group and updates state with frameSize
+ * - measureContent() returns the size from state for proper Yoga layout
+ * - Falls back to platform-specific defaults if state hasn't been set yet
+ */
+class MeasuringPCButtonGroupShadowNode final : public ConcreteViewShadowNode<
+                                          PCButtonGroupComponentName,
+                                          PCButtonGroupProps,
+                                          PCButtonGroupEventEmitter,
+                                          PCButtonGroupStateFrameSize> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+  // Fallback sizes used when native hasn't reported measurements yet
+  // iOS: a row of small UIButtons
+  static constexpr float kFallbackHeightIOS = 34.0f;
+
+  // Android: small Material 3 buttons (40dp) plus their 4dp touch insets
+  static constexpr float kFallbackHeightAndroid = 48.0f;
+
+  static constexpr float kFallbackWidth = 160.0f;
+
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
+    return traits;
+  }
+
+  /**
+   * Called by Yoga when it needs the intrinsic size of the component.
+   */
+  Size measureContent(
+      const LayoutContext& layoutContext,
+      const LayoutConstraints& layoutConstraints) const override;
+};
+
+} // namespace facebook::react

package/shared/PCButtonGroupState-custom.h

@@ -0,0 +1,61 @@
+#pragma once
+
+#include <react/renderer/core/LayoutPrimitives.h>
+#include <memory>
+
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook::react {
+
+/**
+ * Custom state for ButtonGroup that holds the measured frame size from native.
+ * The native side measures the actual group and communicates the size to
+ * the shadow node for proper Yoga layout.
+ */
+struct PCButtonGroupStateFrameSize {
+  using Shared = std::shared_ptr<const PCButtonGroupStateFrameSize>;
+
+  Size frameSize{}; // {width, height} in points
+
+  PCButtonGroupStateFrameSize() = default;
+
+  explicit PCButtonGroupStateFrameSize(Size size) : frameSize(size) {}
+
+  bool operator==(const PCButtonGroupStateFrameSize& other) const {
+    return frameSize.width == other.frameSize.width &&
+           frameSize.height == other.frameSize.height;
+  }
+
+  bool operator!=(const PCButtonGroupStateFrameSize& other) const {
+    return !(*this == other);
+  }
+
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
+  // Required for Android state serialization
+  PCButtonGroupStateFrameSize(
+      const PCButtonGroupStateFrameSize& previousState,
+      folly::dynamic data)
+      : frameSize(previousState.frameSize) {
+    if (data.isObject()) {
+      if (data.count("width") && data.count("height")) {
+        frameSize.width = static_cast<Float>(data["width"].asDouble());
+        frameSize.height = static_cast<Float>(data["height"].asDouble());
+      }
+    }
+  }
+
+  folly::dynamic getDynamic() const {
+    return folly::dynamic::object("width", frameSize.width)("height", frameSize.height);
+  }
+
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  }
+#endif
+};
+
+} // namespace facebook::react

package/shared/PCButtonShadowNode-custom.cpp

@@ -0,0 +1,48 @@
+#include "PCButtonShadowNode-custom.h"
+
+#include <react/renderer/core/LayoutConstraints.h>
+#include <algorithm>
+
+namespace facebook::react {
+
+Size MeasuringPCButtonShadowNode::measureContent(
+    const LayoutContext& /*layoutContext*/,
+    const LayoutConstraints& layoutConstraints) const {
+
+  // Native measures the actual button and reports its intrinsic size
+  const auto& stateData = this->getStateData();
+  Float measuredW = stateData.frameSize.width;
+  Float measuredH = stateData.frameSize.height;
+
+  const Float fallbackHeight =
+#ifdef __ANDROID__
+      static_cast<Float>(kFallbackHeightAndroid);
+#else
+      static_cast<Float>(kFallbackHeightIOS);
+#endif
+
+  const bool usingFallback = (measuredH <= 0);
+  if (usingFallback) {
+    measuredH = fallbackHeight;
+  }
+  if (measuredW <= 0) {
+    measuredW = static_cast<Float>(kFallbackWidth);
+  }
+
+  const Float kHuge = static_cast<Float>(1.0e9);
+
+  measuredW = std::max<Float>(measuredW, layoutConstraints.minimumSize.width);
+  if (layoutConstraints.maximumSize.width > 0 && layoutConstraints.maximumSize.width < kHuge) {
+    measuredW = std::min<Float>(measuredW, layoutConstraints.maximumSize.width);
+  }
+
+  measuredH = std::max<Float>(measuredH, layoutConstraints.minimumSize.height);
+  // Only clamp to max height if we have real measured data (not fallback)
+  if (!usingFallback && layoutConstraints.maximumSize.height > 0 && layoutConstraints.maximumSize.height < kHuge) {
+    measuredH = std::min<Float>(measuredH, layoutConstraints.maximumSize.height);
+  }
+
+  return Size{measuredW, measuredH};
+}
+
+} // namespace facebook::react

package/shared/PCButtonShadowNode-custom.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+
+// Only include what we need for the shadow node definition
+// Do NOT include ComponentDescriptors.h here to avoid circular dependency
+#include <react/renderer/components/PlatformComponentsViewSpec/EventEmitters.h>
+#include <react/renderer/components/PlatformComponentsViewSpec/Props.h>
+
+#include "PCButtonState-custom.h"
+
+namespace facebook::react {
+
+extern const char PCButtonComponentName[];
+
+/**
+ * Custom ShadowNode for Button that supports Yoga measurement.
+ *
+ * - Native measures the actual button and updates state with frameSize
+ * - measureContent() returns the size from state for proper Yoga layout
+ * - Falls back to platform-specific defaults if state hasn't been set yet
+ */
+class MeasuringPCButtonShadowNode final : public ConcreteViewShadowNode<
+                                          PCButtonComponentName,
+                                          PCButtonProps,
+                                          PCButtonEventEmitter,
+                                          PCButtonStateFrameSize> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+  // Fallback sizes used when native hasn't reported measurements yet
+  // iOS UIButton.Configuration small size
+  static constexpr float kFallbackHeightIOS = 34.0f;
+
+  // Android Material 3 small button (40dp) plus its 4dp touch insets
+  static constexpr float kFallbackHeightAndroid = 48.0f;
+
+  static constexpr float kFallbackWidth = 64.0f;
+
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
+    return traits;
+  }
+
+  /**
+   * Called by Yoga when it needs the intrinsic size of the component.
+   */
+  Size measureContent(
+      const LayoutContext& layoutContext,
+      const LayoutConstraints& layoutConstraints) const override;
+};
+
+} // namespace facebook::react

package/shared/PCButtonState-custom.h

@@ -0,0 +1,61 @@
+#pragma once
+
+#include <react/renderer/core/LayoutPrimitives.h>
+#include <memory>
+
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook::react {
+
+/**
+ * Custom state for Button that holds the measured frame size from native.
+ * The native side measures the actual button and communicates the size to
+ * the shadow node for proper Yoga layout.
+ */
+struct PCButtonStateFrameSize {
+  using Shared = std::shared_ptr<const PCButtonStateFrameSize>;
+
+  Size frameSize{}; // {width, height} in points
+
+  PCButtonStateFrameSize() = default;
+
+  explicit PCButtonStateFrameSize(Size size) : frameSize(size) {}
+
+  bool operator==(const PCButtonStateFrameSize& other) const {
+    return frameSize.width == other.frameSize.width &&
+           frameSize.height == other.frameSize.height;
+  }
+
+  bool operator!=(const PCButtonStateFrameSize& other) const {
+    return !(*this == other);
+  }
+
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
+  // Required for Android state serialization
+  PCButtonStateFrameSize(
+      const PCButtonStateFrameSize& previousState,
+      folly::dynamic data)
+      : frameSize(previousState.frameSize) {
+    if (data.isObject()) {
+      if (data.count("width") && data.count("height")) {
+        frameSize.width = static_cast<Float>(data["width"].asDouble());
+        frameSize.height = static_cast<Float>(data["height"].asDouble());
+      }
+    }
+  }
+
+  folly::dynamic getDynamic() const {
+    return folly::dynamic::object("width", frameSize.width)("height", frameSize.height);
+  }
+
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  }
+#endif
+};
+
+} // namespace facebook::react

package/shared/PCDatePickerState-custom.h

@@ -3,7 +3,7 @@
 #include <react/renderer/core/LayoutPrimitives.h>
 #include <memory>
 
-#ifdef RN_SERIALIZABLE_STATE
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
 #include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
@@ -37,7 +37,7 @@ struct PCDatePickerStateFrameSize {
     return !(*this == other);
   }
 
-#ifdef RN_SERIALIZABLE_STATE
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
   // Required for Android state serialization
   PCDatePickerStateFrameSize(
       const PCDatePickerStateFrameSize& previousState,

package/shared/PCSegmentedControlState-custom.h

@@ -3,7 +3,7 @@
 #include <react/renderer/core/LayoutPrimitives.h>
 #include <memory>
 
-#ifdef RN_SERIALIZABLE_STATE
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
 #include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
@@ -34,7 +34,7 @@ struct PCSegmentedControlStateFrameSize {
     return !(*this == other);
   }
 
-#ifdef RN_SERIALIZABLE_STATE
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
   // Required for Android state serialization
   PCSegmentedControlStateFrameSize(
       const PCSegmentedControlStateFrameSize& previousState,

package/shared/PCSelectionMenuState-custom.h

@@ -3,7 +3,7 @@
 #include <react/renderer/core/LayoutPrimitives.h>
 #include <memory>
 
-#ifdef RN_SERIALIZABLE_STATE
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
 #include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
@@ -37,7 +37,7 @@ struct PCSelectionMenuStateFrameSize {
     return !(*this == other);
   }
 
-#ifdef RN_SERIALIZABLE_STATE
+#if defined(RN_SERIALIZABLE_STATE) || defined(ANDROID)
   // Required for Android state serialization
   PCSelectionMenuStateFrameSize(
       const PCSelectionMenuStateFrameSize& previousState,

package/shared/PCTextFieldComponentDescriptors-custom.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+// Forward declaration to avoid circular includes
+namespace facebook::react {
+class MeasuringPCTextFieldShadowNode;
+}
+
+// Include the actual shadow node definition
+#include "PCTextFieldShadowNode-custom.h"
+
+namespace facebook::react {
+
+/**
+ * Custom component descriptor that uses our measuring shadow node
+ * instead of the generated one.
+ */
+using MeasuringPCTextFieldComponentDescriptor =
+    ConcreteComponentDescriptor<MeasuringPCTextFieldShadowNode>;
+
+} // namespace facebook::react

package/shared/PCTextFieldShadowNode-custom.cpp

@@ -0,0 +1,47 @@
+#include "PCTextFieldShadowNode-custom.h"
+
+#include <react/renderer/core/LayoutConstraints.h>
+#include <algorithm>
+
+namespace facebook::react {
+
+Size MeasuringPCTextFieldShadowNode::measureContent(
+    const LayoutContext& /*layoutContext*/,
+    const LayoutConstraints& layoutConstraints) const {
+
+  const auto& stateData = this->getStateData();
+  Float measuredW = stateData.frameSize.width;
+  Float measuredH = stateData.frameSize.height;
+
+  const Float kHuge = static_cast<Float>(1.0e9);
+
+  // A text field fills the width it is offered; only an unbounded row (no
+  // width at all) gets a fixed fallback.
+  if (measuredW <= 0) {
+    const Float maxW = layoutConstraints.maximumSize.width;
+    measuredW = (maxW > 0 && maxW < kHuge) ? maxW : static_cast<Float>(kFallbackWidth);
+  }
+
+  const bool usingFallback = (measuredH <= 0);
+  if (usingFallback) {
+#ifdef __ANDROID__
+    measuredH = static_cast<Float>(kFallbackHeightAndroid);
+#else
+    measuredH = static_cast<Float>(kFallbackHeightIOS);
+#endif
+  }
+
+  measuredW = std::max<Float>(measuredW, layoutConstraints.minimumSize.width);
+  measuredW = std::min<Float>(measuredW, layoutConstraints.maximumSize.width);
+
+  measuredH = std::max<Float>(measuredH, layoutConstraints.minimumSize.height);
+  // Only clamp to max height if we have real measured data (not fallback)
+  if (!usingFallback && layoutConstraints.maximumSize.height > 0 &&
+      layoutConstraints.maximumSize.height < kHuge) {
+    measuredH = std::min<Float>(measuredH, layoutConstraints.maximumSize.height);
+  }
+
+  return Size{measuredW, measuredH};
+}
+
+} // namespace facebook::react