@energysage/es-ds-components 3.1.7 → 3.2.1

package/components/es-button.vue

@@ -80,14 +80,15 @@ const getRootClasses = computed(() => {
     const btnSize = props.size ? `btn-${props.size}` : 'btn-md';
     return `btn ${btnVariant} ${btnInline} ${btnSize}`;
 });
+
+/*
+    <a> is needed for href because a root-relative link like /market/start/
+    that is passed to <nuxt-link :to="" /> will attempt to internally navigate
+    within a micro frontend, which will result in a 404
+*/
 </script>
 
 <template>
-    <!--
-        <a> is needed for href because a root-relative link like /market/start/
-        that is passed to <nuxt-link :to="" /> will attempt to internally navigate
-        within a micro frontend, which will result in a 404
-    -->
     <a
         v-if="props.href"
         :class="getRootClasses"

package/components/es-progress.vue

@@ -1,36 +1,112 @@
 <script setup lang="ts">
 import ProgressBar from 'primevue/progressbar';
 
-const props = defineProps({
-    value: {
-        type: Number,
-        required: true,
-    },
-    height: {
-        type: String,
-        default: '0.3125rem',
-    },
-    showValue: {
-        type: Boolean,
-        default: false,
-    },
+const BASE_FONT_SIZE = 16;
+const DEFAULT_BAR_HEIGHT = 2;
+const DEFAULT_CIRCLE_GLOW_SIZE = 4;
+const DIFF_CIRCLE_SIZE_FROM_BAR_HEIGHT_IN_PX = 4;
+const DEFAULT_CIRCLE_DIMENSION = DEFAULT_BAR_HEIGHT + DIFF_CIRCLE_SIZE_FROM_BAR_HEIGHT_IN_PX;
+
+interface Props {
+    formatter?: Function;
+    height?: string;
+    showCircle?: boolean;
+    showValue?: boolean;
+    value: number;
+    valueClass?: string;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    formatter: (val: number) => `${val}%`,
+    height: '0.125rem',
+    showCircle: true,
+    showValue: false,
+    valueClass: '',
 });
+
 const progressBarPt = {
     value: {
-        class: 'EsProgressValue progress-bar',
+        class: [
+            'EsProgressValue progress-bar overflow-visible position-relative rounded-sm',
+            {
+                'progress-bar--with-circle': props.showCircle,
+            },
+        ],
         style: {
             height: props.height,
-            borderRadius: props.value === 100 ? '0' : '0 0.125rem 0.125rem 0',
         },
     },
 };
+
+const barHeight = computed(() => {
+    let barHeight = DEFAULT_BAR_HEIGHT;
+
+    if (props.height.indexOf('rem') === props.height.length - 3) {
+        barHeight = parseFloat(props.height.replace('rem', '')) * BASE_FONT_SIZE;
+    } else if (props.height.indexOf('px') === props.height.length - 2) {
+        barHeight = parseInt(props.height.replace('px', ''), 10);
+    }
+
+    return barHeight;
+});
+const circleDimension = computed(
+    () => barHeight.value + (DIFF_CIRCLE_SIZE_FROM_BAR_HEIGHT_IN_PX * barHeight.value) / DEFAULT_BAR_HEIGHT,
+);
+
+const circleDimensionPx = computed(() => `${circleDimension.value}px`);
+const circleRightPx = computed(() => `${circleDimension.value * -0.5}px`);
+const circleGlowSizePx = computed(
+    () => `${(DEFAULT_CIRCLE_GLOW_SIZE * circleDimension.value) / DEFAULT_CIRCLE_DIMENSION}px`,
+);
+
+const verticalContainerPaddingPx = computed(() =>
+    props.showCircle ? `${(circleDimension.value - barHeight.value) / 2}px` : '0',
+);
 </script>
+
 <template>
-    <progress-bar
-        class="bg-gray-200 rounded-0"
-        :pt="progressBarPt"
-        :show-value="showValue"
-        :value="value"
-        v-bind="$attrs">
-    </progress-bar>
+    <div
+        class="es-progress"
+        :class="$attrs.class">
+        <progress-bar
+            class="bg-gray-200 rounded-sm"
+            :pt="progressBarPt"
+            :show-value="false"
+            :value="value"
+            v-bind="omit('class', $attrs)">
+        </progress-bar>
+        <div
+            v-if="showValue"
+            class="font-size-75 mt-25 text-right"
+            :class="valueClass">
+            {{ formatter(value) }}
+        </div>
+    </div>
 </template>
+
+<style lang="scss" scoped>
+@use '@energysage/es-ds-styles/scss/variables' as variables;
+
+.es-progress {
+    padding-bottom: v-bind(verticalContainerPaddingPx);
+    padding-top: v-bind(verticalContainerPaddingPx);
+
+    :deep(.progress-bar--with-circle::after) {
+        /*
+         * using v-bind for this border width gets disappeared during npm run generate,
+         * so we need to hardcode it, and the radial background gradient makes it look
+         * good enough at larger sizes
+         */
+        border: 0.5px solid variables.$warm-orange;
+        /*
+         * do not mix both an inset box shadow (has been converted to radial background gradient)
+         * with a non-inset box shadow while using v-bind, or you will get unexpected results
+         * after npm run generate
+         */
+        box-shadow: 0 0 v-bind(circleGlowSizePx) variables.$warm-orange;
+        height: v-bind(circleDimensionPx);
+        right: v-bind(circleRightPx);
+        width: v-bind(circleDimensionPx);
+    }
+}
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@energysage/es-ds-components",
-    "version": "3.1.7",
+    "version": "3.2.1",
     "private": false,
     "type": "module",
     "description": "An EnergySage Vue component library",
@@ -17,7 +17,7 @@
     "author": "EnergySage",
     "license": "MIT",
     "dependencies": {
-        "@energysage/es-ds-styles": "^3.1.6",
+        "@energysage/es-ds-styles": "^3.2.1",
         "@nuxt/eslint": "^1.0.1",
         "@nuxtjs/google-fonts": "^3.2.0",
         "@vuelidate/core": "^2.0.3",

package/utils/omit.ts

@@ -0,0 +1,4 @@
+export const omit = (key: string, obj: any) => {
+    const { [key]: omitted, ...rest } = obj;
+    return rest;
+};