@worksafevictoria/wcl7.5 1.2.2 → 1.4.0

package/src/components/SubComponents/CtaButton/index.vue

@@ -75,77 +75,77 @@ export default {
   components: {
     arrowRight,
     arrowLeft,
-    icon
+    icon,
   },
   props: {
     type: {
       type: String,
       default: 'default',
       validator: (value) =>
-        ['default', 'white', 'gray', 'workwell', 'dark'].indexOf(value) >= 0
+        ['default', 'white', 'gray', 'workwell', 'dark'].indexOf(value) >= 0,
     },
     url: {
       type: String,
       required: false,
-      default: ''
+      default: '',
     },
     alt: {
       type: String,
-      default: ''
+      default: '',
     },
     rtl: {
       type: Boolean,
-      default: false
+      default: false,
     },
     glyph: {
       type: [Object, String],
       required: false,
-      default: () => null
+      default: () => null,
     },
     glyphHeight: {
       type: Number,
       required: false,
-      default: 15
+      default: 15,
     },
     glyphWidth: {
       type: Number,
       required: false,
-      default: 25
+      default: 25,
     },
     workwell: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isCentred: {
       type: Boolean,
-      default: false
+      default: false,
     },
     textOnly: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isFluid: {
       type: Boolean,
-      default: true
+      default: true,
     },
     stretch: {
       type: Boolean,
-      default: false
+      default: false,
     },
     slim: {
       type: Boolean,
-      default: false
+      default: false,
     },
     focusOutline: {
       type: String,
       default: 'default',
-      validator: (value) => ['default', 'light', 'dark'].indexOf(value) >= 0
-    }
+      validator: (value) => ['default', 'light', 'dark'].indexOf(value) >= 0,
+    },
   },
   data() {
     return {
       arrowRight,
-      arrowLeft
+      arrowLeft,
     }
   },
   computed: {
@@ -188,12 +188,12 @@ export default {
       return this.isCentred
         ? { ['wcl-cta__arrow']: hasArrow }
         : {
-            ['wcl-cta__arrow']: hasArrow
+            ['wcl-cta__arrow']: hasArrow,
           }
     },
     textClass() {
       return this.isCentred ? {} : {}
-    }
+    },
   },
   methods: {
     clicked() {
@@ -201,15 +201,17 @@ export default {
       var attrs
       if (theEl && theEl.length > 0) {
         attrs = {
-          group: this.$store?.state?.page?.content?.title,
+          //group: this.$store?.state?.page?.content?.title,
+          group: this.$pageStore?.content?.title,
           label: theEl[0]?.innerText?.split('\n')[0],
-          data: this.url
+          data: this.url,
         }
       } else {
         attrs = {
-          group: this.$store?.state?.page?.content?.title,
+          //group: this.$store?.state?.page?.content?.title,
+          group: this.$pageStore?.content?.title,
           label: '',
-          data: this.url
+          data: this.url,
         }
       }
       // push event to gtm
@@ -225,8 +227,8 @@ export default {
         this.$router.push(this.url)
       }
       this.$emit('clicked')
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

package/src/components/SubComponents/ResourceGroup/index.vue

@@ -307,7 +307,8 @@ export default {
     },
     async loadMoreCards(init) {
       const attrs = {
-        group: this.$store?.state?.page?.content?.title,
+        group: this.$pageStore?.content?.title,
+        //group: this.$store?.state?.page?.content?.title,
       }
       if (this.$gtm && !init) {
         this.$gtm.push({ event: 'custom.interaction.showmore.click', ...attrs })
@@ -439,8 +440,14 @@ export default {
       // Some custom logic for gov caretaker logic
       if (process.env.CARETAKER && process.env.CARETAKER === 'true') {
         if (!isGovSite(card?.selectedCard?.link)) {
-          this.$store.commit('page/SET_CARETAKER_REF', 'list-group')
-          this.$root.$emit('caretaker-open', card?.selectedCard?.link)
+          // this.$store.commit('page/SET_CARETAKER_REF', 'list-group')
+          // this.$root.$emit('caretaker-open', card?.selectedCard?.link)
+          if (this.$pageStore) {
+            this.$pageStore.caretaker.referrer = 'list-group'
+          }
+          if (this.$bus) {
+            this.$bus.$emit('caretaker-open', card?.selectedCard?.link)
+          }
         } else {
           navigateToPath.call(
             this,
@@ -493,7 +500,9 @@ export default {
           nextTabbedCard[0].focus()
         } else {
           let nextFocus = this.focusNextElement()
-          this.$root.$emit('last-focus-out')
+          if (this.$bus) {
+            this.$bus.$emit('last-focus-out')
+          }
           nextFocus.focus()
         }
       } else {

package/src/includes/scss/mixins/src/grid.scss

@@ -7,14 +7,16 @@ $grid-breakpoints: (
   sm: 576px,
   md: 768px,
   lg: 992px,
-  xl: 1200px
+  xl: 1200px,
+  xxl: 1400px
 );
 
 $container-max-widths: (
   sm: 540px,
   md: 720px,
   lg: 960px,
-  xl: 1140px
+  xl: 1140px,
+  xxl: 1320px
 );
 
 // Minimum breakpoint width. Null for the smallest (first) breakpoint.