feat: indicator scaleWith dropdown

Tucsky · Nov 28, 2024 · 93c65ab · 93c65ab
1 parent 046292d
commit 93c65ab
Show file tree

Hide file tree

Showing 23 changed files with 790 additions and 256 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented here.
 
+## [3.6.3] - 2024-10-30
+
+- Reconnect closed apis when tab made visible again (& ios pwa)
+- Fetch range based on indicator length
+- Autocomplete local variable in script
+- Zoomable indicator preview
+- Markdown editor for indicators description
+- Indicator scaleWith dropdown
+
 ## [3.6.2] - 2024-09-29
 
 - Fix Dockerfile and startup instructions

diff --git a/src/assets/sass/dialog.scss b/src/assets/sass/dialog.scss
@@ -124,9 +124,12 @@
     border-radius: 0.75rem 0.75rem 0 0;
     cursor: grab;
 
+    &-wrapper {
+      position: relative;
+    }
+
     #{$self}--contrasted & {
       border-bottom: 0 !important;
-      padding-bottom: 0;
       background-color: var(--theme-base-o25);
     }
 
@@ -153,10 +156,11 @@
   }
 
   &__subheader {
+    position: relative;
+    z-index: 1;
 
     #{$self}--contrasted & {
       background-color: var(--theme-base-o25);
-      padding-top: 0.5rem;
     }
   }
 
