From 397be581e1503d506acb0278208bc78decc4fb8f Mon Sep 17 00:00:00 2001
From: Lee Chase <leechase@live.com>
Date: Mon, 7 Sep 2020 15:13:21 +0100
Subject: [PATCH] fix: use of uidMixin without id use (#1009)

Co-authored-by: Lee Chase <lee.chase@uk.ibm.com>
---
 .../cv-content-switcher/cv-content-switcher-button.vue        | 1 +
 .../src/components/cv-data-table/cv-data-table-heading.vue    | 2 +-
 .../core/src/components/cv-data-table/cv-data-table-row.vue   | 4 ++--
 .../core/src/components/cv-date-picker/cv-date-picker.vue     | 3 ++-
 packages/core/src/components/cv-dropdown/cv-dropdown.vue      | 2 +-
 .../core/src/components/cv-overflow-menu/cv-overflow-menu.vue | 2 +-
 packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue | 2 +-
 .../core/src/components/cv-tooltip/cv-definition-tooltip.vue  | 2 +-
 .../core/src/components/cv-tooltip/cv-interactive-tooltip.vue | 2 +-
 .../src/components/cv-ui-shell/cv-header-global-action.vue    | 1 +
 .../core/src/components/cv-ui-shell/cv-header-menu-button.vue | 1 +
 11 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue b/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue
index a2ac36502..14958d4bf 100644
--- a/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue
+++ b/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue
@@ -23,6 +23,7 @@
     ]"
     :data-target="contentSelector"
     :aria-selected="dataSelected ? 'true' : 'false'"
+    :id="uid"
     @click="open"
   >
     <CvSvg v-if="icon" :svg="icon" :class="`${carbonPrefix}--content-switcher__icon`" height="16" width="16" />
diff --git a/packages/core/src/components/cv-data-table/cv-data-table-heading.vue b/packages/core/src/components/cv-data-table/cv-data-table-heading.vue
index 2a3b966a2..ada9689ca 100644
--- a/packages/core/src/components/cv-data-table/cv-data-table-heading.vue
+++ b/packages/core/src/components/cv-data-table/cv-data-table-heading.vue
@@ -1,5 +1,5 @@
 <template>
-  <th :aria-sort="internalOrder" :style="skeleton && headingStyle">
+  <th :aria-sort="internalOrder" :style="skeleton && headingStyle" :id="uid">
     <button
       type="button"
       v-if="sortable"
diff --git a/packages/core/src/components/cv-data-table/cv-data-table-row.vue b/packages/core/src/components/cv-data-table/cv-data-table-row.vue
index 57713a2da..0bc4a06c8 100644
--- a/packages/core/src/components/cv-data-table/cv-data-table-row.vue
+++ b/packages/core/src/components/cv-data-table/cv-data-table-row.vue
@@ -1,5 +1,5 @@
 <template>
-  <tbody v-if="someExpandingRows" class="cv-data-table-row cv-data-table-row--expandable">
+  <tbody v-if="someExpandingRows" class="cv-data-table-row cv-data-table-row--expandable" :id="uid">
     <cv-data-table-row-inner
       ref="row"
       v-bind="$attrs"
@@ -23,7 +23,7 @@
       </td>
     </tr>
   </tbody>
-  <cv-data-table-row-inner v-else ref="row" v-bind="$attrs" v-on="$listeners" class="cv-data-table-row">
+  <cv-data-table-row-inner v-else ref="row" v-bind="$attrs" v-on="$listeners" class="cv-data-table-row" :id="uid">
     <slot />
   </cv-data-table-row-inner>
 </template>
diff --git a/packages/core/src/components/cv-date-picker/cv-date-picker.vue b/packages/core/src/components/cv-date-picker/cv-date-picker.vue
index b60a414fa..dca46ebf1 100644
--- a/packages/core/src/components/cv-date-picker/cv-date-picker.vue
+++ b/packages/core/src/components/cv-date-picker/cv-date-picker.vue
@@ -1,5 +1,5 @@
 <template>
