From ce7bf9bba4100dc53634a43d3d863dd38775946b Mon Sep 17 00:00:00 2001
From: larsmyrup <hej@larsmyrup.dk>
Date: Tue, 6 Dec 2022 22:41:51 +0100
Subject: [PATCH] Making progress bar styleable with scss variables

---
 package.json                                  |  1 +
 src/components/VtProgressBar.vue              | 12 ++++++++--
 src/components/VtToast.vue                    |  1 +
 src/scss/_progressBar.scss                    | 22 ++++++++++++++++++-
 src/scss/_variables.scss                      |  5 +++++
 .../__snapshots__/VtProgressBar.spec.ts.snap  | 10 ++++-----
 .../__snapshots__/VtToast.spec.ts.snap        | 18 +++++++--------
 .../VtToastContainer.spec.ts.snap             |  6 ++---
 yarn.lock                                     |  5 +++++
 9 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index ce66644..8c3ffc6 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
   "sideEffects": true,
   "dependencies": {},
   "devDependencies": {
+    "@babel/helper-string-parser": "^7.19.4",
     "@types/jest": "^27.4.0",
     "@types/lodash.merge": "^4.6.6",
     "@typescript-eslint/eslint-plugin": "^5.10.1",
diff --git a/src/components/VtProgressBar.vue b/src/components/VtProgressBar.vue
index 537cf07..a08a843 100644
--- a/src/components/VtProgressBar.vue
+++ b/src/components/VtProgressBar.vue
@@ -5,8 +5,9 @@
 <script lang="ts" setup>
 import { computed, ref, watch, nextTick, onMounted, onBeforeUnmount } from "vue"
 
-import { VT_NAMESPACE } from "../ts/constants"
+import { TYPE, VT_NAMESPACE } from "../ts/constants"
 import { TOAST_DEFAULTS } from "../ts/propValidators"
+import { ToastOptionsAndContent } from "../types/toast"
 
 import type { BaseToastOptions } from "../types/toast"
 
@@ -14,6 +15,7 @@ interface ProgressBarProps {
   timeout?: BaseToastOptions["timeout"]
   hideProgressBar?: BaseToastOptions["hideProgressBar"]
   isRunning?: boolean
+  type?: ToastOptionsAndContent["type"]
 }
 
 const emit = defineEmits(["close-toast"])
@@ -21,6 +23,7 @@ const props = withDefaults(defineProps<ProgressBarProps>(), {
   hideProgressBar: TOAST_DEFAULTS.hideProgressBar,
   isRunning: false,
   timeout: TOAST_DEFAULTS.timeout,
+  type: TYPE.DEFAULT,
 })
 
 const el = ref<HTMLElement>()
@@ -35,7 +38,12 @@ const style = computed(() => {
 })
 
 const cpClass = computed(() =>
-  hasClass.value ? `${VT_NAMESPACE}__progress-bar` : ""
+  hasClass.value
+    ? [
+        `${VT_NAMESPACE}__progress-bar`,
+        `${VT_NAMESPACE}__progress-bar--${props.type}`,
+      ]
+    : ""
 )
 
 watch(
diff --git a/src/components/VtToast.vue b/src/components/VtToast.vue
index ac6fc1b..1e5e611 100644
--- a/src/components/VtToast.vue
+++ b/src/components/VtToast.vue
@@ -25,6 +25,7 @@
       :is-running="isRunning"
       :hide-progress-bar="hideProgressBar"
       :timeout="timeout"
+      :type="props.type"
       @close-toast="closeToast"
     />
   </div>
diff --git a/src/scss/_progressBar.scss b/src/scss/_progressBar.scss
index 8893706..143ead7 100644
--- a/src/scss/_progressBar.scss
+++ b/src/scss/_progressBar.scss
@@ -14,12 +14,32 @@
   width: 100%;
   height: 5px;
   z-index: ($vt-z-index + 1);
-  background-color: rgba(255, 255, 255, 0.7);
   transform-origin: left;
   animation: scale-x-frames linear 1 forwards;
+
   .#{$vt-namespace}__toast--rtl & {
     right: 0;
     left: unset;
     transform-origin: right;
   }
+
+  &--default {
+    background-color: $vt-progress-bar-color-default;
+  }
+
+  &--info {
+    background-color: $vt-progress-bar-color-info;
+  }
+
+  &--success {
+    background-color: $vt-progress-bar-color-success;
+  }
+
+  &--error {
+    background-color: $vt-progress-bar-color-error;
+  }
+
+  &--warning {
+    background-color: $vt-progress-bar-color-warning;
+  }
 }
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 7793004..e7807f5 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -8,14 +8,19 @@ $vt-toast-max-height: 800px !default;
 
 $vt-color-default: #1976d2 !default;
 $vt-text-color-default: #fff !default;
+$vt-progress-bar-color-default: rgba(255, 255, 255, 0.7) !default;
 $vt-color-info: #2196f3 !default;
 $vt-text-color-info: #fff !default;
+$vt-progress-bar-color-info: rgba(255, 255, 255, 0.7) !default;
 $vt-color-success: #4caf50 !default;
 $vt-text-color-success: #fff !default;
+$vt-progress-bar-color-success: rgba(255, 255, 255, 0.7) !default;
 $vt-color-warning: #ffc107 !default;
 $vt-text-color-warning: #fff !default;
