@worksafevictoria/wcl7.5 1.9.0-beta.15 → 1.9.0-beta.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worksafevictoria/wcl7.5",
-  "version": "1.9.0-beta.15",
+  "version": "1.9.0-beta.16",
   "main": "src/index.js",
   "license": "MIT",
   "repository": {

package/src/components/Common/CardGridItem/card-grid-item-caret.vue

@@ -10,7 +10,7 @@
         tabCaretContainerBottom: isTabbedCard,
       }"
     >
-      <div class="tabCaretText" aria-hidden="true">
+      <div class="tabCaretText" tabindex="0">
         {{ supportText }}
       </div>
       <icon :glyph="caretSrc" icon-alt="Show more" width="18" float: right :height="caret

package/src/components/Common/CardGridItem/index.vue

@@ -1,16 +1,22 @@
 <template>
   <div class="card-grid-item">
     <slot v-if="$slots.beforeCard" name="beforeCard"></slot>
-    <b-card
+    <BCard
       :id="cardId"
       no-body
-      :tag="buttonRole === 'radio' ? 'div' : isSelectable ? 'button' : 'article'"
+      :tag="buttonRole === 'radio' ? 'div' : isSelectable ? 'button' : 'div'"
       class="card-grid-item__card"
       :class="cardClass"
       :role="buttonRole"
-      :tabindex="['button', 'radio'].includes(buttonRole) ? 0 : undefined"
+      :tabindex="
+        isSelectable ? 0 : ['button', 'radio'].includes(buttonRole) ? 0 : -1
+      "
       :aria-checked="
-        buttonRole === 'radio' ? (isSelectable && selected ? 'true' : 'false') : undefined
+        buttonRole === 'radio'
+          ? isSelectable && selected
+            ? 'true'
+            : 'false'
+          : undefined
       "
       :aria-expanded="
         buttonRole === 'button' && isExpandable
@@ -30,8 +36,10 @@
         :class="[
           {
             rtl: rtl,
-            [`card-grid-item__control-radio`]: isSelectable && buttonRole === 'radio',
-            [`card-grid-item__selected-radio`]: selected && buttonRole === 'radio',
+            [`card-grid-item__control-radio`]:
+              isSelectable && buttonRole === 'radio',
+            [`card-grid-item__selected-radio`]:
+              selected && buttonRole === 'radio',
           },
         ]"
       >
@@ -54,7 +62,7 @@
         }"
       >
       </card-grid-item-icon>
-      <b-card-body>
+      <BCardBody>
         <div
           class="card-grid-item__caretContainer"
           :class="[
@@ -65,7 +73,7 @@
             },
           ]"
         >
-          <b-card-title
+          <BCardTitle
             v-if="cardHeaderTitle !== null && cardHeaderTitle !== undefined"
             :tag="headerTag"
             class="card-grid-item__header"
@@ -98,8 +106,12 @@
               class="d-inline"
             >
             </card-grid-item-icon>
-          </b-card-title>
-          <card-grid-item-caret v-if="caretPosition === 'top'" :caret="caret" :rtl="rtl">
+          </BCardTitle>
+          <card-grid-item-caret
+            v-if="caretPosition === 'top'"
+            :caret="caret"
+            :rtl="rtl"
+          >
           </card-grid-item-caret>
 
           <card-grid-item-icon
@@ -123,7 +135,7 @@
           </card-grid-item-icon>
           <span v-if="pillText" class="visually-hidden">{{ pillText }}</span>
         </div>
-        <b-card-text
+        <BCardText
           v-if="$slots.cardDescription || description"
           tag="div"
           class="card-grid-item__body"
@@ -162,9 +174,13 @@
               :strip-html="stripDescriptionHtml"
             />
           </div>
-        </b-card-text>
-      </b-card-body>
-      <div v-if="$slots.cardFooter" class="card-grid-item__footer" :class="{ rtl: rtl }">
+        </BCardText>
+      </BCardBody>
+      <div
+        v-if="$slots.cardFooter"
+        class="card-grid-item__footer"
+        :class="{ rtl: rtl }"
+      >
         <slot name="cardFooter"></slot>
       </div>
       <div
@@ -177,21 +193,21 @@
         <card-grid-item-caret :caret="caret" :rtl="rtl" />
         <span class="card-bottom-border"></span>
       </div>
-    </b-card>
+    </BCard>
     <slot v-if="$slots.afterCard" name="afterCard"></slot>
   </div>
 </template>
 
 <script>
