react-native-platform-components 0.5.3 → 0.5.4

package/lib/module/SelectionMenu.js

@@ -2,7 +2,6 @@
 
 // SelectionMenu.tsx
 import React, { useCallback, useMemo } from 'react';
-import { Platform, StyleSheet } from 'react-native';
 import NativeSelectionMenu from './SelectionMenuNativeComponent';
 import { jsx as _jsx } from "react/jsx-runtime";
 function normalizeSelectedData(selected) {
@@ -49,9 +48,8 @@ export function SelectionMenu(props) {
       material: android.material
     };
   }, [android]);
-  const isAndroidM3Inline = android?.material && inlineMode && android.material === 'm3' && Platform.OS === 'android';
   return /*#__PURE__*/_jsx(NativeSelectionMenu, {
-    style: [style, isAndroidM3Inline && styles.androidInline],
+    style: style,
     options: options,
     selectedData: selectedData,
     interactivity: disabled ? 'disabled' : 'enabled',
@@ -65,9 +63,4 @@ export function SelectionMenu(props) {
     ...viewProps
   });
 }
-const styles = StyleSheet.create({
-  androidInline: {
-    minHeight: 60
-  }
-});
 //# sourceMappingURL=SelectionMenu.js.map

package/lib/module/SelectionMenu.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useMemo","Platform","StyleSheet","NativeSelectionMenu","jsx","_jsx","normalizeSelectedData","selected","normalizeNativeVisible","inlineMode","visible","undefined","SelectionMenu","props","style","options","disabled","placeholder","onSelect","onRequestClose","ios","android","viewProps","selectedData","nativeVisible","handleSelect","e","index","label","data","nativeEvent","handleRequestClose","nativeAndroid","material","isAndroidM3Inline","OS","styles","androidInline","interactivity","anchorMode","create","minHeight"],"sourceRoot":"../../src","sources":["SelectionMenu.tsx"],"mappings":";;AAAA;AACA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,OAAO,QAAQ,OAAO;AACnD,SAASC,QAAQ,EAAEC,UAAU,QAAwB,cAAc;AAEnE,OAAOC,mBAAmB,MAGnB,gCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAsDxC,SAASC,qBAAqBA,CAACC,QAAuB,EAAU;EAC9D,OAAOA,QAAQ,IAAI,EAAE;AACvB;AAEA,SAASC,sBAAsBA,CAC7BC,UAA+B,EAC/BC,OAA4B,EACG;EAC/B;EACA,IAAID,UAAU,EAAE,OAAOE,SAAS;EAChC,OAAOD,OAAO,GAAG,MAAM,GAAG,QAAQ;AACpC;AAEA,OAAO,SAASE,aAAaA,CAACC,KAAyB,EAAsB;EAC3E,MAAM;IACJC,KAAK;IACLC,OAAO;IACPR,QAAQ;IACRS,QAAQ;IACRC,WAAW;IACXR,UAAU;IACVC,OAAO;IACPQ,QAAQ;IACRC,cAAc;IACdC,GAAG;IACHC,OAAO;IACP,GAAGC;EACL,CAAC,GAAGT,KAAK;EAET,MAAMU,YAAY,GAAGvB,OAAO,CAC1B,MAAMM,qBAAqB,CAACC,QAAQ,CAAC,EACrC,CAACA,QAAQ,CACX,CAAC;EAED,MAAMiB,aAAa,GAAGxB,OAAO,CAC3B,MAAMQ,sBAAsB,CAACC,UAAU,EAAEC,OAAO,CAAC,EACjD,CAACD,UAAU,EAAEC,OAAO,CACtB,CAAC;EAED,MAAMe,YAAY,GAAG1B,WAAW,CAC7B2B,CAA4C,IAAK;IAChD,MAAM;MAAEC,KAAK;MAAEC,KAAK;MAAEC;IAAK,CAAC,GAAGH,CAAC,CAACI,WAAW;IAC5CZ,QAAQ,GAAGW,IAAI,EAAED,KAAK,EAAED,KAAK,CAAC;EAChC,CAAC,EACD,CAACT,QAAQ,CACX,CAAC;EAED,MAAMa,kBAAkB,GAAGhC,WAAW,CAAC,MAAM;IAC3CoB,cAAc,GAAG,CAAC;EACpB,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;;EAEpB;EACA,MAAMa,aAAa,GAAGhC,OAAO,CAAC,MAAM;IAClC,IAAI,CAACqB,OAAO,EAAE,OAAOV,SAAS;IAC9B,OAAO;MAAEsB,QAAQ,EAAEZ,OAAO,CAACY;IAAS,CAAC;EACvC,CAAC,EAAE,CAACZ,OAAO,CAAC,CAAC;EAEb,MAAMa,iBAAiB,GACrBb,OAAO,EAAEY,QAAQ,IACjBxB,UAAU,IACVY,OAAO,CAACY,QAAQ,KAAK,IAAI,IACzBhC,QAAQ,CAACkC,EAAE,KAAK,SAAS;EAE3B,oBACE9B,IAAA,CAACF,mBAAmB;IAClBW,KAAK,EAAE,CAACA,KAAK,EAAEoB,iBAAiB,IAAIE,MAAM,CAACC,aAAa,CAAE;IAC1DtB,OAAO,EAAEA,OAAQ;IACjBQ,YAAY,EAAEA,YAAa;IAC3Be,aAAa,EAAEtB,QAAQ,GAAG,UAAU,GAAG,SAAU;IACjDC,WAAW,EAAEA,WAAY;IACzBsB,UAAU,EAAE9B,UAAU,GAAG,QAAQ,GAAG,UAAW;IAC/CC,OAAO,EAAEc,aAAc;IACvBN,QAAQ,EAAEA,QAAQ,GAAGO,YAAY,GAAGd,SAAU;IAC9CQ,cAAc,EAAEA,cAAc,GAAGY,kBAAkB,GAAGpB,SAAU;IAChES,GAAG,EAAEA,GAAI;IACTC,OAAO,EAAEW,aAAc;IAAA,GACnBV;EAAS,CACd,CAAC;AAEN;AAEA,MAAMc,MAAM,GAAGlC,UAAU,CAACsC,MAAM,CAAC;EAC/BH,aAAa,EAAE;IAAEI,SAAS,EAAE;EAAG;AACjC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useMemo","NativeSelectionMenu","jsx","_jsx","normalizeSelectedData","selected","normalizeNativeVisible","inlineMode","visible","undefined","SelectionMenu","props","style","options","disabled","placeholder","onSelect","onRequestClose","ios","android","viewProps","selectedData","nativeVisible","handleSelect","e","index","label","data","nativeEvent","handleRequestClose","nativeAndroid","material","interactivity","anchorMode"],"sourceRoot":"../../src","sources":["SelectionMenu.tsx"],"mappings":";;AAAA;AACA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAGnD,OAAOC,mBAAmB,MAGnB,gCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAsDxC,SAASC,qBAAqBA,CAACC,QAAuB,EAAU;EAC9D,OAAOA,QAAQ,IAAI,EAAE;AACvB;AAEA,SAASC,sBAAsBA,CAC7BC,UAA+B,EAC/BC,OAA4B,EACG;EAC/B;EACA,IAAID,UAAU,EAAE,OAAOE,SAAS;EAChC,OAAOD,OAAO,GAAG,MAAM,GAAG,QAAQ;AACpC;AAEA,OAAO,SAASE,aAAaA,CAACC,KAAyB,EAAsB;EAC3E,MAAM;IACJC,KAAK;IACLC,OAAO;IACPR,QAAQ;IACRS,QAAQ;IACRC,WAAW;IACXR,UAAU;IACVC,OAAO;IACPQ,QAAQ;IACRC,cAAc;IACdC,GAAG;IACHC,OAAO;IACP,GAAGC;EACL,CAAC,GAAGT,KAAK;EAET,MAAMU,YAAY,GAAGrB,OAAO,CAC1B,MAAMI,qBAAqB,CAACC,QAAQ,CAAC,EACrC,CAACA,QAAQ,CACX,CAAC;EAED,MAAMiB,aAAa,GAAGtB,OAAO,CAC3B,MAAMM,sBAAsB,CAACC,UAAU,EAAEC,OAAO,CAAC,EACjD,CAACD,UAAU,EAAEC,OAAO,CACtB,CAAC;EAED,MAAMe,YAAY,GAAGxB,WAAW,CAC7ByB,CAA4C,IAAK;IAChD,MAAM;MAAEC,KAAK;MAAEC,KAAK;MAAEC;IAAK,CAAC,GAAGH,CAAC,CAACI,WAAW;IAC5CZ,QAAQ,GAAGW,IAAI,EAAED,KAAK,EAAED,KAAK,CAAC;EAChC,CAAC,EACD,CAACT,QAAQ,CACX,CAAC;EAED,MAAMa,kBAAkB,GAAG9B,WAAW,CAAC,MAAM;IAC3CkB,cAAc,GAAG,CAAC;EACpB,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;;EAEpB;EACA,MAAMa,aAAa,GAAG9B,OAAO,CAAC,MAAM;IAClC,IAAI,CAACmB,OAAO,EAAE,OAAOV,SAAS;IAC9B,OAAO;MAAEsB,QAAQ,EAAEZ,OAAO,CAACY;IAAS,CAAC;EACvC,CAAC,EAAE,CAACZ,OAAO,CAAC,CAAC;EAEb,oBACEhB,IAAA,CAACF,mBAAmB;IAClBW,KAAK,EAAEA,KAAM;IACbC,OAAO,EAAEA,OAAQ;IACjBQ,YAAY,EAAEA,YAAa;IAC3BW,aAAa,EAAElB,QAAQ,GAAG,UAAU,GAAG,SAAU;IACjDC,WAAW,EAAEA,WAAY;IACzBkB,UAAU,EAAE1B,UAAU,GAAG,QAAQ,GAAG,UAAW;IAC/CC,OAAO,EAAEc,aAAc;IACvBN,QAAQ,EAAEA,QAAQ,GAAGO,YAAY,GAAGd,SAAU;IAC9CQ,cAAc,EAAEA,cAAc,GAAGY,kBAAkB,GAAGpB,SAAU;IAChES,GAAG,EAAEA,GAAI;IACTC,OAAO,EAAEW,aAAc;IAAA,GACnBV;EAAS,CACd,CAAC;AAEN","ignoreList":[]}

