Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect against View context not being a ThemedReactContext in AndroidTextInput in Android 4

Browse Source 
Summary:
See D19204032. In some cases the View might not have a ThemedReactContext, it may be wrapped, so we use a previously-created helper to get the correct context from the View or we throw a soft exception.

Changelog: [Internal] Fabric change

Reviewed By: mdvacca

Differential Revision: D20355126

fbshipit-source-id: 469a3b7f8f2d3b98236f3170dd62c4a6e7e1e46f
This commit is contained in:
Joshua Gross
2020-03-09 20:41:50 -07:00
committed by Facebook Github Bot
parent 3cc69d2e2b
commit 2f45961beb
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+24 -13
View File
@@ -1251,22 +1251,33 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
if (!state.getBoolean("hasThemeData")) {
WritableNativeMap update = new WritableNativeMap();
EditText editText = createInternalEditText((ThemedReactContext) view.getContext());
ReactContext reactContext = UIManagerHelper.getReactContext(view);
if (reactContext instanceof ThemedReactContext) {
ThemedReactContext themedReactContext = (ThemedReactContext) reactContext;
EditText editText = createInternalEditText(themedReactContext);
// Even though we check `data["textChanged"].empty()` before using the value in C++,
// state updates crash without this value on key exception. It's unintuitive why
// folly::dynamic is crashing there and if there's any way to fix on the native side,
// so leave this here until we can figure out a better way of key-existence-checking in C++.
update.putNull("textChanged");
// Even though we check `data["textChanged"].empty()` before using the value in C++,
// state updates crash without this value on key exception. It's unintuitive why
// folly::dynamic is crashing there and if there's any way to fix on the native side,
// so leave this here until we can figure out a better way of key-existence-checking in C++.
update.putNull("textChanged");
update.putDouble(
"themePaddingStart", PixelUtil.toDIPFromPixel(ViewCompat.getPaddingStart(editText)));
update.putDouble(
"themePaddingEnd", PixelUtil.toDIPFromPixel(ViewCompat.getPaddingEnd(editText)));
update.putDouble("themePaddingTop", PixelUtil.toDIPFromPixel(editText.getPaddingTop()));
update.putDouble("themePaddingBottom", PixelUtil.toDIPFromPixel(editText.getPaddingBottom()));
update.putDouble(
"themePaddingStart", PixelUtil.toDIPFromPixel(ViewCompat.getPaddingStart(editText)));
update.putDouble(
"themePaddingEnd", PixelUtil.toDIPFromPixel(ViewCompat.getPaddingEnd(editText)));
update.putDouble("themePaddingTop", PixelUtil.toDIPFromPixel(editText.getPaddingTop()));
update.putDouble(
"themePaddingBottom", PixelUtil.toDIPFromPixel(editText.getPaddingBottom()));
stateWrapper.updateState(update);
stateWrapper.updateState(update);
} else {
ReactSoftException.logSoftException(
TAG,
new IllegalStateException(
"ReactContext is not a ThemedReactContent: "
+ (reactContext != null ? reactContext.getClass().getName() : "null")));
}
}
ReadableMap attributedString = state.getMap("attributedString");