@operato/gantt 8.0.0-alpha.4 → 8.0.0-alpha.43

package/src/gantt-chart-controller.ts

@@ -3,19 +3,16 @@ import * as d3 from 'd3'
 import { TimeScale, Task, TaskTag } from './types'
 import { OxTaskTooltip } from './ox-task-tooltip'
 import { drawTimeScaleHeader, getScale, getChartWidth } from './draw-time-scale-header'
+import { levelDown, levelUp } from './utils'
+import { GestureEventPinch, GestureEventDoubleTap, GestureEventDrag } from '@operato/utils/gesture-mixin.js'
 
 export class GanttChartController implements ReactiveController {
-  private host: ReactiveControllerHost & LitElement
+  private host: (ReactiveControllerHost & LitElement) | null
   private fromTime: Date
   private toTime: Date
   private totalDays: number
   private _timeScale?: d3.ScaleTime<number, number, never>
 
-  private touchStartX?: number
-  private touchStartY?: number
-  private scrollStartX?: number
-  private scrollStartY?: number
-
   private colorProvider?: (task: Task) => string
 
   public baseWidth: number = 30
@@ -34,6 +31,10 @@ export class GanttChartController implements ReactiveController {
     this.host.addController(this)
   }
 
+  dispose() {
+    this.host = null
+  }
+
   hostConnected() {
     this.updateTimeScale()
   }
@@ -57,12 +58,12 @@ export class GanttChartController implements ReactiveController {
     this.toTime = new Date(toDate)
     this.totalDays = d3.timeDay.count(this.fromTime, d3.timeDay.offset(this.toTime, 1))
     this._timeScale = undefined
-    this.host.requestUpdate()
+    this.host?.requestUpdate()
   }
 
   setTasks(tasks: Task[]) {
     this.tasks = tasks
-    this.host.requestUpdate()
+    this.host?.requestUpdate()
   }
 
   updateTimeScale() {
@@ -93,7 +94,7 @@ export class GanttChartController implements ReactiveController {
       .append('marker')
       .attr('id', 'arrow')
       .attr('viewBox', '0 0 10 10')
-      .attr('refX', 10) // Adjusted refX to move the arrow tip closer to the line's end
+      .attr('refX', 10)
       .attr('refY', 5)
       .attr('markerWidth', 6)
       .attr('markerHeight', 6)
@@ -150,14 +151,20 @@ export class GanttChartController implements ReactiveController {
       const taskWidth = endX - startX + this.baseWidth / this.getScale()
       const taskY = index * 30 + 7.5
 
-      const showTooltip = (event: MouseEvent) => {
+      const showTooltip = (event: MouseEvent | TouchEvent) => {
+        tooltip.hide()
+
+        const touch = 'touches' in event
+        const x = touch ? event.touches[0].clientX : event.clientX
+        const y = touch ? event.touches[0].clientY : event.clientY
+
         tooltip.title = task.title
         tooltip.startDate = startDate.toISOString().split('T')[0]
         tooltip.endDate = endDate.toISOString().split('T')[0]
         tooltip.progress = task.progress ?? 0
         tooltip.type = task.type
 
-        tooltip.show(event.clientX, event.clientY)
+        tooltip.show(x, y)
       }
 
       const hideTooltip = () => {
@@ -185,15 +192,18 @@ export class GanttChartController implements ReactiveController {
         .attr('stroke-width', 1)
 
       taskBar
-        .on('click', () => {
+        .on('click', e => {
           this.selectedTaskId = task.id
           const customEvent = new CustomEvent('task-clicked', {
             detail: { taskId: task.id },
             bubbles: true,
             composed: true
           })
-          this.host.dispatchEvent(customEvent)
-          this.host.requestUpdate()
+
+          showTooltip(e)
+
+          this.host?.dispatchEvent(customEvent)
+          this.host?.requestUpdate()
         })
         .on('mouseover', showTooltip)
         .on('mouseout', hideTooltip)
@@ -209,15 +219,18 @@ export class GanttChartController implements ReactiveController {
           .attr('fill', 'lightgreen')
 
         progressBar
-          .on('click', () => {
+          .on('click', e => {
             this.selectedTaskId = task.id
             const customEvent = new CustomEvent('task-clicked', {
               detail: { taskId: task.id },
               bubbles: true,
               composed: true
             })
-            this.host.dispatchEvent(customEvent)
-            this.host.requestUpdate()
+
+            showTooltip(e)
+
+            this.host?.dispatchEvent(customEvent)
+            this.host?.requestUpdate()
           })
           .on('mouseover', showTooltip)
           .on('mouseout', hideTooltip)
@@ -256,7 +269,7 @@ export class GanttChartController implements ReactiveController {
           .attr('stroke', 'var(--md-sys-color-on-primary-container, black)')
           .attr('fill', 'none')
           .attr('stroke-width', 1)
-          .attr('marker-end', 'url(#arrow)') // Add arrow marker
+          .attr('marker-end', 'url(#arrow)')
       }
     })
   }
@@ -277,6 +290,8 @@ export class GanttChartController implements ReactiveController {
     event.preventDefault()
     event.stopPropagation()
 
+    const { offsetHeight } = container
+
     const deltaModeFactor =
       event.deltaMode === WheelEvent.DOM_DELTA_LINE
         ? 16
@@ -288,7 +303,8 @@ export class GanttChartController implements ReactiveController {
 
     // 가로 스크롤 및 세로 스크롤 모두 처리
     container.scrollLeft += deltaX
-    container.scrollTop += deltaY
+    // container.scrollTop += deltaY
+    container.scrollTop = Math.min(this.tasks.length * 30 - (offsetHeight - 40), container.scrollTop + deltaY)
 
     const customEvent = new CustomEvent('scroll', {
       detail: {
@@ -299,28 +315,78 @@ export class GanttChartController implements ReactiveController {
       composed: true
     })
 
-    this.host.dispatchEvent(customEvent)
+    this.host?.dispatchEvent(customEvent)
   }
 
-  handleTouchStartForBody(event: TouchEvent, container: HTMLDivElement) {
-    event.stopPropagation()
+  handlePinchForBody = (event: GestureEventPinch) => {
+    const { scale } = event.detail
+
+    this.baseWidth *= scale
+
+    if (this.baseWidth > 40) {
+      if (this.level === 'week-day') {
+        this.baseWidth = 40
+      } else {
+        this.level = levelDown(this.level)
+        this.baseWidth = 30
+      }
+    } else if (this.baseWidth < 30) {
+      if (this.level === 'year-quarter') {
+        this.baseWidth = 30
+      }
+    }
 
-    this.touchStartX = event.touches[0].clientX
-    this.touchStartY = event.touches[0].clientY
+    if (this.baseWidth < 20) {
+      this.level = levelUp(this.level)
+      this.baseWidth = 30
+    }
 
-    this.scrollStartX = container.scrollLeft
-    this.scrollStartY = container.scrollTop
+    this.updateTimeScale()
+    this.host?.requestUpdate()
+
+    const customEvent = new CustomEvent('timescale-changed', {
+      detail: {
+        baseWidth: this.baseWidth,
+        level: this.level
+      },
+      bubbles: true,
+      composed: true
+    })
+
+    this.host?.dispatchEvent(customEvent)
   }
 
-  handleTouchMoveForBody(event: TouchEvent, container: HTMLDivElement) {
-    const touchCurrentX = event.touches[0].clientX
-    const touchCurrentY = event.touches[0].clientY
+  handleDoubleTapForBody = (event: GestureEventDoubleTap) => {
+    const container = (this.host as any).container
+
+    container.scrollLeft = 0
+    container.scrollTop = 0
+
+    this.baseWidth = 30
+    this.level = 'week-day'
+
+    this.updateTimeScale()
+    this.host?.requestUpdate()
+
+    const customEvent = new CustomEvent('timescale-changed', {
+      detail: {
+        baseWidth: this.baseWidth,
+        level: this.level
+      },
+      bubbles: true,
+      composed: true
+    })
+
+    this.host?.dispatchEvent(customEvent)
+  }
 
-    const deltaX = this.touchStartX! - touchCurrentX
-    const deltaY = this.touchStartY! - touchCurrentY
+  handleDragForBody = (event: GestureEventDrag) => {
+    const { deltaX: dx, deltaY: dy } = event.detail
+    const container = (this.host as any).container
+    const { offsetHeight } = container
 
-    container.scrollLeft = this.scrollStartX! + deltaX
-    container.scrollTop = this.scrollStartY! + deltaY
+    container.scrollLeft -= dx
+    container.scrollTop = Math.min(this.tasks.length * 30 - (offsetHeight - 40), container.scrollTop - dy)
 
     const customEvent = new CustomEvent('scroll', {
       detail: {
@@ -331,6 +397,6 @@ export class GanttChartController implements ReactiveController {
       composed: true
     })
 
-    this.host.dispatchEvent(customEvent)
+    this.host?.dispatchEvent(customEvent)
   }
 }

package/src/ox-gantt-chart.ts

@@ -2,7 +2,7 @@ import './ox-task-tooltip.js'
 import './ox-resource-chart.js'
 
 import { LitElement, html, css, PropertyValues, PropertyValueMap } from 'lit'
-import { customElement, property, query } from 'lit/decorators.js'
+import { customElement, property, query, state } from 'lit/decorators.js'
 import * as d3 from 'd3'
 import { locales } from './locales'
 
@@ -13,8 +13,10 @@ import { Task, TimeScale } from './types.js'
 import { levelDown, levelUp } from './utils'
 import { OxTaskTooltip } from './ox-task-tooltip.js'
 
+import { gesture } from '@operato/utils/gesture-mixin.js'
+
 @customElement('ox-gantt-chart')
-export class OxGanttChart extends LitElement {
+export class OxGanttChart extends gesture(LitElement) {
   static styles = [
     MDTypeScaleStyles,
     ScrollbarStyles,
@@ -23,15 +25,21 @@ export class OxGanttChart extends LitElement {
         display: flex;
         overflow: hidden;
         position: relative;
+        user-select: none;
       }
+
       div[chart-container] {
         display: block;
         overflow-x: auto;
         overflow-y: hidden;
+        overscroll-behavior: none;
+        touch-action: none;
       }
+
       svg {
         min-width: 100%;
       }
+
       svg[header] {
         display: block;
         min-width: 100%;
@@ -44,27 +52,27 @@ export class OxGanttChart extends LitElement {
         top: 0;
         z-index: 1;
       }
-      .scroll-buttons {
-        position: absolute;
-        top: 44px; /* 헤더 바로 아래 위치 */
-        right: 4px;
-        display: flex;
-        align-items: center;
-        gap: 2px;
-      }
+
       .scroll-button {
-        width: 10px;
-        height: 10px;
+        position: absolute;
+        top: 46px; /* 헤더 바로 아래 위치 */
+        width: 14px;
+        height: 14px;
         background-color: var(--ox-gantt-header-color, var(--md-sys-color-on-secondary-container));
+        opacity: 0.5;
         clip-path: polygon(50% 0%, 0% 100%, 100% 100%);
         cursor: pointer;
         transform: rotate(90deg);
       }
+
       .scroll-button.left {
+        left: 6px;
         transform: rotate(-90deg);
       }
+
       .scroll-button.right {
         transform: rotate(90deg);
+        right: 6px;
       }
     `
   ]
@@ -81,20 +89,38 @@ export class OxGanttChart extends LitElement {
   @property({ type: String }) locale: string = 'en-US'
   @property({ type: Object }) colorProvider!: (task: Task) => string
 
+  @state() dateRangeSelected?: { start: Date; end: Date }
+
   @query('svg[header]') svgHeader!: SVGElement
   @query('svg[body]') svgBody!: SVGElement
   @query('[chart-container]') container!: HTMLDivElement
   @query('ox-task-tooltip') tooltip!: OxTaskTooltip
 
-  private ganttChartController: GanttChartController
+  private ganttChartController!: GanttChartController
+
+  protected firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {
+    this.initHeaderGestureHandlers()
+
+    // this.addEventListener('date-range-cleared', e => this.clearSelection())
+  }
 
-  constructor() {
-    super()
+  connectedCallback(): void {
+    super.connectedCallback()
     this.ganttChartController = new GanttChartController(this, this.fromDate, this.toDate, this.axisScale)
+
+    this.addEventListener('pinch', this.ganttChartController.handlePinchForBody as EventListener)
+    this.addEventListener('drag', this.ganttChartController.handleDragForBody as EventListener)
+    this.addEventListener('doubletap', this.ganttChartController.handleDoubleTapForBody as EventListener)
   }
 
-  protected firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {
-    this.initHeaderGestureHandlers()
+  disconnectedCallback(): void {
+    super.disconnectedCallback()
+
+    this.removeEventListener('pinch', this.ganttChartController.handlePinchForBody as EventListener)
+    this.removeEventListener('drag', this.ganttChartController.handleDragForBody as EventListener)
+    this.removeEventListener('doubletap', this.ganttChartController.handleDoubleTapForBody as EventListener)
+
+    this.ganttChartController.dispose()
   }
 
   updated(changedProperties: PropertyValues<this>) {
@@ -103,8 +129,9 @@ export class OxGanttChart extends LitElement {
     }
 
     if (changedProperties.has('tasks')) {
-      this.ganttChartController.setTasks(this.flattenTasks(this.tasks))
-      this.svgBody.style.height = Math.max(this.tasks.length * 30, 2000) + 'px'
+      const flattenTasks = this.flattenTasks(this.tasks)
+      this.ganttChartController.setTasks(flattenTasks)
+      this.svgBody.style.height = Math.max(flattenTasks.length * 30, 2000) + 'px'
     }
 
     if (changedProperties.has('locale')) {
@@ -126,26 +153,16 @@ export class OxGanttChart extends LitElement {
 
     this.ganttChartController.drawAxes(this.svgHeader)
     this.ganttChartController.drawBody(this.svgBody, this.tooltip)
+    this.drawSelectedRange()
   }
 
   render() {
     return html`
-      <div
-        chart-container
-        @wheel=${(e: WheelEvent) => this.ganttChartController.handleWheelForBody(e, this.container)}
-        @touchstart=${(e: TouchEvent) => this.ganttChartController.handleTouchStartForBody(e, this.container)}
-        @touchmove=${(e: TouchEvent) => this.ganttChartController.handleTouchMoveForBody(e, this.container)}
-      >
-        <svg
-          header
-          @date-range-selected=${(e: CustomEvent) => this.handleDateRangeSelected(e)}
-          @wheel=${this.handleWheelForHeader.bind(this)}
-        ></svg>
+      <div chart-container @wheel=${(e: WheelEvent) => this.ganttChartController.handleWheelForBody(e, this.container)}>
+        <svg header @wheel=${this.handleWheelForHeader.bind(this)}></svg>
         <svg body></svg>
-        <div class="scroll-buttons">
-          <div class="scroll-button left" @click=${this.scrollToStart}></div>
-          <div class="scroll-button right" @click=${this.scrollToEnd}></div>
-        </div>
+        <div class="scroll-button left" @click=${this.scrollToStart} @touchstart=${this.scrollToStart}></div>
+        <div class="scroll-button right" @click=${this.scrollToEnd} @touchstart=${this.scrollToEnd}></div>
         <ox-task-tooltip></ox-task-tooltip>
       </div>
     `
@@ -248,11 +265,6 @@ export class OxGanttChart extends LitElement {
     this.dispatchEvent(customEvent)
   }
 
-  handleDateRangeSelected(event: CustomEvent) {
-    const detail = event.detail
-    this.dispatchEvent(new CustomEvent('date-range-selected', { detail }))
-  }
-
   updateLocale(locale: string) {
     const localeDefinition = (locales as any)[locale || 'en-US']
     if (localeDefinition) {
@@ -264,141 +276,47 @@ export class OxGanttChart extends LitElement {
   initHeaderGestureHandlers() {
     const header = d3.select(this.svgHeader)
 
-    let isDragging = false
     let startX: number | null = null
-    let lastTouchDistance: number | null = null
 
-    const handleTouchStart = (event: TouchEvent) => {
+    const handlePointerDown = (event: PointerEvent) => {
       event.preventDefault()
+      event.stopPropagation()
 
-      if (event.touches.length === 2) {
-        lastTouchDistance = getTouchDistance(event.touches)
-      } else {
-        isDragging = true
-        const touch = event.touches[0]
-        const containerOffsetX = header.node()!.getBoundingClientRect().left
-        startX = touch.clientX - containerOffsetX
-      }
-    }
-
-    const handleTouchMove = (event: TouchEvent) => {
-      event.preventDefault()
+      const containerOffsetX = header.node()!.getBoundingClientRect().left
+      startX = event.clientX - containerOffsetX
 
-      if (event.touches.length === 2 && lastTouchDistance !== null) {
-        const currentDistance = getTouchDistance(event.touches)
-        const zoomFactor = currentDistance / lastTouchDistance
-        this.ganttChartController.baseWidth *= zoomFactor
-
-        if (this.ganttChartController.baseWidth > 60) {
-          if (this.ganttChartController.level == 'year-quarter') {
-            this.ganttChartController.baseWidth = 60
-          } else {
-            this.ganttChartController.level = levelUp(this.ganttChartController.level)
-            this.ganttChartController.baseWidth = 30
-          }
-        } else if (this.ganttChartController.baseWidth < 30) {
-          if (this.ganttChartController.level == 'week-day') {
-            this.ganttChartController.baseWidth = 30
-          } else {
-            this.ganttChartController.level = levelDown(this.ganttChartController.level)
-            this.ganttChartController.baseWidth = 60
-          }
-        }
-
-        lastTouchDistance = currentDistance
-        this.ganttChartController.updateTimeScale()
-        this.requestUpdate()
-
-        // Dispatch custom event to sync with ox-resource-chart
-        const customEvent = new CustomEvent('timescale-changed', {
-          detail: {
-            baseWidth: this.ganttChartController.baseWidth,
-            level: this.ganttChartController.level
-          },
-          bubbles: true,
-          composed: true
-        })
-        this.dispatchEvent(customEvent)
-      } else if (isDragging && startX !== null) {
-        const touch = event.touches[0]
-        const containerOffsetX = header.node()!.getBoundingClientRect().left
-        const currentX = touch.clientX - containerOffsetX
-        this.highlightSelection(startX, currentX)
-      }
+      window.addEventListener('pointermove', handlePointerMove)
+      window.addEventListener('pointerup', handlePointerUp)
     }
 
-    const handleTouchEnd = (event: TouchEvent) => {
+    const handlePointerMove = (event: PointerEvent) => {
       event.preventDefault()
+      event.stopPropagation()
 
-      if (event.touches.length < 2) {
-        lastTouchDistance = null
-      }
-
-      if (!isDragging || startX === null) {
-        const touch = event.changedTouches[0]
-        const containerOffsetX = header.node()!.getBoundingClientRect().left
-        const clickX = touch.clientX - containerOffsetX
-        this.finalizeSelection(clickX, clickX)
-        return
-      }
-
-      const touch = event.changedTouches[0]
       const containerOffsetX = header.node()!.getBoundingClientRect().left
-      const endX = touch.clientX - containerOffsetX
-      this.finalizeSelection(startX, endX)
-
-      isDragging = false
-      startX = null
-    }
+      const currentX = event.clientX - containerOffsetX
 
-    const getTouchDistance = (touches: TouchList): number => {
-      const dx = touches[0].clientX - touches[1].clientX
-      const dy = touches[0].clientY - touches[1].clientY
-      return Math.sqrt(dx * dx + dy * dy)
+      this.highlightSelection(startX!, currentX)
     }
 
-    const handleMouseDown = (event: MouseEvent) => {
-      isDragging = true
-      const containerOffsetX = header.node()!.getBoundingClientRect().left
-      startX = event.clientX - containerOffsetX
-    }
-
-    const handleMouseMove = (event: MouseEvent) => {
-      if (!isDragging || startX === null) return
-
-      const containerOffsetX = header.node()!.getBoundingClientRect().left
-      const currentX = event.clientX - containerOffsetX
-      this.highlightSelection(startX, currentX)
-    }
+    const handlePointerUp = (event: PointerEvent) => {
+      event.preventDefault()
+      event.stopPropagation()
 
-    const handleMouseUp = (event: MouseEvent) => {
-      if (!isDragging || startX === null) {
-        const containerOffsetX = header.node()!.getBoundingClientRect().left
-        const clickX = event.clientX - containerOffsetX
-        this.finalizeSelection(clickX, clickX)
-        return
-      }
+      window.removeEventListener('pointermove', handlePointerMove)
+      window.removeEventListener('pointerup', handlePointerUp)
 
       const containerOffsetX = header.node()!.getBoundingClientRect().left
       const endX = event.clientX - containerOffsetX
-      this.finalizeSelection(startX, endX)
+      this.finalizeSelection(startX!, endX)
 
-      isDragging = false
       startX = null
     }
 
-    header.on('mousedown', handleMouseDown)
-    header.on('mousemove', handleMouseMove)
-    header.on('mouseup', handleMouseUp)
-    header.on('touchstart', handleTouchStart)
-    header.on('touchmove', handleTouchMove)
-    header.on('touchend', handleTouchEnd)
+    header.on('pointerdown', handlePointerDown)
   }
 
   highlightSelection(startX: number, endX: number) {
-    const header = d3.select(this.svgHeader)
-    const body = d3.select(this.svgBody)
-
     let startDate = this.ganttChartController.timeScale.invert(startX)
     let endDate = this.ganttChartController.timeScale.invert(endX)
 
@@ -418,44 +336,10 @@ export class OxGanttChart extends LitElement {
       end = d3.timeDay.offset(d3.timeMonth.every(3)!.ceil(d3.max([startDate, endDate])!), -1)
     }
 
-    header.selectAll('.selection-rect').remove()
-    body.selectAll('.selection-rect').remove()
-
-    header
-      .append('rect')
-      .attr('class', 'selection-rect')
-      .attr('x', this.ganttChartController.timeScale(start!))
-      .attr('y', 20)
-      .attr(
-        'width',
-        this.ganttChartController.timeScale(end!) -
-          this.ganttChartController.timeScale(start!) +
-          this.ganttChartController.baseWidth / this.ganttChartController.getScale()
-      )
-      .attr('height', 20)
-      .attr('fill', 'var(--ox-gantt-selection-color, var(--md-sys-color-on-primary-container))')
-      .attr('opacity', '.2')
-
-    body
-      .append('rect')
-      .attr('class', 'selection-rect')
-      .attr('x', this.ganttChartController.timeScale(start!))
-      .attr('y', 0)
-      .attr(
-        'width',
-        this.ganttChartController.timeScale(end!) -
-          this.ganttChartController.timeScale(start!) +
-          this.ganttChartController.baseWidth / this.ganttChartController.getScale()
-      )
-      .attr('height', '100%')
-      .attr('fill', 'var(--ox-gantt-selection-color, var(--md-sys-color-on-primary-container))')
-      .attr('opacity', '.2')
+    this.dateRangeSelected = { start: start!, end: end! }
   }
 
   finalizeSelection(startX: number, endX: number) {
-    const header = d3.select(this.svgHeader)
-    const body = d3.select(this.svgBody)
-
     let startDate = this.ganttChartController.timeScale.invert(startX)
     let endDate = this.ganttChartController.timeScale.invert(endX)
 
@@ -475,6 +359,29 @@ export class OxGanttChart extends LitElement {
       end = d3.timeDay.offset(d3.timeMonth.every(3)!.ceil(d3.max([startDate, endDate])!), -1)
     }
 
+    this.dateRangeSelected = { start: start!, end: end! }
+
+    const formatDate = d3.timeFormat('%Y-%m-%d')
+
+    this.dispatchEvent(
+      new CustomEvent('date-range-selected', {
+        detail: { start: formatDate(start!), end: formatDate(end!) },
+        bubbles: true,
+        composed: true
+      })
+    )
+  }
+
+  drawSelectedRange() {
+    if (!this.dateRangeSelected) {
+      return
+    }
+
+    let { start, end } = this.dateRangeSelected
+
+    const header = d3.select(this.svgHeader)
+    const body = d3.select(this.svgBody)
+
     header.selectAll('.selection-rect').remove()
     body.selectAll('.selection-rect').remove()
 
@@ -507,12 +414,5 @@ export class OxGanttChart extends LitElement {
       .attr('height', '100%')
       .attr('fill', 'var(--ox-gantt-selection-color, var(--md-sys-color-on-primary-container))')
       .attr('opacity', '.2')
-
-    const formatDate = d3.timeFormat('%Y-%m-%d')
-    const customEvent = new CustomEvent('date-range-selected', {
-      detail: { start: formatDate(start!), end: formatDate(end!) }
-    })
-
-    header.node()?.dispatchEvent(customEvent)
   }
 }