From 023f175d3befb9548017008da931c61190f36aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Juh=C3=A9=20Lluveras?= <contact@albertjuhe.com>
Date: Thu, 26 May 2022 12:31:29 +0200
Subject: [PATCH] Remove Combobox patch (#6465)

---
 assets/js/base/components/combobox/index.tsx |  2 -
 package-lock.json                            | 48 --------------------
 package.json                                 |  1 -
 patches/wordpress-components+14.2.0.patch    | 44 ------------------
 4 files changed, 95 deletions(-)
 delete mode 100644 patches/wordpress-components+14.2.0.patch

diff --git a/assets/js/base/components/combobox/index.tsx b/assets/js/base/components/combobox/index.tsx
index f0a492fa948..8ed9af5baf6 100644
--- a/assets/js/base/components/combobox/index.tsx
+++ b/assets/js/base/components/combobox/index.tsx
@@ -92,8 +92,6 @@ const Combobox = ( {
 		setValidationErrors,
 	] );
 
-	// @todo Remove patch for ComboboxControl once https://github.com/WordPress/gutenberg/pull/33928 is released
-	// Also see https://github.com/WordPress/gutenberg/pull/34090
 	return (
 		<div
 			id={ controlId }
diff --git a/package-lock.json b/package-lock.json
index 47c51dfc5e8..18e31c66a07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17500,12 +17500,6 @@
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 			"dev": true
 		},
-		"node_modules/@yarnpkg/lockfile": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-			"integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-			"dev": true
-		},
 		"node_modules/abab": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@@ -26960,15 +26954,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/find-yarn-workspace-root": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
-			"integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
-			"dev": true,
-			"dependencies": {
-				"micromatch": "^4.0.2"
-			}
-		},
 		"node_modules/findup": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/findup/-/findup-0.1.5.tgz",
@@ -35579,15 +35564,6 @@
 				"graceful-fs": "^4.1.9"
 			}
 		},
-		"node_modules/klaw-sync": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
-			"integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.1.11"
-			}
-		},
 		"node_modules/kleur": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -65799,12 +65775,6 @@
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 			"dev": true
 		},
-		"@yarnpkg/lockfile": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-			"integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-			"dev": true
-		},
 		"abab": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@@ -73247,15 +73217,6 @@
 				"path-exists": "^4.0.0"
 			}
 		},
-		"find-yarn-workspace-root": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
-			"integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
-			"dev": true,
-			"requires": {
-				"micromatch": "^4.0.2"
-			}
-		},
 		"findup": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/findup/-/findup-0.1.5.tgz",
@@ -79948,15 +79909,6 @@
 				"graceful-fs": "^4.1.9"
 			}
 		},
-		"klaw-sync": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
-			"integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.11"
-			}
-		},
 		"kleur": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
diff --git a/package.json b/package.json
index f8e61bd4f2e..ad2a7fd3213 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
 		"package-plugin:dev": "rimraf woocommerce-gutenberg-products-block.zip && ./bin/build-plugin-zip.sh -d",
 		"package-plugin:zip-only": "rimraf woocommerce-gutenberg-products-block.zip && ./bin/build-plugin-zip.sh -z",
 		"package-plugin:deploy": "npm run build:deploy && npm run package-plugin:zip-only",
-		"postinstall": "patch-package",
 		"reformat-files": "prettier --ignore-path .eslintignore --write \"**/*.{js,jsx,json,ts,tsx}\"",
 		"release": "sh ./bin/wordpress-deploy.sh",
 		"start": "rimraf build/* && cross-env BABEL_ENV=default CHECK_CIRCULAR_DEPS=true webpack --watch --info-verbosity none",
diff --git a/patches/wordpress-components+14.2.0.patch b/patches/wordpress-components+14.2.0.patch
deleted file mode 100644
index 69a0ce6e4f5..00000000000
--- a/patches/wordpress-components+14.2.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/node_modules/wordpress-components/build-module/combobox-control/index.js b/node_modules/wordpress-components/build-module/combobox-control/index.js
-index ddef775..2d0b3ab 100644
---- a/node_modules/wordpress-components/build-module/combobox-control/index.js
-+++ b/node_modules/wordpress-components/build-module/combobox-control/index.js
-@@ -55,6 +55,7 @@ function ComboboxControl({
-   const instanceId = useInstanceId(ComboboxControl);
-   const [selectedSuggestion, setSelectedSuggestion] = useState(null);
-   const [isExpanded, setIsExpanded] = useState(false);
-+  const [inputHasFocus, setInputHasFocus] = useState( false );
-   const [inputValue, setInputValue] = useState('');
-   const inputContainer = useRef();
-   const currentOption = options.find(option => option.value === value);
-@@ -135,7 +136,12 @@ function ComboboxControl({
-     }
-   };
- 
-+  const onBlur = () => {
-+    setInputHasFocus( false );
-+  };
-+
-   const onFocus = () => {
-+	setInputHasFocus( true );
-     setIsExpanded(true);
-     onFilterValueChange('');
-     setInputValue('');
-@@ -149,7 +155,9 @@ function ComboboxControl({
-     const text = event.value;
-     setInputValue(text);
-     onFilterValueChange(text);
--    setIsExpanded(true);
-+    if ( inputHasFocus ) {
-+		setIsExpanded( true );
-+	}
-   };
- 
-   const handleOnReset = () => {
-@@ -193,6 +201,7 @@ function ComboboxControl({
-     value: isExpanded ? inputValue : currentLabel,
-     "aria-label": currentLabel ? `${currentLabel}, ${label}` : null,
-     onFocus: onFocus,
-+	onBlur: onBlur,
-     isExpanded: isExpanded,
-     selectedSuggestionIndex: matchingSuggestions.indexOf(selectedSuggestion),
-     onChange: onInputChange