Merge branch 'master' into master

carbon-design-system · Dec 11, 2020 · 95d67cc · 95d67cc
2 parents 99a2db5 + 9fab0ff
commit 95d67cc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/core/src/components/cv-modal/cv-modal.vue b/packages/core/src/components/cv-modal/cv-modal.vue
@@ -245,14 +245,17 @@ export default {
       document.body.classList.remove(`${this.carbonPrefix}--body--with-modal-open`);
 
       if (this.dataVisible) {
-        this.$el.addEventListener('transitionend', this.afterHide, { once: true });
+        this.$el.addEventListener('transitionend', this.afterHide);
       }
 
       this.dataVisible = false;
       this.$emit('modal-hidden');
     },
-    afterHide() {
-      this.$emit('after-modal-hidden');
+    afterHide(event) {
+      if (event.propertyName === 'opacity') {
+        this.$emit('after-modal-hidden');
+        this.$el.removeEventListener('transitionend', this.afterHide);
+      }
     },
     onPrimaryClick(ev) {
       this.$emit('primary-click');

diff --git a/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue b/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue
@@ -30,7 +30,7 @@ export default {
       type: String,
       default: 'top',
       validator(val) {
-        const validValues = ['top', 'bottom'];
+        const validValues = ['top', 'left', 'right', 'bottom'];
         const valid = validValues.includes(val);
         if (!valid) {
           console.warn(`CVDefinitionTooltip.direction must be one of the following: ${validValues}`);

diff --git a/packages/core/yarn.lock b/packages/core/yarn.lock
@@ -2755,9 +2755,9 @@ hex-color-regex@^1.1.0:
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 highlight.js@^9.6.0:
-  version "9.18.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
-  integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
+  version "9.18.5"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
+  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"