-  <cv-wrapper :tag-type="formItem ? 'div' : ''" :class="`cv-date-picker ${carbonPrefix}--form-item`">
+  <cv-wrapper :tag-type="formItem ? 'div' : ''" :class="`cv-date-picker ${carbonPrefix}--form-item`" :id="uid">
     <div
       :data-date-picker="['single', 'range'].includes(kind)"
       :data-date-picker-type="kind"
@@ -12,6 +12,7 @@
         },
       ]"
       ref="date-picker"
+      :id="formItem ? '' : uid"
     >
       <div
         :class="{
diff --git a/packages/core/src/components/cv-dropdown/cv-dropdown.vue b/packages/core/src/components/cv-dropdown/cv-dropdown.vue
index 0deb346ea..44f729726 100644
--- a/packages/core/src/components/cv-dropdown/cv-dropdown.vue
+++ b/packages/core/src/components/cv-dropdown/cv-dropdown.vue
@@ -16,7 +16,7 @@
 -->
 
 <template>
-  <div :class="{ [`${carbonPrefix}--form-item`]: formItem }">
+  <div :class="{ [`${carbonPrefix}--form-item`]: formItem }" :id="uid">
     <div
       :class="[
         `${carbonPrefix}--dropdown__wrapper`,
diff --git a/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue b/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue
index a8a45026b..04733a496 100644
--- a/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue
+++ b/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue
@@ -1,5 +1,5 @@
 <template>
-  <div data-overflow-menu :class="`cv-overflow-menu ${carbonPrefix}--overflow-menu`">
+  <div data-overflow-menu :class="`cv-overflow-menu ${carbonPrefix}--overflow-menu`" :id="uid">
     <button
       :class="[
         `${carbonPrefix}--overflow-menu__trigger ${carbonPrefix}--tooltip__trigger`,
diff --git a/packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue b/packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue
index d2d0864b1..92c130af8 100644
--- a/packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue
+++ b/packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="`cv-toggle ${carbonPrefix}--form-item`">
+  <div :class="`cv-toggle ${carbonPrefix}--form-item`" :id="uid">
     <label
       :class="`${carbonPrefix}--toggle__label ${carbonPrefix}--skeleton`"
       :for="uid"
diff --git a/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue b/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue
index 67ab82db9..3935c5840 100644
--- a/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue
+++ b/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="`cv-definition-tooltip ${carbonPrefix}--tooltip--definition ${carbonPrefix}--tooltip--a11y`">
+  <div :class="`cv-definition-tooltip ${carbonPrefix}--tooltip--definition ${carbonPrefix}--tooltip--a11y`" :id="uid">
     <button
       :aria-describedby="`${uid}-label`"
       :class="[
diff --git a/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue b/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue
index 54242b097..0e7699663 100644
--- a/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue
+++ b/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue
@@ -22,7 +22,7 @@
     </div>
 
     <div
-      :id="`${uid}`"
+      :id="uid"
       aria-hidden="true"
       :data-floating-menu-direction="direction"
       :class="[`${carbonPrefix}--tooltip`, { [`${carbonPrefix}--tooltip--shown`]: dataVisible }]"
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-global-action.vue b/packages/core/src/components/cv-ui-shell/cv-header-global-action.vue
index 99009ec32..f8e6b9824 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-global-action.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-global-action.vue
@@ -12,6 +12,7 @@
     :aria-expanded="active ? 'true' : 'false'"
     @click="gaToggle"
     @focusout="gaFocusout"
+    :id="uid"
   >
     <slot />
   </button>
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-menu-button.vue b/packages/core/src/components/cv-ui-shell/cv-header-menu-button.vue
index 099f5bad1..a5bfe0890 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-menu-button.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-menu-button.vue
@@ -17,6 +17,7 @@
     :aria-expanded="active ? 'true' : 'false'"
     @click="gaToggle"
     @focusout="gaFocusout"
+    :id="uid"
   >
     <Close20 v-if="dataActive" />
     <Menu20 v-if="!dataActive" />