Revert "Add requireExactMatch prop to ComboBox to prevent wrong c…

…ountry/state values being sent to the server (#6426)" (#6447) This reverts commit 5a2a979.
woocommerce · May 24, 2022 · 40d27b7 · 40d27b7
1 parent e8be043
commit 40d27b7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 67 deletions.
diff --git a/assets/js/base/components/combobox/index.tsx b/assets/js/base/components/combobox/index.tsx
@@ -34,7 +34,6 @@ export interface ComboboxProps {
 	options: ComboboxControlOption[];
 	required?: boolean;
 	value: string;
-	requireExactMatch?: boolean;
 }
 
 /**
@@ -55,7 +54,6 @@ const Combobox = ( {
 	errorId: incomingErrorId,
 	instanceId = '0',
 	autoComplete = 'off',
-	requireExactMatch = false,
 }: ComboboxProps ): JSX.Element => {
 	const {
 		getValidationError,
@@ -138,13 +136,7 @@ const Combobox = ( {
 									normalizedFilterValue
 						);
 						if ( foundOption ) {
-							if ( ! requireExactMatch ) {
-								onChange( foundOption.value );
-								return;
-							}
-							if ( foundOption.label === filterValue ) {
-								onChange( foundOption.value );
-							}
+							onChange( foundOption.value );
 						}
 					}
 				} }

diff --git a/assets/js/base/components/combobox/test/index.js b/assets/js/base/components/combobox/test/index.js
diff --git a/assets/js/base/components/country-input/country-input.tsx b/assets/js/base/components/country-input/country-input.tsx
@@ -56,7 +56,6 @@ export const CountryInput = ( {
 				errorMessage={ errorMessage }
 				required={ required }
 				autoComplete={ autoComplete }
-				requireExactMatch={ true }
 			/>
 			{ autoComplete !== 'off' && (
 				<input

diff --git a/assets/js/base/components/state-input/state-input.tsx b/assets/js/base/components/state-input/state-input.tsx
@@ -105,7 +105,6 @@ const StateInput = ( {
 					) }
 					required={ required }
 					autoComplete={ autoComplete }
-					requireExactMatch={ true }
 				/>
 				{ autoComplete !== 'off' && (
 					<input