+$vt-progress-bar-color-warning: rgba(255, 255, 255, 0.7) !default;
 $vt-color-error: #ff5252 !default;
 $vt-text-color-error: #fff !default;
+$vt-progress-bar-color-error: rgba(255, 255, 255, 0.7) !default;
 
 $vt-color-progress-default: linear-gradient(
   to right,
diff --git a/tests/unit/components/__snapshots__/VtProgressBar.spec.ts.snap b/tests/unit/components/__snapshots__/VtProgressBar.spec.ts.snap
index 5e63f26..433d410 100644
--- a/tests/unit/components/__snapshots__/VtProgressBar.spec.ts.snap
+++ b/tests/unit/components/__snapshots__/VtProgressBar.spec.ts.snap
@@ -2,28 +2,28 @@
 
 exports[`VtProgressBar matches snapshot 1`] = `
 <div
-  class="Vue-Toastification__progress-bar"
+  class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
   style="animation-duration: 5000ms; animation-play-state: paused; opacity: 1;"
 />
 `;
 
 exports[`VtProgressBar sets opacity to 0 from from hideProgressBar 1`] = `
 <div
-  class="Vue-Toastification__progress-bar"
+  class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
   style="animation-duration: 5000ms; animation-play-state: paused; opacity: 0;"
 />
 `;
 
 exports[`VtProgressBar sets playstate from isRunning 1`] = `
 <div
-  class="Vue-Toastification__progress-bar"
+  class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
   style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
 />
 `;
 
 exports[`VtProgressBar sets style duration from timeout 1`] = `
 <div
-  class="Vue-Toastification__progress-bar"
+  class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
   style="animation-duration: 1000ms; animation-play-state: paused; opacity: 1;"
 />
 `;
@@ -37,7 +37,7 @@ exports[`VtProgressBar triggers class reset on timeout change 1`] = `
 
 exports[`VtProgressBar triggers class reset on timeout change 2`] = `
 <div
-  class="Vue-Toastification__progress-bar"
+  class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
   style="animation-duration: 1000ms; animation-play-state: paused; opacity: 1;"
 />
 `;
diff --git a/tests/unit/components/__snapshots__/VtToast.spec.ts.snap b/tests/unit/components/__snapshots__/VtToast.spec.ts.snap
index c7e525a..cd94f6c 100644
--- a/tests/unit/components/__snapshots__/VtToast.spec.ts.snap
+++ b/tests/unit/components/__snapshots__/VtToast.spec.ts.snap
@@ -32,7 +32,7 @@ exports[`VtToast snapshots renders 1`] = `
      × 
   </button>
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
@@ -65,7 +65,7 @@ exports[`VtToast ui closeButton = false removes it 1`] = `
   </div>
   <!--v-if-->
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
@@ -103,7 +103,7 @@ exports[`VtToast ui has all default sub components 1`] = `
      × 
   </button>
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
@@ -129,7 +129,7 @@ exports[`VtToast ui icon = false removes it 1`] = `
      × 
   </button>
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
@@ -167,7 +167,7 @@ exports[`VtToast ui renders custom aria role and button aria label 1`] = `
      × 
   </button>
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
@@ -207,7 +207,7 @@ exports[`VtToast ui renders custom component 1`] = `
      × 
   </button>
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
@@ -245,7 +245,7 @@ exports[`VtToast ui renders default aria role and button aria label 1`] = `
      × 
   </button>
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
@@ -283,7 +283,7 @@ exports[`VtToast ui renders ltr by default 1`] = `
      × 
   </button>
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
@@ -321,7 +321,7 @@ exports[`VtToast ui renders rtl if set 1`] = `
      × 
   </button>
   <div
-    class="Vue-Toastification__progress-bar"
+    class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
   />
 </div>
diff --git a/tests/unit/components/__snapshots__/VtToastContainer.spec.ts.snap b/tests/unit/components/__snapshots__/VtToastContainer.spec.ts.snap
index 386d1ce..58193f5 100644
--- a/tests/unit/components/__snapshots__/VtToastContainer.spec.ts.snap
+++ b/tests/unit/components/__snapshots__/VtToastContainer.spec.ts.snap
@@ -167,7 +167,7 @@ exports[`VtToastContainer snapshots with toasts 1`] = `
            × 
         </button>
         <div
-          class="Vue-Toastification__progress-bar"
+          class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--info"
           style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
         />
       </div>
@@ -203,7 +203,7 @@ exports[`VtToastContainer snapshots with toasts 1`] = `
            × 
         </button>
         <div
-          class="Vue-Toastification__progress-bar"
+          class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--default"
           style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
         />
       </div>
@@ -265,7 +265,7 @@ exports[`VtToastContainer snapshots with toasts 1`] = `
            × 
         </button>
         <div
-          class="Vue-Toastification__progress-bar"
+          class="Vue-Toastification__progress-bar Vue-Toastification__progress-bar--error"
           style="animation-duration: 5000ms; animation-play-state: running; opacity: 1;"
         />
       </div>
diff --git a/yarn.lock b/yarn.lock
index eabcba5..6a82fe8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -263,6 +263,11 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+
 "@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
   version "7.15.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"