gatsby-matrix-theme 37.0.40 → 37.0.42

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [37.0.42](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v37.0.41...v37.0.42) (2023-12-27)
+
+
+### Bug Fixes
+
+* add buttin style ([f8c3608](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/f8c3608597975fb6d100f071c7d9aa88c16214af))
+* add style ([501e2df](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/501e2dfb87cd3ed90d1547f8103c957a35280aad))
+* fix the result logic ([0e2fa6c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/0e2fa6cf6e87ec2cddcea13851a548d51c8b7413))
+* make style ([82933bb](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/82933bb9a645fb79993c075dbc16541739166d5e))
+* update matrix theme ([a57d925](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/a57d925c21962ac471f1caffeaffd6de59f9c63d))
+* update srettings newsletter constant ([143d117](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/143d1173f4e8a846c31b593e0931cff847b1f296))
+
+
+* Merge branch 'horse-calculator' into 'master' ([68ab90d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/68ab90d2a4d77193776038aaf1bcc8b9fd59711c))
+* Merge branch 'tm-3901-404-page' into 'master' ([0b17a1b](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/0b17a1b33e7ac15f91bec759bfcaefb1cecaa474))
+
+## [37.0.41](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v37.0.40...v37.0.41) (2023-12-26)
+
+
+### Bug Fixes
+
+* jest ([19e145e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/19e145e1544b72414fd29ac100fbc345c8f62813))
+* tooltip scrolling fix ([3d171e5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/3d171e51c9b2557eea755cb1ddd4deff76e7011a))
+* update to latest core theme ([1d0f786](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/1d0f7869fb703e1d018fa68aa770623017ab43b3))
+
+
+* Merge branch 'tooltip-scrolling-fix' into 'master' ([c362f78](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/c362f7870b5053acf8dfdaa32961116a6b8f7c73))
+
 ## [37.0.40](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v37.0.39...v37.0.40) (2023-12-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "37.0.40",
+  "version": "37.0.42",
   "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": "30.0.37",
+    "gatsby-core-theme": "30.0.39",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-plugin-sitemap": "^3.3.0",
     "gatsby-transformer-sharp": "^5.11.0",

package/src/components/atoms/tooltip/index.js

