From 67822047d72e10625744a0935bd5e55ab2a2f17b Mon Sep 17 00:00:00 2001 From: Joe Vilches Date: Tue, 5 Dec 2023 13:11:01 -0800 Subject: [PATCH] Make position static behave like position static (#1482) Summary: X-link: https://github.com/facebook/react-native/pull/41685 This is the final step (that I know of) to get the core features of static working. Here we turn on all of the tests and pass down the correct owner size for the call to `calculateLayoutInternal` that is in `layoutAbsoluteChild` Reviewed By: NickGerleman Differential Revision: D51293606 --- gentest/fixtures/YGStaticPositionTest.html | 68 +++++++++---------- .../facebook/yoga/YGStaticPositionTest.java | 34 ---------- .../generated/YGStaticPositionTest.test.ts | 68 +++++++++---------- tests/generated/YGStaticPositionTest.cpp | 68 ------------------- yoga/algorithm/AbsoluteLayout.cpp | 8 +-- 5 files changed, 72 insertions(+), 174 deletions(-) diff --git a/gentest/fixtures/YGStaticPositionTest.html b/gentest/fixtures/YGStaticPositionTest.html index 30b781172b..3cb5e55599 100644 --- a/gentest/fixtures/YGStaticPositionTest.html +++ b/gentest/fixtures/YGStaticPositionTest.html @@ -10,7 +10,7 @@ -
+
@@ -19,7 +19,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
@@ -52,7 +52,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -70,7 +70,7 @@
-
+
@@ -79,7 +79,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
@@ -115,7 +115,7 @@
-
+
@@ -124,7 +124,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
@@ -142,7 +142,7 @@
-
+
@@ -151,7 +151,7 @@
-
+
@@ -160,7 +160,7 @@
-
+
@@ -169,7 +169,7 @@
-
+
@@ -178,7 +178,7 @@
-
+
@@ -187,7 +187,7 @@
-
+
@@ -196,7 +196,7 @@
-
+
@@ -205,7 +205,7 @@
-
+
@@ -214,7 +214,7 @@
-
+
@@ -223,7 +223,7 @@
-
+
@@ -232,7 +232,7 @@
-
+
@@ -241,7 +241,7 @@
-
+
@@ -250,7 +250,7 @@
-
+
@@ -259,7 +259,7 @@
-
+
@@ -268,7 +268,7 @@
-
+
@@ -277,7 +277,7 @@
-
+
@@ -286,7 +286,7 @@
-
+
@@ -295,7 +295,7 @@
-
+
@@ -311,14 +311,14 @@
-
+
-
+
diff --git a/java/tests/com/facebook/yoga/YGStaticPositionTest.java b/java/tests/com/facebook/yoga/YGStaticPositionTest.java index f41d5dd06e..efa19ace25 100644 --- a/java/tests/com/facebook/yoga/YGStaticPositionTest.java +++ b/java/tests/com/facebook/yoga/YGStaticPositionTest.java @@ -110,7 +110,6 @@ public void test_static_position_insets_have_no_effect_right_bottom() { } @Test - @Ignore public void test_static_position_absolute_child_insets_relative_to_positioned_ancestor() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -185,7 +184,6 @@ public void test_static_position_absolute_child_insets_relative_to_positioned_an } @Test - @Ignore public void test_static_position_absolute_child_insets_relative_to_positioned_ancestor_deep() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -311,7 +309,6 @@ public void test_static_position_absolute_child_insets_relative_to_positioned_an } @Test - @Ignore public void test_static_position_absolute_child_width_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -383,7 +380,6 @@ public void test_static_position_absolute_child_width_percentage() { } @Test - @Ignore public void test_static_position_relative_child_width_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -454,7 +450,6 @@ public void test_static_position_relative_child_width_percentage() { } @Test - @Ignore public void test_static_position_static_child_width_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -526,7 +521,6 @@ public void test_static_position_static_child_width_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_height_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -598,7 +592,6 @@ public void test_static_position_absolute_child_height_percentage() { } @Test - @Ignore public void test_static_position_relative_child_height_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -669,7 +662,6 @@ public void test_static_position_relative_child_height_percentage() { } @Test - @Ignore public void test_static_position_static_child_height_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -741,7 +733,6 @@ public void test_static_position_static_child_height_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_left_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -814,7 +805,6 @@ public void test_static_position_absolute_child_left_percentage() { } @Test - @Ignore public void test_static_position_relative_child_left_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -886,7 +876,6 @@ public void test_static_position_relative_child_left_percentage() { } @Test - @Ignore public void test_static_position_static_child_left_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -959,7 +948,6 @@ public void test_static_position_static_child_left_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_right_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1032,7 +1020,6 @@ public void test_static_position_absolute_child_right_percentage() { } @Test - @Ignore public void test_static_position_relative_child_right_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1104,7 +1091,6 @@ public void test_static_position_relative_child_right_percentage() { } @Test - @Ignore public void test_static_position_static_child_right_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1177,7 +1163,6 @@ public void test_static_position_static_child_right_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_top_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1250,7 +1235,6 @@ public void test_static_position_absolute_child_top_percentage() { } @Test - @Ignore public void test_static_position_relative_child_top_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1322,7 +1306,6 @@ public void test_static_position_relative_child_top_percentage() { } @Test - @Ignore public void test_static_position_static_child_top_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1395,7 +1378,6 @@ public void test_static_position_static_child_top_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_bottom_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1468,7 +1450,6 @@ public void test_static_position_absolute_child_bottom_percentage() { } @Test - @Ignore public void test_static_position_relative_child_bottom_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1540,7 +1521,6 @@ public void test_static_position_relative_child_bottom_percentage() { } @Test - @Ignore public void test_static_position_static_child_bottom_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1613,7 +1593,6 @@ public void test_static_position_static_child_bottom_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_margin_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1689,7 +1668,6 @@ public void test_static_position_absolute_child_margin_percentage() { } @Test - @Ignore public void test_static_position_relative_child_margin_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1764,7 +1742,6 @@ public void test_static_position_relative_child_margin_percentage() { } @Test - @Ignore public void test_static_position_static_child_margin_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1840,7 +1817,6 @@ public void test_static_position_static_child_margin_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_padding_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1916,7 +1892,6 @@ public void test_static_position_absolute_child_padding_percentage() { } @Test - @Ignore public void test_static_position_relative_child_padding_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -1991,7 +1966,6 @@ public void test_static_position_relative_child_padding_percentage() { } @Test - @Ignore public void test_static_position_static_child_padding_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -2067,7 +2041,6 @@ public void test_static_position_static_child_padding_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_border_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -2139,7 +2112,6 @@ public void test_static_position_absolute_child_border_percentage() { } @Test - @Ignore public void test_static_position_relative_child_border_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -2210,7 +2182,6 @@ public void test_static_position_relative_child_border_percentage() { } @Test - @Ignore public void test_static_position_static_child_border_percentage() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -2282,7 +2253,6 @@ public void test_static_position_static_child_border_percentage() { } @Test - @Ignore public void test_static_position_absolute_child_containing_block_padding_box() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -2358,7 +2328,6 @@ public void test_static_position_absolute_child_containing_block_padding_box() { } @Test - @Ignore public void test_static_position_relative_child_containing_block_padding_box() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -2433,7 +2402,6 @@ public void test_static_position_relative_child_containing_block_padding_box() { } @Test - @Ignore public void test_static_position_static_child_containing_block_padding_box() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -2569,7 +2537,6 @@ public void test_static_position_absolute_child_containing_block_content_box() { } @Test - @Ignore public void test_static_position_relative_child_containing_block_content_box() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); @@ -2628,7 +2595,6 @@ public void test_static_position_relative_child_containing_block_content_box() { } @Test - @Ignore public void test_static_position_static_child_containing_block_content_box() { YogaConfig config = YogaConfigFactory.create(); config.setExperimentalFeatureEnabled(YogaExperimentalFeature.ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE, true); diff --git a/javascript/tests/generated/YGStaticPositionTest.test.ts b/javascript/tests/generated/YGStaticPositionTest.test.ts index 0084609542..023f8d28fb 100644 --- a/javascript/tests/generated/YGStaticPositionTest.test.ts +++ b/javascript/tests/generated/YGStaticPositionTest.test.ts @@ -121,7 +121,7 @@ test('static_position_insets_have_no_effect_right_bottom', () => { config.free(); } }); -test.skip('static_position_absolute_child_insets_relative_to_positioned_ancestor', () => { +test('static_position_absolute_child_insets_relative_to_positioned_ancestor', () => { const config = Yoga.Config.create(); let root; @@ -201,7 +201,7 @@ test.skip('static_position_absolute_child_insets_relative_to_positioned_ancestor config.free(); } }); -test.skip('static_position_absolute_child_insets_relative_to_positioned_ancestor_deep', () => { +test('static_position_absolute_child_insets_relative_to_positioned_ancestor_deep', () => { const config = Yoga.Config.create(); let root; @@ -332,7 +332,7 @@ test.skip('static_position_absolute_child_insets_relative_to_positioned_ancestor config.free(); } }); -test.skip('static_position_absolute_child_width_percentage', () => { +test('static_position_absolute_child_width_percentage', () => { const config = Yoga.Config.create(); let root; @@ -409,7 +409,7 @@ test.skip('static_position_absolute_child_width_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_width_percentage', () => { +test('static_position_relative_child_width_percentage', () => { const config = Yoga.Config.create(); let root; @@ -485,7 +485,7 @@ test.skip('static_position_relative_child_width_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_width_percentage', () => { +test('static_position_static_child_width_percentage', () => { const config = Yoga.Config.create(); let root; @@ -562,7 +562,7 @@ test.skip('static_position_static_child_width_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_height_percentage', () => { +test('static_position_absolute_child_height_percentage', () => { const config = Yoga.Config.create(); let root; @@ -639,7 +639,7 @@ test.skip('static_position_absolute_child_height_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_height_percentage', () => { +test('static_position_relative_child_height_percentage', () => { const config = Yoga.Config.create(); let root; @@ -715,7 +715,7 @@ test.skip('static_position_relative_child_height_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_height_percentage', () => { +test('static_position_static_child_height_percentage', () => { const config = Yoga.Config.create(); let root; @@ -792,7 +792,7 @@ test.skip('static_position_static_child_height_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_left_percentage', () => { +test('static_position_absolute_child_left_percentage', () => { const config = Yoga.Config.create(); let root; @@ -870,7 +870,7 @@ test.skip('static_position_absolute_child_left_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_left_percentage', () => { +test('static_position_relative_child_left_percentage', () => { const config = Yoga.Config.create(); let root; @@ -947,7 +947,7 @@ test.skip('static_position_relative_child_left_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_left_percentage', () => { +test('static_position_static_child_left_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1025,7 +1025,7 @@ test.skip('static_position_static_child_left_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_right_percentage', () => { +test('static_position_absolute_child_right_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1103,7 +1103,7 @@ test.skip('static_position_absolute_child_right_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_right_percentage', () => { +test('static_position_relative_child_right_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1180,7 +1180,7 @@ test.skip('static_position_relative_child_right_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_right_percentage', () => { +test('static_position_static_child_right_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1258,7 +1258,7 @@ test.skip('static_position_static_child_right_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_top_percentage', () => { +test('static_position_absolute_child_top_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1336,7 +1336,7 @@ test.skip('static_position_absolute_child_top_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_top_percentage', () => { +test('static_position_relative_child_top_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1413,7 +1413,7 @@ test.skip('static_position_relative_child_top_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_top_percentage', () => { +test('static_position_static_child_top_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1491,7 +1491,7 @@ test.skip('static_position_static_child_top_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_bottom_percentage', () => { +test('static_position_absolute_child_bottom_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1569,7 +1569,7 @@ test.skip('static_position_absolute_child_bottom_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_bottom_percentage', () => { +test('static_position_relative_child_bottom_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1646,7 +1646,7 @@ test.skip('static_position_relative_child_bottom_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_bottom_percentage', () => { +test('static_position_static_child_bottom_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1724,7 +1724,7 @@ test.skip('static_position_static_child_bottom_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_margin_percentage', () => { +test('static_position_absolute_child_margin_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1805,7 +1805,7 @@ test.skip('static_position_absolute_child_margin_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_margin_percentage', () => { +test('static_position_relative_child_margin_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1885,7 +1885,7 @@ test.skip('static_position_relative_child_margin_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_margin_percentage', () => { +test('static_position_static_child_margin_percentage', () => { const config = Yoga.Config.create(); let root; @@ -1966,7 +1966,7 @@ test.skip('static_position_static_child_margin_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_padding_percentage', () => { +test('static_position_absolute_child_padding_percentage', () => { const config = Yoga.Config.create(); let root; @@ -2047,7 +2047,7 @@ test.skip('static_position_absolute_child_padding_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_padding_percentage', () => { +test('static_position_relative_child_padding_percentage', () => { const config = Yoga.Config.create(); let root; @@ -2127,7 +2127,7 @@ test.skip('static_position_relative_child_padding_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_padding_percentage', () => { +test('static_position_static_child_padding_percentage', () => { const config = Yoga.Config.create(); let root; @@ -2208,7 +2208,7 @@ test.skip('static_position_static_child_padding_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_border_percentage', () => { +test('static_position_absolute_child_border_percentage', () => { const config = Yoga.Config.create(); let root; @@ -2285,7 +2285,7 @@ test.skip('static_position_absolute_child_border_percentage', () => { config.free(); } }); -test.skip('static_position_relative_child_border_percentage', () => { +test('static_position_relative_child_border_percentage', () => { const config = Yoga.Config.create(); let root; @@ -2361,7 +2361,7 @@ test.skip('static_position_relative_child_border_percentage', () => { config.free(); } }); -test.skip('static_position_static_child_border_percentage', () => { +test('static_position_static_child_border_percentage', () => { const config = Yoga.Config.create(); let root; @@ -2438,7 +2438,7 @@ test.skip('static_position_static_child_border_percentage', () => { config.free(); } }); -test.skip('static_position_absolute_child_containing_block_padding_box', () => { +test('static_position_absolute_child_containing_block_padding_box', () => { const config = Yoga.Config.create(); let root; @@ -2519,7 +2519,7 @@ test.skip('static_position_absolute_child_containing_block_padding_box', () => { config.free(); } }); -test.skip('static_position_relative_child_containing_block_padding_box', () => { +test('static_position_relative_child_containing_block_padding_box', () => { const config = Yoga.Config.create(); let root; @@ -2599,7 +2599,7 @@ test.skip('static_position_relative_child_containing_block_padding_box', () => { config.free(); } }); -test.skip('static_position_static_child_containing_block_padding_box', () => { +test('static_position_static_child_containing_block_padding_box', () => { const config = Yoga.Config.create(); let root; @@ -2745,7 +2745,7 @@ test.skip('static_position_absolute_child_containing_block_content_box', () => { config.free(); } }); -test.skip('static_position_relative_child_containing_block_content_box', () => { +test('static_position_relative_child_containing_block_content_box', () => { const config = Yoga.Config.create(); let root; @@ -2809,7 +2809,7 @@ test.skip('static_position_relative_child_containing_block_content_box', () => { config.free(); } }); -test.skip('static_position_static_child_containing_block_content_box', () => { +test('static_position_static_child_containing_block_content_box', () => { const config = Yoga.Config.create(); let root; diff --git a/tests/generated/YGStaticPositionTest.cpp b/tests/generated/YGStaticPositionTest.cpp index ba1436e44c..7ff13b6668 100644 --- a/tests/generated/YGStaticPositionTest.cpp +++ b/tests/generated/YGStaticPositionTest.cpp @@ -98,8 +98,6 @@ TEST(YogaTest, static_position_insets_have_no_effect_right_bottom) { } TEST(YogaTest, static_position_absolute_child_insets_relative_to_positioned_ancestor) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -175,8 +173,6 @@ TEST(YogaTest, static_position_absolute_child_insets_relative_to_positioned_ance } TEST(YogaTest, static_position_absolute_child_insets_relative_to_positioned_ancestor_deep) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -303,8 +299,6 @@ TEST(YogaTest, static_position_absolute_child_insets_relative_to_positioned_ance } TEST(YogaTest, static_position_absolute_child_width_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -377,8 +371,6 @@ TEST(YogaTest, static_position_absolute_child_width_percentage) { } TEST(YogaTest, static_position_relative_child_width_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -450,8 +442,6 @@ TEST(YogaTest, static_position_relative_child_width_percentage) { } TEST(YogaTest, static_position_static_child_width_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -524,8 +514,6 @@ TEST(YogaTest, static_position_static_child_width_percentage) { } TEST(YogaTest, static_position_absolute_child_height_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -598,8 +586,6 @@ TEST(YogaTest, static_position_absolute_child_height_percentage) { } TEST(YogaTest, static_position_relative_child_height_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -671,8 +657,6 @@ TEST(YogaTest, static_position_relative_child_height_percentage) { } TEST(YogaTest, static_position_static_child_height_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -745,8 +729,6 @@ TEST(YogaTest, static_position_static_child_height_percentage) { } TEST(YogaTest, static_position_absolute_child_left_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -820,8 +802,6 @@ TEST(YogaTest, static_position_absolute_child_left_percentage) { } TEST(YogaTest, static_position_relative_child_left_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -894,8 +874,6 @@ TEST(YogaTest, static_position_relative_child_left_percentage) { } TEST(YogaTest, static_position_static_child_left_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -969,8 +947,6 @@ TEST(YogaTest, static_position_static_child_left_percentage) { } TEST(YogaTest, static_position_absolute_child_right_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1044,8 +1020,6 @@ TEST(YogaTest, static_position_absolute_child_right_percentage) { } TEST(YogaTest, static_position_relative_child_right_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1118,8 +1092,6 @@ TEST(YogaTest, static_position_relative_child_right_percentage) { } TEST(YogaTest, static_position_static_child_right_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1193,8 +1165,6 @@ TEST(YogaTest, static_position_static_child_right_percentage) { } TEST(YogaTest, static_position_absolute_child_top_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1268,8 +1238,6 @@ TEST(YogaTest, static_position_absolute_child_top_percentage) { } TEST(YogaTest, static_position_relative_child_top_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1342,8 +1310,6 @@ TEST(YogaTest, static_position_relative_child_top_percentage) { } TEST(YogaTest, static_position_static_child_top_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1417,8 +1383,6 @@ TEST(YogaTest, static_position_static_child_top_percentage) { } TEST(YogaTest, static_position_absolute_child_bottom_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1492,8 +1456,6 @@ TEST(YogaTest, static_position_absolute_child_bottom_percentage) { } TEST(YogaTest, static_position_relative_child_bottom_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1566,8 +1528,6 @@ TEST(YogaTest, static_position_relative_child_bottom_percentage) { } TEST(YogaTest, static_position_static_child_bottom_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1641,8 +1601,6 @@ TEST(YogaTest, static_position_static_child_bottom_percentage) { } TEST(YogaTest, static_position_absolute_child_margin_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1719,8 +1677,6 @@ TEST(YogaTest, static_position_absolute_child_margin_percentage) { } TEST(YogaTest, static_position_relative_child_margin_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1796,8 +1752,6 @@ TEST(YogaTest, static_position_relative_child_margin_percentage) { } TEST(YogaTest, static_position_static_child_margin_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1874,8 +1828,6 @@ TEST(YogaTest, static_position_static_child_margin_percentage) { } TEST(YogaTest, static_position_absolute_child_padding_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -1952,8 +1904,6 @@ TEST(YogaTest, static_position_absolute_child_padding_percentage) { } TEST(YogaTest, static_position_relative_child_padding_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2029,8 +1979,6 @@ TEST(YogaTest, static_position_relative_child_padding_percentage) { } TEST(YogaTest, static_position_static_child_padding_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2107,8 +2055,6 @@ TEST(YogaTest, static_position_static_child_padding_percentage) { } TEST(YogaTest, static_position_absolute_child_border_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2181,8 +2127,6 @@ TEST(YogaTest, static_position_absolute_child_border_percentage) { } TEST(YogaTest, static_position_relative_child_border_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2254,8 +2198,6 @@ TEST(YogaTest, static_position_relative_child_border_percentage) { } TEST(YogaTest, static_position_static_child_border_percentage) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2328,8 +2270,6 @@ TEST(YogaTest, static_position_static_child_border_percentage) { } TEST(YogaTest, static_position_absolute_child_containing_block_padding_box) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2406,8 +2346,6 @@ TEST(YogaTest, static_position_absolute_child_containing_block_padding_box) { } TEST(YogaTest, static_position_relative_child_containing_block_padding_box) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2483,8 +2421,6 @@ TEST(YogaTest, static_position_relative_child_containing_block_padding_box) { } TEST(YogaTest, static_position_static_child_containing_block_padding_box) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2623,8 +2559,6 @@ TEST(YogaTest, static_position_absolute_child_containing_block_content_box) { } TEST(YogaTest, static_position_relative_child_containing_block_content_box) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); @@ -2684,8 +2618,6 @@ TEST(YogaTest, static_position_relative_child_containing_block_content_box) { } TEST(YogaTest, static_position_static_child_containing_block_content_box) { - GTEST_SKIP(); - const YGConfigRef config = YGConfigNew(); YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, true); diff --git a/yoga/algorithm/AbsoluteLayout.cpp b/yoga/algorithm/AbsoluteLayout.cpp index 22574cf805..cbccf07b9f 100644 --- a/yoga/algorithm/AbsoluteLayout.cpp +++ b/yoga/algorithm/AbsoluteLayout.cpp @@ -388,8 +388,8 @@ void layoutAbsoluteChild( direction, childWidthSizingMode, childHeightSizingMode, - childWidth, - childHeight, + containingBlockWidth, + containingBlockHeight, false, LayoutPassReason::kAbsMeasureChild, layoutMarkerData, @@ -408,8 +408,8 @@ void layoutAbsoluteChild( direction, SizingMode::StretchFit, SizingMode::StretchFit, - childWidth, - childHeight, + containingBlockWidth, + containingBlockHeight, true, LayoutPassReason::kAbsLayout, layoutMarkerData,