gatsby-matrix-theme 28.0.15 → 28.0.17

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [28.0.17](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v28.0.16...v28.0.17) (2023-08-14)
+
+
+### Bug Fixes
+
+* cookie consent ([3cd2358](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/3cd235838d89ab65a117baca8f769c495c489a02))
+* cookie consent ([44dd78f](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/44dd78f13f1c607a07fbcafda243dee9976688d6))
+* update core version ([336cc4b](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/336cc4b0e4e59f1769ce5cce110d5a2a6413c633))
+
+## [28.0.16](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v28.0.15...v28.0.16) (2023-08-09)
+
+
+### Bug Fixes
+
+* some cookie style for site ([f601354](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/f6013546ce38592d842a9e610531faf33945ea83))
+
 ## [28.0.15](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v28.0.14...v28.0.15) (2023-08-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "28.0.15",
+  "version": "28.0.17",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "gatsby": "^5.11.0",
-    "gatsby-core-theme": "25.0.13",
+    "gatsby-core-theme": "25.0.14",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-plugin-sitemap": "^3.3.0",
     "gatsby-transformer-sharp": "^5.11.0",

package/src/gatsby-core-theme/components/organisms/cookie-consent/cookie-consent.module.scss

@@ -65,7 +65,8 @@
           border: var(--cookie-consent-first-button-border, 2px solid #262629);
 
           &:hover {
-            background: none;
+            background: var(--cookie-consent-first-button-bg, white) !important;
+            background-color: var(--cookie-consent-first-button-bg, white) !important;
           }
         }
 

package/src/gatsby-core-theme/components/organisms/cookie-consent/index.js

@@ -18,6 +18,7 @@ const CookieConsent = ({
   showOnScroll = true,
   settingsCookie,
   isPageHomepage,
+  type,
   cookieImage = '../../../images/cookie.png',
   children,
   cookieName = 'CookieConsent',
@@ -51,7 +52,7 @@ const CookieConsent = ({
       {!cookieAccepted && (
         <Sticky
           showOnScroll={showOnScroll}
-          className={styles?.cookieConsent || ''}
+          className={`${styles?.cookieConsent || ''} ${type === 'operator' && styles.bottom}`}
           position={location}
         >
           <>
@@ -106,6 +107,7 @@ CookieConsent.propTypes = {
   acceptText: PropTypes.string,
   settingsCookie: PropTypes.bool,
   location: PropTypes.oneOf(['bottom', 'top']),
+  type: PropTypes.string,
   cookieName: PropTypes.string,
   showOnScroll: PropTypes.bool,
   isPageHomepage: PropTypes.bool,

package/src/gatsby-core-theme/components/pages/body/index.js

@@ -10,7 +10,6 @@ import ScrollToTop from 'gatsby-core-theme/src/components/atoms/scroll-to-top';
 import Main from 'gatsby-core-theme/src/components/molecules/main';
 import Header from 'gatsby-core-theme/src/components/molecules/header';
 import Footer from '../../molecules/footer';
-import { getCookie } from '~helpers/cookies';
 import LinkMenu from '../../../../components/atoms/link-menu';
 
 function Body({ pageContext, children, excludeTemplateInPopup = [], hideOperatorBanner = false }) {
@@ -48,8 +47,6 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], hideOperator
   const isHomePage = pageContext?.page && pageContext?.page.path === '/';
   const pageType = pageContext.page.relation_type;
   const is404 = pageContext.page.path.includes('404');
-  const cookieConsentAccepted =
-    (typeof window !== 'undefined' && Boolean(getCookie('CookieConsent'))) || false;
 
   const excOperator = navigation?.modules.find((module) => module.name === 'bonus');
   const Popup = pageContext?.marketSections?.popup
@@ -92,9 +89,7 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], hideOperator
   const isPageHomepage =
     getAllMarketsHomepage()?.includes(pageContext?.page?.path) || pageContext?.page?.path === '/';
 
-  const modalProvider = !cookieConsentAccepted || isPageHomepage;
-
-  const Cookie = modalProvider ? loadable(() => import('../../organisms/cookie-consent')) : null;
+  const Cookie = loadable(() => import('../../organisms/cookie-consent'));
 
   return (
     <>
@@ -180,8 +175,6 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], hideOperator
           template={template}
           settingsCookie
           isPageHomepage={isPageHomepage}
-          modalProvider={modalProvider}
-          cookieConsentAccepted={cookieConsentAccepted}
         >
           <p>
             We use cookies in order to optimise our site and improve your experience with us. By