From 7db1b4e90e7d0206d570558184d9377835ffdeac Mon Sep 17 00:00:00 2001
From: graphieros <alec.lloyd.probert@gmail.com>
Date: Sun, 26 Nov 2023 09:01:41 +0100
Subject: [PATCH] VueUiSparkline add bar type

---
 package-lock.json                   |  4 ++--
 package.json                        |  2 +-
 src/App.vue                         | 29 +++++++++++++---------------
 src/components/vue-ui-sparkline.vue | 30 +++++++++++++++++++++++++----
 src/default_configs.json            |  5 +++++
 types/vue-data-ui.d.ts              |  5 +++++
 6 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cae9f7d4..2086c099 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "vue-data-ui",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "vue-data-ui",
-      "version": "1.9.4",
+      "version": "1.9.5",
       "license": "MIT",
       "devDependencies": {
         "@vitejs/plugin-vue": "^4.2.3",
diff --git a/package.json b/package.json
index b9e3abc5..2427f672 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue-data-ui",
   "private": false,
-  "version": "1.9.5",
+  "version": "1.9.6",
   "type": "module",
   "description": "A user-empowering data visualization Vue components library",
   "keywords": [
diff --git a/src/App.vue b/src/App.vue
index d70b4417..73dd2e58 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2186,6 +2186,7 @@ const skeletonConfig = ref({
 });
 
 const sparklineConfig = ref({
+  type: 'bar',
   style: {
     backgroundColor: "#1A1A1A",
     sparkline: {
@@ -2243,7 +2244,7 @@ const sparklineDataset = ref([
   },
   {
     period: "period2",
-    value: -1,
+    value: 1,
   },
   {
     period: "period3",
@@ -2255,7 +2256,7 @@ const sparklineDataset = ref([
   },
   {
     period: "period5",
-    value: -4,
+    value: 4,
   },
   {
     period: "period6",
@@ -2263,7 +2264,7 @@ const sparklineDataset = ref([
   },
   {
     period: "period6",
-    value: -6,
+    value: 6,
   },
   {
     period: "period8",
@@ -2271,40 +2272,36 @@ const sparklineDataset = ref([
   },
   {
     period: "period9",
-    value: -8,
+    value: -7,
   },
   {
     period: "period10",
-    value: 9,
+    value: -6,
   },
   {
     period: "period11",
-    value: -10,
+    value: -5,
   },
   {
     period: "period12",
-    value: 11,
+    value: -4,
   },
   {
     period: "period13",
-    value: -12,
+    value: -3,
   },
   {
     period: "period14",
-    value: 13,
+    value: -2,
   },
   {
     period: "period15",
-    value: -14,
+    value: -1,
   },
   {
     period: "period16",
-    value: 15,
-  },
-  {
-    period: "period17",
-    value: -16,
-  },
+    value: 0,
+  }
 ]);
 
 const heatmapDataset = computed(() => {
diff --git a/src/components/vue-ui-sparkline.vue b/src/components/vue-ui-sparkline.vue
index a2c26b55..9e2915e9 100644
--- a/src/components/vue-ui-sparkline.vue
+++ b/src/components/vue-ui-sparkline.vue
@@ -91,7 +91,8 @@ const mutableDataset = computed(() => {
             x: drawingArea.value.start + (i * (drawingArea.value.width / len.value)),
             y: drawingArea.value.bottom - (drawingArea.value.height * ratioToMax(absoluteValue + bottomPadding.value + absoluteMin.value)),
             id: `plot_${uid}_${i}`,
-            color: sparklineConfig.value.style.area.useGradient ? shiftHue(sparklineConfig.value.style.line.color, 0.05 * ( 1 - (i / len.value))) : sparklineConfig.value.style.line.color
+            color: isBar.value ? sparklineConfig.value.style.bar.color : sparklineConfig.value.style.area.useGradient ? shiftHue(sparklineConfig.value.style.line.color, 0.05 * ( 1 - (i / len.value))) : sparklineConfig.value.style.line.color,
+            width: drawingArea.value.width / len.value
         }
     })
 });
@@ -126,6 +127,10 @@ const dataLabel = computed(() => {
     }
 });
 
+const isBar = computed(() => {
+    return sparklineConfig.value.type && sparklineConfig.value.type === 'bar';
+});
+
 </script>
 
 <template>
@@ -147,10 +152,18 @@ const dataLabel = computed(() => {
                     <stop offset="0%" :stop-color="`${shiftHue(sparklineConfig.style.area.color, 0.05)}${opacity[sparklineConfig.style.area.opacity]}`"/>
                     <stop offset="100%" :stop-color="sparklineConfig.style.area.color + opacity[sparklineConfig.style.area.opacity]" />
                 </linearGradient>
+                <linearGradient x2="0%" y2="100%" :id="`sparkline_bar_gradient_pos_${uid}`">
+                    <stop offset="0%" :stop-color="sparklineConfig.style.bar.color"/>
+                    <stop offset="100%" :stop-color="`${shiftHue(sparklineConfig.style.bar.color, 0.05)}`"/>
+                </linearGradient>
+                <linearGradient x2="0%" y2="100%" :id="`sparkline_bar_gradient_neg_${uid}`">
+                    <stop offset="0%" :stop-color="`${shiftHue(sparklineConfig.style.bar.color, 0.05)}`"/>
+                    <stop offset="100%" :stop-color="sparklineConfig.style.bar.color"/>
+                </linearGradient>
             </defs>
 
             <!-- AREA -->
-            <g v-if="sparklineConfig.style.area.show">
+            <g v-if="sparklineConfig.style.area.show && !isBar">
                 <path
                     data-cy="sparkline-smooth-area"
                     v-if="sparklineConfig.style.line.smooth"
@@ -165,11 +178,11 @@ const dataLabel = computed(() => {
                 />
             </g>
 
-            <path data-cy="sparkline-smooth-path" v-if="sparklineConfig.style.line.smooth" :d="`M ${createSmoothPath(mutableDataset)}`" :stroke="sparklineConfig.style.line.color" fill="none" :stroke-width="sparklineConfig.style.line.strokeWidth" stroke-linecap="round"/>
+            <path data-cy="sparkline-smooth-path" v-if="sparklineConfig.style.line.smooth && !isBar" :d="`M ${createSmoothPath(mutableDataset)}`" :stroke="sparklineConfig.style.line.color" fill="none" :stroke-width="sparklineConfig.style.line.strokeWidth" stroke-linecap="round"/>
             
             <g v-for="(plot, i) in mutableDataset">
                 <line 
-                    v-if="i < mutableDataset.length - 1 && !sparklineConfig.style.line.smooth"
+                    v-if="i < mutableDataset.length - 1 && !sparklineConfig.style.line.smooth && !isBar"
                     :data-cy="`sparkline-segment-${i}`"
                     :x1="plot.x"
                     :x2="mutableDataset[i + 1].x"
@@ -181,6 +194,15 @@ const dataLabel = computed(() => {
                     stroke-linejoin="round"
                     shape-rendering="geometricPrecision"
                 />
+                <rect 
+                    v-if="isBar"
+                    :x="plot.x - plot.width / 2"
+                    :y="plot.absoluteValue > 0 ? plot.y : absoluteZero"
+                    :width="plot.width"
+                    :height="Math.abs(plot.y - absoluteZero)"
+                    :fill="plot.absoluteValue > 0 ? `url(#sparkline_bar_gradient_pos_${uid})` : `url(#sparkline_bar_gradient_neg_${uid})`"
+                    :rx="sparklineConfig.style.bar.borderRadius"
+                />
                 <!-- VERTICAL INDICATORS -->
                 <line
                     :data-cy="`sparkline-vertical-indicator-${i}`"
diff --git a/src/default_configs.json b/src/default_configs.json
index 9db30f3a..30c02606 100644
--- a/src/default_configs.json
+++ b/src/default_configs.json
@@ -1459,6 +1459,7 @@
         }
     },
     "vue_ui_sparkline": {
+        "type": "line",
         "style": {
             "backgroundColor":"#FFFFFF",
             "fontFamily": "inherit",
@@ -1467,6 +1468,10 @@
                 "strokeWidth": 3,
                 "smooth": false
             },
+            "bar": {
+                "borderRadius": 3,
+                "color":"#3366cc"
+            },
             "zeroLine": {
                 "color": "#2D353C",
                 "strokeWidth": 1
diff --git a/types/vue-data-ui.d.ts b/types/vue-data-ui.d.ts
index 2aae3eba..2c1087b0 100644
--- a/types/vue-data-ui.d.ts
+++ b/types/vue-data-ui.d.ts
@@ -2205,6 +2205,7 @@ declare module 'vue-data-ui' {
     };
 
     export type VueUiSparklineConfig = {
+        type?: "line" | "bar";
         style?: {
             backgroundColor?: string;
             fontFamily?: string;
@@ -2217,6 +2218,10 @@ declare module 'vue-data-ui' {
                 strokeWidth?: number;
                 smooth?: boolean;
             };
+            bar?: {
+                borderRadius?: number;
+                color?: string;
+            };
             zeroLine?: {
                 color?: string;
                 strokeWidth?: number;