From 41b11b4db1906a2501f4293d39f9e9095840e1cc Mon Sep 17 00:00:00 2001
From: Andrew Huth <ahuth@chanzuckerberg.com>
Date: Wed, 4 Jan 2023 16:43:07 -0500
Subject: [PATCH] fix: pin @headlessui/react to 1.7.5

Resolves e2e test failures in Traject (see https://github.com/FB-PLP/traject/pull/13040).

Issue starts in 1.7.6, possibly from https://github.com/tailwindlabs/headlessui/pull/2093.
---
 package.json                                  |  2 +-
 .../__snapshots__/Dropdown.test.tsx.snap      | 20 +++++++++----------
 .../Menu/__snapshots__/Menu.test.tsx.snap     |  6 +++---
 .../Select/__snapshots__/Select.test.tsx.snap | 20 +++++++++----------
 yarn.lock                                     | 10 +++++-----
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index b3a08d45b..118394c68 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "react": ">= 16.8.0"
   },
   "dependencies": {
-    "@headlessui/react": "^1.7.7",
+    "@headlessui/react": "1.7.5",
     "@popperjs/core": "^2.11.6",
     "@tippyjs/react": "^4.2.6",
     "clsx": "^1.2.1",
diff --git a/src/components/Dropdown/__snapshots__/Dropdown.test.tsx.snap b/src/components/Dropdown/__snapshots__/Dropdown.test.tsx.snap
index 95da292ed..99ad703b6 100644
--- a/src/components/Dropdown/__snapshots__/Dropdown.test.tsx.snap
+++ b/src/components/Dropdown/__snapshots__/Dropdown.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`<Dropdown /> Compact story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-15"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-13 headlessui-listbox-button-14"
     class="dropdown-button dropdown-button--compact"
     data-headlessui-state="open"
@@ -112,7 +112,7 @@ exports[`<Dropdown /> CompactUsingChildrenPropAndNoVisibleLabel story renders sn
   <button
     aria-controls="headlessui-listbox-options-45"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-43 headlessui-listbox-button-44"
     class="dropdown-button dropdown-button--compact"
     data-headlessui-state="open"
@@ -208,7 +208,7 @@ exports[`<Dropdown /> CompactWithOptionsRightAligned story renders snapshot 1`]
   <button
     aria-controls="headlessui-listbox-options-21"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-19 headlessui-listbox-button-20"
     class="dropdown-button dropdown-button--compact"
     data-headlessui-state="open"
@@ -304,7 +304,7 @@ exports[`<Dropdown /> Default story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-3"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-1 headlessui-listbox-button-2"
     class="dropdown-button"
     data-headlessui-state="open"
@@ -400,7 +400,7 @@ exports[`<Dropdown /> DefaultWithoutVisibleLabel story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-9"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-7 headlessui-listbox-button-8"
     class="dropdown-button"
     data-headlessui-state="open"
@@ -496,7 +496,7 @@ exports[`<Dropdown /> SeparateButtonAndMenuWidth story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-27"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-25 headlessui-listbox-button-26"
     class="dropdown-button"
     data-headlessui-state="open"
@@ -592,7 +592,7 @@ exports[`<Dropdown /> UsingChildrenProp story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-33"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-31 headlessui-listbox-button-32"
     class="dropdown-button"
     data-headlessui-state="open"
@@ -688,7 +688,7 @@ exports[`<Dropdown /> UsingChildrenPropAndNoVisibleLabel story renders snapshot
   <button
     aria-controls="headlessui-listbox-options-39"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-37 headlessui-listbox-button-38"
     class="dropdown-button"
     data-headlessui-state="open"
@@ -778,7 +778,7 @@ exports[`<Dropdown /> UsingFunctionChildrenProp story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-50"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="function-children__button"
     data-headlessui-state="open"
     id="headlessui-listbox-button-49"
@@ -868,7 +868,7 @@ exports[`<Dropdown /> renders the OpenByDefault story 1`] = `
   <button
     aria-controls="headlessui-listbox-options-56"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-54 headlessui-listbox-button-55"
     class="dropdown-button"
     data-headlessui-state="open"
diff --git a/src/components/Menu/__snapshots__/Menu.test.tsx.snap b/src/components/Menu/__snapshots__/Menu.test.tsx.snap
index b9c5f1fe9..faca42d0a 100644
--- a/src/components/Menu/__snapshots__/Menu.test.tsx.snap
+++ b/src/components/Menu/__snapshots__/Menu.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`<Menu /> Default story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-menu-items-2"
     aria-expanded="true"
-    aria-haspopup="menu"
+    aria-haspopup="true"
     class="clickable-style clickable-style--lg clickable-style--secondary clickable-style--neutral menu__button"
     data-bootstrap-override="clickable-style-secondary"
     data-headlessui-state="open"
@@ -159,7 +159,7 @@ exports[`<Menu /> WithLongButtonText story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-menu-items-8"
     aria-expanded="true"
-    aria-haspopup="menu"
+    aria-haspopup="true"
     class="clickable-style clickable-style--lg clickable-style--secondary clickable-style--neutral menu__button"
     data-bootstrap-override="clickable-style-secondary"
     data-headlessui-state="open"
@@ -310,7 +310,7 @@ exports[`<Menu /> WithShortButtonText story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-menu-items-14"
     aria-expanded="true"
-    aria-haspopup="menu"
+    aria-haspopup="true"
     class="clickable-style clickable-style--lg clickable-style--secondary clickable-style--neutral menu__button"
     data-bootstrap-override="clickable-style-secondary"
     data-headlessui-state="open"
diff --git a/src/components/Select/__snapshots__/Select.test.tsx.snap b/src/components/Select/__snapshots__/Select.test.tsx.snap
index 100f29ad2..6dcbea658 100644
--- a/src/components/Select/__snapshots__/Select.test.tsx.snap
+++ b/src/components/Select/__snapshots__/Select.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`<Select /> Compact story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-13"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="select-button select-button--compact"
     data-headlessui-state="open"
     id="headlessui-listbox-button-12"
@@ -106,7 +106,7 @@ exports[`<Select /> CompactUsingChildrenPropAndNoVisibleLabel story renders snap
   <button
     aria-controls="headlessui-listbox-options-39"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="select-button select-button--compact"
     data-headlessui-state="open"
     id="headlessui-listbox-button-38"
@@ -203,7 +203,7 @@ exports[`<Select /> CompactWithOptionsRightAligned story renders snapshot 1`] =
   <button
     aria-controls="headlessui-listbox-options-18"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="select-button select-button--compact"
     data-headlessui-state="open"
     id="headlessui-listbox-button-17"
@@ -300,7 +300,7 @@ exports[`<Select /> Default story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-2"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="select-button"
     data-headlessui-state="open"
     id="headlessui-listbox-button-1"
@@ -404,7 +404,7 @@ exports[`<Select /> DefaultWithVisibleLabel story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-8"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-6 headlessui-listbox-button-7"
     class="select-button"
     data-headlessui-state="open"
@@ -502,7 +502,7 @@ exports[`<Select /> SeparateButtonAndMenuWidth story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-23"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="select-button"
     data-headlessui-state="open"
     id="headlessui-listbox-button-22"
@@ -606,7 +606,7 @@ exports[`<Select /> UsingChildrenProp story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-29"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     aria-labelledby="headlessui-listbox-label-27 headlessui-listbox-button-28"
     class="select-button"
     data-headlessui-state="open"
@@ -704,7 +704,7 @@ exports[`<Select /> UsingChildrenPropAndNoVisibleLabel story renders snapshot 1`
   <button
     aria-controls="headlessui-listbox-options-34"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="select-button"
     data-headlessui-state="open"
     id="headlessui-listbox-button-33"
@@ -802,7 +802,7 @@ exports[`<Select /> UsingFunctionChildrenProp story renders snapshot 1`] = `
   <button
     aria-controls="headlessui-listbox-options-44"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="function-children__button"
     data-headlessui-state="open"
     id="headlessui-listbox-button-43"
@@ -894,7 +894,7 @@ exports[`<Select /> renders the OpenByDefault story 1`] = `
   <button
     aria-controls="headlessui-listbox-options-51"
     aria-expanded="true"
-    aria-haspopup="listbox"
+    aria-haspopup="true"
     class="select-button"
     data-headlessui-state="open"
     id="headlessui-listbox-button-50"
diff --git a/yarn.lock b/yarn.lock
index 519e1de51..afac432d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2002,7 +2002,7 @@ __metadata:
     "@commitlint/config-conventional": ^16.2.4
     "@commitlint/prompt-cli": ^16.3.0
     "@geometricpanda/storybook-addon-badges": ^0.2.2
-    "@headlessui/react": ^1.7.7
+    "@headlessui/react": 1.7.5
     "@popperjs/core": ^2.11.6
     "@size-limit/preset-small-lib": ^4.12.0
     "@storybook/addon-a11y": ^6.5.14
@@ -2534,15 +2534,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@headlessui/react@npm:^1.7.7":
-  version: 1.7.7
-  resolution: "@headlessui/react@npm:1.7.7"
+"@headlessui/react@npm:1.7.5":
+  version: 1.7.5
+  resolution: "@headlessui/react@npm:1.7.5"
   dependencies:
     client-only: ^0.0.1
   peerDependencies:
     react: ^16 || ^17 || ^18
     react-dom: ^16 || ^17 || ^18
-  checksum: 049d7ee46056fe96067f7b2f4f962672dfc824e68044ae38561a457278c8e38c0fd17592ab648ba5648e7e82bef9890eddbf329c9a00d11acf85700c7072a0bf
+  checksum: 0658251a38a23cb6e41bc4edb15184fa8a5470f57f8c9d948a1aa5ce4da5b1d6ec24ac488ce5d5dbf0ed49c0ad1f147a03db4d6661262eb60a1eed299527a0f0
   languageName: node
   linkType: hard