From 472cee8e80b99b777b4a409b6d1b2d179552014e Mon Sep 17 00:00:00 2001
From: Sergey Solodyagin <solodyagin@gmail.com>
Date: Fri, 8 Oct 2021 09:35:50 +0300
Subject: [PATCH] fix: time marker movement

---
 src/GGanttBar.vue      | 11 ++++++++---
 src/GGanttChart.vue    | 10 +++++-----
 src/GGanttTimeaxis.vue | 24 +++++++++++++-----------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/GGanttBar.vue b/src/GGanttBar.vue
index 3c7c74f..49dd4ef 100644
--- a/src/GGanttBar.vue
+++ b/src/GGanttBar.vue
@@ -273,7 +273,8 @@ export default {
     },
 
     drag(e) {
-      const chart = document.querySelector('#g-gantt-chart')
+      const chart = e.target.closest('.g-gantt-chart')
+      if (!chart) return
       let barWidth = this.$refs['g-gantt-bar'].getBoundingClientRect().width
       let newXStart =
         chart.scrollLeft +
@@ -291,7 +292,9 @@ export default {
     },
 
     dragByHandleLeft(e) {
-      let newXStart = e.clientX - this.barContainer.left
+      const chart = e.target.closest('.g-gantt-chart')
+      if (!chart) return
+      let newXStart = chart.scrollLeft + e.clientX - this.barContainer.left
       let newStartMoment = this.mapPositionToTime(newXStart)
       if (
         this.barEndMoment.diff(newStartMoment, this.timeUnit) < 1 ||
@@ -304,7 +307,9 @@ export default {
     },
 
     dragByHandleRight(e) {
-      let newXEnd = e.clientX - this.barContainer.left
+      const chart = e.target.closest('.g-gantt-chart')
+      if (!chart) return
+      let newXEnd = chart.scrollLeft + e.clientX - this.barContainer.left
       let newEndMoment = this.mapPositionToTime(newXEnd)
       if (
         newEndMoment.isSameOrBefore(this.barStartMoment, this.timeUnit) ||
diff --git a/src/GGanttChart.vue b/src/GGanttChart.vue
index 7ea7d1c..de5937c 100644
--- a/src/GGanttChart.vue
+++ b/src/GGanttChart.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    id="g-gantt-chart"
+    class="g-gantt-chart"
     :style="{ width: width, background: themeColors.background }"
   >
     <g-gantt-timeaxis
@@ -22,7 +22,7 @@
     />
 
     <div
-      id="g-gantt-rows-container"
+      class="g-gantt-rows-container"
       :style="{
         width: `${
           timeCount * 30 + parseInt(rowLabelWidth.replace('px', ''))
@@ -480,7 +480,7 @@ export default {
 </script>
 
 <style scoped>
-#g-gantt-chart {
+.g-gantt-chart {
   position: relative;
   /* display: flex; */
   /* flex-direction: column; */
@@ -494,11 +494,11 @@ export default {
   padding-bottom: 23px;
 }
 
-#g-gantt-chart >>> * {
+.g-gantt-chart >>> * {
   font-family: Roboto, Verdana;
 }
 
-#g-gantt-rows-container {
+.g-gantt-rows-container {
   position: relative;
 }
 </style>
\ No newline at end of file
diff --git a/src/GGanttTimeaxis.vue b/src/GGanttTimeaxis.vue
index 313900f..8b533d8 100644
--- a/src/GGanttTimeaxis.vue
+++ b/src/GGanttTimeaxis.vue
@@ -1,6 +1,7 @@
 <template>
   <div
-    id="g-timeaxis"
+    ref="g-timeaxis"
+    class="g-timeaxis"
     :style="{
       width: `${
         getTimeCount() * 30 + parseInt(rowLabelWidth.replace('px', ''))
@@ -48,7 +49,7 @@
         </div>
       </div>
     </div>
-    <div id="g-timeaxis-marker" />
+    <div ref="g-timeaxis-marker" class="g-timeaxis-marker" />
   </div>
 </template>
 
@@ -83,7 +84,7 @@ export default {
   },
 
   mounted() {
-    this.timemarker = document.querySelector('#g-timeaxis-marker')
+    this.timemarker = this.$refs['g-timeaxis-marker']
     this.initAxis()
     this.onWindowResize()
     window.addEventListener('resize', this.onWindowResize)
@@ -175,7 +176,9 @@ export default {
     },
 
     moveTimemarker(event) {
+      const chart = this.timemarker.closest('.g-gantt-chart')
       this.timemarker.style.left =
+        chart.scrollLeft +
         event.clientX -
         this.timemarkerOffset -
         this.horizontalAxisContainer.left +
@@ -183,9 +186,8 @@ export default {
     },
 
     onWindowResize() {
-      this.horizontalAxisContainer = document
-        .querySelector('#g-timeaxis')
-        .getBoundingClientRect()
+      this.horizontalAxisContainer =
+        this.$refs['g-timeaxis'].getBoundingClientRect()
       this.hourFontSize =
         Math.min(
           9.5,
@@ -228,7 +230,7 @@ export default {
 </script>
 
 <style scoped>
-#g-timeaxis,
+.g-timeaxis,
 .g-timeaxis-days,
 .g-timeaxis-day,
 .g-timeaxis-day > div {
@@ -236,7 +238,7 @@ export default {
   /* overflow: hidden; */
 }
 
-#g-timeaxis {
+.g-timeaxis {
   position: sticky;
   top: 0;
   /* width: 100%; */
@@ -247,7 +249,7 @@ export default {
   box-shadow: 0px 1px 3px 2px rgba(50, 50, 50, 0.5);
 }
 
-#g-timeaxis > .g-timeaxis-empty-space {
+.g-timeaxis > .g-timeaxis-empty-space {
   /* width: 20%; this has to be as wide as .ganttRowTitle in VGanttastic.css */
   min-height: 100%;
   background: #f5f5f5;
@@ -256,7 +258,7 @@ export default {
   position: sticky;
 }
 
-#g-timeaxis > .g-timeaxis-days {
+.g-timeaxis > .g-timeaxis-days {
   position: relative;
   /* width: 80%; */
   height: 100%;
@@ -304,7 +306,7 @@ export default {
   height: 8px;
 }
 
-#g-timeaxis-marker {
+.g-timeaxis-marker {
   position: absolute;
   top: 0;
   left: 0;