package/lib/typescript/src/SelectionMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SelectionMenu.d.ts","sourceRoot":"","sources":["../../../src/SelectionMenu.tsx"],"names":[],"mappings":"AACA,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAEpE,OAA4B,EAC1B,KAAK,mBAAmB,EAEzB,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD,MAAM,WAAW,kBAAmB,SAAQ,SAAS;IACnD,yCAAyC;IACzC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAExC;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAExB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAEhE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAE5B;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,CAAC;IAET,OAAO,CAAC,EAAE;QACR,6CAA6C;QAC7C,QAAQ,CAAC,EAAE,mBAAmB,CAAC;KAChC,CAAC;IAEF,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAeD,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,CAAC,YAAY,CAkE3E"}
+{"version":3,"file":"SelectionMenu.d.ts","sourceRoot":"","sources":["../../../src/SelectionMenu.tsx"],"names":[],"mappings":"AACA,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAA4B,EAC1B,KAAK,mBAAmB,EAEzB,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD,MAAM,WAAW,kBAAmB,SAAQ,SAAS;IACnD,yCAAyC;IACzC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAExC;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAExB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAEhE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAE5B;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,CAAC;IAET,OAAO,CAAC,EAAE;QACR,6CAA6C;QAC7C,QAAQ,CAAC,EAAE,mBAAmB,CAAC;KAChC,CAAC;IAEF,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAeD,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,CAAC,YAAY,CA4D3E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-platform-components",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "A cross-platform toolkit of native UI components for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/react-native.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        componentDescriptors: [
+          'MeasuringPCSelectionMenuComponentDescriptor',
+          'MeasuringPCDatePickerComponentDescriptor',
+        ],
+        cmakeListsPath: 'src/main/jni/CMakeLists.txt',
+      },
+    },
+  },
+};

