diff --git a/packages/react-native/Libraries/StyleSheet/__tests__/processTransformOrigin-itest.js b/packages/react-native/Libraries/StyleSheet/__tests__/processTransformOrigin-itest.js index 81a882f4175..318b3f9e088 100644 --- a/packages/react-native/Libraries/StyleSheet/__tests__/processTransformOrigin-itest.js +++ b/packages/react-native/Libraries/StyleSheet/__tests__/processTransformOrigin-itest.js @@ -122,5 +122,16 @@ describe('processTransformOrigin', () => { expect(processTransformOrigin('12.5px 7.5px')).toEqual([12.5, 7.5, 0]); expect(processTransformOrigin('.5% .5px')).toEqual(['.5%', 0.5, 0]); }); + it('should preserve negative percentage and pixel values', () => { + expect(processTransformOrigin('-50.5% -30.2%')).toEqual([ + '-50.5%', + '-30.2%', + 0, + ]); + expect(processTransformOrigin('-12.5px -7.5px -2.5px')).toEqual([ + -12.5, -7.5, -2.5, + ]); + expect(processTransformOrigin('-.5% -.5px')).toEqual(['-.5%', -0.5, 0]); + }); }); }); diff --git a/packages/react-native/Libraries/StyleSheet/processTransformOrigin.js b/packages/react-native/Libraries/StyleSheet/processTransformOrigin.js index 96cd040d814..5c132d92ae4 100644 --- a/packages/react-native/Libraries/StyleSheet/processTransformOrigin.js +++ b/packages/react-native/Libraries/StyleSheet/processTransformOrigin.js @@ -12,7 +12,7 @@ import invariant from 'invariant'; // Pre-compiled regex pattern for performance - avoids regex compilation on each call const TRANSFORM_ORIGIN_REGEX = - /(top|bottom|left|right|center|\d*\.?\d+(?:%|px)|0)/gi; + /(top|bottom|left|right|center|-?\d*\.?\d+(?:%|px)|0)/gi; const INDEX_X = 0; const INDEX_Y = 1; diff --git a/packages/react-native/ReactCommon/react/renderer/css/tests/CSSTransformOriginTest.cpp b/packages/react-native/ReactCommon/react/renderer/css/tests/CSSTransformOriginTest.cpp index 3df2920f069..5bb2fa2040a 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/tests/CSSTransformOriginTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/css/tests/CSSTransformOriginTest.cpp @@ -455,4 +455,46 @@ TEST(CSSTransformOrigin, decimal_percentage_percentage) { EXPECT_EQ(origin.z, CSSLength{}); } +TEST(CSSTransformOrigin, negative_lengths) { + auto value = parseCSSProperty("-12.5px -7.5px -2.5px"); + EXPECT_TRUE(std::holds_alternative(value)); + auto& origin = std::get(value); + + EXPECT_TRUE(std::holds_alternative(origin.x)); + EXPECT_EQ(std::get(origin.x).value, -12.5f); + EXPECT_EQ(std::get(origin.x).unit, CSSLengthUnit::Px); + + EXPECT_TRUE(std::holds_alternative(origin.y)); + EXPECT_EQ(std::get(origin.y).value, -7.5f); + EXPECT_EQ(std::get(origin.y).unit, CSSLengthUnit::Px); + + EXPECT_EQ(origin.z.value, -2.5f); + EXPECT_EQ(origin.z.unit, CSSLengthUnit::Px); +} + +TEST(CSSTransformOrigin, negative_percentages) { + auto value = parseCSSProperty("-50.5% -30.2%"); + EXPECT_TRUE(std::holds_alternative(value)); + auto& origin = std::get(value); + + EXPECT_TRUE(std::holds_alternative(origin.x)); + EXPECT_EQ(std::get(origin.x).value, -50.5f); + + EXPECT_TRUE(std::holds_alternative(origin.y)); + EXPECT_EQ(std::get(origin.y).value, -30.2f); +} + +TEST(CSSTransformOrigin, negative_leading_dot_values) { + auto value = parseCSSProperty("-.5% -.5px"); + EXPECT_TRUE(std::holds_alternative(value)); + auto& origin = std::get(value); + + EXPECT_TRUE(std::holds_alternative(origin.x)); + EXPECT_EQ(std::get(origin.x).value, -0.5f); + + EXPECT_TRUE(std::holds_alternative(origin.y)); + EXPECT_EQ(std::get(origin.y).value, -0.5f); + EXPECT_EQ(std::get(origin.y).unit, CSSLengthUnit::Px); +} + } // namespace facebook::react