@operato/gantt 8.0.0-alpha.0 → 8.0.0-alpha.25

package/src/ox-gantt-chart.ts

@@ -23,15 +23,20 @@ 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;
       }
+
       svg {
         min-width: 100%;
       }
+
       svg[header] {
         display: block;
         min-width: 100%;
@@ -44,27 +49,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;
       }
     `
   ]
@@ -95,6 +100,14 @@ export class OxGanttChart extends LitElement {
 
   protected firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {
     this.initHeaderGestureHandlers()
+
+    this.addEventListener('date-range-cleared', e => this.clearSelection())
+  }
+
+  disconnectedCallback(): void {
+    super.disconnectedCallback()
+
+    this.ganttChartController.dispose()
   }
 
   updated(changedProperties: PropertyValues<this>) {
@@ -133,8 +146,12 @@ export class OxGanttChart extends LitElement {
       <div
         chart-container
         @wheel=${(e: WheelEvent) => this.ganttChartController.handleWheelForBody(e, this.container)}
+        @mousedown=${(e: MouseEvent) => this.ganttChartController.handleTouchStartForBody(e, this.container)}
+        @mousemove=${(e: MouseEvent) => this.ganttChartController.handleTouchMoveForBody(e, this.container)}
+        @mouseup=${(e: MouseEvent) => this.ganttChartController.handleTouchEndForBody(e)}
         @touchstart=${(e: TouchEvent) => this.ganttChartController.handleTouchStartForBody(e, this.container)}
         @touchmove=${(e: TouchEvent) => this.ganttChartController.handleTouchMoveForBody(e, this.container)}
+        @touchend=${(e: TouchEvent) => this.ganttChartController.handleTouchEndForBody(e)}
       >
         <svg
           header
@@ -142,10 +159,8 @@ export class OxGanttChart extends LitElement {
           @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>
     `
