diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java index d6ef3952e8d090..51deec2f262075 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java @@ -747,7 +747,10 @@ private void setIntrinsicContentSize() { // view, we don't need to construct one or apply it at all - it provides no use in Fabric. ReactContext reactContext = getReactContext(this); - if (!mFabricViewStateManager.hasStateWrapper() && !reactContext.isBridgeless()) { + if (mFabricViewStateManager != null + && !mFabricViewStateManager.hasStateWrapper() + && !reactContext.isBridgeless()) { + final ReactTextInputLocalData localData = new ReactTextInputLocalData(this); UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class); if (uiManager != null) { @@ -983,7 +986,7 @@ public FabricViewStateManager getFabricViewStateManager() { */ private void updateCachedSpannable(boolean resetStyles) { // Noops in non-Fabric - if (!mFabricViewStateManager.hasStateWrapper()) { + if (mFabricViewStateManager == null || !mFabricViewStateManager.hasStateWrapper()) { return; } // If this view doesn't have an ID yet, we don't have a cache key, so bail here