@@ -239,13 +243,7 @@
 
   .dialog__close {
     text-align: center;
-    padding: 0.75rem;
-    margin: -0.75rem -0.75rem -0.75rem 0.75rem;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    align-self: stretch;
-    border-radius: 0 $border-radius-base 0 0;
+    margin: 0 -0.5rem 0 0.5rem;
     color: var(--theme-color-100);
 
     &:hover {

diff --git a/src/components/chart/IndicatorsOverlay.vue b/src/components/chart/IndicatorsOverlay.vue
@@ -1,69 +1,11 @@
 <template>
   <div class="chart-overlay__panel indicators-overlay">
     <div class="chart-overlay__content" v-if="value">
-      <dropdown v-model="dropdownTrigger">
-        <button
-          type="button"
-          class="dropdown-item"
-          @click="editIndicator(selectedIndicator)"
-        >
-          <i class="icon-edit"></i>
-          <span>Edit</span>
-        </button>
-        <button
-          type="button"
-          class="dropdown-item"
-          @click="resizeIndicator(selectedIndicator)"
-        >
-          <i class="icon-resize-height"></i>
-          <span>Resize</span>
-        </button>
-        <button
-          type="button"
-          class="dropdown-item"
-          @click="duplicateIndicator(selectedIndicator)"
-        >
-          <i class="icon-copy-paste"></i>
-          <span>Duplicate</span>
-        </button>
-        <button
-          type="button"
-          class="dropdown-item"
-          @click="downloadIndicator(selectedIndicator)"
-        >
-          <i class="icon-download"></i>
-          <span>Download</span>
-        </button>
-        <button
-          type="button"
-          class="dropdown-item"
-          @click="setIndicatorOrder(selectedIndicator, 0)"
-          v-if="selectedIndicatorIsFront"
-        >
-          <i class="icon-up"></i>
-          <span>Send to back</span>
-        </button>
-        <button
-          v-else
-          type="button"
-          class="dropdown-item"
-          @click="
-            setIndicatorOrder(selectedIndicator, indicatorOrder.length - 1)
-          "
-        >
-          <i class="icon-down -lower"></i>
-          <span>Bring to front</span>
-        </button>
-        <div class="dropdown-divider"></div>
-        <button
-          type="button"
-          class="dropdown-item"
-          @click="removeIndicator(selectedIndicator)"
-        >
-          <i class="icon-trash"></i>
-          <span>Remove</span>
-        </button>
-      </dropdown>
+      <IndicatorDropdown
+        v-model="dropdownTrigger"
+        :indicator-id="indicatorId"
+        :pane-id="paneId"
+      />
       <IndicatorControl
         v-for="id in indicatorOrder"
         :key="id"
@@ -93,11 +35,13 @@ import { ChartPaneState } from '../../store/panesSettings/chart'
 import dialogService from '../../services/dialogService'
 
 import IndicatorControl from '@/components/chart/IndicatorControl.vue'
+import IndicatorDropdown from '@/components/indicators/IndicatorDropdown.vue'
 
 @Component({
   name: 'IndicatorsOverlay',
   components: {
-    IndicatorControl
+    IndicatorControl,
+    IndicatorDropdown
   },
   props: {
     paneId: {
@@ -114,8 +58,7 @@ export default class IndicatorsOverlay extends Vue {
   private value: boolean
 
   dropdownTrigger: HTMLElement = null
-  selectedIndicator: string = null
-  selectedIndicatorIsFront: boolean = null
+  indicatorId: string = null
   sorting: {
     id: string
     height: number
@@ -151,18 +94,14 @@ export default class IndicatorsOverlay extends Vue {
   toggleDropdown(event?: Event, id?: string) {
     if (
       event &&
-      (!this.dropdownTrigger ||
-        !this.selectedIndicator ||
-        this.selectedIndicator !== id)
+      (!this.dropdownTrigger || !this.indicatorId || this.indicatorId !== id)
     ) {
       const triggerElement = event.currentTarget as HTMLElement
+      this.indicatorId = id
       this.dropdownTrigger = triggerElement
-      this.selectedIndicator = id
-      this.selectedIndicatorIsFront =
-        this.indicatorOrder.indexOf(id) === this.indicatorOrder.length - 1
     } else {
       this.dropdownTrigger = null
-      this.selectedIndicator = null
+      this.indicatorId = null
     }
   }
 
@@ -175,22 +114,6 @@ export default class IndicatorsOverlay extends Vue {
     this.dropdownTrigger = null
   }
 
-  removeIndicator(indicatorId: string) {
-    this.$store.dispatch(this.paneId + '/removeIndicator', { id: indicatorId })
-  }
-
-  resizeIndicator(indicatorId: string) {
-    this.$store.commit(this.paneId + '/TOGGLE_LAYOUTING', indicatorId)
-  }
-
-  duplicateIndicator(indicatorId: string) {
-    this.$store.dispatch(this.paneId + '/duplicateIndicator', indicatorId)
-  }
-
-  downloadIndicator(indicatorId: string) {
-    this.$store.dispatch(this.paneId + '/downloadIndicator', indicatorId)
-  }
-
   async addIndicator() {
     dialogService.open(
       (await import('@/components/indicators/IndicatorLibraryDialog.vue'))
@@ -217,9 +140,14 @@ export default class IndicatorsOverlay extends Vue {
       case 'menu':
         return this.toggleDropdown(event, indicatorId)
       case 'remove':
-        return this.removeIndicator(indicatorId)
+        return this.$store.dispatch(this.paneId + '/removeIndicator', {
+          id: indicatorId
+        })
       case 'resize':
-        return this.resizeIndicator(indicatorId)
+        return this.$store.commit(
+          this.paneId + '/TOGGLE_LAYOUTING',
+          indicatorId
+        )
     }
 
     return this.editIndicator(indicatorId)

diff --git a/src/components/chart/options.ts b/src/components/chart/options.ts
@@ -344,7 +344,7 @@ export function getChartScales(
       return scales
     },
     {
-      ...{ [indicatorId]: `Own scale 📍` },
+      ...{ [indicatorId]: `Own scale` },
       left: 'Left ←',
       right: 'Right →'
     }

diff --git a/src/components/framework/BlobImage.vue b/src/components/framework/BlobImage.vue
@@ -0,0 +1,45 @@
+<template>
+  <img v-if="imageObjectUrl" :src="imageObjectUrl" />
+</template>
+
+<script lang="ts">
+import { Component, Vue, Watch } from 'vue-property-decorator'
+
+@Component({
+  name: 'BlobImage',
+  props: {
+    value: {
+      type: [Blob, File],
+      default: null
+    }
+  }
+})
+export default class BlobImage extends Vue {
+  value: Blob | File
+  imageObjectUrl: string = null
+
+  @Watch('value', { immediate: true })
+  onBlobChange() {
+    this.loadBlob()
+  }
+
+  beforeDestroy() {
+    this.clearBlob()
+  }
+
+  loadBlob() {
+    this.clearBlob()
+
+    if (this.value instanceof Blob || (this.value as any) instanceof File) {
+      this.imageObjectUrl = URL.createObjectURL(this.value)
+    }
+  }
+
+  clearBlob() {
+    if (this.imageObjectUrl) {
+      URL.revokeObjectURL(this.imageObjectUrl)
+      this.imageObjectUrl = null
+    }
+  }
+}
+</script>
diff --git a/src/components/framework/Dialog.vue b/src/components/framework/Dialog.vue
@@ -30,6 +30,7 @@
         @mousedown="handleDrag"
         @touchstart="handleDrag"
       >
+        <slot name="cover"></slot>
         <div class="dialog__header">
           <slot name="header"></slot>
           <button

diff --git a/src/components/framework/Dropdown.vue b/src/components/framework/Dropdown.vue
@@ -421,6 +421,10 @@ export default {
     margin: 0.5em 0;
     position: relative;
 
+    &:first-child {
+      margin-top: 0.75rem;
+    }
+
     &[data-label]:before {
       content: attr(data-label);
       position: absolute;
@@ -452,11 +456,21 @@ export default {
     box-shadow: none;
     line-height: 1;
     cursor: pointer;
+    text-decoration: none;
 
     &:hover {
       background-color: var(--theme-color-o10);
     }
 
+    &--active {
+      font-weight: 600;
+      background-color: var(--theme-background-100);
+
+      &:hover {
+        background-color: var(--theme-background-100);
+      }
+    }
+
     &--group {
       padding: 0;
 
@@ -465,12 +479,26 @@ export default {
       }
     }
 
+    &--narrow {
+      padding-block: 0.375rem;
+    }
+
     &__subtitle {
       opacity: 0.5;
       font-size: 0.875em;
       margin-top: 0.25em;
     }
 
+    &__emoji {
+      width: 1em;
+      padding-right: 1em;
+      font-size: 0.75em;
+    }
+
+    &__icon {
+      padding: 0 0.375rem;
+    }
+
     &--space-between {
       justify-content: space-between;
     }