-import CardGridItemIcon from "./card-grid-item-icon.vue";
-import CardGridItemCaret from "./card-grid-item-caret.vue";
-import RichText from "../../Paragraphs/RichText/index.vue";
-import { parseISO } from "date-fns";
-import { isAbsoluteUrl, isGovSite } from "../../../../lib/utility";
-import { BCard, BCardBody, BCardTitle, BCardText } from "bootstrap-vue-next";
+import CardGridItemIcon from './card-grid-item-icon.vue'
+import CardGridItemCaret from './card-grid-item-caret.vue'
+import RichText from '../../Paragraphs/RichText/index.vue'
+import { parseISO } from 'date-fns'
+import { isAbsoluteUrl, isGovSite } from '../../../../lib/utility'
+import { BCard, BCardBody, BCardTitle, BCardText } from 'bootstrap-vue-next'
 
 export default {
-  name: "CardGridItem",
+  name: 'CardGridItem',
   components: {
     CardGridItemIcon,
     CardGridItemCaret,
@@ -204,8 +220,9 @@ export default {
   props: {
     backgroundVariant: {
       type: String,
-      default: "white",
-      validator: (value) => ["white", "transparent", "light"].indexOf(value) >= 0,
+      default: 'white',
+      validator: (value) =>
+        ['white', 'transparent', 'light'].indexOf(value) >= 0,
     },
     imageSrc: {
       type: String,
@@ -224,7 +241,7 @@ export default {
     },
     descriptionClass: {
       type: String,
-      default: "",
+      default: '',
     },
     glyphSrc: {
       type: [Object, String],
@@ -236,16 +253,21 @@ export default {
     },
     iconSize: {
       type: String,
-      default: "small",
-      validator: (value) => ["xsmall", "small", "medium", "large"].indexOf(value) >= 0,
+      default: 'small',
+      validator: (value) =>
+        ['xsmall', 'small', 'medium', 'large'].indexOf(value) >= 0,
     },
     iconPosition: {
       type: String,
-      default: "top",
+      default: 'top',
       validator: (value) =>
-        ["top", "top-left", "top-right", "after-title", "before-description"].indexOf(
-          value
-        ) >= 0,
+        [
+          'top',
+          'top-left',
+          'top-right',
+          'after-title',
+          'before-description',
+        ].indexOf(value) >= 0,
     },
     iconIsBordered: {
       type: Boolean,
@@ -260,13 +282,14 @@ export default {
     },
     invertOnSelectBackground: {
       type: String,
-      default: "none",
-      validator: (value) => ["none", "yellow", "black"].indexOf(value) >= 0,
+      default: 'none',
+      validator: (value) => ['none', 'yellow', 'black'].indexOf(value) >= 0,
     },
     borderOnSelectBackground: {
       type: String,
-      default: "none",
-      validator: (value) => ["none", "yellow", "black", "blue"].indexOf(value) >= 0,
+      default: 'none',
+      validator: (value) =>
+        ['none', 'yellow', 'black', 'blue'].indexOf(value) >= 0,
     },
     rtl: {
       type: Boolean,
@@ -274,47 +297,49 @@ export default {
     },
     headerSize: {
       type: String,
-      default: "custom",
+      default: 'custom',
       validator: (value) =>
-        ["medium", "large", "extra-large", "extra-2x-large", "custom"].indexOf(value) >=
-        0,
+        ['medium', 'large', 'extra-large', 'extra-2x-large', 'custom'].indexOf(
+          value,
+        ) >= 0,
     },
     headerTextAlign: {
       type: String,
-      default: "left",
-      validator: (value) => ["left", "center", "right"].indexOf(value) >= 0,
+      default: 'left',
+      validator: (value) => ['left', 'center', 'right'].indexOf(value) >= 0,
     },
     headerTag: {
       type: String,
       required: false,
-      default: "h3",
+      default: 'h3',
     },
     caret: {
       type: String,
       default: undefined,
       validator: (value) =>
-        ["down", "up", "right", "left", "external"].indexOf(value) >= 0,
+        ['down', 'up', 'right', 'left', 'external'].indexOf(value) >= 0,
     },
     caretPosition: {
       type: String,
-      default: "top",
-      validator: (value) => ["top", "bottom", "after-title"].indexOf(value) >= 0,
+      default: 'top',
+      validator: (value) =>
+        ['top', 'bottom', 'after-title'].indexOf(value) >= 0,
     },
     cardPadding: {
       type: String,
-      default: "none",
+      default: 'none',
       validator: (value) =>
-        ["none", "xsmall", "small", "medium", "large"].indexOf(value) >= 0,
+        ['none', 'xsmall', 'small', 'medium', 'large'].indexOf(value) >= 0,
     },
     borderType: {
       type: String,
-      default: "none",
+      default: 'none',
       validator: (value) =>
-        ["none", "thin", "shadow", "thick", "dark"].indexOf(value) >= 0,
+        ['none', 'thin', 'shadow', 'thick', 'dark'].indexOf(value) >= 0,
     },
     cardTextAlign: {
       type: String,
-      default: "left",
+      default: 'left',
     },
     disableSelect: {
       type: Boolean,
@@ -322,11 +347,11 @@ export default {
     },
     pillText: {
       type: String,
-      default: "",
+      default: '',
     },
     buttonRole: {
       type: String,
-      default: "link",
+      default: 'link',
     },
     isSelected: {
       type: Boolean,
@@ -364,18 +389,20 @@ export default {
       return {
         [`card-grid-item__card--hasIcon`]:
           (this.imageSrc || this.glyphSrc) &&
-          (this.iconPosition === "top" || this.iconPosition === "top-left"),
+          (this.iconPosition === 'top' || this.iconPosition === 'top-left'),
         [`card-grid-item__card--selectable`]: this.isSelectable,
-        [`card-grid-item__card--selected-inverted--` + this.invertOnSelectBackground]:
+        [`card-grid-item__card--selected-inverted--` +
+        this.invertOnSelectBackground]:
           this.selected &&
           this.invertOnSelectBackground &&
-          this.invertOnSelectBackground !== "none",
-        [`card-grid-item__card--selected-border--` + this.borderOnSelectBackground]:
+          this.invertOnSelectBackground !== 'none',
+        [`card-grid-item__card--selected-border--` +
+        this.borderOnSelectBackground]:
           this.selected &&
           this.borderOnSelectBackground &&
-          this.borderOnSelectBackground !== "none",
+          this.borderOnSelectBackground !== 'none',
         [`card-grid-item__card--selected-focus`]:
-          this.selected && this.buttonRole === "radio",
+          this.selected && this.buttonRole === 'radio',
         [`card-grid-item__card--selected-link`]:
           this.selected && !this.invertOnSelectBackground,
         [`card-grid-item__card--padding-${this.cardPadding}`]: true,
@@ -383,87 +410,89 @@ export default {
         [`card-grid-item__card--bg-${this.backgroundVariant}`]: true,
         [`card-grid-item__card--select-${this.buttonRole}`]: true,
         [`card-grid-item__card--align-${this.cardTextAlign}`]: true,
-      };
+      }
     },
     urlHostname() {
-      return window.location.protocol + "//" + window.location.host;
+      return window.location.protocol + '//' + window.location.host
     },
   },
   mounted() {
-    this.selected = this.isSelected;
+    this.selected = this.isSelected
   },
   created() {
-    this.parentGrid = this.getParentGridItem();
+    this.parentGrid = this.getParentGridItem()
     if (this.parentGrid) {
-      this.parentGrid.registerChild(this);
-      this.setCardId();
-      this.isSelectable = !this.disableSelect && this.parentGrid.isSelectable;
+      this.parentGrid.registerChild(this)
+      this.setCardId()
+      this.isSelectable = !this.disableSelect && this.parentGrid.isSelectable
     }
   },
   beforeDestroy() {
     if (this.parentGrid) {
-      this.parentGrid.deregisterChild(this);
+      this.parentGrid.deregisterChild(this)
     }
   },
   methods: {
     cardClicked(ev) {
       if (this.isSelectable) {
-        this.parentGrid.cardSelected(this, ev);
+        this.parentGrid.cardSelected(this, ev)
       }
 
       if (this.$gtm) {
-        this.fireGTM();
+        this.fireGTM()
       }
     },
     cardTitleClicked(ev) {
       if (this.isCardTitleSelectable) {
-        this.parentGrid.cardTitleSelected(this, ev);
+        this.parentGrid.cardTitleSelected(this, ev)
       }
     },
     getParentGridItem() {
-      let counter = 0;
-      const maxParentDepth = 10;
-      let currentParent = this.$parent;
-      let gridParent;
+      let counter = 0
+      const maxParentDepth = 10
+      let currentParent = this.$parent
+      let gridParent
       while (maxParentDepth > counter) {
-        counter += 1;
+        counter += 1
         if (currentParent && Array.isArray(currentParent.cards)) {
-          gridParent = currentParent;
-          break;
+          gridParent = currentParent
+          break
         } else if (currentParent) {
-          currentParent = currentParent.$parent;
+          currentParent = currentParent.$parent
         }
       }
-      return gridParent;
+      return gridParent
     },
     setCardId() {
       this.cardId = this.parentGrid.cardIdPrefix
-        ? this.parentGrid.cardIdPrefix + "-" + this.parentGrid.getChildIndex(this)
-        : undefined;
+        ? this.parentGrid.cardIdPrefix +
+          '-' +
+          this.parentGrid.getChildIndex(this)
+        : undefined
     },
     setGridMetaData(gridColumnSize, isMobileView, isTabletView) {
-      this.gridColumnSize = gridColumnSize;
-      this.isMobileView = isMobileView;
-      this.isTabletView = isTabletView;
+      this.gridColumnSize = gridColumnSize
+      this.isMobileView = isMobileView
+      this.isTabletView = isTabletView
     },
     handleFocus(ev) {
-      this.parentGrid.handleFocus(ev);
+      this.parentGrid.handleFocus(ev)
     },
     fireGTM() {
-      let theEl = this.$slots?.cardDescription;
+      let theEl = this.$slots?.cardDescription
       if (theEl && theEl.length > 0) {
         var content = {
           content: this.$diffInDays(
-            parseISO(theEl[0]?.componentOptions?.propsData?.card?.created)
+            parseISO(theEl[0]?.componentOptions?.propsData?.card?.created),
           ),
-        };
+        }
       }
       if (this.$gtm) {
         // format link
-        const linkStr = this.link;
-        let linkURL = linkStr;
+        const linkStr = this.link
+        let linkURL = linkStr
         if (linkStr !== false && !linkStr.includes(this.urlHostname)) {
-          linkURL = this.urlHostname + linkStr;
+          linkURL = this.urlHostname + linkStr
         }
         // gather attrs
         let attrs = {
@@ -471,45 +500,46 @@ export default {
           data: linkURL,
           ...content,
           ...this.taxonomies,
-        };
+        }
         // fire the default event
         this.$gtm.push({
-          event: "custom.interaction.tile.click",
+          event: 'custom.interaction.tile.click',
           group: this?.parentGrid?.title,
           ...attrs,
-        });
-        if (this.pillText === "News") {
+        })
+        if (this.pillText === 'News') {
           this.$gtm.push({
-            event: "custom.interaction.news.click",
-            group: "News",
+            event: 'custom.interaction.news.click',
+            group: 'News',
             ...attrs,
-          });
+          })
         }
-        if (this.pillText === "Event") {
+        if (this.pillText === 'Event') {
           this.$gtm.push({
-            event: "custom.interaction.event.click",
-            group: "Event",
+            event: 'custom.interaction.event.click',
+            group: 'Event',
             ...attrs,
-          });
+          })
         }
-        if (this.pillText === "Safety alert") {
+        if (this.pillText === 'Safety alert') {
           this.$gtm.push({
-            event: "custom.interaction.safety.click",
-            group: "Safety alert",
+            event: 'custom.interaction.safety.click',
+            group: 'Safety alert',
             ...attrs,
-          });
+          })
         }
         if (
           (this.link,
           this.isAbsoluteUrl(this.link) &&
-            (this.$config ? this.$config.public.caretaker : process.env.CARETAKER) ===
-              "false")
+            (this.$config
+              ? this.$config.public.caretaker
+              : process.env.CARETAKER) === 'false')
         ) {
           this.$gtm.push({
-            event: "custom.interaction.outboundlink",
+            event: 'custom.interaction.outboundlink',
             category: this.cardHeaderTitle,
             label: this.link,
-          });
+          })
         }
       }
       // for non gov sites and when caretaker mode is on, analytics is fired from listenersCaretaker.js
@@ -517,21 +547,23 @@ export default {
         this.link &&
         this.isAbsoluteUrl(this.link) &&
         isGovSite(this.link) &&
-        (this.$config ? this.$config.public.caretaker : process.env.CARETAKER) === "true"
+        (this.$config
+          ? this.$config.public.caretaker
+          : process.env.CARETAKER) === 'true'
       ) {
         this.$gtm.push({
-          event: "custom.interaction.outboundlink",
+          event: 'custom.interaction.outboundlink',
           category: this.cardHeaderTitle,
           label: this.link,
-        });
+        })
       }
     },
   },
-};
+}
 </script>
 
 <style lang="scss" scoped>
-@import "../../../includes/scss/all";
+@import '../../../includes/scss/all';
 
 .card-grid-item {
   height: 100%;
@@ -783,7 +815,7 @@ export default {
       align-items: center;
     }
     :deep(.card_item__control-radio span) {
-      background-image: url("../../../assets/icons/tick.svg");
+      background-image: url('../../../assets/icons/tick.svg');
       background-position: center;
       background-repeat: no-repeat;
       filter: invert(1);
@@ -832,7 +864,7 @@ export default {
       line-height: 80px;
 
       @media screen and (max-width: 1199px) and (min-width: 768px) {
-        @include fp("font-size", 60, 72);
+        @include fp('font-size', 60, 72);
       }
     }