Skip to content

fix(android): link error on React Native 0.82–0.85 #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lodev09 merged 1 commit into from
Oct 17, 2026
Merged

fix(android): link error on React Native 0.82–0.85 #937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewShadowNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#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>
Expand Down Expand Up @@ -95,7 +94,12 @@ void TrueSheetContentViewShadowNode::updateNaturalHeightIfNeeded(const LayoutCon
if (contentChanged_ || !measurement_ || !(measurement_->constraints == constraints) ||
!(measurement_->context == measurementContext) || measurement_->errata != errata) {
gIsMeasuringNaturalHeight = true;
auto restoreMeasurement = folly::makeGuard([] { gIsMeasuringNaturalHeight = false; });
// Not folly::makeGuard: its terminate() isn't linked into RN < 0.86 on Android.
struct RestoreMeasurement {
~RestoreMeasurement() {
gIsMeasuringNaturalHeight = false;
}
} restoreMeasurement;
auto measurementNode =
measurement_ ? cloneForMeasurement(*this, *measurementSourceChildren_, measurement_->root->getChildren())
: cloneForMeasurement(*this, {}, {});
Expand Down
Loading