[C] replace react-uid

lsst-epo · May 21, 2024 · 1a7dca9 · 1a7dca9
1 parent e411789
commit 1a7dca9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 32 deletions.
diff --git a/components/atomic/Tile/index.js b/components/atomic/Tile/index.js
@@ -1,5 +1,5 @@
 import PropTypes from "prop-types";
-import { useUID } from "react-uid";
+import { useId } from "react";
 import classNames from "classnames";
 import {
   ResponsiveImage,
@@ -25,7 +25,7 @@ const Tile = ({
   type = "related",
   showSharePopup,
 }) => {
-  const uid = useUID();
+  const uid = useId();
   const { siteInfo } = useGlobalData();
   const finalImage =
     type === "jobs" ? image : image || siteInfo?.siteImage?.[0];

diff --git a/components/atomic/Tile/patterns/InvestigationTile/index.js b/components/atomic/Tile/patterns/InvestigationTile/index.js
@@ -1,12 +1,12 @@
+import { useId } from "react";
 import PropTypes from "prop-types";
-import { useUID } from "react-uid";
 import { Image } from "@rubin-epo/epo-react-lib";
 import * as Styled from "./styles";
 import { useTranslation } from "react-i18next";
 import { imageShaper } from "@/lib/utils";
 
 const InvestigationTile = ({ investigation, useExternalLink }) => {
-  const uid = useUID();
+  const uid = useId();
 
   const { t } = useTranslation();
   const { cantoAssetSingle, status, title, externalUrl, landingPage } =

diff --git a/components/atomic/Tile/patterns/SlideTile/index.js b/components/atomic/Tile/patterns/SlideTile/index.js
@@ -1,5 +1,5 @@
 import PropTypes from "prop-types";
-import { useUID } from "react-uid";
+import { useId } from "react";
 import classNames from "classnames";
 import {
   ResponsiveImage,
@@ -22,7 +22,7 @@ const SlideTile = ({
   titleTag = "h3",
   type = "related",
 }) => {
-  const uid = useUID();
+  const uid = useId();
   const { siteInfo } = useGlobalData();
   const finalImage =
     type === "jobs" ? image : image || siteInfo?.siteImage?.[0];

diff --git a/package.json b/package.json
@@ -85,7 +85,6 @@
     "react-is": "^18.2.0",
     "react-player": "^2.12.0",
     "react-popper": "^2.3.0",
-    "react-uid": "^2.3.2",
     "striptags": "^3.2.0",
     "styled-components": "5.3.11",
     "swr": "^1.3.0",

diff --git a/pages/_app.js b/pages/_app.js
@@ -3,7 +3,6 @@
 import PropTypes from "prop-types";
 import "@/lib/i18n";
 import "focus-visible";
-import { UIDReset } from "react-uid";
 import Script from "next/script";
 import { AuthenticationContextProvider } from "@/contexts/Authentication";
 import useAuthentication from "@/hooks/useAuthentication";
@@ -23,23 +22,22 @@ function Client({ Component, pageProps }) {
   });
 
   return (
-    <UIDReset>
-      <AuthenticationContextProvider data={authData}>
-        {PLAUSIBLE_DOMAIN && (
+    <AuthenticationContextProvider data={authData}>
+      {PLAUSIBLE_DOMAIN && (
+        <Script
+          id="plausible-script"
+          data-domain={PLAUSIBLE_DOMAIN}
+          src="https://plausible.io/js/plausible.js"
+          strategy="afterInteractive"
+        />
+      )}
+      {SURVEY_SPARROW && (
+        <>
+          <div id="ss_survey_widget"></div>
           <Script
-            id="plausible-script"
-            data-domain={PLAUSIBLE_DOMAIN}
-            src="https://plausible.io/js/plausible.js"
-            strategy="afterInteractive"
-          />
-        )}
-        {SURVEY_SPARROW && (
-          <>
-            <div id="ss_survey_widget"></div>
-            <Script
-              id="SS_SCRIPT"
-              dangerouslySetInnerHTML={{
-                __html: `
+            id="SS_SCRIPT"
+            dangerouslySetInnerHTML={{
+              __html: `
               function sparrowLaunch(opts) {
                 // eslint-disable-next-line no-var, one-var
                 var e = "ss-widget",
@@ -89,14 +87,13 @@ function Client({ Component, pageProps }) {
               }
               sparrowLaunch({sparrowLang: "${lang}"});
             `,
-              }}
-            />
-          </>
-        )}
-        <GlobalStyles />
-        <Component {...pageProps} />
-      </AuthenticationContextProvider>
-    </UIDReset>
+            }}
+          />
+        </>
+      )}
+      <GlobalStyles />
+      <Component {...pageProps} />
+    </AuthenticationContextProvider>
   );
 }