From 78b1f08abc201720f3432a5fee8ef42e90a22877 Mon Sep 17 00:00:00 2001 From: Paul Dempsey <76729591+paul-daniel-dempsey@users.noreply.github.com> Date: Tue, 18 Feb 2025 17:41:24 +0000 Subject: [PATCH 1/4] feat: fix for patch --- support-frontend/assets/components/tooltip/Tooltip.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/support-frontend/assets/components/tooltip/Tooltip.tsx b/support-frontend/assets/components/tooltip/Tooltip.tsx index bbaff00e09..2f609e5db9 100644 --- a/support-frontend/assets/components/tooltip/Tooltip.tsx +++ b/support-frontend/assets/components/tooltip/Tooltip.tsx @@ -210,6 +210,8 @@ export default function Tooltip({ shift(), ], }); + const xShift = x ?? 0; + const yShift = y ?? 0; // Event listeners to change the open state const click = useClick(context, { toggle: false }); @@ -247,8 +249,8 @@ export default function Tooltip({ style={{ // Positioning styles position: strategy, - top: y ?? 0, - left: x ?? 0, + top: yShift, + left: xShift, }} {...getFloatingProps()} > From 5c7026677775369423986d8c76272b543f9ec68a Mon Sep 17 00:00:00 2001 From: Paul Dempsey <76729591+paul-daniel-dempsey@users.noreply.github.com> Date: Tue, 18 Feb 2025 17:49:19 +0000 Subject: [PATCH 2/4] feat: patch updates --- support-frontend/package.json | 2 +- support-frontend/yarn.lock | 65 ++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/support-frontend/package.json b/support-frontend/package.json index 50fcc3b95e..af005deae5 100644 --- a/support-frontend/package.json +++ b/support-frontend/package.json @@ -81,7 +81,7 @@ "dependencies": { "@emotion/react": "^11.11.1", "@emotion/utils": "^1.1.0", - "@floating-ui/react": "^0.19.2", + "@floating-ui/react": "^0.27.4", "@guardian/libs": "^19.1.0", "@guardian/pasteup": "1.0.0-alpha.7", "@guardian/source": "8.0.0", diff --git a/support-frontend/yarn.lock b/support-frontend/yarn.lock index 4cbc7777dd..30e891f11b 100644 --- a/support-frontend/yarn.lock +++ b/support-frontend/yarn.lock @@ -1756,33 +1756,41 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== -"@floating-ui/core@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.1.tgz#074182a1d277f94569c50a6b456e62585d463c8e" - integrity sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg== +"@floating-ui/core@^1.6.0": + version "1.6.9" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.9.tgz#64d1da251433019dafa091de9b2886ff35ec14e6" + integrity sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw== + dependencies: + "@floating-ui/utils" "^0.2.9" -"@floating-ui/dom@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.1.tgz#8f93906e1a3b9f606ce78afb058e874344dcbe07" - integrity sha512-Rt45SmRiV8eU+xXSB9t0uMYiQ/ZWGE/jumse2o3i5RGlyvcbqOF4q+1qBnzLE2kZ5JGhq0iMkcGXUKbFe7MpTA== +"@floating-ui/dom@^1.0.0": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.13.tgz#a8a938532aea27a95121ec16e667a7cbe8c59e34" + integrity sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w== dependencies: - "@floating-ui/core" "^1.2.1" + "@floating-ui/core" "^1.6.0" + "@floating-ui/utils" "^0.2.9" -"@floating-ui/react-dom@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-1.3.0.tgz#4d35d416eb19811c2b0e9271100a6aa18c1579b3" - integrity sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g== +"@floating-ui/react-dom@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.2.tgz#a1349bbf6a0e5cb5ded55d023766f20a4d439a31" + integrity sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A== dependencies: - "@floating-ui/dom" "^1.2.1" + "@floating-ui/dom" "^1.0.0" -"@floating-ui/react@^0.19.2": - version "0.19.2" - resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.19.2.tgz#c6e4d2097ed0dca665a7c042ddf9cdecc95e9412" - integrity sha512-JyNk4A0Ezirq8FlXECvRtQOX/iBe5Ize0W/pLkrZjfHW9GUV7Xnq6zm6fyZuQzaHHqEnVizmvlA96e1/CkZv+w== +"@floating-ui/react@^0.27.4": + version "0.27.4" + resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.27.4.tgz#283ceaa8539282d6b8e6a84ac0400c111bee1e7a" + integrity sha512-05mXdkUiVh8NCEcYKQ2C9SV9IkZ9k/dFtYmaEIN2riLv80UHoXylgBM76cgPJYfLJM3dJz7UE5MOVH0FypMd2Q== dependencies: - "@floating-ui/react-dom" "^1.3.0" - aria-hidden "^1.1.3" - tabbable "^6.0.1" + "@floating-ui/react-dom" "^2.1.2" + "@floating-ui/utils" "^0.2.9" + tabbable "^6.0.0" + +"@floating-ui/utils@^0.2.9": + version "0.2.9" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.9.tgz#50dea3616bc8191fb8e112283b49eaff03e78429" + integrity sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg== "@guardian/browserslist-config@^6.1.2": version "6.1.2" @@ -3838,13 +3846,6 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -aria-hidden@^1.1.3: - version "1.2.2" - resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.2.tgz#8c4f7cc88d73ca42114106fdf6f47e68d31475b8" - integrity sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA== - dependencies: - tslib "^2.0.0" - aria-query@5.3.0, aria-query@^5.0.0: version "5.3.0" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e" @@ -10866,10 +10867,10 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -tabbable@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.0.1.tgz#427a09b13c83ae41eed3e88abb76a4af28bde1a6" - integrity sha512-SYJSIgeyXW7EuX1ytdneO5e8jip42oHWg9xl/o3oTYhmXusZVgiA+VlPvjIN+kHii9v90AmzTZEBcsEvuAY+TA== +tabbable@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97" + integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew== tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: version "2.2.1" From 2d4c0ae61792919600d13932c09f99fef7287587 Mon Sep 17 00:00:00 2001 From: Paul Dempsey <76729591+paul-daniel-dempsey@users.noreply.github.com> Date: Tue, 18 Feb 2025 17:53:29 +0000 Subject: [PATCH 3/4] feat: alternative lint --- support-frontend/assets/components/tooltip/Tooltip.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support-frontend/assets/components/tooltip/Tooltip.tsx b/support-frontend/assets/components/tooltip/Tooltip.tsx index 2f609e5db9..75201978c8 100644 --- a/support-frontend/assets/components/tooltip/Tooltip.tsx +++ b/support-frontend/assets/components/tooltip/Tooltip.tsx @@ -210,8 +210,8 @@ export default function Tooltip({ shift(), ], }); - const xShift = x ?? 0; - const yShift = y ?? 0; + const xShift = x ? x : 0; + const yShift = y ? y : 0; // Event listeners to change the open state const click = useClick(context, { toggle: false }); From bb918f8b7b6e9a4467532adfc983cf51a13baff4 Mon Sep 17 00:00:00 2001 From: Paul Dempsey <76729591+paul-daniel-dempsey@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:10:20 +0000 Subject: [PATCH 4/4] feat: first lint amend for null check --- support-frontend/assets/components/tooltip/Tooltip.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/support-frontend/assets/components/tooltip/Tooltip.tsx b/support-frontend/assets/components/tooltip/Tooltip.tsx index 75201978c8..c10b46d07d 100644 --- a/support-frontend/assets/components/tooltip/Tooltip.tsx +++ b/support-frontend/assets/components/tooltip/Tooltip.tsx @@ -210,8 +210,6 @@ export default function Tooltip({ shift(), ], }); - const xShift = x ? x : 0; - const yShift = y ? y : 0; // Event listeners to change the open state const click = useClick(context, { toggle: false }); @@ -249,8 +247,8 @@ export default function Tooltip({ style={{ // Positioning styles position: strategy, - top: yShift, - left: xShift, + top: y ? y : 0, + left: x ? x : 0, }} {...getFloatingProps()} >