@lodev09/react-native-true-sheet 4.0.0-beta.2 → 4.0.0-beta.21

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewShadowNode.cpp

@@ -1,6 +1,12 @@
 #include "TrueSheetContentViewShadowNode.h"
 
+#include <folly/ScopeGuard.h>
 #include <react/renderer/components/view/conversions.h>
+#include <react/renderer/core/ComponentDescriptor.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/core/LayoutContext.h>
+
+#include <limits>
 
 namespace facebook::react {
 
@@ -8,36 +14,110 @@ using namespace yoga;
 
 extern const char TrueSheetContentViewComponentName[] = "TrueSheetContentView";
 
-void TrueSheetContentViewShadowNode::adjustLayoutWithState() {
-  ensureUnsealed();
-
-  auto state = std::static_pointer_cast<
-      const TrueSheetContentViewShadowNode::ConcreteState>(getState());
-  auto stateData = state->getData();
-
-  auto &props = getConcreteProps();
-
-  // When a ScrollView is pinned under an auto detent, fill the container so
-  // descendant flex layouts (flex:1 wrappers, the ScrollView itself) resolve
-  // against a definite height and the viewport is bounded — natural layout is
-  // circular there since the sheet height derives from the ScrollView's content
-  // size instead (see ContentView's naturalHeight on each platform). For fixed
-  // detents, content lays out naturally like a regular view.
-  auto flexGrow = stateData.scrollableBounded
-      ? FloatOptional{1.0f}
-      : props.yogaStyle.flexGrow();
-  auto flexShrink = stateData.scrollableBounded
-      ? FloatOptional{1.0f}
-      : props.yogaStyle.flexShrink();
-
-  if (yogaNode_.style().flexGrow() != flexGrow ||
-      yogaNode_.style().flexShrink() != flexShrink) {
-    yoga::Style adjustedStyle = props.yogaStyle;
-    adjustedStyle.setFlexGrow(flexGrow);
-    adjustedStyle.setFlexShrink(flexShrink);
-    yogaNode_.setStyle(adjustedStyle);
-    yogaNode_.setDirty(true);
+// The measurement pass re-enters layout() on a clone — guard so it doesn't
+// measure again recursively.
+static thread_local bool gIsMeasuringNaturalHeight = false;
+
+TrueSheetContentViewShadowNode::TrueSheetContentViewShadowNode(
+  const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment)
+    : ConcreteViewShadowNode(sourceShadowNode, fragment),
+      measurement_(static_cast<const TrueSheetContentViewShadowNode &>(sourceShadowNode).measurement_),
+      measurementSourceChildren_(
+        static_cast<const TrueSheetContentViewShadowNode &>(sourceShadowNode).measurementSourceChildren_),
+      contentChanged_(static_cast<const TrueSheetContentViewShadowNode &>(sourceShadowNode).contentChanged_ ||
+                      fragment.props || fragment.children) {
+}
+
+void TrueSheetContentViewShadowNode::layout(LayoutContext layoutContext) {
+  // The sizing tree needs Yoga's result, not Fabric state updates or events.
+  if (gIsMeasuringNaturalHeight) {
+    return;
+  }
+  ConcreteViewShadowNode::layout(layoutContext);
+  updateNaturalHeightIfNeeded(layoutContext);
+}
+
+// Every descendant must be detached from React's runtime references before
+// Yoga clones it during measurement. Disabling transfer only on the root
+// still lets descendant clones replace React's live nodes. Reuse unchanged
+// measurement subtrees; Yoga owns copy-on-write when their layout changes.
+std::shared_ptr<ShadowNode> TrueSheetContentViewShadowNode::cloneForMeasurement(
+  const ShadowNode &node, const Children &previousSourceChildren, const Children &previousMeasurementChildren) {
+  auto children = std::make_shared<Children>();
+  children->reserve(node.getChildren().size());
+  for (size_t index = 0; index < node.getChildren().size(); index++) {
+    const auto &child = node.getChildren()[index];
+    if (index < previousSourceChildren.size() && ShadowNode::sameFamily(*child, *previousSourceChildren[index])) {
+      const auto &previousSource = previousSourceChildren[index];
+      const auto &previousMeasurement = previousMeasurementChildren[index];
+      children->push_back(child == previousSource ? previousMeasurement
+                                                  : cloneForMeasurement(*child, previousSource->getChildren(),
+                                                      previousMeasurement->getChildren()));
+    } else {
+      children->push_back(cloneForMeasurement(*child, {}, {}));
+    }
+  }
+
+  auto clone = node.getComponentDescriptor().cloneShadowNode(
+    node, {.children = children, .state = node.getState(), .runtimeShadowNodeReference = false});
+  if (auto content = dynamic_cast<TrueSheetContentViewShadowNode *>(clone.get())) {
+    content->measurement_.reset();
+    content->measurementSourceChildren_.reset();
+  }
+  return clone;
+}
+
+// The natural height is the height the content wants when unbounded — the
+// source for the auto detent. When the content's height derives from the
+// container, the committed layout doesn't reflect it — lay out a clone of the
+// subtree with an unconstrained height instead. Yoga respects the user's
+// styles: an explicit-height ScrollView keeps its height while a flexible one
+// expands to its content — no ScrollView discovery involved.
+void TrueSheetContentViewShadowNode::updateNaturalHeightIfNeeded(const LayoutContext &layoutContext) {
+  auto stateData = getStateData();
+  auto size = getLayoutMetrics().frame.size;
+
+  Float naturalHeight = size.height;
+  // Auto-height content can also be capped by a shrinking ScrollView. Only
+  // a fixed, non-flexible height can be taken from the viewport layout.
+  if (yogaNode_.isNodeFlexible() || !getConcreteProps().yogaStyle.dimension(Dimension::Height).isPoints()) {
+    auto constraints = LayoutConstraints{};
+    constraints.minimumSize = {size.width, 0};
+    constraints.maximumSize = {size.width, std::numeric_limits<Float>::infinity()};
+    constraints.layoutDirection = getLayoutMetrics().layoutDirection;
+
+    auto measurementContext = layoutContext;
+    measurementContext.affectedNodes = nullptr;
+    auto errata = YGConfigGetErrata(&yogaConfig_);
+
+    // Yoga's viewport-only clones carry no new props or children. Reuse the
+    // intrinsic height across those layouts instead of measuring each drag frame.
+    if (contentChanged_ || !measurement_ || !(measurement_->constraints == constraints) ||
+        !(measurement_->context == measurementContext) || measurement_->errata != errata) {
+      gIsMeasuringNaturalHeight = true;
+      auto restoreMeasurement = folly::makeGuard([] { gIsMeasuringNaturalHeight = false; });
+      auto measurementNode =
+        measurement_ ? cloneForMeasurement(*this, *measurementSourceChildren_, measurement_->root->getChildren())
+                     : cloneForMeasurement(*this, {}, {});
+      auto &measurement = static_cast<LayoutableShadowNode &>(*measurementNode);
+      measurement.layoutTree(measurementContext, constraints);
+      measurement_ = std::make_shared<const Measurement>(Measurement{.root = measurementNode,
+        .constraints = constraints,
+        .context = measurementContext,
+        .errata = errata,
+        .height = measurement.getLayoutMetrics().frame.size.height});
+    }
+    naturalHeight = measurement_->height;
+  } else {
+    measurement_.reset();
+  }
+  measurementSourceChildren_ = children_;
+  contentChanged_ = false;
+
+  if (stateData.naturalHeight != naturalHeight) {
+    stateData.naturalHeight = naturalHeight;
+    setStateData(std::move(stateData));
   }
 }
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewShadowNode.h

@@ -5,6 +5,8 @@
 #include <react/renderer/components/TrueSheetSpec/Props.h>
 #include <react/renderer/components/TrueSheetSpec/TrueSheetContentViewState.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/core/LayoutContext.h>
 
 namespace facebook::react {
 
@@ -14,15 +16,36 @@ JSI_EXPORT extern const char TrueSheetContentViewComponentName[];
  * `ShadowNode` for <TrueSheetContentView> component.
  */
 class JSI_EXPORT TrueSheetContentViewShadowNode final
-    : public ConcreteViewShadowNode<
-          TrueSheetContentViewComponentName,
-          TrueSheetContentViewProps,
-          TrueSheetContentViewEventEmitter,
-          TrueSheetContentViewState> {
+    : public ConcreteViewShadowNode<TrueSheetContentViewComponentName, TrueSheetContentViewProps,
+        TrueSheetContentViewEventEmitter, TrueSheetContentViewState> {
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
-  void adjustLayoutWithState();
+  TrueSheetContentViewShadowNode(const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment);
+
+#pragma mark - LayoutableShadowNode
+
+  void layout(LayoutContext layoutContext) override;
+
+ private:
+  using Children = std::vector<std::shared_ptr<const ShadowNode>>;
+
+  struct Measurement {
+    std::shared_ptr<const ShadowNode> root;
+    LayoutConstraints constraints;
+    LayoutContext context;
+    YGErrata errata;
+    Float height;
+  };
+
+  std::shared_ptr<const Measurement> measurement_;
+  std::shared_ptr<const Children> measurementSourceChildren_;
+  bool contentChanged_{true};
+
+  static std::shared_ptr<ShadowNode> cloneForMeasurement(
+    const ShadowNode &node, const Children &previousSourceChildren, const Children &previousMeasurementChildren);
+
+  void updateNaturalHeightIfNeeded(const LayoutContext &layoutContext);
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewState.cpp

@@ -4,8 +4,8 @@ namespace facebook::react {
 
 #ifdef ANDROID
 folly::dynamic TrueSheetContentViewState::getDynamic() const {
-  return folly::dynamic::object("scrollableBounded", scrollableBounded);
+  return folly::dynamic::object("naturalHeight", naturalHeight);
 }
 #endif
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewState.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <react/renderer/graphics/Float.h>
+
 #ifdef ANDROID
 #include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
@@ -10,21 +12,20 @@ namespace facebook::react {
 
 /*
  * State for <TrueSheetContentView> component.
- * Set from native when a ScrollView is pinned so the shadow node bounds the
- * content to the container via flexShrink (see TrueSheetContentViewShadowNode).
+ * `naturalHeight` is measured by the shadow node during layout — the height
+ * the content wants when unbounded (see TrueSheetContentViewShadowNode).
  */
 class TrueSheetContentViewState final {
  public:
   TrueSheetContentViewState() = default;
 
 #ifdef ANDROID
-  TrueSheetContentViewState(
-      TrueSheetContentViewState const &previousState,
-      folly::dynamic data)
-      : scrollableBounded(data["scrollableBounded"].getBool()) {}
+  TrueSheetContentViewState(TrueSheetContentViewState const &previousState, folly::dynamic data)
+      : naturalHeight(previousState.naturalHeight) {
+  }
 #endif
 
-  bool scrollableBounded{false};
+  Float naturalHeight{0};
 
 #ifdef ANDROID
   folly::dynamic getDynamic() const;
@@ -34,4 +35,4 @@ class TrueSheetContentViewState final {
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewComponentDescriptor.h

@@ -8,17 +8,15 @@ namespace facebook::react {
 /*
  * Descriptor for <TrueSheetFooterView> component.
  */
-class TrueSheetFooterViewComponentDescriptor final
-    : public ConcreteComponentDescriptor<TrueSheetFooterViewShadowNode> {
+class TrueSheetFooterViewComponentDescriptor final : public ConcreteComponentDescriptor<TrueSheetFooterViewShadowNode> {
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
   void adopt(ShadowNode &shadowNode) const override {
-    auto &concreteShadowNode =
-        static_cast<TrueSheetFooterViewShadowNode &>(shadowNode);
+    auto &concreteShadowNode = static_cast<TrueSheetFooterViewShadowNode &>(shadowNode);
     concreteShadowNode.adjustLayoutWithState();
 
     ConcreteComponentDescriptor::adopt(shadowNode);
   }
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewShadowNode.cpp

@@ -13,8 +13,7 @@ extern const char TrueSheetFooterViewComponentName[] = "TrueSheetFooterView";
 void TrueSheetFooterViewShadowNode::adjustLayoutWithState() {
   ensureUnsealed();
 
-  auto state = std::static_pointer_cast<
-      const TrueSheetFooterViewShadowNode::ConcreteState>(getState());
+  auto state = std::static_pointer_cast<const TrueSheetFooterViewShadowNode::ConcreteState>(getState());
   auto stateData = state->getData();
 
   auto &props = getConcreteProps();
@@ -25,6 +24,13 @@ void TrueSheetFooterViewShadowNode::adjustLayoutWithState() {
   float bottomInset = stateData.bottomInset;
   if (!stateData.initialized && props.autoBottomInset) {
     bottomInset = TrueSheetInsets::bottomSafeArea();
+    if (bottomInset != stateData.bottomInset) {
+      // Record the seeded value so the mounted view reads exactly the inset
+      // baked into this layout — the global may change before mount.
+      auto seededData = stateData;
+      seededData.bottomInset = bottomInset;
+      setStateData(std::move(seededData));
+    }
   }
 
   // A footer pinned to the sheet's bottom edge owns the bottom safe-area
@@ -53,4 +59,4 @@ void TrueSheetFooterViewShadowNode::adjustLayoutWithState() {
   }
 }
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewShadowNode.h

@@ -14,15 +14,12 @@ JSI_EXPORT extern const char TrueSheetFooterViewComponentName[];
  * `ShadowNode` for <TrueSheetFooterView> component.
  */
 class JSI_EXPORT TrueSheetFooterViewShadowNode final
-    : public ConcreteViewShadowNode<
-          TrueSheetFooterViewComponentName,
-          TrueSheetFooterViewProps,
-          TrueSheetFooterViewEventEmitter,
-          TrueSheetFooterViewState> {
+    : public ConcreteViewShadowNode<TrueSheetFooterViewComponentName, TrueSheetFooterViewProps,
+        TrueSheetFooterViewEventEmitter, TrueSheetFooterViewState> {
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
   void adjustLayoutWithState();
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewState.cpp

@@ -8,4 +8,4 @@ folly::dynamic TrueSheetFooterViewState::getDynamic() const {
 }
 #endif
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewState.h

@@ -18,11 +18,9 @@ class TrueSheetFooterViewState final {
   TrueSheetFooterViewState() = default;
 
 #ifdef ANDROID
-  TrueSheetFooterViewState(
-      TrueSheetFooterViewState const &previousState,
-      folly::dynamic data)
-      : bottomInset(static_cast<float>(data["bottomInset"].getDouble())),
-        initialized(true) {}
+  TrueSheetFooterViewState(TrueSheetFooterViewState const &previousState, folly::dynamic data)
+      : bottomInset(static_cast<float>(data["bottomInset"].getDouble())), initialized(true) {
+  }
 #endif
 
   float bottomInset{0};
@@ -38,4 +36,4 @@ class TrueSheetFooterViewState final {
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetInsets.cpp

@@ -15,4 +15,4 @@ float TrueSheetInsets::bottomSafeArea() {
   return gBottomSafeArea.load(std::memory_order_relaxed);
 }
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetInsets.h

@@ -13,4 +13,4 @@ class TrueSheetInsets {
   static float bottomSafeArea();
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetLayoutUtils.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <react/renderer/components/view/conversions.h>
+#include <yoga/node/Node.h>
+#include <yoga/style/Style.h>
+
+namespace facebook::react {
+
+/*
+ * Overrides a node's Yoga dimensions with the container size reported from
+ * native. A zero dimension leaves that axis to Yoga.
+ */
+inline void applyContainerSizeToYogaNode(
+  yoga::Node &node, const yoga::Style &baseStyle, float containerWidth, float containerHeight) {
+  if (containerWidth <= 0 && containerHeight <= 0) {
+    return;
+  }
+
+  yoga::Style adjustedStyle = baseStyle;
+  const auto &currentStyle = node.style();
+  bool needsUpdate = false;
+
+  if (containerWidth > 0) {
+    adjustedStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(containerWidth));
+    if (adjustedStyle.dimension(yoga::Dimension::Width) != currentStyle.dimension(yoga::Dimension::Width)) {
+      needsUpdate = true;
+    }
+  }
+
+  if (containerHeight > 0) {
+    adjustedStyle.setDimension(yoga::Dimension::Height, yoga::StyleSizeLength::points(containerHeight));
+    if (adjustedStyle.dimension(yoga::Dimension::Height) != currentStyle.dimension(yoga::Dimension::Height)) {
+      needsUpdate = true;
+    }
+  }
+
+  if (needsUpdate) {
+    node.setStyle(adjustedStyle);
+    node.setDirty(true);
+  }
+}
+
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetOverlayViewComponentDescriptor.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <react/renderer/components/TrueSheetSpec/TrueSheetOverlayViewShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+/*
+ * Descriptor for <TrueSheetOverlayView> component.
+ */
+class TrueSheetOverlayViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<TrueSheetOverlayViewShadowNode> {
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+
+  void adopt(ShadowNode &shadowNode) const override {
+    static_cast<TrueSheetOverlayViewShadowNode &>(shadowNode).adjustLayoutWithState();
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetOverlayViewShadowNode.cpp

@@ -0,0 +1,17 @@
+#include "TrueSheetOverlayViewShadowNode.h"
+
+#include "TrueSheetLayoutUtils.h"
+
+namespace facebook::react {
+
+extern const char TrueSheetOverlayViewComponentName[] = "TrueSheetOverlayView";
+
+void TrueSheetOverlayViewShadowNode::adjustLayoutWithState() {
+  ensureUnsealed();
+
+  const auto &stateData = getStateData();
+  applyContainerSizeToYogaNode(
+    yogaNode_, getConcreteProps().yogaStyle, stateData.containerWidth, stateData.containerHeight);
+}
+
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetOverlayViewShadowNode.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/TrueSheetSpec/EventEmitters.h>
+#include <react/renderer/components/TrueSheetSpec/Props.h>
+#include <react/renderer/components/TrueSheetSpec/TrueSheetViewState.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char TrueSheetOverlayViewComponentName[];
+
+/*
+ * `ShadowNode` for <TrueSheetOverlayView> component.
+ * Sized to the window from native (via TrueSheetViewState) so its children
+ * lay out against the full window like the sheet's container.
+ */
+class JSI_EXPORT TrueSheetOverlayViewShadowNode final
+    : public ConcreteViewShadowNode<TrueSheetOverlayViewComponentName, TrueSheetOverlayViewProps,
+        TrueSheetOverlayViewEventEmitter, TrueSheetViewState> {
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+ public:
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::RootNodeKind);
+    return traits;
+  }
+
+  void adjustLayoutWithState();
+};
+
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewComponentDescriptor.h

@@ -8,13 +8,11 @@ namespace facebook::react {
 /*
  * Descriptor for <TrueSheetView> component.
  */
-class TrueSheetViewComponentDescriptor final
-    : public ConcreteComponentDescriptor<TrueSheetViewShadowNode> {
+class TrueSheetViewComponentDescriptor final : public ConcreteComponentDescriptor<TrueSheetViewShadowNode> {
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
   void adopt(ShadowNode &shadowNode) const override {
-    auto &concreteShadowNode =
-        static_cast<TrueSheetViewShadowNode &>(shadowNode);
+    auto &concreteShadowNode = static_cast<TrueSheetViewShadowNode &>(shadowNode);
     concreteShadowNode.adjustLayoutWithState();
 
     ConcreteComponentDescriptor::adopt(shadowNode);
@@ -25,4 +23,4 @@ class TrueSheetViewComponentDescriptor final
   }
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.cpp

@@ -1,61 +1,28 @@
 #include "TrueSheetViewShadowNode.h"
 
-#include <react/renderer/components/view/conversions.h>
+#include "TrueSheetLayoutUtils.h"
 
 namespace facebook::react {
 
-using namespace yoga;
-
 extern const char TrueSheetViewComponentName[] = "TrueSheetView";
 
 void TrueSheetViewShadowNode::adjustLayoutWithState() {
   ensureUnsealed();
 
-  auto state = std::static_pointer_cast<
-      const TrueSheetViewShadowNode::ConcreteState>(getState());
-  auto stateData = state->getData();
-
-  // If container dimensions are set from native, override Yoga's dimensions
-  if (stateData.containerWidth > 0 || stateData.containerHeight > 0) {
-    auto &props = getConcreteProps();
-    yoga::Style adjustedStyle = props.yogaStyle;
-    auto currentStyle = yogaNode_.style();
-    bool needsUpdate = false;
-
-    // Set width if provided
-    if (stateData.containerWidth > 0) {
-      adjustedStyle.setDimension(yoga::Dimension::Width, StyleSizeLength::points(stateData.containerWidth));
-      if (adjustedStyle.dimension(yoga::Dimension::Width) != currentStyle.dimension(yoga::Dimension::Width)) {
-        needsUpdate = true;
-      }
-    }
-
-    // Set height if provided
-    if (stateData.containerHeight > 0) {
-      adjustedStyle.setDimension(yoga::Dimension::Height, StyleSizeLength::points(stateData.containerHeight));
-      if (adjustedStyle.dimension(yoga::Dimension::Height) != currentStyle.dimension(yoga::Dimension::Height)) {
-        needsUpdate = true;
-      }
-    }
-
-    if (needsUpdate) {
-      yogaNode_.setStyle(adjustedStyle);
-      yogaNode_.setDirty(true);
-    }
-  }
+  const auto &stateData = getStateData();
+  applyContainerSizeToYogaNode(
+    yogaNode_, getConcreteProps().yogaStyle, stateData.containerWidth, stateData.containerHeight);
 }
 
 #if !defined(ANDROID)
-void TrueSheetViewShadowNode::setEventDispatcher(
-    std::weak_ptr<const EventDispatcher> dispatcher) {
+void TrueSheetViewShadowNode::setEventDispatcher(std::weak_ptr<const EventDispatcher> dispatcher) {
   getStateDataMutable().setEventDispatcher(dispatcher);
 }
 
-TrueSheetViewShadowNode::StateData &
-TrueSheetViewShadowNode::getStateDataMutable() {
+TrueSheetViewShadowNode::StateData &TrueSheetViewShadowNode::getStateDataMutable() {
   ensureUnsealed();
   return const_cast<TrueSheetViewShadowNode::StateData &>(getStateData());
 }
 #endif
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.h

@@ -15,12 +15,8 @@ JSI_EXPORT extern const char TrueSheetViewComponentName[];
 /*
  * `ShadowNode` for <TrueSheetView> component.
  */
-class JSI_EXPORT TrueSheetViewShadowNode final
-    : public ConcreteViewShadowNode<
-          TrueSheetViewComponentName,
-          TrueSheetViewProps,
-          TrueSheetViewEventEmitter,
-          TrueSheetViewState> {
+class JSI_EXPORT TrueSheetViewShadowNode final : public ConcreteViewShadowNode<TrueSheetViewComponentName,
+                                                   TrueSheetViewProps, TrueSheetViewEventEmitter, TrueSheetViewState> {
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
@@ -42,4 +38,4 @@ class JSI_EXPORT TrueSheetViewShadowNode final
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.cpp

@@ -9,15 +9,13 @@ folly::dynamic TrueSheetViewState::getDynamic() const {
 #endif
 
 #if !defined(ANDROID)
-void TrueSheetViewState::setEventDispatcher(
-    std::weak_ptr<const EventDispatcher> dispatcher) {
+void TrueSheetViewState::setEventDispatcher(std::weak_ptr<const EventDispatcher> dispatcher) {
   eventDispatcher_ = dispatcher;
 }
 
-std::weak_ptr<const EventDispatcher> TrueSheetViewState::getEventDispatcher()
-    const noexcept {
+std::weak_ptr<const EventDispatcher> TrueSheetViewState::getEventDispatcher() const noexcept {
   return eventDispatcher_;
 }
 #endif
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.h

@@ -23,11 +23,10 @@ class TrueSheetViewState final {
   TrueSheetViewState() = default;
 
 #ifdef ANDROID
-  TrueSheetViewState(
-      TrueSheetViewState const &previousState,
-      folly::dynamic data)
+  TrueSheetViewState(TrueSheetViewState const &previousState, folly::dynamic data)
       : containerWidth(static_cast<float>(data["containerWidth"].getDouble())),
-        containerHeight(static_cast<float>(data["containerHeight"].getDouble())) {}
+        containerHeight(static_cast<float>(data["containerHeight"].getDouble())) {
+  }
 #endif
 
   float containerWidth{0};
@@ -49,4 +48,4 @@ class TrueSheetViewState final {
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react