package/shared/PCDatePickerComponentDescriptors-custom.h

@@ -1,52 +1,23 @@
 #pragma once
 
-#include "PCDatePickerShadowNode-custom.h"
-
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/mounting/ShadowView.h>
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/core/ShadowNodeTraits.h>
-#include <react/renderer/core/ShadowNodeFragment.h>
-#include <react/renderer/core/ShadowNodeFamily.h>
-#include <react/renderer/components/view/YogaLayoutableShadowNode.h>
-
-namespace facebook::react
-{
 
-    class MeasuringPCDatePickerComponentDescriptor final
-        : public ConcreteComponentDescriptor<MeasuringPCDatePickerShadowNode>
-    {
-    public:
-        using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+// Forward declaration to avoid circular includes
+namespace facebook::react {
+class MeasuringPCDatePickerShadowNode;
+}
 
-        void adopt(ShadowNode &shadowNode) const override
-        {
-            auto &pickerShadowNode =
-                static_cast<MeasuringPCDatePickerShadowNode &>(shadowNode);
-            auto &layoutableShadowNode =
-                static_cast<YogaLayoutableShadowNode &>(pickerShadowNode);
-
-            auto state =
-                std::static_pointer_cast<
-                    const MeasuringPCDatePickerShadowNode::ConcreteState
-                >(shadowNode.getState());
-
-            if (state)
-            {
-                auto stateData = state->getData();
-                auto frameSize = stateData.frameSize;
+// Include the actual shadow node definition
+#include "PCDatePickerShadowNode-custom.h"
 
-                if (frameSize.width >= 0 && frameSize.height >= 0)
-                {
-                    layoutableShadowNode.setSize(Size{
-                        frameSize.width,
-                        frameSize.height,
-                    });
-                }
-            }
+namespace facebook::react {
 
-            ConcreteComponentDescriptor::adopt(shadowNode);
-        }
-    };
+/**
+ * Custom component descriptor that uses our measuring shadow node
+ * instead of the generated one. No custom adopt() needed since
+ * measurement is handled via measureContent().
+ */
+using MeasuringPCDatePickerComponentDescriptor =
+    ConcreteComponentDescriptor<MeasuringPCDatePickerShadowNode>;
 
 } // namespace facebook::react

package/shared/PCDatePickerShadowNode-custom.cpp

@@ -1 +1,36 @@
 #include "PCDatePickerShadowNode-custom.h"
+
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/core/ConcreteShadowNode.h>
+#include <algorithm>
+
+namespace facebook::react {
+
+Size MeasuringPCDatePickerShadowNode::measureContent(
+    const LayoutContext& /*layoutContext*/,
+    const LayoutConstraints& layoutConstraints) const {
+
+  // Get frame size from native state - native measures the actual picker
+  const auto& stateData = this->getStateData();
+  Float measuredW = stateData.frameSize.width;
+  Float measuredH = stateData.frameSize.height;
+
+  // If width is 0, use available width from constraints
+  const Float kHuge = static_cast<Float>(1.0e9);
+  if (measuredW <= 0) {
+    const Float maxW = layoutConstraints.maximumSize.width;
+    measuredW = (maxW > 0 && maxW < kHuge) ? maxW : 0;
+  }
+
+  // Respect layout constraints
+  measuredW = std::max<Float>(measuredW, layoutConstraints.minimumSize.width);
+  measuredW = std::min<Float>(measuredW, layoutConstraints.maximumSize.width);
+
+  measuredH = std::max<Float>(measuredH, layoutConstraints.minimumSize.height);
+  measuredH = std::min<Float>(measuredH, layoutConstraints.maximumSize.height);
+
+  Size result{measuredW, measuredH};
+  return layoutConstraints.clamp(result);
+}
+
+} // namespace facebook::react

package/shared/PCDatePickerShadowNode-custom.h

@@ -1,27 +1,49 @@
 #pragma once
 
-#include <react/renderer/components/PlatformComponentsViewSpec/ComponentDescriptors.h>
+#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 <react/renderer/components/view/ConcreteViewShadowNode.h>
-#include <react/renderer/core/ConcreteState.h>
-#include <react/renderer/core/ShadowNodeTraits.h>
-#include <react/renderer/mounting/ShadowView.h>
-
 #include "PCDatePickerState-custom.h"
 
-namespace facebook::react
-{
-    class MeasuringPCDatePickerShadowNode final
-        : public ConcreteViewShadowNode<
-              PCDatePickerComponentName,
-              PCDatePickerProps,
-              PCDatePickerEventEmitter,
-              PCDatePickerStateFrameSize>
-    {
-    public:
-        using ConcreteViewShadowNode::ConcreteViewShadowNode;
-    };
+namespace facebook::react {
+
+extern const char PCDatePickerComponentName[];
+
+/**
+ * Custom ShadowNode for DatePicker that supports Yoga measurement.
+ *
+ * Key behavior:
+ * - Native side measures the actual picker and updates state with frameSize
+ * - measureContent() returns the size from state for proper Yoga layout
+ * - No hardcoded dimensions - uses actual measured values from native
+ */
+class MeasuringPCDatePickerShadowNode final
+    : public ConcreteViewShadowNode<
+          PCDatePickerComponentName,
+          PCDatePickerProps,
+          PCDatePickerEventEmitter,
+          PCDatePickerStateFrameSize> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+  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.
+   * Returns the size provided by native through state - no hardcoding.
+   */
+  Size measureContent(
+      const LayoutContext& layoutContext,
+      const LayoutConstraints& layoutConstraints) const override;
+};
 
 } // namespace facebook::react

package/shared/PCDatePickerState-custom.h

@@ -1,13 +1,65 @@
 #pragma once
 
 #include <react/renderer/core/LayoutPrimitives.h>
+#include <memory>
+
+#ifdef RN_SERIALIZABLE_STATE
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
 
 namespace facebook::react {
 
-struct PCDatePickerStateFrameSize final {
+/**
+ * Custom state for DatePicker that holds the measured frame size from native.
+ * This allows the native side to measure the actual picker and communicate
+ * the size to the shadow node for proper Yoga layout.
+ *
+ * Note: Does NOT inherit from StateData (which is final). Custom state types
+ * are standalone structs that satisfy the ConcreteState template requirements.
+ */
+struct PCDatePickerStateFrameSize {
   using Shared = std::shared_ptr<const PCDatePickerStateFrameSize>;
 
   Size frameSize{}; // {width, height} in points
+
+  PCDatePickerStateFrameSize() = default;
+
+  explicit PCDatePickerStateFrameSize(Size size) : frameSize(size) {}
+
+  bool operator==(const PCDatePickerStateFrameSize& other) const {
+    return frameSize.width == other.frameSize.width &&
+           frameSize.height == other.frameSize.height;
+  }
+
+  bool operator!=(const PCDatePickerStateFrameSize& other) const {
+    return !(*this == other);
+  }
+
+#ifdef RN_SERIALIZABLE_STATE
+  // Required for Android state serialization
+  PCDatePickerStateFrameSize(
+      const PCDatePickerStateFrameSize& previousState,
+      folly::dynamic data)
+      : frameSize(previousState.frameSize) {
+    // Parse frame size from dynamic data if provided
+    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/PCSelectionMenuComponentDescriptors-custom.h

@@ -1,25 +1,22 @@
 #pragma once
 
-#include "PCSelectionMenuShadowNode-custom.h"
-
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/mounting/ShadowView.h>
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/core/ShadowNodeTraits.h>
-#include <react/renderer/core/ShadowNodeFragment.h>
-#include <react/renderer/core/ShadowNodeFamily.h>
-#include <react/renderer/components/view/YogaLayoutableShadowNode.h>
 
-namespace facebook::react
-{
-using MeasuringPCSelectionMenuComponentDescriptor = ConcreteComponentDescriptor<MeasuringPCSelectionMenuShadowNode>;
+// Forward declaration to avoid circular includes
+namespace facebook::react {
+class MeasuringPCSelectionMenuShadowNode;
+}
+
+// Include the actual shadow node definition
+#include "PCSelectionMenuShadowNode-custom.h"
+
+namespace facebook::react {
 
-/*
-    class MeasuringPCDatePickerComponentDescriptor final
-        : public ConcreteComponentDescriptor<MeasuringPCSelectionMenuShadowNode>
-    {
-    public:
-        using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
-    };*/
+/**
+ * Custom component descriptor that uses our measuring shadow node
+ * instead of the generated one.
+ */
+using MeasuringPCSelectionMenuComponentDescriptor =
+    ConcreteComponentDescriptor<MeasuringPCSelectionMenuShadowNode>;
 
 } // namespace facebook::react

package/shared/PCSelectionMenuShadowNode-custom.cpp

@@ -1,36 +1,57 @@
-#include <react/renderer/core/LayoutConstraints.h>
 #include "PCSelectionMenuShadowNode-custom.h"
 
+#include <react/renderer/core/LayoutConstraints.h>
 #include <algorithm>
 
 namespace facebook::react {
 
-  Size MeasuringPCSelectionMenuShadowNode::measureContent(
-      const LayoutContext&,
-      const LayoutConstraints& layoutConstraints) const {
-
-    const Float kHuge = static_cast<Float>(1.0e9);
+Size MeasuringPCSelectionMenuShadowNode::measureContent(
+    const LayoutContext& /*layoutContext*/,
+    const LayoutConstraints& layoutConstraints) const {
 
-    const Float maxW = layoutConstraints.maximumSize.width;
-    const Float measuredW = (maxW > 0 && maxW < kHuge) ? maxW : 0;
-
-    const auto& props = *std::static_pointer_cast<const PCSelectionMenuProps>(getProps());
-    const bool inlineMode = props.anchorMode == "inline";
+  const auto& props = *std::static_pointer_cast<const PCSelectionMenuProps>(getProps());
+  const bool inlineMode = props.anchorMode == "inline";
 
-    Float measuredH = 0;
+  // Headless mode: zero size
+  if (!inlineMode) {
+    return layoutConstraints.clamp(Size{0, 0});
+  }
 
-    if (inlineMode) {
-      measuredH = static_cast<Float>(kMinRowHeight); // 44
+  // Get frame size from native state - native measures the actual picker
+  const auto& stateData = this->getStateData();
+  Float measuredW = stateData.frameSize.width;
+  Float measuredH = stateData.frameSize.height;
+
+  // If height is 0, use fallback values (state not yet set by native)
+  if (measuredH <= 0) {
+#ifdef __ANDROID__
+    const std::string& material = props.android.material;
+    if (material == "m3") {
+      measuredH = static_cast<Float>(kFallbackHeightAndroidM3);
     } else {
-      measuredH = 0;
+      measuredH = static_cast<Float>(kFallbackHeightAndroid);
     }
+#else
+    measuredH = static_cast<Float>(kFallbackHeightIOS);
+#endif
+  }
 
-    // Respect layout constraints (min/max) coming from JS styles
-    measuredH = std::max<Float>(measuredH, layoutConstraints.minimumSize.height);
-    measuredH = std::min<Float>(measuredH, layoutConstraints.maximumSize.height);
-
-    Size result{measuredW, measuredH};
-    return layoutConstraints.clamp(result);
+  // If width is 0, use available width from constraints
+  const Float kHuge = static_cast<Float>(1.0e9);
+  if (measuredW <= 0) {
+    const Float maxW = layoutConstraints.maximumSize.width;
+    measuredW = (maxW > 0 && maxW < kHuge) ? maxW : 0;
   }
 
+  // Respect layout constraints
+  measuredW = std::max<Float>(measuredW, layoutConstraints.minimumSize.width);
+  measuredW = std::min<Float>(measuredW, layoutConstraints.maximumSize.width);
+
+  measuredH = std::max<Float>(measuredH, layoutConstraints.minimumSize.height);
+  measuredH = std::min<Float>(measuredH, layoutConstraints.maximumSize.height);
+
+  Size result{measuredW, measuredH};
+  return layoutConstraints.clamp(result);
+}
+
 } // namespace facebook::react

package/shared/PCSelectionMenuShadowNode-custom.h

@@ -2,31 +2,43 @@
 
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
-#import <react/renderer/components/PlatformComponentsViewSpec/ComponentDescriptors.h>
-#import <react/renderer/components/PlatformComponentsViewSpec/EventEmitters.h>
-#import <react/renderer/components/PlatformComponentsViewSpec/Props.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 "PCSelectionMenuState-custom.h"
 
 namespace facebook::react {
 
 extern const char PCSelectionMenuComponentName[];
 
 /**
- * ShadowNode for SelectionMenu.
+ * Custom ShadowNode for SelectionMenu that supports Yoga measurement.
  *
  * Key behavior:
- * - Provides a non-zero default measured height (minRowHeight) so the view
- *   remains tappable when JS does not specify an explicit height.
+ * - Native side measures the actual picker 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 MeasuringPCSelectionMenuShadowNode final : public ConcreteViewShadowNode<
                                           PCSelectionMenuComponentName,
                                           PCSelectionMenuProps,
                                           PCSelectionMenuEventEmitter,
-                                          PCSelectionMenuState> {
+                                          PCSelectionMenuStateFrameSize> {
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
-  static constexpr float kMinRowHeight = 44.0f;
-                                            
+  // Fallback heights used when native hasn't reported measurements yet
+  // iOS standard row height
+  static constexpr float kFallbackHeightIOS = 44.0f;
+
+  // Android System Spinner height
+  static constexpr float kFallbackHeightAndroid = 56.0f;
+
+  // Android M3 TextInputLayout with floating label height
+  static constexpr float kFallbackHeightAndroidM3 = 72.0f;
+
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
@@ -36,7 +48,8 @@ class MeasuringPCSelectionMenuShadowNode final : public ConcreteViewShadowNode<
 
   /**
    * Called by Yoga when it needs the intrinsic size of the component.
-   * We ensure a sensible minimum height so the view doesn't measure to 0.
+   * Returns the size provided by native through state, with fallback to
+   * platform-specific defaults if state hasn't been set.
    */
   Size measureContent(
       const LayoutContext& layoutContext,

package/shared/PCSelectionMenuState-custom.h

@@ -0,0 +1,65 @@
+#pragma once
+
+#include <react/renderer/core/LayoutPrimitives.h>
+#include <memory>
+
+#ifdef RN_SERIALIZABLE_STATE
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook::react {
+
+/**
+ * Custom state for SelectionMenu that holds the measured frame size from native.
+ * This allows the native side to measure the actual picker and communicate
+ * the size to the shadow node for proper Yoga layout.
+ *
+ * Note: Does NOT inherit from StateData (which is final). Custom state types
+ * are standalone structs that satisfy the ConcreteState template requirements.
+ */
+struct PCSelectionMenuStateFrameSize {
+  using Shared = std::shared_ptr<const PCSelectionMenuStateFrameSize>;
+
+  Size frameSize{}; // {width, height} in points
+
+  PCSelectionMenuStateFrameSize() = default;
+
+  explicit PCSelectionMenuStateFrameSize(Size size) : frameSize(size) {}
+
+  bool operator==(const PCSelectionMenuStateFrameSize& other) const {
+    return frameSize.width == other.frameSize.width &&
+           frameSize.height == other.frameSize.height;
+  }
+
+  bool operator!=(const PCSelectionMenuStateFrameSize& other) const {
+    return !(*this == other);
+  }
+
+#ifdef RN_SERIALIZABLE_STATE
+  // Required for Android state serialization
+  PCSelectionMenuStateFrameSize(
+      const PCSelectionMenuStateFrameSize& previousState,
+      folly::dynamic data)
+      : frameSize(previousState.frameSize) {
+    // Parse frame size from dynamic data if provided
+    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