@@ -266,60 +281,22 @@ export class OxGanttChart extends LitElement {
 
     let isDragging = false
     let startX: number | null = null
-    let lastTouchDistance: number | null = null
 
     const handleTouchStart = (event: TouchEvent) => {
       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
-      }
+      isDragging = true
+      const touch = event.touches[0]
+      const containerOffsetX = header.node()!.getBoundingClientRect().left
+      startX = touch.clientX - containerOffsetX
     }
 
     const handleTouchMove = (event: TouchEvent) => {
       event.preventDefault()
+      event.stopPropagation()
 
-      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) {
+      if (isDragging && startX !== null) {
         const touch = event.touches[0]
         const containerOffsetX = header.node()!.getBoundingClientRect().left
         const currentX = touch.clientX - containerOffsetX
@@ -329,10 +306,7 @@ export class OxGanttChart extends LitElement {
 
     const handleTouchEnd = (event: TouchEvent) => {
       event.preventDefault()
-
-      if (event.touches.length < 2) {
-        lastTouchDistance = null
-      }
+      event.stopPropagation()
 
       if (!isDragging || startX === null) {
         const touch = event.changedTouches[0]
@@ -351,12 +325,6 @@ export class OxGanttChart extends LitElement {
       startX = null
     }
 
-    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)
-    }
-
     const handleMouseDown = (event: MouseEvent) => {
       isDragging = true
       const containerOffsetX = header.node()!.getBoundingClientRect().left
@@ -515,4 +483,13 @@ export class OxGanttChart extends LitElement {
 
     header.node()?.dispatchEvent(customEvent)
   }
+
+  clearSelection() {
+    const header = d3.select(this.svgHeader)
+    const body = d3.select(this.svgBody)
+
+    // 선택한 영역을 나타내는 모든 'selection-rect' 요소를 제거합니다.
+    header.selectAll('.selection-rect').remove()
+    body.selectAll('.selection-rect').remove()
+  }
 }

package/src/ox-gantt-resize-splitter.ts

@@ -10,15 +10,29 @@ export class OxGanttResizeSplitter extends LitElement {
       background-color: var(--splitter-background-color);
       width: var(--width);
       height: var(--height);
+      z-index: 2;
     }
 
     :host(:hover) {
       background-color: var(--splitter-hover-background-color);
     }
 
+    /* 터치 영역을 넓히기 위해 실제 터치 영역을 더 크게 설정 */
     div {
       width: var(--width);
       height: var(--height);
+      touch-action: none; /* 터치 이벤트 처리에 방해되지 않도록 설정 */
+    }
+
+    div.touch-target {
+      width: var(--width);
+      height: var(--height);
+      transform: scale(1, 5);
+      transform-origin: center;
+    }
+
+    :host([vertical]) div.touch-target {
+      transform: scale(5, 1); /* 세로 스플리터는 세로 방향으로 터치 영역을 확장 */
     }
   `
 
@@ -39,14 +53,37 @@ export class OxGanttResizeSplitter extends LitElement {
   }
 
   render() {
-    return html`<div @mousedown=${(e: MouseEvent) => this.onMouseDown(e)}></div>`
+    return html`
+      <div
+        class="touch-target"
+        @mousedown=${(e: MouseEvent) => this.onMouseDown(e)}
+        @touchstart=${this.onTouchStart}
+      ></div>
+      <div></div>
+      <!-- 실제 보이는 스플리터 -->
+    `
   }
 
   private onMouseDown(e: MouseEvent) {
-    this.dragstart = {
-      x: e.clientX,
-      y: e.clientY
+    this.startDrag(e.clientX, e.clientY)
+    window.addEventListener('mousemove', this.onMouseMove)
+    window.addEventListener('mouseup', this.onMouseUp)
+    e.stopPropagation()
+  }
+
+  private onTouchStart(e: TouchEvent) {
+    // 터치가 touch-target에서 시작된 경우에만 작동
+    if ((e.target as HTMLElement).classList.contains('touch-target')) {
+      const touch = e.touches[0]
+      this.startDrag(touch.clientX, touch.clientY)
+      window.addEventListener('touchmove', this.onTouchMove)
+      window.addEventListener('touchend', this.onTouchEnd)
     }
+    e.stopPropagation()
+  }
+
+  private startDrag(clientX: number, clientY: number) {
+    this.dragstart = { x: clientX, y: clientY }
 
     this.dispatchEvent(
       new CustomEvent('splitter-dragstart', {
@@ -54,44 +91,28 @@ export class OxGanttResizeSplitter extends LitElement {
         composed: true
       })
     )
-
-    this.parentElement!.addEventListener('mousemove', this.onMouseMoveHandler)
-    this.parentElement!.addEventListener('mouseup', this.onMouseUpHandler)
-    window.addEventListener('mousemove', this.onMouseMoveHandler)
-    window.addEventListener('mouseup', this.onMouseUpHandler)
-
-    e.stopPropagation()
   }
 
-  private onMouseMoveHandler = (e: MouseEvent) => this.onMouseMove(e)
-  private onMouseUpHandler = (e: MouseEvent) => this.onMouseUp(e)
+  private onMouseMove = (e: MouseEvent) => {
+    this.moveDrag(e.clientX, e.clientY)
+  }
 
-  private onMouseMove(e: MouseEvent) {
-    if (!this.dragstart) {
-      return
-    }
+  private onTouchMove = (e: TouchEvent) => {
+    const touch = e.touches[0]
+    this.moveDrag(touch.clientX, touch.clientY)
+  }
 
-    const parentRect = this.parentElement!.getBoundingClientRect()
-    if (
-      e.clientX < parentRect.left ||
-      e.clientX > parentRect.right ||
-      e.clientY < parentRect.top ||
-      e.clientY > parentRect.bottom
-    ) {
-      this.onMouseUp(e)
-      return
-    }
+  private moveDrag(clientX: number, clientY: number) {
+    if (!this.dragstart) return
 
-    e.preventDefault()
+    const deltaX = clientX - this.dragstart.x
+    const deltaY = clientY - this.dragstart.y
 
     this.dispatchEvent(
       new CustomEvent('splitter-drag', {
         bubbles: true,
         composed: true,
-        detail: {
-          x: e.clientX - this.dragstart!.x,
-          y: e.clientY - this.dragstart!.y
-        }
+        detail: { x: deltaX, y: deltaY }
       })
     )
 
@@ -102,30 +123,37 @@ export class OxGanttResizeSplitter extends LitElement {
     }
 
     document.body.style.userSelect = 'none'
+  }
 
-    e.stopPropagation()
+  private onMouseUp = (e: MouseEvent) => {
+    this.endDrag(e.clientX, e.clientY)
+    window.removeEventListener('mousemove', this.onMouseMove)
+    window.removeEventListener('mouseup', this.onMouseUp)
+  }
+
+  private onTouchEnd = (e: TouchEvent) => {
+    const touch = e.changedTouches[0]
+    this.endDrag(touch.clientX, touch.clientY)
+    window.removeEventListener('touchmove', this.onTouchMove)
+    window.removeEventListener('touchend', this.onTouchEnd)
   }
 
-  private onMouseUp(e: MouseEvent) {
-    this.parentElement!.removeEventListener('mousemove', this.onMouseMoveHandler)
-    this.parentElement!.removeEventListener('mouseup', this.onMouseUpHandler)
-    window.removeEventListener('mousemove', this.onMouseMoveHandler)
-    window.removeEventListener('mouseup', this.onMouseUpHandler)
+  private endDrag(clientX: number, clientY: number) {
+    if (!this.dragstart) return
+
+    const deltaX = clientX - this.dragstart.x
+    const deltaY = clientY - this.dragstart.y
 
     this.dispatchEvent(
       new CustomEvent('splitter-dragend', {
         bubbles: true,
         composed: true,
-        detail: {
-          x: e.clientX - this.dragstart!.x,
-          y: e.clientY - this.dragstart!.y
-        }
+        detail: { x: deltaX, y: deltaY }
       })
     )
 
+    this.dragstart = undefined
     document.body.style.cursor = ''
     document.body.style.userSelect = ''
-
-    e.stopPropagation()
   }
 }

package/src/ox-gantt.ts

@@ -23,6 +23,7 @@ export class OxGantt extends localize(i18next)(LitElement) {
         font-family: Arial, sans-serif;
         text-wrap: nowrap;
         position: relative;
+        user-select: none;
       }
 
       .container {
@@ -49,6 +50,7 @@ export class OxGantt extends localize(i18next)(LitElement) {
         overflow-y: overlay;
         box-sizing: border-box;
         border: 1px solid var(--ox-gantt-border-color, var(--md-sys-color-outline));
+        overscroll-behavior: none; /* diabled rubber-band effect */
       }
 
       .resource-chart-container {
@@ -56,6 +58,7 @@ export class OxGantt extends localize(i18next)(LitElement) {
         padding: 0;
         box-sizing: border-box;
         border: 1px solid var(--ox-gantt-border-color, var(--md-sys-color-outline));
+        overscroll-behavior: none;
       }
 
       .task-container {
@@ -64,6 +67,8 @@ export class OxGantt extends localize(i18next)(LitElement) {
         display: flex;
         overflow: hidden;
         box-sizing: border-box;
+        user-select: none;
+        overscroll-behavior: none;
       }
 
       .task-table-container {
@@ -72,6 +77,7 @@ export class OxGantt extends localize(i18next)(LitElement) {
         overflow-y: overlay;
         box-sizing: border-box;
         border: 1px solid var(--ox-gantt-border-color, var(--md-sys-color-outline));
+        overscroll-behavior: none; /* diabled rubber-band effect */
       }
 
       .task-chart-container {
@@ -104,6 +110,9 @@ export class OxGantt extends localize(i18next)(LitElement) {
         border: 1px solid var(--ox-gantt-border-color, var(--md-sys-color-outline));
         padding: 4px;
         text-align: left;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
       th {
@@ -312,7 +321,7 @@ export class OxGantt extends localize(i18next)(LitElement) {
   }
 
   renderTaskRows(tasks: Task[], level: number = 0, columnConfig: ColumnConfig[]): TemplateResult[] {
-    return tasks.flatMap(task => {
+    return (tasks || []).flatMap(task => {
       if (task.collapsed) {
         return [this.renderTaskRow(task, level, columnConfig)]
       } else {

package/src/ox-resource-chart.ts

@@ -16,12 +16,14 @@ export class OxResourceChart extends LitElement {
         display: flex;
         overflow: hidden;
         position: relative;
+        user-select: none;
       }
 
       div[chart-container] {
         flex-direction: column;
         overflow-x: auto;
         overflow-y: hidden;
+        overscroll-behavior: none;
       }
 
       svg[header] {

package/src/ox-task-tooltip.ts

@@ -1,11 +1,11 @@
 import { LitElement, html, css } from 'lit'
-import { customElement, property } from 'lit/decorators.js'
+import { customElement, property, query } from 'lit/decorators.js'
 
 @customElement('ox-task-tooltip')
 export class OxTaskTooltip extends LitElement {
   static styles = css`
     :host {
-      position: fixed; /* position: absolute로 변경 */
+      position: fixed;
       background-color: var(--ox-gantt-tooltip-background-color, var(--md-sys-color-surface-variant, #f9f9f9));
       border: 1px solid var(--ox-gantt-tooltip-border-color, var(--md-sys-color-outline, #ccc));
       padding: var(--spacing-medium, 10px);
@@ -21,17 +21,18 @@ export class OxTaskTooltip extends LitElement {
       transition:
         visibility 0.1s,
         opacity 0.1s;
-      opacity: 0; /* 초기에는 보이지 않음 */
+      opacity: 0;
     }
     :host([visible]) {
       visibility: visible;
-      opacity: 1; /* 보일 때는 불투명 */
+      opacity: 1;
     }
     .title {
       font-weight: bold;
       font-size: 16px;
       margin-bottom: 8px;
-      color: var(--ox-gantt-tooltip-title-color, var(--md-sys-color-primary, #0078d4)); /* 파란색 텍스트 */
+      color: var(--ox-gantt-tooltip-title-color, var(--md-sys-color-primary, #0078d4));
+      outline: none;
     }
     .detail {
       display: grid;
@@ -42,14 +43,24 @@ export class OxTaskTooltip extends LitElement {
     .label {
       font-weight: bold;
       color: var(--ox-gantt-tooltip-color, var(--md-sys-color-secondary, #333));
-      text-align: right; /* 라벨을 우측 정렬 */
+      text-align: right;
     }
     .colon {
       text-align: center;
       color: var(--ox-gantt-tooltip-color, var(--md-sys-color-secondary, #333));
     }
     .value {
-      text-align: left; /* 값을 좌측 정렬 */
+      text-align: left;
+      color: var(--ox-gantt-tooltip-color, var(--md-sys-color-on-surface, #333));
+    }
+    .close-button {
+      position: absolute;
+      top: 4px;
+      right: 8px;
+      background: none;
+      border: none;
+      font-size: 16px;
+      cursor: pointer;
       color: var(--ox-gantt-tooltip-color, var(--md-sys-color-on-surface, #333));
     }
   `
@@ -59,6 +70,9 @@ export class OxTaskTooltip extends LitElement {
   @property({ type: String }) endDate = ''
   @property({ type: Number }) progress = 0
   @property({ type: String }) type = ''
+  @property({ type: Boolean, attribute: true }) visible: boolean = false
+
+  @query('.title') titleElement!: HTMLDivElement
 
   show(x: number, y: number) {
     const tooltipWidth = this.offsetWidth
@@ -100,15 +114,23 @@ export class OxTaskTooltip extends LitElement {
     }
 
     this.setAttribute('visible', '')
+
+    setTimeout(() => {
+      this.titleElement.addEventListener('blur', this.hide)
+      this.titleElement.focus({ preventScroll: true })
+    }, 500)
   }
 
-  hide() {
+  hide = () => {
+    this.titleElement.removeEventListener('blur', this.hide)
     this.removeAttribute('visible')
   }
 
   render() {
     return html`
-      <div class="title">${this.title}</div>
+      <div class="close-button" @click=${this.hide} @touchstart=${this.hide}>✕</div>
+      <div class="title" tabindex="0">${this.title}</div>
+
       <div class="detail">
         <span class="label">Type</span><span class="colon">:</span><span class="value">${this.type}</span>
         <span class="label">Start Date</span><span class="colon">:</span><span class="value">${this.startDate}</span>

package/stories/ox-gantt.stories.ts

@@ -68,6 +68,22 @@ const Template: Story<ArgTypes> = ({
   </style>
 
   <style>
+    html,
+    body {
+      margin: 0;
+      padding: 0;
+      overflow: hidden;
+
+      overscroll-behavior: none;
+
+      /* This is a font-stack that tries to use the system-default sans-serifs first */
+      font-family: Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+      line-height: 1.5;
+      -webkit-font-smoothing: antialiased;
+
+      accent-color: var(--md-sys-color-primary);
+    }
+
     body {
       width: 100%;
       height: 800px;

package/themes/form-theme.css

@@ -39,7 +39,6 @@ body {
   --file-uploader-label-color: #fff;
   --file-uploader-li-padding: 2px 5px 0px 5px;
   --file-uploader-li-border-bottom: 1px dotted rgba(0, 0, 0, 0.1);
-  --file-uploader-li-icon-margin: 2px 0 2px 5px;
   --file-uploader-li-icon-font: normal 15px var(--md-icon-font, 'Material Symbols Outlined');
   --file-uploader-li-icon-focus-color: var(--md-sys-color-primary);
 }