@@ -40,14 +40,16 @@ const Tooltip = ({ content, delay = 0, children, direction, minWidth = 10 }) =>
   };
 
   return (
+    // eslint-disable-next-line jsx-a11y/interactive-supports-focus, jsx-a11y/click-events-have-key-events
     <div
       className={styles?.wrapper || ''}
       onMouseEnter={showTip}
       onMouseLeave={hideTip}
-      onTouchStart={(e) => {
+      onClick={(e) => {
         getPositionClass(e.target, styles);
         showTip();
       }}
+      role="button"
     >
       {children}
       {active && (
@@ -57,7 +59,7 @@ const Tooltip = ({ content, delay = 0, children, direction, minWidth = 10 }) =>
             styles[direction] ? styles[direction] || '' : styles.top || ''
           }`}
         >
-          {content}
+          <span>{content}</span>
         </div>
       )}
     </div>

package/src/components/atoms/tooltip/tooltip.test.js

@@ -30,7 +30,7 @@ describe('Tooltip Component', () => {
     expect(container).toBeTruthy();
     expect(getByText('Test Children')).toBeTruthy();
 
-    fireEvent.touchStart(screen.getByText('Test Children'));
+    fireEvent.click(screen.getByText('Test Children'));
     await waitFor(() => screen.getByText('test content'));
   });
   test('render tooltip with different direction', async () => {
@@ -42,7 +42,7 @@ describe('Tooltip Component', () => {
     expect(container).toBeTruthy();
     expect(getByText('Test Children')).toBeTruthy();
 
-    fireEvent.touchStart(screen.getByText('Test Children'));
+    fireEvent.click(screen.getByText('Test Children'));
     await waitFor(() => {
       screen.getByText('test content');
       expect(container.querySelector('.tooltip')).toBeTruthy();

package/src/components/molecules/horse-calculator/horse-calculator.module.scss

@@ -1,5 +1,5 @@
 .innerContainer {
-  background: var(--horse-calc-background-color);
+  background: var(--horse-calc-background-color, #fff);
   border-radius: var(--horse-calc-border-radius, 1.6rem);
   border: 1px solid var(--horse-calc-border-color, transparent);
   padding: 3.7rem 1rem;
@@ -20,7 +20,7 @@
     gap: 2rem;
 
     table {
-      width: 100%;
+      width: 100% !important;
       background-color: var(--horse-calc-totals-table-background, #fff);
 
       th,
@@ -44,6 +44,61 @@
     }
   }
 }
+.cells{
+  @include flex-direction(row);
+  @include flex-align(center, space-between);
+  @include min(tablet){
+    @include flex-direction(column);
+    @include flex-align(start, start);
+    width: 100%;
+    >div{
+      width: 100%;
+    }
+  }
+  &:before{
+    color: #39394f;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 24px;
+    @include min(tablet){
+      font-size: 1.4rem;
+    }
+  }
+  select, label{
+    max-width: 13.2rem;
+    @include min(tablet){
+      max-width: 100%;
+      width: 100%;
+    }
+  }
+}
+
+.outComing{
+  &:before{
+    content: 'Outcome:';
+  }
+}
+
+.odds{
+  &:before{
+    content: 'Odds:';
+  }
+}
+.placeOdds{
+  &:before{
+    content: 'Place Odds:';
+  }
+}
+.ruleFour{
+  select{
+    min-width: 13.2rem;
+  }
+  &:before{
+    content: 'Rule Four:';
+  }
+}
+
 .placeOdds {
   width: 100%;
   @include flex-direction(row);
@@ -189,7 +244,7 @@
 
   select{
     width: 100%;
-  
+    min-width: 13.2rem;
   }
   label {
     flex-basis: 100% !important;
@@ -396,7 +451,6 @@
 
       td {
         text-align: start;
-        border-bottom: 1px solid #eae5e0;
         padding: 1rem;
         @include min(tablet) {
           flex: 1;
@@ -570,3 +624,4 @@
     }
   }
 }
+

package/src/components/molecules/horse-calculator/index.js

@@ -374,9 +374,9 @@ const HorseCalculator = () => {
                       ref={(el) => (outcomesTableRefs.current[index] = el)}
                     >
                       {addNotes === 'No' && <td>{index + 1}</td>}
-                      <td>
+                      <td className={`${styles.outComing} ${styles.cells}`}>
                         <Select
-                          label="Outcome:"
+                          // label="Outcome:"
                           id={`outcome-${index}`}
                           onChangeFunc={handleOutcomeSelection}
                           options={outcomeOptions.map((option) => (
@@ -386,16 +386,13 @@ const HorseCalculator = () => {
                         />
                       </td>
                       <td
-                        className={`${
+                        className={`${styles.cells} ${styles.odds}${
                           outcomeSelection[index] === 'lost' || outcomeSelection[index] === 'void'
                             ? styles.displayNone || ''
                             : ''
                         }`}
                       >
                         <label>
-                          {!(
-                            outcomeSelection[index] === 'lost' || outcomeSelection[index] === 'void'
-                          ) && <div>Odds:</div>}
                           <input
                             onChange={calculateTotalBet}
                             className={
@@ -410,8 +407,7 @@ const HorseCalculator = () => {
                         </label>
                       </td>
                       {eachWay === 'Yes' && (
-                        <td className={styles?.placeOdds}>
-                          <label>Place odds</label>
+                        <td className={`${styles?.placeOdds} ${styles.cells} ${styles.placeOdds}`}>
                           <Select
                             id="place_odds"
                             onChangeFunc={calculateTotalBet}
@@ -422,9 +418,8 @@ const HorseCalculator = () => {
                         </td>
                       )}
                       {ruleFour === 'Yes' && (
-                        <td>
+                        <td className={`${styles.cells} ${styles.ruleFour}`}>
                           <Select
-                            label="Rule Four"
                             id="rule_four"
                             onChangeFunc={calculateTotalBet}
                             options={ruleFourOptions.map((option) => (

package/src/components/organisms/cards/template-two/buttons/buttons.module.scss

@@ -1,8 +1,8 @@
 .buttLeft,
 .buttRight {
   position: absolute;
-  left: 3.8rem;
-  bottom: 4rem;
+  top: 1rem;
+  right: 1rem;
   width: 4rem;
   height: 4rem;
   border-radius: 100px;

package/src/constants/settings/newsletter.js

@@ -14,4 +14,7 @@ export default {
   'xn--nt-casino-v2a.se': {
     filter_pages: ['page', 'operator', 'game', 'article', 'payment_method', 'software_provider'],
   },
+  'betamericalatina.com': {
+    filter_pages: ['*'],
+  },
 };

package/src/helpers/horse-racing-calculator/index.js

@@ -10,7 +10,7 @@ const getOutcomeRow = (row, addNotes, applyEachWay, applyRuleFour) => {
   let ruleFour = null;
   if (row.children.length > 2) {
     if (applyEachWay === 'Yes') {
-      placeOdds = row.children[addNotes ? 2 : 3].children[1].children[0].value;
+      placeOdds = row.children[addNotes ? 2 : 3].children[0].children[0].value;
     }
 
     if (applyRuleFour && applyEachWay === 'Yes') {
@@ -25,9 +25,10 @@ const getOutcomeRow = (row, addNotes, applyEachWay, applyRuleFour) => {
 };
 
 const getDeadHeatRow = (row) => {
-  const tiedPosition = row.children[1].children[0].children[0].children[0].children[0].value;
-  const deadHeatsrunners = row.children[1].children[0].children[1].children[0].children[0].value;
-  const placesOffered = row.children[1].children[0].children[2].children[0].children[0].value;
+  const tiedPosition = row.children[1]?.children[0]?.children[0]?.children[1]?.children[0]?.value;
+  const deadHeatsrunners =
+    row.children[1]?.children[0]?.children[1]?.children[1]?.children[0]?.value;
+  const placesOffered = row.children[1]?.children[0]?.children[2]?.children[1]?.children[0]?.value;
 
   return [tiedPosition, deadHeatsrunners, placesOffered];
 };