diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.kt index 9f09f26b09f9..12fcd84d60e6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.kt @@ -64,6 +64,15 @@ public object YogaNative { @JvmStatic public external fun jni_YGNodeIsReferenceBaselineJNI(nativePointer: Long): Boolean + @JvmStatic + public external fun jni_YGNodeSetMeasureFuncFollowsMeasureModesJNI( + nativePointer: Long, + followsMeasureModes: Boolean, + ) + + @JvmStatic + public external fun jni_YGNodeGetMeasureFuncFollowsMeasureModesJNI(nativePointer: Long): Boolean + @JvmStatic public external fun jni_YGNodeRemoveAllChildrenJNI(nativePointer: Long) @JvmStatic public external fun jni_YGNodeRemoveChildJNI(nativePointer: Long, childPointer: Long) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.kt index 754ed7a27913..0e62437c09fb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.kt @@ -239,6 +239,31 @@ public abstract class YogaNode : YogaProps { */ public open fun setNodeType(nodeType: YogaNodeType) {} + /** + * Sets whether this node's measure function sizes as [YogaMeasureFunction] describes for each + * [YogaMeasureMode]: [YogaMeasureMode.UNDEFINED] as max-content, [YogaMeasureMode.AT_MOST] as + * fit-content and [YogaMeasureMode.EXACTLY] as stretch-fit. True by default. + * + * When false, Yoga infers nothing about the node from a measurement under other constraints: + * - It reuses a measurement only under the same constraints. + * - For automatic minimum sizing (enabled by clearing + * [YogaErrata.MIN_SIZE_UNDEFINED_INSTEAD_OF_AUTO]), the measure function isn't called with + * [YogaMeasureMode.AT_MOST] 0. The node's min-content size is the one set by + * [setMinContentWidth] / [setMinContentHeight], if any; else its padding and border plus what + * its [setMinContentMeasureFunction] function returns, or plus 0 without one. + * + * Set it false for a measure function that sizes itself otherwise, for example one that fills the + * space it is given or picks a layout by it. Has no effect on the layout of a node without a + * measure function. Marks the node dirty when the value changes. + * + * Does nothing by default, so a subclass built against an earlier [YogaNode] keeps working. + */ + public open fun setMeasureFunctionFollowsMeasureModes(followsMeasureModes: Boolean) {} + + /** Whether this node's measure function sizes as the measure modes describe. True by default. */ + public open val measureFunctionFollowsMeasureModes: Boolean + get() = true + abstract override fun setMinContentMeasureFunction(measureFunction: YogaMeasureFunction?) abstract override fun setMinContentWidth(minContentWidth: Float) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.kt index 9e2b1fe14e1b..76a9239ef14a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.kt @@ -530,6 +530,13 @@ public abstract class YogaNodeJNIBase : YogaNode, Cloneable { YogaNative.jni_YGNodeSetNodeTypeJNI(nativePointer, nodeType.intValue()) } + override fun setMeasureFunctionFollowsMeasureModes(followsMeasureModes: Boolean) { + YogaNative.jni_YGNodeSetMeasureFuncFollowsMeasureModesJNI(nativePointer, followsMeasureModes) + } + + override val measureFunctionFollowsMeasureModes: Boolean + get() = YogaNative.jni_YGNodeGetMeasureFuncFollowsMeasureModesJNI(nativePointer) + override fun setMinContentMeasureFunction(measureFunction: YogaMeasureFunction?) { this.minContentMeasureFunction = measureFunction YogaNative.jni_YGNodeSetHasMinContentMeasureFuncJNI(nativePointer, measureFunction != null) diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp b/packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp index d3d39a704c17..b97a1bff0d90 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp @@ -239,6 +239,23 @@ static jboolean jni_YGNodeIsReferenceBaselineJNI( YGNodeIsReferenceBaseline(_jlong2YGNodeRef(nativePointer))); } +static void jni_YGNodeSetMeasureFuncFollowsMeasureModesJNI( + JNIEnv* /*env*/, + jobject /*obj*/, + jlong nativePointer, + jboolean followsMeasureModes) { + YGNodeSetMeasureFuncFollowsMeasureModes( + _jlong2YGNodeRef(nativePointer), static_cast(followsMeasureModes)); +} + +static jboolean jni_YGNodeGetMeasureFuncFollowsMeasureModesJNI( + JNIEnv* /*env*/, + jobject /*obj*/, + jlong nativePointer) { + return static_cast( + YGNodeGetMeasureFuncFollowsMeasureModes(_jlong2YGNodeRef(nativePointer))); +} + static void jni_YGNodeRemoveAllChildrenJNI( JNIEnv* /*env*/, jobject /*obj*/, @@ -880,6 +897,12 @@ static JNINativeMethod methods[] = { {"jni_YGNodeIsReferenceBaselineJNI", "(J)Z", (void*)jni_YGNodeIsReferenceBaselineJNI}, + {"jni_YGNodeSetMeasureFuncFollowsMeasureModesJNI", + "(JZ)V", + (void*)jni_YGNodeSetMeasureFuncFollowsMeasureModesJNI}, + {"jni_YGNodeGetMeasureFuncFollowsMeasureModesJNI", + "(J)Z", + (void*)jni_YGNodeGetMeasureFuncFollowsMeasureModesJNI}, {"jni_YGNodeRemoveAllChildrenJNI", "(J)V", (void*)jni_YGNodeRemoveAllChildrenJNI}, diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGNode.cpp b/packages/react-native/ReactCommon/yoga/yoga/YGNode.cpp index afadea4c89c9..97d2d9f6653b 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/YGNode.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/YGNode.cpp @@ -310,6 +310,21 @@ bool YGNodeHasMeasureFunc(YGNodeConstRef node) { return resolveRef(node)->hasMeasureFunc(); } +void YGNodeSetMeasureFuncFollowsMeasureModes( + YGNodeRef nodeRef, + bool measureFuncFollowsMeasureModes) { + const auto node = resolveRef(nodeRef); + if (node->measureFuncFollowsMeasureModes() != + measureFuncFollowsMeasureModes) { + node->setMeasureFuncFollowsMeasureModes(measureFuncFollowsMeasureModes); + node->markDirtyAndPropagate(); + } +} + +bool YGNodeGetMeasureFuncFollowsMeasureModes(YGNodeConstRef node) { + return resolveRef(node)->measureFuncFollowsMeasureModes(); +} + void YGNodeSetMinContentMeasureFunc( YGNodeRef node, YGMinContentMeasureFunc minContentMeasureFunc) { @@ -413,5 +428,6 @@ bool YGNodeCanUseCachedMeasurement( lastComputedHeight, marginRow, marginColumn, - resolveRef(config)); + resolveRef(config), + /*measureFuncFollowsMeasureModes=*/true); } diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGNode.h b/packages/react-native/ReactCommon/yoga/yoga/YGNode.h index 4f8cdf81a521..0012ebcf1cc9 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/YGNode.h +++ b/packages/react-native/ReactCommon/yoga/yoga/YGNode.h @@ -220,6 +220,36 @@ YG_EXPORT void YGNodeSetMeasureFunc(YGNodeRef node, YGMeasureFunc measureFunc); */ YG_EXPORT bool YGNodeHasMeasureFunc(YGNodeConstRef node); +/** + * Sets whether the node's measure function sizes as `YGMeasureFunc` describes + * for each `YGMeasureMode`: `YGMeasureModeUndefined` as max-content, + * `YGMeasureModeAtMost` as fit-content and `YGMeasureModeExactly` as + * stretch-fit. True by default. + * + * When false, Yoga infers nothing about the node from a measurement under other + * constraints: + * - It reuses a measurement only under the same constraints. + * - For automatic minimum sizing (enabled by clearing + * `YGErrataMinSizeUndefinedInsteadOfAuto`), the measure function isn't + * called with `AtMost 0`. The node's min-content size is the one set by + * `YGNodeSetMinContentWidth` / `YGNodeSetMinContentHeight`, if any; else + * its padding and border plus what its `YGMinContentMeasureFunc` returns, + * or plus 0 without one. + * + * Set it false for a measure function that sizes itself otherwise, for example + * one that fills the space it is given or picks a layout by it. Has no effect + * on the layout of a node without a measure function. Marks the node dirty when + * the value changes. + */ +YG_EXPORT void YGNodeSetMeasureFuncFollowsMeasureModes( + YGNodeRef node, + bool measureFuncFollowsMeasureModes); + +/** + * Whether the node's measure function sizes as the measure modes describe. + */ +YG_EXPORT bool YGNodeGetMeasureFuncFollowsMeasureModes(YGNodeConstRef node); + /** * Optional companion to `YGMeasureFunc` invoked by the CSS Flexbox §4.5 * automatic minimum sizing path when probing this node for its min-content @@ -233,7 +263,9 @@ YG_EXPORT bool YGNodeHasMeasureFunc(YGNodeConstRef node); * * When unset, the algorithm falls back to the regular `YGMeasureFunc` * invoked with the same `AtMost 0` constraint — preserving today's - * behavior. Setting this is a perf opt-in for Primitives whose min-content + * behavior — unless the node's measure function doesn't follow the measure + * modes (`YGNodeSetMeasureFuncFollowsMeasureModes`), whose content then + * contributes 0. Setting this is a perf opt-in for Primitives whose min-content * size is cheap to compute or differs from what the regular measure would * return. Its results are kept, as a measure function's are, until the node is * marked dirty. @@ -273,7 +305,8 @@ YG_EXPORT bool YGNodeHasMinContentMeasureFunc(YGNodeConstRef node); * Precedence inside the probe is: * 1. Static value via `YGNodeSetMinContentWidth/Height` (this API) * 2. Dynamic callback via `YGNodeSetMinContentMeasureFunc` - * 3. Regular `YGMeasureFunc` with `AtMost 0` (today's default) + * 3. Regular `YGMeasureFunc` with `AtMost 0` (today's default), if it + * follows the measure modes; else 0 for the content * 4. Container recursion (sum on main axis, max on cross) * * Static is preferred for known-constant values because it skips the JNI diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.cpp index 9154fc6ce9cc..fd7214deef44 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.cpp @@ -55,7 +55,8 @@ bool canUseCachedMeasurement( const float lastComputedHeight, const float marginRow, const float marginColumn, - const yoga::Config* const config) { + const yoga::Config* const config, + const bool measureFuncFollowsMeasureModes) { if ((yoga::isDefined(lastComputedHeight) && lastComputedHeight < 0) || ((yoga::isDefined(lastComputedWidth)) && lastComputedWidth < 0)) { return false; @@ -84,6 +85,13 @@ bool canUseCachedMeasurement( const bool hasSameHeightSpec = lastHeightMode == heightMode && yoga::inexactEquals(effectiveLastHeight, effectiveHeight); + // A measure function that doesn't follow the measure modes may size the node + // differently under any other spec, so nothing is inferred from a measurement + // under another: only the same spec reuses it. + if (!measureFuncFollowsMeasureModes) { + return hasSameWidthSpec && hasSameHeightSpec; + } + const bool widthIsCompatible = hasSameWidthSpec || sizeIsExactAndMatchesOldMeasuredSize( diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.h b/packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.h index f8857eaf35c9..1e81becbff1f 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.h +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/Cache.h @@ -25,6 +25,7 @@ bool canUseCachedMeasurement( float lastComputedHeight, float marginRow, float marginColumn, - const yoga::Config* config); + const yoga::Config* config, + bool measureFuncFollowsMeasureModes); } // namespace facebook::yoga diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp index f82a789afd1d..89863e27593c 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp @@ -991,19 +991,26 @@ static MinContentSize measureOrWalkMinContentMainSize( // 2. Dynamic min-content callback if set (for Primitives whose // min-content depends on state). Otherwise fall back to the regular // measure function with `AtMost 0`, which text measurers naturally - // answer with longest-word width. - const YGSize size = node->hasMinContentMeasureFunc() - ? node->measureMinContent( - wantRow ? 0.0f : YGUndefined, - wantRow ? MeasureMode::AtMost : MeasureMode::Undefined, - wantRow ? YGUndefined : 0.0f, - wantRow ? MeasureMode::Undefined : MeasureMode::AtMost) - : node->measure( - wantRow ? 0.0f : YGUndefined, - wantRow ? MeasureMode::AtMost : MeasureMode::Undefined, - wantRow ? YGUndefined : 0.0f, - wantRow ? MeasureMode::Undefined : MeasureMode::AtMost); - layout.minContent[axisIndex] = wantRow ? size.width : size.height; + // answer with longest-word width. A measure function that doesn't + // follow the measure modes isn't called: its answer at `AtMost 0` says + // nothing about its min-content, so its content contributes 0. + if (node->hasMinContentMeasureFunc()) { + const YGSize size = node->measureMinContent( + wantRow ? 0.0f : YGUndefined, + wantRow ? MeasureMode::AtMost : MeasureMode::Undefined, + wantRow ? YGUndefined : 0.0f, + wantRow ? MeasureMode::Undefined : MeasureMode::AtMost); + layout.minContent[axisIndex] = wantRow ? size.width : size.height; + } else if (node->measureFuncFollowsMeasureModes()) { + const YGSize size = node->measure( + wantRow ? 0.0f : YGUndefined, + wantRow ? MeasureMode::AtMost : MeasureMode::Undefined, + wantRow ? YGUndefined : 0.0f, + wantRow ? MeasureMode::Undefined : MeasureMode::AtMost); + layout.minContent[axisIndex] = wantRow ? size.width : size.height; + } else { + layout.minContent[axisIndex] = 0.0f; + } layout.minContentGeneration[axisIndex] = generationCount; return leafMinContentSize(node, requestedAxis, ownerDirection, ownerWidth); } @@ -1115,7 +1122,10 @@ static MinContentSize computeChildMinContentMainSize( // * Leaf with measure function: invoke it with `AtMost 0` on the // requested axis and `Undefined` on the other. Text measure-funcs // respond with longest-word width; image/collection-like measures -// respond with 0 along their scroll axis. +// respond with 0 along their scroll axis. A measure function that +// doesn't follow the measure modes (see +// `YGNodeSetMeasureFuncFollowsMeasureModes`) isn't invoked: without a +// static or callback min-content, its content contributes 0. // * Empty leaf: return 0. // * Container: iterate in-flow children. For each, take its // min-content along the container's own main axis (sum into @@ -2983,6 +2993,8 @@ bool calculateLayoutInternal( node->style().computeMarginForAxis(FlexDirection::Row, ownerWidth); const float marginAxisColumn = node->style().computeMarginForAxis(FlexDirection::Column, ownerWidth); + const bool measureFuncFollowsMeasureModes = + node->measureFuncFollowsMeasureModes(); // First, try to use the layout cache. if (canUseCachedMeasurement( @@ -2998,7 +3010,8 @@ bool calculateLayoutInternal( layout->cachedLayout.computedHeight, marginAxisRow, marginAxisColumn, - node->getConfig()) && + node->getConfig(), + measureFuncFollowsMeasureModes) && isCachedForOwnerSize( node, layout->cachedLayout, ownerWidth, ownerHeight)) { cachedResults = &layout->cachedLayout; @@ -3018,7 +3031,8 @@ bool calculateLayoutInternal( layout->cachedMeasurements[i].computedHeight, marginAxisRow, marginAxisColumn, - node->getConfig()) && + node->getConfig(), + measureFuncFollowsMeasureModes) && isCachedForOwnerSize( node, layout->cachedMeasurements[i], ownerWidth, ownerHeight)) { cachedResults = &layout->cachedMeasurements[i]; diff --git a/packages/react-native/ReactCommon/yoga/yoga/node/Node.cpp b/packages/react-native/ReactCommon/yoga/yoga/node/Node.cpp index 3ed017ce8aeb..794ad480788f 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/node/Node.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/node/Node.cpp @@ -33,6 +33,7 @@ Node::Node(Node&& node) noexcept isReferenceBaseline_(node.isReferenceBaseline_), isDirty_(node.isDirty_), alwaysFormsContainingBlock_(node.alwaysFormsContainingBlock_), + measureFuncFollowsMeasureModes_(node.measureFuncFollowsMeasureModes_), nodeType_(node.nodeType_), context_(node.context_), measureFunc_(node.measureFunc_), diff --git a/packages/react-native/ReactCommon/yoga/yoga/node/Node.h b/packages/react-native/ReactCommon/yoga/yoga/node/Node.h index 1c6eedf85267..b10bd073b9f2 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/node/Node.h +++ b/packages/react-native/ReactCommon/yoga/yoga/node/Node.h @@ -67,6 +67,10 @@ class YG_EXPORT Node : public ::YGNode { return measureFunc_ != nullptr; } + bool measureFuncFollowsMeasureModes() const noexcept { + return measureFuncFollowsMeasureModes_; + } + YGSize measure( float availableWidth, MeasureMode widthMode, @@ -238,6 +242,10 @@ class YG_EXPORT Node : public ::YGNode { void setMeasureFunc(YGMeasureFunc measureFunc); + void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes) { + measureFuncFollowsMeasureModes_ = measureFuncFollowsMeasureModes; + } + void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc) { minContentMeasureFunc_ = minContentMeasureFunc; } @@ -343,6 +351,7 @@ class YG_EXPORT Node : public ::YGNode { bool isReferenceBaseline_ : 1 = false; bool isDirty_ : 1 = true; bool alwaysFormsContainingBlock_ : 1 = false; + bool measureFuncFollowsMeasureModes_ : 1 = true; NodeType nodeType_ : bitCount() = NodeType::Default; void* context_ = nullptr; YGMeasureFunc measureFunc_ = nullptr; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index b1f8d72fcfb7..ddef066ccf1f 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -6459,7 +6459,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -6657,6 +6657,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -6719,6 +6720,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api index 7b33432309db..38a77a61f965 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api @@ -10922,7 +10922,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -11120,6 +11120,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -11182,6 +11183,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 2e76b6de8216..6ca527915b7e 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -6308,7 +6308,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -6506,6 +6506,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -6568,6 +6569,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 2e76b6de8216..6ca527915b7e 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -6308,7 +6308,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -6506,6 +6506,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -6568,6 +6569,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index 25ee74c97f74..3f106561aafa 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -8194,7 +8194,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -8392,6 +8392,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -8454,6 +8455,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api index aeaed7df09a0..5aac8aaea5bb 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api @@ -12683,7 +12683,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -12881,6 +12881,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -12943,6 +12944,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index d505b7fcfd0d..e1d182e842d7 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -8046,7 +8046,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -8244,6 +8244,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -8306,6 +8307,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 3feedc079438..41fa51fc66bd 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -8053,7 +8053,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -8251,6 +8251,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -8313,6 +8314,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index 55ec0d0a6ff4..6804e4ef19c1 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -3674,7 +3674,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -3872,6 +3872,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -3934,6 +3935,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api index 4c05ab7f6cec..0728fa2c5a82 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api @@ -8028,7 +8028,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -8226,6 +8226,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -8288,6 +8289,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index e988c59a3228..19a8368824e8 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -3667,7 +3667,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -3865,6 +3865,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -3927,6 +3928,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index e988c59a3228..19a8368824e8 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -3667,7 +3667,7 @@ template concept facebook::yoga::HasOrdinality = (facebook::yoga::ordinalCount()> 0); YGLogger facebook::yoga::getDefaultLogger(); bool facebook::yoga::calculateLayoutInternal(facebook::yoga::Node* node, float availableWidth, float availableHeight, facebook::yoga::Direction ownerDirection, facebook::yoga::SizingMode widthSizingMode, facebook::yoga::SizingMode heightSizingMode, float ownerWidth, float ownerHeight, bool performLayout, facebook::yoga::LayoutPassReason reason, facebook::yoga::LayoutData& layoutMarkerData, uint32_t depth, uint32_t generationCount); -bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config); +bool facebook::yoga::canUseCachedMeasurement(facebook::yoga::SizingMode widthMode, float availableWidth, facebook::yoga::SizingMode heightMode, float availableHeight, facebook::yoga::SizingMode lastWidthMode, float lastAvailableWidth, facebook::yoga::SizingMode lastHeightMode, float lastAvailableHeight, float lastComputedWidth, float lastComputedHeight, float marginRow, float marginColumn, const facebook::yoga::Config* config, bool measureFuncFollowsMeasureModes); bool facebook::yoga::configUpdateInvalidatesLayout(const facebook::yoga::Config& oldConfig, const facebook::yoga::Config& newConfig); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleLength& a, const facebook::yoga::StyleLength& b); bool facebook::yoga::inexactEquals(const facebook::yoga::StyleSizeLength& a, const facebook::yoga::StyleSizeLength& b); @@ -3865,6 +3865,7 @@ class facebook::yoga::Node : public YGNode { public bool isLayoutDimensionDefined(facebook::yoga::FlexDirection axis); public bool isNodeFlexible(); public bool isReferenceBaseline() const; + public bool measureFuncFollowsMeasureModes() const noexcept; public bool removeChild(facebook::yoga::Node* child); public const facebook::yoga::Config* getConfig() const; public const facebook::yoga::LayoutResults& getLayout() const; @@ -3927,6 +3928,7 @@ class facebook::yoga::Node : public YGNode { public void setLayoutPosition(float position, facebook::yoga::PhysicalEdge edge); public void setLineIndex(size_t lineIndex); public void setMeasureFunc(YGMeasureFunc measureFunc); + public void setMeasureFuncFollowsMeasureModes(bool measureFuncFollowsMeasureModes); public void setMinContentHeight(facebook::yoga::FloatOptional minContentHeight) noexcept; public void setMinContentMeasureFunc(YGMinContentMeasureFunc minContentMeasureFunc); public void setMinContentWidth(facebook::yoga::FloatOptional minContentWidth) noexcept;