gatsby-core-theme 33.0.0 → 33.0.2

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [33.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.0.1...v33.0.2) (2024-06-19)
+
+
+### Bug Fixes
+
+* update is disabled button ([91a0052](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/91a0052e25616642c1b21c61104d4c1ca6e18e2c))
+* update styling of logo and search icon when on responsible gambling page template ([bb20215](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/bb20215cc7576ad37617bdaadc914e4f02f8d48f))
+* update tests for navigation ([e5d7fcb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e5d7fcbd1b368df50cdb32392c0d1baf8743b7ac))
+
+
+* Merge branch 'tm-4293-improvements-rg-template' into 'master' ([93c29e4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/93c29e4fde5faa137c92db8096ba334c75edd4e0))
+
+## [33.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.0.0...v33.0.1) (2024-06-13)
+
+
+### Bug Fixes
+
+* get the name from market first ([5f23499](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5f23499dda83e26cd536005b557e975e7e09a1e2))
+
 # [33.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v32.0.6...v33.0.0) (2024-06-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "33.0.0",
+  "version": "33.0.2",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/molecules/bonus/template-one/index.js

@@ -51,7 +51,7 @@ export default function Bonus({
               width={width}
             />
             <div className={styles.details}>
-              {name && <span>{name}</span>}
+              {(bonus?.operator_name || name) && <span>{bonus?.operator_name || name}</span>}
               {(operator?.rating || bonus?.rating) && (
                 <Rating
                   rating={operator.rating || bonus?.rating}

package/src/components/molecules/bonus/template-two/index.js

@@ -72,7 +72,7 @@ export default function TemplateOne({
               width={width}
             />
             <div className={styles.details}>
-              {name && <span>{name}</span>}
+              {(bonus?.operator_name || name) && <span>{bonus?.operator_name || name}</span>}
               {(operator?.rating || bonus?.rating) && (
                 <Rating
                   rating={operator?.rating || bonus?.rating}

package/src/components/organisms/navigation/index.js

@@ -30,6 +30,7 @@ const Navigation = ({
   children,
   customStyles,
   hasCustomComponent = false,
+  isRGpage,
 }) => {
   const navRef = useRef(React.createRef());
   const showMenu = template !== 'ppc';
@@ -74,7 +75,7 @@ const Navigation = ({
     >
       <nav className={styles.nav || ''} ref={navRef}>
         <NavigationProvider>
-          {showMenu ? (
+          {showMenu && !isRGpage ? (
             <Link
               className={`${styles.logo || ''} main-menu-gtm logo-cta`}
               aria-label="Nav Logo"
@@ -84,7 +85,7 @@ const Navigation = ({
               {logoImg}
             </Link>
           ) : (
-            logoImg
+            <div className={`${styles.logo || ''}`}>{logoImg}</div>
           )}
           {showMenu && (
             <>
@@ -106,6 +107,7 @@ const Navigation = ({
                   pageContext={pageContext}
                   searchURLPageName={searchURLPageName}
                   marketPrefix={activeMarket?.path_prefix || '/'}
+                  isDisabled={isRGpage}
                 />
               )}
               {hasCustomComponent && (
@@ -154,6 +156,7 @@ Navigation.propTypes = {
   children: PropTypes.node,
   customStyles: PropTypes.shape({}),
   hasCustomComponent: PropTypes.bool,
+  isRGpage: PropTypes.bool,
 };
 
 export default Navigation;

package/src/components/organisms/navigation/navigation.module.scss

@@ -47,6 +47,7 @@
 .logo {
   justify-content: flex-start;
   width: 16.4rem;
+  order: 2;
 }
 
 .search {

package/src/components/organisms/navigation/navigation.test.js

@@ -23,7 +23,7 @@ describe('Navigation Component', () => {
 
     await waitFor(() => {
       expect(container.querySelectorAll('.nav')).toBeTruthy();
-      expect(container.querySelectorAll('.logo')).toHaveLength(0);
+      expect(container.querySelectorAll('.logo')).toHaveLength(1);
       expect(container.querySelectorAll('.menuContainer')).toHaveLength(0);
       expect(container.querySelectorAll('.search')).toHaveLength(0);
     });

package/src/components/organisms/search/index.js

@@ -17,6 +17,7 @@ const SearchForm = ({
   iconHeight = 24,
   placeholder = null,
   marketPrefix = '/',
+  isDisabled,
 }) => {
   const [localSearch, setLocalSearch] = useState(false);
   const [searchBoxQuery, setSearchBoxQuery] = useState();
@@ -59,6 +60,7 @@ const SearchForm = ({
         className={`${styles.searchButton || ''} ${
           localSearch && (styles.active || '')
         } search-gtm btn-cta`}
+        disabled={isDisabled}
       >
         {searchIcon === null ? (
           <FaSearch title="Search Icon" />
@@ -106,6 +108,7 @@ SearchForm.propTypes = {
   pageContext: PropTypes.shape({}),
   placeholder: PropTypes.string,
   marketPrefix: PropTypes.string,
+  isDisabled: PropTypes.bool,
 };
 
 export default SearchForm;

package/src/components/organisms/search/search.module.scss

@@ -59,4 +59,12 @@
       font-size: 3rem;
     }
   }
+}
+
+.searchButton {
+  &:disabled {
+    background: transparent;
+    border: none;
+    cursor: not-allowed
+  }
 }

package/src/components/pages/body/index.js

@@ -41,6 +41,7 @@ function Body({ pageContext, children, serverData }) {
           mobileAnimation="collapseFull"
           stopScrollOnOpen
           canOpenAllSubMenus
+          isRGpage={isRGpage}
         />
       )}
       {!is404 && <Header serverData={serverData} section={pageContext} />}