@hpcc-js/timeline 2.54.1 → 2.56.0

package/src/ReactTimeline.ts

@@ -1,11 +1,11 @@
 import { timeFormat as d3TimeFormat, timeParse as d3TimeParse } from "d3-time-format";
-import { ReactAxisGantt } from "./ReactAxisGantt";
+import { ReactAxisGantt } from "./ReactAxisGantt.ts";
 
 export class ReactTimeline extends ReactAxisGantt {
 
     protected _axisLabelFormatter;//TODO: add a type to this? d3 time formatting function type?
 
-    constructor(){
+    constructor() {
         super();
         this._drawStartPos = "origin";
         this._topAxis.type("time");
@@ -24,29 +24,33 @@ export class ReactTimeline extends ReactAxisGantt {
     update(domNode, element) {
         super.update(domNode, element);
 
-        if(this.timePattern_exists()) {
+        if (this.timePattern_exists()) {
 
             let minTimestamp = Infinity;
             let maxTimestamp = -Infinity;
             let lowDateStr = "";
             let highDateStr = "";
-            this.data().map(n=>{
+            this.data().map(n => {
                 const start = new Date(n[1]).getTime();
                 const end = new Date(n[2]).getTime();
-                if(minTimestamp > start){
+                if (minTimestamp > start) {
                     minTimestamp = start;
                     lowDateStr = "" + n[1];
                 }
-                if(maxTimestamp < end){
+                if (maxTimestamp < end) {
                     maxTimestamp = end;
                     highDateStr = "" + n[2];
                 }
             });
+
+            const axisTickFormat = this._axisLabelFormatter
+                ? this._axisLabelFormatter
+                : (this.tickFormat_exists && this.tickFormat_exists() ? this.tickFormat() : undefined);
+
             this._topAxis
                 .type("time")
                 .timePattern(this.timePattern())
                 .overlapMode("none")
-                .tickFormat(this._axisLabelFormatter)
                 .low(lowDateStr)
                 .high(highDateStr)
                 ;
@@ -54,10 +58,17 @@ export class ReactTimeline extends ReactAxisGantt {
                 .type("time")
                 .timePattern(this.timePattern())
                 .overlapMode("none")
-                .tickFormat(this._axisLabelFormatter)
                 .low(lowDateStr)
                 .high(highDateStr)
                 ;
+
+            if (axisTickFormat) {
+                this._topAxis.tickFormat(axisTickFormat);
+                this._bottomAxis.tickFormat(axisTickFormat);
+            } else {
+                this._topAxis.tickFormat_reset();
+                this._bottomAxis.tickFormat_reset();
+            }
             this._gantt._minStart = minTimestamp;
             this._gantt._maxEnd = maxTimestamp;
         }
@@ -78,7 +89,7 @@ export class ReactTimeline extends ReactAxisGantt {
     }
 
     onzoom(transform) {
-        
+
         const w = this.width();
         const low = this._gantt._minStart;
         const high = this._gantt._maxEnd;
@@ -98,18 +109,18 @@ export class ReactTimeline extends ReactAxisGantt {
             .render()
             ;
     }
-
-    _tooltipHTML: (_) => string;
 }
 ReactTimeline.prototype._class += " timeline_ReactTimeline";
 
 export interface ReactTimeline {
+    _tooltipHTML(_): string;
+
     timePattern(): string;
     timePattern(_: string): this;
     timePattern_exists(): boolean;
     tooltipTimeFormat(): string;
     tooltipTimeFormat(_: string): this;
 }
-ReactTimeline.prototype.publish("timePattern", "%Y-%m-%d", "string", "Time pattern used for parsing datetime strings on each data row", null, {optional:true});
+ReactTimeline.prototype.publish("timePattern", "%Y-%m-%d", "string", "Time pattern used for parsing datetime strings on each data row", null, { optional: true });
 ReactTimeline.prototype.publish("tooltipTimeFormat", "%Y-%m-%d", "string", "Time format used in the default html tooltip");
 

package/src/ReactTimelineSeries.ts

@@ -1,12 +1,12 @@
 import { timeFormat as d3TimeFormat, timeParse as d3TimeParse } from "d3-time-format";
-import { ReactAxisGanttSeries } from "./ReactAxisGanttSeries";
+import { ReactAxisGanttSeries } from "./ReactAxisGanttSeries.ts";
 
 const parseTime = d3TimeParse("%Q");
 export class ReactTimelineSeries extends ReactAxisGanttSeries {
 
     protected _axisLabelFormatter;//TODO: add a type to this? d3 time formatting function type?
 
-    constructor(){
+    constructor() {
         super();
         this._topAxis.type("time");
         this._bottomAxis.type("time");
@@ -23,29 +23,33 @@ export class ReactTimelineSeries extends ReactAxisGanttSeries {
     update(domNode, element) {
         super.update(domNode, element);
 
-        if(this.timePattern_exists()) {
+        if (this.timePattern_exists()) {
 
             let minTimestamp = Infinity;
             let maxTimestamp = -Infinity;
             let lowDateStr = "";
             let highDateStr = "";
-            this.data().forEach(n=>{
+            this.data().forEach(n => {
                 const start = new Date(n[1]).getTime();
                 const end = new Date(n[2]).getTime();
-                if(minTimestamp > start){
+                if (minTimestamp > start) {
                     minTimestamp = start;
                     lowDateStr = "" + n[1];
                 }
-                if(maxTimestamp < end){
+                if (maxTimestamp < end) {
                     maxTimestamp = end;
                     highDateStr = "" + n[2];
                 }
             });
+
+            const axisTickFormat = this._axisLabelFormatter
+                ? this._axisLabelFormatter
+                : (this.tickFormat_exists && this.tickFormat_exists() ? this.tickFormat() : undefined);
+
             this._topAxis
                 .type("time")
                 .timePattern(this.timePattern())
                 .overlapMode("none")
-                .tickFormat(this._axisLabelFormatter)
                 .low(lowDateStr)
                 .high(highDateStr)
                 ;
@@ -53,10 +57,17 @@ export class ReactTimelineSeries extends ReactAxisGanttSeries {
                 .type("time")
                 .timePattern(this.timePattern())
                 .overlapMode("none")
-                .tickFormat(this._axisLabelFormatter)
                 .low(lowDateStr)
                 .high(highDateStr)
                 ;
+
+            if (axisTickFormat) {
+                this._topAxis.tickFormat(axisTickFormat);
+                this._bottomAxis.tickFormat(axisTickFormat);
+            } else {
+                this._topAxis.tickFormat_reset();
+                this._bottomAxis.tickFormat_reset();
+            }
             this._gantt._minStart = minTimestamp;
             this._gantt._maxEnd = maxTimestamp;
         }
@@ -76,7 +87,7 @@ export class ReactTimelineSeries extends ReactAxisGanttSeries {
     }
 
     onzoom(transform) {
-        
+
         const w = this.width();
         const low = this._gantt._minStart;
         const high = this._gantt._maxEnd;
@@ -108,6 +119,6 @@ export interface ReactTimelineSeries {
     tooltipTimeFormat(): string;
     tooltipTimeFormat(_: string): this;
 }
-ReactTimelineSeries.prototype.publish("timePattern", "%Y-%m-%d", "string", "Time pattern used for parsing datetime strings on each data row", null, {optional:true});
+ReactTimelineSeries.prototype.publish("timePattern", "%Y-%m-%d", "string", "Time pattern used for parsing datetime strings on each data row", null, { optional: true });
 ReactTimelineSeries.prototype.publish("tooltipTimeFormat", "%Y-%m-%d", "string", "Time format used in the default html tooltip");
 

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/timeline";
-export const PKG_VERSION = "2.54.1";
-export const BUILD_VERSION = "2.108.2";
+export const PKG_VERSION = "3.0.0";
+export const BUILD_VERSION = "3.2.1";

package/src/index.ts

@@ -1,7 +1,7 @@
-export * from "./__package__";
-export * from "./MiniGantt";
-export * from "./ReactGantt";
-export * from "./ReactAxisGantt";
-export * from "./ReactAxisGanttSeries";
-export * from "./ReactTimeline";
-export * from "./ReactTimelineSeries";
+export * from "./__package__.ts";
+export * from "./MiniGantt.ts";
+export * from "./ReactGantt.ts";
+export * from "./ReactAxisGantt.ts";
+export * from "./ReactAxisGanttSeries.ts";
+export * from "./ReactTimeline.ts";
+export * from "./ReactTimelineSeries.ts";

package/types/MiniGantt.d.ts

@@ -43,12 +43,12 @@ export declare class MiniGantt extends SVGWidget {
     dblclick(row: any, col: any, sel: any): void;
     enterEntityRect(textbox: EntityRect, d: any): void;
     updateEntityRect(textbox: EntityRect, d: any): void;
-    tooltip: any;
-    tooltipHTML: (_: any) => string;
-    tooltipFormat: (_: any) => string;
-    _selection: any;
 }
 export interface MiniGantt {
+    tooltip: any;
+    tooltipHTML(_: any): string;
+    tooltipFormat(_: any): string;
+    _selection: any;
     timePattern(): string;
     timePattern(_: string): this;
     tickFormat(): string;
@@ -97,4 +97,3 @@ export interface MiniGantt {
     centerOnMostRecent(): boolean;
     centerOnMostRecent(_: boolean): this;
 }
-//# sourceMappingURL=MiniGantt.d.ts.map

package/types/ReactAxisGantt.d.ts

@@ -1,6 +1,6 @@
 import { Axis } from "@hpcc-js/chart";
 import { SVGWidget } from "@hpcc-js/common";
-import { ReactGantt } from "./ReactGantt";
+import { ReactGantt } from "./ReactGantt.ts";
 export type IAxisGanttData = [string, number | string, number | string, any?] | any[];
 export declare class ReactAxisGantt extends SVGWidget {
     protected _topAxis: Axis;
@@ -20,6 +20,7 @@ export declare class ReactAxisGantt extends SVGWidget {
     enter(domNode: any, element: any): void;
     onzoom(transform: any): void;
     update(domNode: any, element: any): void;
+    exit(domNode: any, element: any): void;
     columns(): string[];
     columns(_: string[]): this;
     data(): IAxisGanttData[];
@@ -75,4 +76,3 @@ export interface ReactAxisGantt {
     maxZoom(): number;
     maxZoom(_: number): this;
 }
-//# sourceMappingURL=ReactAxisGantt.d.ts.map

package/types/ReactAxisGanttSeries.d.ts

@@ -1,8 +1,8 @@
 import { Axis } from "@hpcc-js/chart";
 import { Border2 } from "@hpcc-js/layout";
-import { ReactGantt } from "./ReactGantt";
-import { IAxisGanttData } from "./ReactAxisGantt";
 import { React } from "@hpcc-js/react";
+import { ReactGantt } from "./ReactGantt.ts";
+import { IAxisGanttData } from "./ReactAxisGantt.ts";
 export declare class ReactAxisGanttSeries extends Border2 {
     protected _topAxis: Axis;
     protected _gantt: ReactGantt;
@@ -79,4 +79,3 @@ export interface ReactAxisGanttSeries {
     maxZoom(): number;
     maxZoom(_: number): this;
 }
-//# sourceMappingURL=ReactAxisGanttSeries.d.ts.map

package/types/ReactGantt.d.ts

@@ -43,6 +43,7 @@ export declare class ReactGantt extends SVGZoomWidget {
     rangeRenderer(_: React.FunctionComponent): this;
     enter(domNode: any, element: any): void;
     update(domNode: any, element: any): void;
+    exit(domNode: any, element: any): void;
     renderRangeElement(d: any, i: any, transformEach?: boolean, options?: any, seriesKey?: string): void;
     setRangeOptions(): void;
     _transform: {
@@ -127,4 +128,3 @@ export interface ReactGantt {
     oddSeriesBackground(): string;
     oddSeriesBackground(_: string): this;
 }
-//# sourceMappingURL=ReactGantt.d.ts.map

package/types/ReactTimeline.d.ts

@@ -1,4 +1,4 @@
-import { ReactAxisGantt } from "./ReactAxisGantt";
+import { ReactAxisGantt } from "./ReactAxisGantt.ts";
 export declare class ReactTimeline extends ReactAxisGantt {
     protected _axisLabelFormatter: any;
     constructor();
@@ -6,13 +6,12 @@ export declare class ReactTimeline extends ReactAxisGantt {
     tooltipHTML(callback: any): this;
     parseAxisValue(v: any): string;
     onzoom(transform: any): void;
-    _tooltipHTML: (_: any) => string;
 }
 export interface ReactTimeline {
+    _tooltipHTML(_: any): string;
     timePattern(): string;
     timePattern(_: string): this;
     timePattern_exists(): boolean;
     tooltipTimeFormat(): string;
     tooltipTimeFormat(_: string): this;
 }
-//# sourceMappingURL=ReactTimeline.d.ts.map

package/types/ReactTimelineSeries.d.ts

@@ -1,4 +1,4 @@
-import { ReactAxisGanttSeries } from "./ReactAxisGanttSeries";
+import { ReactAxisGanttSeries } from "./ReactAxisGanttSeries.ts";
 export declare class ReactTimelineSeries extends ReactAxisGanttSeries {
     protected _axisLabelFormatter: any;
     constructor();
@@ -15,4 +15,3 @@ export interface ReactTimelineSeries {
     tooltipTimeFormat(): string;
     tooltipTimeFormat(_: string): this;
 }
-//# sourceMappingURL=ReactTimelineSeries.d.ts.map

package/types/__package__.d.ts

@@ -1,4 +1,3 @@
 export declare const PKG_NAME = "@hpcc-js/timeline";
-export declare const PKG_VERSION = "2.54.1";
-export declare const BUILD_VERSION = "2.108.2";
-//# sourceMappingURL=__package__.d.ts.map
+export declare const PKG_VERSION = "3.0.0";
+export declare const BUILD_VERSION = "3.2.1";

package/types/index.d.ts

@@ -1,8 +1,7 @@
-export * from "./__package__";
-export * from "./MiniGantt";
-export * from "./ReactGantt";
-export * from "./ReactAxisGantt";
-export * from "./ReactAxisGanttSeries";
-export * from "./ReactTimeline";
-export * from "./ReactTimelineSeries";
-//# sourceMappingURL=index.d.ts.map
+export * from "./__package__.ts";
+export * from "./MiniGantt.ts";
+export * from "./ReactGantt.ts";
+export * from "./ReactAxisGantt.ts";
+export * from "./ReactAxisGanttSeries.ts";
+export * from "./ReactTimeline.ts";
+export * from "./ReactTimelineSeries.ts";