qpp-style 9.34.3-beta.0 → 9.34.3

package/components/Header/HeaderContainer.jsx

@@ -64,14 +64,13 @@ HeaderContainer.propTypes = {
   showCancelButton: PropTypes.bool,
   skipToContentId: PropTypes.string,
   isIESupportPage: PropTypes.bool,
-  isDevPre: PropTypes.bool,
+  isDevPre: PropTypes.object,
 };
 HeaderContainer.defaultProps = {
   includeSkipToSidebar: false,
   showCancelButton: false,
   skipToContentId: null,
   isIESupportPage: false,
-  isDevPre: false,
 };
 
 export default HeaderContainer;

package/components/Header/HeaderLogo.jsx

@@ -5,7 +5,19 @@ import { useHeaderState } from "./hooks";
 
 const HeaderLogo = (isDevPre) => {
   const { closeMenus, RouterLink } = useHeaderState();
-  if (RouterLink && !isDevPre) {
+  const showDevPre = isDevPre.isDevPre;
+  if (showDevPre) {
+    return (
+      <div className="header-logo">
+        <img
+          className="qpp-logo"
+          src="/images/qpp_logo_rgb_color.png"
+          alt="QPP logo"
+        />
+      </div>
+    );
+  }
+  if (RouterLink) {
     return (
       <RouterLink
         className="header-logo"
@@ -23,17 +35,7 @@ const HeaderLogo = (isDevPre) => {
       </RouterLink>
     );
   }
-  if (isDevPre) {
-    return (
-      <div className="header-logo">
-        <img
-          className="qpp-logo"
-          src="/images/qpp_logo_rgb_color.png"
-          alt="QPP logo"
-        />
-      </div>
-    );
-  }
+
   return (
     <a
       className="header-logo"
@@ -52,10 +54,7 @@ const HeaderLogo = (isDevPre) => {
 };
 
 HeaderLogo.propTypes = {
-  isDevPre: PropTypes.bool,
-};
-HeaderLogo.defaultProps = {
-  isDevPre: false,
+  isDevPre: PropTypes.object,
 };
 
 export default HeaderLogo;

package/components/SideNav/UI/SideNavUI.jsx

@@ -54,16 +54,9 @@ const SideNavUI = ({
 
   const collapseRef = useRef(null);
 
-  const changeExpandedClass = (currentClass, newClass) => {
-    document
-      .querySelectorAll(`.${currentClass}`)
-      .forEach((e) => e.classList.replace(currentClass, newClass));
-  };
-
   const expand = () => {
     setSideNavExpanded(window.document, "true");
     setIsExpandedState(true);
-    changeExpandedClass("animation-group-exit", "animation-group-enter");
     if (onExpanded) {
       onExpanded();
     }
@@ -72,7 +65,6 @@ const SideNavUI = ({
   const collapse = () => {
     setSideNavExpanded(window.document, "false");
     setIsExpandedState(false);
-    changeExpandedClass("animation-group-enter", "animation-group-exit");
     if (onCollapsed) {
       onCollapsed();
     }
@@ -86,11 +78,6 @@ const SideNavUI = ({
     // some applications use the isExpanded prop instead of reading the cookie
     // this will ensure the application ignores the cookie
     if (isExpandedPropSet) {
-      if (isExpanded) {
-        changeExpandedClass("animation-group-exit", "animation-group-enter");
-      } else {
-        changeExpandedClass("animation-group-enter", "animation-group-exit");
-      }
       setIsExpandedState(isExpanded);
     } else {
       isSideNavExpanded(window.document);
@@ -98,7 +85,7 @@ const SideNavUI = ({
   }, [isExpanded, isExpandedPropSet]);
 
   useEffect(() => {
-    const initialExpandedState = isSideNavExpanded(window.document);
+    isSideNavExpanded(window.document);
     let cancelRequest = false;
     const { origin } = window.location;
     const isRunningLocally = origin.includes("localhost");
@@ -116,24 +103,7 @@ const SideNavUI = ({
         }
       }
       if (!cancelRequest) {
-        const realInitialState = isExpandedPropSet
-          ? isExpanded
-          : initialExpandedState;
-        if (realInitialState) {
-          setSideNavContent(sideNavMenuItems);
-        } else {
-          // TODO: we are replacing the class here because the server does not take into account the
-          // initial expand/collapse state of the sidenav.
-          // Once we have confirmation that everyone has installed this version of QPP-Style we can
-          // remove this if/else block (assuming the server has been updated to read the cookie and
-          // render the appropriate class for each link)
-          setSideNavContent(
-            sideNavMenuItems.replaceAll(
-              "animation-group-enter",
-              "animation-group-exit",
-            ),
-          );
-        }
+        setSideNavContent(sideNavMenuItems);
       }
     }
     getSideNavConfig();