dhx-chart 7.2.5 → 7.3.2

package/codebase/types/ts-chart/sources/Chart.d.ts

@@ -1,9 +1,9 @@
 import { IEventSystem } from "../../ts-common/events";
 import { View } from "../../ts-common/view";
-import { DataCollection, DataEvents } from "../../ts-data";
+import { DataCollection, DataEvents, TreeCollection } from "../../ts-data";
 import { ChartEvents, IChart, IChartConfig, ISeria } from "./types";
 export declare class Chart extends View implements IChart {
-    data: DataCollection;
+    data: DataCollection | TreeCollection;
     events: IEventSystem<DataEvents | ChartEvents>;
     config: IChartConfig;
     private _layers;

package/codebase/types/ts-chart/sources/helpers/common.d.ts

@@ -1,5 +1,5 @@
 import { IContainerConfig } from "../../../ts-common/core";
-export declare function getDefaultColor(index?: number): string;
+export declare function getDefaultColor(index?: number, isTreeMapRange?: boolean): string;
 declare type Locator = (data: any) => number | string;
 export declare function locator(value: string | Locator): Locator;
 export declare function log10(x: number): number;
@@ -32,6 +32,7 @@ interface ITextObj {
 export declare function linearGradient(grad: IGradient, id: string): any;
 export declare function getRadialGradient(opts: any, stops: IStop[], id: string): any;
 export declare function euclideanDistance(x1: number, y1: number, x2: number, y2: number): number;
+export declare function roundToTwoNumAfterPoint(p: number): number;
 export declare function verticalCenteredText(text: string): any;
 export declare function verticalTopText(text: string): any;
 export declare function verticalBottomText(text: string): any;

package/codebase/types/ts-chart/sources/series/TreeMap.d.ts

@@ -0,0 +1,30 @@
+import { IFitPosition } from "../../../ts-common/html";
+import { TreeCollection } from "../../../ts-data";
+import { ITreeMapConfig, PointData, SvgElement } from "../types";
+import BaseSeria from "./BaseSeria";
+export default class TreeMap extends BaseSeria {
+    config: ITreeMapConfig;
+    protected _data: TreeCollection;
+    private _sum;
+    private _maxLevel;
+    private _aspectRatio;
+    private _layout;
+    private _headerHeight;
+    private _textLocator;
+    private _valueLocator;
+    scaleReady(sizes: IFitPosition): IFitPosition;
+    toggle(id?: string): void;
+    dataReady(): PointData[];
+    paint(width: number, height: number): SvgElement;
+    private _drawBar;
+    private _getBar;
+    protected _setDefaults(config: ITreeMapConfig): void;
+    protected _defaultLocator(v: any): any[];
+    private _getSerie;
+    private _getDataLevel;
+    private _getMaxLevel;
+    private _getDeepParent;
+    private _getLayoutObj;
+    private _recountParentArea;
+    private _toggleGroup;
+}

package/codebase/types/ts-chart/sources/series/index.d.ts

@@ -9,6 +9,7 @@ import radar from "./Radar";
 import scatter from "./Scatter";
 import spline from "./Spline";
 import splineArea from "./SplineArea";
+import treeMap from "./TreeMap";
 declare const seriesTypes: {
     line: typeof line;
     spline: typeof spline;
@@ -21,5 +22,6 @@ declare const seriesTypes: {
     radar: typeof radar;
     bar: typeof bar;
     xbar: typeof xbar;
+    treeMap: typeof treeMap;
 };
 export default seriesTypes;

package/codebase/types/ts-chart/sources/types.d.ts

@@ -19,7 +19,7 @@ export interface IChartConfig {
     maxPoints?: number;
     data?: DataCollection<any> | any[];
 }
-export declare type ChartType = "bar" | "line" | "spline" | "scatter" | "area" | "donut" | "pie" | "pie3D" | "radar" | "xbar" | "splineArea";
+export declare type ChartType = "bar" | "line" | "spline" | "scatter" | "area" | "donut" | "pie" | "pie3D" | "radar" | "xbar" | "splineArea" | "treeMap";
 export declare enum ChartEvents {
     toggleSeries = "toggleSeries",
     chartMouseMove = "chartMouseMove",
@@ -53,6 +53,7 @@ export interface ISeria extends ILikeSeria {
     getClosest(x: number, y: number): [number, number, number, string];
     getClosestVertical(x: number): [number, number, number, string, number];
 }
+export declare type TreeDirectionType = "asc" | "desc";
 export interface ISeriaConfig {
     id?: string;
     type?: ChartType;
@@ -60,6 +61,7 @@ export interface ISeriaConfig {
     pointColor?: string;
     dashed?: boolean;
     scales?: ScaleType[];
+    stroke?: string;
     strokeWidth?: number;
     value?: string;
     name?: string;
@@ -79,6 +81,9 @@ export interface ISeriaConfig {
     baseLine?: number;
     tooltipType?: TooltipType;
     stacked?: boolean;
+    direction?: TreeDirectionType;
+    treeSeries?: ITreeSeries[];
+    legendType?: LegendType;
 }
 export declare type SeriaConfig = ISeriaConfig | INoScaleConfig;
 export interface IScale extends IComposable {
@@ -129,12 +134,26 @@ export interface ILegendConfig {
     };
     size?: number;
     form?: Shape;
+    type?: LegendType;
     itemPadding?: number;
     halign?: HorizontalPosition;
     valign?: VerticalPosition;
     series?: string[];
+    treeSeries?: ITreeSeries[];
     margin?: number;
+    direction?: LegendDirection;
     $seriesInfo?: ISeria[];
+    $sizes?: LegendSizes;
+}
+export interface ITreeSeries {
+    less?: number | string;
+    from?: number | string;
+    to?: number | string;
+    greater?: number | string;
+    color?: string;
+    active?: boolean;
+    id?: string;
+    name?: string;
 }
 export interface ILegendDrawData {
     id: string;
@@ -155,7 +174,7 @@ export interface IComposeLayer {
     add(obj: any): void;
     clear(): void;
     getSizes(): IFitPosition;
-    toVDOM(width: number, height: number, events: IEventSystem<DataEvents | ChartEvents>): void;
+    toVDOM(width: number, height: number): void;
 }
 export interface IRadarConfig extends ISeriaConfig {
     radius?: number;
@@ -174,12 +193,17 @@ export interface IRadarScaleDrawData {
     zebra: boolean;
     attribute: string;
 }
+export interface ITreeMapConfig extends ISeriaConfig {
+    paddings?: number;
+    text?: string;
+}
 export interface IAxisCreatorConfig {
     max?: number;
     min?: number;
     log?: boolean;
     padding?: number;
     maxTicks?: number;
+    type?: string;
 }
 export interface IAxisScale {
     min: number;
@@ -211,6 +235,12 @@ export declare type SvgElement = any;
 export declare type Shape = "rect" | "circle";
 export declare type HorizontalPosition = "left" | "center" | "right";
 export declare type VerticalPosition = "top" | "middle" | "bottom";
+export declare type LegendDirection = "row" | "column";
+export declare type LegendType = "groupName" | "range";
+export declare type LegendSizes = {
+    width: number;
+    height: number;
+};
 export interface ILikeSeria extends IComposable {
     getPoints(): PointData[];
     seriesShift?(size?: number): number;
@@ -225,7 +255,10 @@ export declare type SmartLocator = Locator | string;
 export interface IStacker extends IComposable, ILikeSeria {
     add(seria: ISeria): void;
 }
-export declare type PointData = [number, number, string, number, number];
+export declare type PointData = [number, number, string, number | string, number, TreePointData?];
+export declare type TreePointData = {
+    items: PointData[];
+};
 export interface IGridRenderConfig {
     targetLine?: number;
     dashed: boolean;

package/codebase/types/ts-combobox/sources/Combobox.d.ts

@@ -27,6 +27,7 @@ export declare class Combobox extends View implements ICombobox {
     clear(): void | boolean;
     getValue<T extends boolean = false>(asArray?: T): T extends true ? string[] : string;
     setValue(ids: Id[] | Id): void | boolean;
+    addOption(value: string): void;
     destructor(): void;
     /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
     setState(state: State): void;

package/codebase/types/ts-combobox/sources/helper.d.ts

@@ -1,3 +1,4 @@
 export declare function selectAllView(): any;
 export declare function unselectAllView(): any;
-export declare function emptyListView(): any;
+export declare function emptyListView(value?: string): any;
+export declare function emptyListHeight(value: string, width: number): number;

package/codebase/types/ts-combobox/sources/locales/en.d.ts

@@ -3,5 +3,6 @@ declare const _default: {
     selectAll: string;
     unselectAll: string;
     selectedItems: string;
+    createItem: string;
 };
 export default _default;

package/codebase/types/ts-combobox/sources/types.d.ts

@@ -22,6 +22,8 @@ export interface IComboboxConfig {
     hiddenLabel?: boolean;
     css?: string;
     value?: string | string[];
+    newOptions?: boolean;
+    htmlEnable?: boolean;
     /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
     cellHeight?: number;
     /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
@@ -33,15 +35,6 @@ export interface IComboboxConfig {
     /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
     readonly?: boolean;
 }
-export interface IComboFilterConfig {
-    data?: DataCollection<any> | any[];
-    readonly?: boolean;
-    template?: (item: any) => string;
-    filter?: (item: any, input: string) => boolean;
-    placeholder?: string;
-    virtual?: boolean;
-    multiselection?: boolean;
-}
 export declare enum ComboboxEvents {
     change = "change",
     focus = "focus",
@@ -82,6 +75,7 @@ export interface ICombobox {
     blur(): void;
     getValue(asArray?: boolean): Id[] | string;
     setValue(ids: Id[] | Id): void;
+    addOption(value: string): void;
     /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
     setState(state: State): void;
 }

package/codebase/types/ts-data/sources/datacollection/loader.d.ts

@@ -13,4 +13,5 @@ export declare class Loader {
     private _addToChain;
     private _findPrevState;
     private _removeFromOrder;
+    private _getUniqueOrder;
 }

package/codebase/types/ts-data/sources/datacollection.d.ts

@@ -29,7 +29,7 @@ export declare class DataCollection<T extends IDataItem = IDataItem> implements
     remove(id: Id | Id[]): void;
     removeAll(): void;
     exists(id: Id): boolean;
-    getNearId(id: Id): string | number;
+    getNearId(id: Id): Id;
     getItem(id: Id): T;
     update(id: Id, newItem: IUpdateObject, silent?: boolean): void;
     getIndex(id: Id): number;

package/codebase/types/ts-data/sources/treecollection.d.ts

@@ -47,7 +47,7 @@ export declare class TreeCollection<T extends IDataItem = IDataItem> extends Dat
     protected _reset(id?: Id): void;
     protected _removeCore(id: any): void;
     protected _addToOrder(_order: any, obj: any, index: number): void;
-    protected _parse_data(data: any, parent?: string | number): void;
+    protected _parse_data(data: any, parent?: Id): void;
     private _fastDeleteChilds;
     private _recursiveFilter;
     private _serialize;

package/codebase/types/ts-data/sources/types.d.ts

@@ -212,7 +212,8 @@ export declare enum DataEvents {
     load = "load",
     loadError = "loaderror",
     beforeLazyLoad = "beforelazyload",
-    afterLazyLoad = "afterlazyload"
+    afterLazyLoad = "afterlazyload",
+    dataRequest = "dataRequest"
 }
 export interface IDataEventsHandlersMap {
     [key: string]: (...args: any[]) => any;
@@ -226,6 +227,7 @@ export interface IDataEventsHandlersMap {
     [DataEvents.loadError]: (response: any) => void;
     [DataEvents.beforeLazyLoad]: () => boolean | void;
     [DataEvents.afterLazyLoad]: (from: number, count: number) => void;
+    [DataEvents.dataRequest]: (from: number, to: number) => void;
 }
 export declare enum DragEvents {
     beforeDrag = "beforeDrag",

package/codebase/types/ts-grid/sources/types.d.ts

@@ -1,9 +1,9 @@
 import { IEventSystem } from "../../ts-common/events";
 import { IKeyManager } from "../../ts-common/KeyManager";
 import { IAlign } from "../../ts-common/html";
-import { IDataCollection, IDragConfig, ICsvDriverConfig, IDataItem, IDragInfo } from "../../ts-data";
+import { IDataCollection, IDragConfig, ICsvDriverConfig, IDataItem, IDragInfo, DataCollection } from "../../ts-data";
 import { Exporter } from "./Exporter";
-import { IComboFilterConfig, Combobox } from "../../ts-combobox";
+import { Combobox } from "../../ts-combobox";
 import { IHandlers, Id } from "../../ts-common/types";
 import { ScrollView } from "../../ts-common/ScrollView";
 export interface IGridConfig extends IDragConfig {
@@ -135,6 +135,9 @@ export interface IProGrid extends IGrid {
     scrollView: ScrollView;
 }
 export declare type EditorType = "input" | "select" | "datePicker" | "checkbox" | "combobox" | "multiselect" | "textarea";
+export interface IComboEditorConfig {
+    newOptions?: boolean;
+}
 export interface ICellRect extends ICoords, ISizes {
 }
 export declare type colType = "string" | "number" | "boolean" | "date" | "percent" | any;
@@ -148,6 +151,7 @@ export interface ICol {
     mark?: IMark | MarkFunction;
     type?: colType;
     editorType?: EditorType;
+    editorConfig?: IComboEditorConfig;
     editable?: boolean;
     resizable?: boolean;
     sortable?: boolean;
@@ -189,10 +193,20 @@ export interface IHeader {
     css?: any;
     content?: fixedRowContent | footerMethods;
     filterConfig?: IComboFilterConfig;
+    customFilter?: (item: any, input: string) => boolean;
     align?: IAlign;
     headerSort?: boolean;
     sortAs?: SortFunction;
 }
+export interface IComboFilterConfig {
+    data?: DataCollection<any> | any[];
+    readonly?: boolean;
+    template?: (item: any) => string;
+    filter?: (item: any, input: string) => boolean;
+    placeholder?: string;
+    virtual?: boolean;
+    multiselection?: boolean;
+}
 export declare type SortFunction = (cellValue: any) => string | number;
 export interface IFooter {
     text?: string | number;

package/codebase/types/ts-layout/sources/Cell.d.ts

@@ -22,6 +22,7 @@ export declare class Cell extends View implements ICell {
     expand(): void;
     collapse(): void;
     toggle(): void;
+    protected _checkNextSize(cell?: ICell): any;
     getParent(): ILayout;
     destructor(): void;
     getWidget(): IViewLike;
@@ -31,9 +32,11 @@ export declare class Cell extends View implements ICell {
     toVDOM(nodes?: any[]): any;
     protected _getCss(_content?: boolean): string;
     protected _initHandlers(): void;
+    protected _getCollapsedSize(cell: ICell, nextCell: ICell): number;
     protected _getCollapseIcon(): "dxi dxi-chevron-up" | "dxi dxi-chevron-down" | "dxi dxi-chevron-right" | "dxi dxi-chevron-left";
     protected _isLastCell(): boolean;
     protected _getNextCell(): any;
+    protected _getAnyFlexCell(): any;
     protected _getResizerView(): any;
     protected _isXDirection(): any;
     protected _calculateStyle(): any;

package/codebase/types/ts-layout/sources/types.d.ts

@@ -33,6 +33,8 @@ export interface ICellConfig {
     full?: boolean;
     init?: (c: ICell, cfg: ICellConfig | IView) => void;
     $fixed?: boolean;
+    $autoWidth?: boolean;
+    $autoHeight?: boolean;
 }
 export interface ILayoutConfig extends ICellConfig {
     rows?: ICellConfig[] | ILayoutConfig[];

package/codebase/types/ts-list/sources/List.d.ts

@@ -20,6 +20,7 @@ export declare class List extends View implements IList {
     private _topOffset;
     private _visibleHeight;
     private _touch;
+    protected _changed: boolean;
     constructor(node: HTMLElement | string, config?: IListConfig);
     protected _didRedraw(vm: any): void;
     private _dblClick;

package/codebase/types/ts-list/sources/types.d.ts

@@ -19,6 +19,7 @@ export interface IListConfig extends IDragConfig {
     eventHandlers?: {
         [key: string]: any;
     };
+    htmlEnable?: boolean;
     /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
     editing?: boolean;
     /** @deprecated See a documentation: https://docs.dhtmlx.com/ */

package/codebase/types/ts-message/sources/types.d.ts

@@ -5,6 +5,7 @@ export interface IBaseProps {
     css?: string;
     buttonsAlignment?: IAlign;
     blockerCss?: string;
+    htmlEnable?: boolean;
 }
 export interface IAlertProps extends IBaseProps {
     buttons?: [string];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhx-chart",
-  "version": "7.2.5",
+  "version": "7.3.2",
   "description": "dhtmlxChart widget",
   "homepage":"https://docs.dhtmlx.com/chart",
   "license":"GPL",

package/readme.txt

@@ -1,7 +1,7 @@
 /*
 @license
 
-dhtmlxChart v.7.2.5 Standard
+dhtmlxChart v.7.3.2 Standard
 This software is covered by GPL-2.0 License. Usage without proper license is prohibited.
 
 (c) XB Software.

package/whatsnew.txt

@@ -1,9 +1,29 @@
-Version 7.2.5 (October 28, 2021)
+Version 7.3.2 (April 4, 2022)
 ----------------------------
 
-Version 7.2.4 (October 13, 2021)
+Version 7.3.1 (March 17, 2022)
 ----------------------------
 
+Version 7.3.0 (January 19, 2022)
+----------------------------
+
+### New functionality
+
+- New Treemap chart
+- The ability to arrange legend items vertically or horizontally via the direction property of the legend
+
+### Fixes
+
+- Fix the incorrect display of Radar chart if the values in the data set are the same
+- Fix the issue with displaying an empty tooltip in Line chart
+- Fix the issue with the type of the value property in a data set
+
+Version 7.2.5 (October 28, 2021)
+----------------------------
+
+Version 7.2.4 (October 13, 2021)
+----------------------------
+
 Version 7.2.3 (September 27, 2021)
 ----------------------------