@svar-ui/gantt-store 2.5.2 → 2.6.1

package/dist/types/DataStore.d.ts

@@ -1,7 +1,7 @@
 import { Store, EventBus } from "@svar-ui/lib-state";
 import type { TDataConfig, TWritableCreator, TID } from "@svar-ui/lib-state";
 import { HistoryManager } from "./pro/HistoryManager";
-import type { IData, IDataConfig, ITask, TMethodsConfig, ILink, IVisibleArea, IParsedTask, TScrollTask, IExportConfig } from "./types";
+import type { IData, IDataConfig, ITask, TMethodsConfig, ILink, IVisibleArea, IParsedTask, IExportConfig, TFilterHandler, TScrollMode } from "./types";
 export default class DataStore extends Store<IData> {
     in: EventBus<TMethodsConfig, keyof TMethodsConfig>;
     private _router;
@@ -24,6 +24,7 @@ export default class DataStore extends Store<IData> {
     private calcScaleDate;
     getNextRow(id: TID): IParsedTask;
     getPrevRow(id: TID): IParsedTask;
+    scrollToTask(id: TID, mode: TScrollMode, eventSource?: keyof IDataMethodsConfig): void;
 }
 type CombineTypes<T, N> = {
     [P in keyof T]: T[P] & N;
@@ -34,7 +35,7 @@ export type IDataMethodsConfig = CombineTypes<{
         task: Partial<ITask>;
         target?: TID;
         mode?: "before" | "after" | "child";
-        show?: TScrollTask["mode"];
+        show?: TScrollMode;
         select?: boolean;
         eventSource?: string;
     };
@@ -59,7 +60,9 @@ export type IDataMethodsConfig = CombineTypes<{
         id: TID;
         toggle?: boolean;
         range?: boolean;
-        show?: TScrollTask["mode"];
+        column?: string | boolean;
+        show?: TScrollMode;
+        focus?: "grid" | "chart";
     };
     ["drag-task"]: {
         id: TID;
@@ -67,7 +70,6 @@ export type IDataMethodsConfig = CombineTypes<{
         width?: number;
         left?: number;
         top?: number;
-        start?: boolean;
         inProgress?: boolean;
     };
     ["copy-task"]: {
@@ -109,6 +111,8 @@ export type IDataMethodsConfig = CombineTypes<{
     ["scroll-chart"]: {
         left?: number;
         top?: number;
+        date?: Date;
+        eventSource?: string;
     };
     ["render-data"]: IVisibleArea;
     ["request-data"]: {
@@ -126,21 +130,27 @@ export type IDataMethodsConfig = CombineTypes<{
         ratio?: number;
         offset?: number;
     };
-    ["expand-scale"]: {
-        minWidth: number;
-        date?: Date;
-        offset?: number;
-    };
     ["sort-tasks"]: {
         key: string;
         order: "asc" | "desc";
         add?: boolean;
     };
+    ["filter-tasks"]: {
+        filter?: TFilterHandler;
+        key?: string;
+        value?: any;
+        open?: boolean;
+    };
     ["hotkey"]: {
         key: string;
         event: any;
         eventSource?: string;
     };
+    ["resize-chart"]: {
+        width: number;
+        height: number;
+        scrollSize: number;
+    };
     ["schedule-tasks"]: {
         id?: TID;
         task?: Partial<ITask>;

package/dist/types/GanttDataTree.d.ts

@@ -1,7 +1,7 @@
 import { DataTree, TID } from "@svar-ui/lib-state";
-import type { ITask, IParsedTask, TSort } from "./types";
+import { ITask, IParsedTask, TSort, TFilterHandler, IGanttColumn } from "./types";
 export default class GanttDataTree extends DataTree<IParsedTask> {
-    private _sort;
+    private _filteredIds;
     constructor(tasks?: Partial<ITask>[]);
     parse(tasks: Partial<ITask>[], parent: TID): void;
     getBranch(id: TID): IParsedTask[];
@@ -9,11 +9,16 @@ export default class GanttDataTree extends DataTree<IParsedTask> {
     getIndexById(id: TID): number;
     add(task: Partial<ITask>, index: number): IParsedTask;
     copy(taskObj: ITask, parent: TID, ind: number): TID[][];
+    remove(id: TID): void;
     normalizeTask(task: Partial<ITask>): ITask;
     getSummaryId(id: TID): TID | null;
-    getSummaryId(id: TID, all: true): TID[] | null;
-    sort(conf: TSort[]): void;
-    sortBranch(conf: TSort[], parent?: TID): void;
+    getSummaryId(id: TID, all: boolean): TID[] | null;
+    sort(conf: TSort[], columns: IGanttColumn[]): void;
+    sortBranch(conf: TSort[], parent: TID, columns: IGanttColumn[]): void;
     serialize(): Partial<ITask>[];
     clear(): void;
+    filterTree(filter?: TFilterHandler, open?: boolean): void;
+    toArray(all?: boolean): IParsedTask[];
+    isFilteredId(id: TID): boolean;
+    hasChildItems(task: Partial<IParsedTask>): boolean;
 }

package/dist/types/helpers/editorItems.d.ts

@@ -47,6 +47,16 @@ export declare function getEditorItems(config?: IDataConfig): ({
         id: any;
         label: string;
     }[];
+} | {
+    [x: string]: any;
+    id?: import("@svar-ui/lib-state").TID;
+    key: string;
+    label?: string;
+    labelTemplate?: (value: any) => string;
+    config?: Record<string, any>;
+    isHidden?: (task: Partial<ITask>) => boolean;
+    isDisabled?: (task: Partial<ITask>, state: IData) => boolean;
+    comp: "checkbox";
 } | {
     [x: string]: any;
     id?: import("@svar-ui/lib-state").TID;

package/dist/types/helpers/filter.d.ts

@@ -0,0 +1,3 @@
+import { IParsedTask, TFilterHandler, TID } from "../types";
+export declare function filterTask(task: IParsedTask, filter: TFilterHandler, ids: Set<TID>, open?: boolean): boolean;
+export declare function deleteFromFiltered(ids: Set<string | number>, id: TID, branch?: IParsedTask[]): void;

package/dist/types/helpers/sort.d.ts

@@ -1,2 +1,2 @@
-import type { IParsedTask, TSort } from "../types";
-export declare function sort(data: IParsedTask[], conf: TSort[]): IParsedTask[];
+import type { IGanttColumn, IParsedTask, TSort } from "../types";
+export declare function sort(data: IParsedTask[], conf: TSort[], columns: IGanttColumn[]): IParsedTask[];

package/dist/types/links.d.ts

@@ -1,5 +1,5 @@
 import type { IGanttTask, IGanttLink, ILink } from "./types";
-export declare const updateLink: (link: IGanttLink, startTask: IGanttTask, endTask: IGanttTask, height: number, baselines: boolean) => IGanttLink;
+export declare const updateLink: (link: IGanttLink, startTask: IGanttTask, endTask: IGanttTask, cellHeight: number) => IGanttLink;
 export declare function placeLink(box: {
     left: number;
     top: number;

package/dist/types/scales.d.ts

@@ -1,13 +1,13 @@
-import type { IScaleConfig, GanttScaleData, IUnitFormats, IZoomConfig, TLengthUnit, IMarker } from "./types";
+import type { IScaleConfig, GanttScaleData, IUnitFormats, IZoomConfig, TLengthUnit, IMarker, IData } from "./types";
 import type GanttDataTree from "./GanttDataTree";
 import { Day } from "date-fns";
 export declare function getMinUnit(scales: IScaleConfig[]): IScaleConfig;
 export declare const units: string[];
-export declare function calcScales(prevStart?: Date, prevEnd?: Date, autoScale?: boolean, minUnit?: string, tasks?: GanttDataTree, markers?: IMarker[]): {
+export declare function calcScales(prevStart?: Date, prevEnd?: Date, autoScale?: boolean, minUnit?: string, tasks?: GanttDataTree, markers?: IMarker[], projectStart?: Date, projectEnd?: Date, baselines?: boolean): {
     _start: Date;
     _end: Date;
 };
-export declare function resetScales(start: Date, end: Date, lengthUnit: TLengthUnit, width: number, height: number, _weekStart: Day, scales: IScaleConfig[]): GanttScaleData | null;
+export declare function resetScales(start: Date, end: Date, lengthUnit: TLengthUnit, width: number, height: number, _weekStart: Day, scales: IScaleConfig[], minLength: number): GanttScaleData | null;
 export declare function normalizeZoom(zoom: boolean | IZoomConfig, unitFormats: IUnitFormats, scales: IScaleConfig[], cellWidth: number): {
     zoom: IZoomConfig;
     scales: IScaleConfig[];
@@ -19,3 +19,4 @@ export declare function zoomScale(zoom: IZoomConfig, step: number, level: number
     lengthUnit: TLengthUnit;
     zoom: IZoomConfig;
 };
+export declare function expandScale(minWidth: number, state: Partial<IData>): Partial<IData>;

package/dist/types/tasks.d.ts

@@ -1,7 +1,8 @@
-import { IGanttTask, IParsedTask, GanttDataTree, ITask, IData, IDataHash } from "./types";
-export declare function dragSummaryKids(task: IParsedTask, dx: number, state: Partial<IData>): void;
-export declare function dragSummary(tasks: GanttDataTree, task: IParsedTask, state: Partial<IData>, updateHidden?: boolean): void;
+import { IGanttTask, IParsedTask, GanttDataTree, ITask, IDataHash, IData } from "./types";
+export declare const heightAdjustment = 7;
+export declare function dragSummaryKids(task: IParsedTask, dx: number, rollups: boolean): void;
+export declare function dragSummary(tasks: GanttDataTree, task: IParsedTask): void;
 export declare function setSummaryDates(task: ITask, tasks?: Partial<ITask>[]): ITask;
-export declare function updateTask(t: IGanttTask, i: number, state: Partial<IData>): IGanttTask;
+export declare function updateTask(t: IGanttTask, i: number | null, state: Partial<IData>): IGanttTask;
 export declare function isSegmentMoveAllowed(task: IGanttTask, moveOptions: IDataHash): boolean;
 export declare function extendDragOptions(task: ITask, options: IDataHash): void;

package/dist/types/types.d.ts

@@ -3,7 +3,8 @@ import type { DataArray, TID, IEventBus, IPublicWritable, IEventConfig } from "@
 import type GanttDataTree from "./GanttDataTree";
 import { Day } from "date-fns";
 import type DataStore from "./DataStore";
-import type { IApi as ITableApi, IColumn } from "@svar-ui/grid-store";
+import type { IApi as ITableApi, IColumn, IFilterValues } from "@svar-ui/grid-store";
+import { TaskSlackInfo } from "@svar-ui/lib-schedule";
 export type TMethodsConfig = IDataMethodsConfig;
 export type { GanttDataTree, TID };
 export interface IExportConfig {
@@ -66,7 +67,7 @@ export interface IGanttLink extends ILink {
     id: TID;
     $p: string;
     $pl: number;
-    $critical?: boolean;
+    critical?: boolean;
 }
 export interface ITask {
     start?: Date;
@@ -77,6 +78,7 @@ export interface ITask {
     base_start?: Date;
     base_end?: Date;
     base_duration?: number;
+    rollup?: boolean;
     open?: boolean;
     text?: string;
     details?: string;
@@ -100,8 +102,16 @@ export interface IGanttTask extends IParsedTask {
     $w: number;
     $x_base?: number;
     $w_base?: number;
+    $x_rollup?: number;
+    $h_rollup?: number;
+    $y_rollup_relative?: number;
+    $w_rollup?: number;
     $reorder?: boolean;
-    $critical?: boolean;
+    critical?: boolean;
+    slack?: TaskSlackInfo;
+    $visibleSlack?: number;
+    $x_slack?: number;
+    $w_slack?: number;
 }
 export type TDispatch = <A extends keyof TMethodsConfig>(action: A, data: TMethodsConfig[A]) => void;
 export interface IMethodsHash {
@@ -203,6 +213,9 @@ export interface IConfig {
     undo?: boolean;
     unscheduledTasks?: boolean;
     baselines?: boolean;
+    rollups?: boolean | {
+        type: "all" | "closest";
+    };
     markers?: IMarker[];
     criticalPath?: ICriticalPathConfig;
     projectStart?: Date;
@@ -210,23 +223,38 @@ export interface IConfig {
     calendar?: Calendar;
     splitTasks?: boolean;
     summary?: ISummaryConfig;
+    slack?: boolean;
 }
 export interface IDataConfig extends IConfig {
     scrollLeft: number;
     scrollTop: number;
     area: IVisibleArea;
     history?: IHistory;
+    filterValues?: IFilterValues;
+    focusTask?: TFocusTask;
     _cellWidth?: number;
     _sort?: TSort[];
-    _scrollTask?: TScrollTask;
     _weekStart?: Day;
     _markers?: IMarker[];
+    _rollups?: {
+        [key: TID]: Array<ITask>;
+    };
+    _isFiltered?: boolean;
+    _chartWidth?: number;
+    _chartHeight?: number;
+    _scrollSize?: number;
 }
-export interface IData extends Omit<IDataConfig, "tasks" | "links"> {
+export interface IData extends Omit<IDataConfig, "tasks" | "links" | "rollups"> {
+    rollups?: false | {
+        type: "all" | "closest";
+    };
     zoom?: IZoomConfig;
     tasks: GanttDataTree;
     links: DataArray<ILink>;
     _tasks: IParsedTask[];
+    _rollups: {
+        [key: TID]: Array<ITask>;
+    };
     _links: IGanttLink[];
     _selected?: ITask[];
     _activeTask?: ITask;
@@ -236,7 +264,11 @@ export interface IData extends Omit<IDataConfig, "tasks" | "links"> {
     _scaleDate?: Date;
     _zoomOffset?: number;
     _weekStart?: Day;
-    _scrollTask?: TScrollTask;
+    _isFiltered?: boolean;
+    _headerLength?: number;
+    _chartWidth?: number;
+    _chartHeight?: number;
+    _scrollSize?: number;
 }
 export interface IDataHash<T = any> {
     [key: string]: T;
@@ -300,6 +332,7 @@ export type IGanttColumn = {
     cell?: any;
     editor?: IColumn["editor"];
     options?: IColumn["options"];
+    getter?: (obj: IDataHash) => any;
 };
 export type TCommonShape = {
     id?: TID;
@@ -331,6 +364,9 @@ export type TComboFieldShape = TCommonShape & {
         label: string;
     }[];
 };
+export type TCheckboxShape = TCommonShape & {
+    comp: "checkbox";
+};
 export type TSliderShape = TCommonShape & {
     comp: "slider";
 };
@@ -344,7 +380,7 @@ export type ILinksShape = TCommonShape & {
 export type ITwoStateShape = TCommonShape & {
     comp: "twostate";
 };
-export type TEditorItem = TTextFieldShape | TCounterShape | TComboFieldShape | TSliderShape | TDateFieldShape | TRadioShape | ILinksShape | ITwoStateShape;
+export type TEditorItem = TTextFieldShape | TCounterShape | TComboFieldShape | TSliderShape | TDateFieldShape | TRadioShape | ILinksShape | ITwoStateShape | TCheckboxShape;
 export type ITaskType = {
     id: TID;
     label: string;
@@ -354,9 +390,11 @@ export type TSort = {
     order?: "asc" | "desc";
 };
 export type TSortValue = string | number | Date;
-export type TScrollTask = {
+export type TFilterHandler = (task: any) => boolean;
+export type TScrollMode = "x" | "y" | "xy" | boolean;
+export type TFocusTask = {
     id: TID;
-    mode?: "x" | "y" | "xy" | boolean;
+    column?: boolean;
 };
 export interface IApi {
     exec: <A extends keyof TMethodsConfig | (string & {})>(action: A, params?: A extends keyof TMethodsConfig ? TMethodsConfig[A] : any) => Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svar-ui/gantt-store",
-  "version": "2.5.2",
+  "version": "2.6.1",
   "description": "Internal state management used by SVAR Gantt component",
   "type": "module",
   "main": "dist/index.js",