-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into @jakex7/filtersFeColorMatrix
- Loading branch information
Showing
30 changed files
with
1,404 additions
and
1,142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| diff --git a/node_modules/react-native-windows/Microsoft.ReactNative/Modules/NativeUIManager.cpp b/node_modules/react-native-windows/Microsoft.ReactNative/Modules/NativeUIManager.cpp | ||
| index 97c1691..8136008 100644 | ||
| --- a/node_modules/react-native-windows/Microsoft.ReactNative/Modules/NativeUIManager.cpp | ||
| +++ b/node_modules/react-native-windows/Microsoft.ReactNative/Modules/NativeUIManager.cpp | ||
| @@ -309,16 +309,10 @@ static YGValue YGValueOrDefault( | ||
| return YGValue{static_cast<float>(pct.asDouble()), YGUnitPercent}; | ||
| } | ||
| if (str.length() > 2 && (str.compare(str.length() - 2, 2, "pt") || str.compare(str.length() - 2, 2, "px"))) { | ||
| - shadowNode.RedBox( | ||
| - "Value '" + value.AsString() + "' for " + key + " is invalid. Cannot be converted to YGValue. '" + | ||
| - str.substr((str.length() - 2), 2) + "' unit not needed. Simply use integer value."); | ||
| return defaultValue; | ||
| } | ||
| } | ||
|
|
||
| - shadowNode.RedBox( | ||
| - "Value '" + value.AsString() + "' for " + key + | ||
| - " is invalid. Cannot be converted to YGValue. Did you forget the %? Otherwise, simply use integer value."); | ||
| return defaultValue; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.