Mobile - Aztec - Trigger notifyInputChange on both blur and focus whe…

…n they're called directly as well as checking there are listeners set before notifying
WordPress · May 4, 2022 · edd61d8 · edd61d8
1 parent 3929ae8
commit edd61d8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/react-native-aztec/src/AztecInputState.js b/packages/react-native-aztec/src/AztecInputState.js
@@ -71,15 +71,18 @@ export const getCurrentFocusedElement = () => {
 export const notifyInputChange = () => {
 	const focusedInput = TextInputState.currentlyFocusedInput();
 	const hasAnyFocusedInput = focusedInput !== null;
+	const hasListeners = focusChangeListeners.length > 0;
 
-	if ( hasAnyFocusedInput ) {
-		if ( ! currentFocusedElement ) {
-			notifyListeners( { isFocused: true } );
+	if ( hasListeners ) {
+		if ( hasAnyFocusedInput ) {
+			if ( ! currentFocusedElement ) {
+				notifyListeners( { isFocused: true } );
+			}
+			currentFocusedElement = focusedInput;
+		} else if ( currentFocusedElement ) {
+			notifyListeners( { isFocused: false } );
+			currentFocusedElement = null;
 		}
-		currentFocusedElement = focusedInput;
-	} else if ( currentFocusedElement ) {
-		notifyListeners( { isFocused: false } );
-		currentFocusedElement = null;
 	}
 };
 

diff --git a/packages/react-native-aztec/src/AztecView.js b/packages/react-native-aztec/src/AztecView.js
@@ -189,10 +189,13 @@ class AztecView extends Component {
 
 	blur() {
 		AztecInputState.blur( this.aztecViewRef.current );
+		// Unmounting the component needs to update the current focused element
+		AztecInputState.notifyInputChange();
 	}
 
 	focus() {
 		AztecInputState.focus( this.aztecViewRef.current );
+		AztecInputState.notifyInputChange();
 	}
 
 	isFocused() {