cx 22.3.4 → 22.3.5

package/src/widgets/grid/Grid.d.ts

@@ -1,13 +1,29 @@
-import * as Cx from "../../core";
 import * as React from "react";
 import { Instance } from "../../ui/Instance";
 import { DragEvent } from "../drag-drop/ops";
 import { View } from "../../data/View";
-
-type FetchRecordsResult = Cx.Record[] | { records: Cx.Record[]; lastPage?: boolean; totalRecordCount?: number };
+import {
+   BooleanProp,
+   ClassProp,
+   CollatorOptions,
+   Config,
+   NumberProp,
+   Prop,
+   Record,
+   RecordAlias,
+   SortDirection,
+   SortersProp,
+   StringProp,
+   StructuredProp,
+   StyledContainerProps,
+   StyleProp,
+   Widget,
+} from "../../core";
+
+type FetchRecordsResult = Record[] | { records: Record[]; lastPage?: boolean; totalRecordCount?: number };
 
 interface MappedGridRecord {
-   data: Cx.Record;
+   data: Record;
    store: View;
 }
 
@@ -37,10 +53,10 @@ interface GridColumnDropEvent extends DragEvent {
 
 interface GridGroupingKey {
    [key: string]:
-      | Cx.Prop<any>
+      | Prop<any>
       | {
-           value: Cx.Prop<any>;
-           direction: Cx.SortDirection;
+           value: Prop<any>;
+           direction: SortDirection;
         };
 }
 
@@ -48,106 +64,108 @@ type GridColumnAlignment = "left" | "right" | "center";
 
 interface GridGroupingConfig {
    key: GridGroupingKey;
-   aggregates?: Cx.StructuredProp;
+   aggregates?: StructuredProp;
    showCaption?: boolean;
    showFooter?: boolean;
    showHeader?: boolean;
-   caption?: Cx.StringProp;
-   name?: Cx.StringProp;
-   text?: Cx.StringProp;
+   caption?: StringProp;
+   name?: StringProp;
+   text?: StringProp;
 }
 
 // TODO: Check Column config
 // Props are in order based on docs
 
 interface GridColumnHeaderConfig {
-   text?: Cx.StringProp;
-   colSpan?: Cx.NumberProp;
-   rowSpan?: Cx.NumberProp;
+   text?: StringProp;
+   colSpan?: NumberProp;
+   rowSpan?: NumberProp;
    align?: GridColumnAlignment;
    allowSorting?: boolean;
    items?: React.ReactNode;
    children?: React.ReactNode;
    tool?: React.ReactNode;
+   style?: StyleProp;
+   class?: ClassProp;
+   className?: ClassProp;
 }
 
 interface GridColumnConfig {
    align?: GridColumnAlignment;
    field?: string;
-   format?: Cx.StringProp;
-   header?: Cx.StringProp | GridColumnHeaderConfig;
-   header1?: Cx.StringProp | GridColumnHeaderConfig;
-   header2?: Cx.StringProp | GridColumnHeaderConfig;
-   header3?: Cx.StringProp | GridColumnHeaderConfig;
+   format?: StringProp;
+   header?: StringProp | GridColumnHeaderConfig;
+   header1?: StringProp | GridColumnHeaderConfig;
+   header2?: StringProp | GridColumnHeaderConfig;
+   header3?: StringProp | GridColumnHeaderConfig;
    sortable?: boolean;
    aggregate?: "min" | "max" | "count" | "sum" | "distinct" | "avg";
    aggregateAlias?: string;
    aggregateField?: string;
-   caption?: Cx.StringProp;
-   class?: Cx.ClassProp;
-   className?: Cx.ClassProp;
+   caption?: StringProp;
+   class?: ClassProp;
+   className?: ClassProp;
    draggable?: boolean;
    editable?: boolean;
    editor?: React.ReactNode;
-   footer?: Cx.StringProp | false;
+   footer?: StringProp | false;
    items?: React.ReactNode;
    children?: React.ReactNode;
-   layout?: Cx.StringProp;
    key?: string;
    pad?: boolean;
    sortField?: string;
-   sortValue?: Cx.Prop<any>;
-   style?: Cx.StyleProp;
+   sortValue?: Prop<any>;
+   style?: StyleProp;
    trimWhitespace?: boolean;
-   visible?: Cx.BooleanProp;
-   if?: Cx.BooleanProp;
+   visible?: BooleanProp;
+   if?: BooleanProp;
    weightField?: string;
 
    // Not in docs
-   value?: Cx.Prop<any>;
-   defaultWidth?: Cx.NumberProp;
-   width?: Cx.NumberProp;
+   value?: Prop<any>;
+   defaultWidth?: NumberProp;
+   width?: NumberProp;
    resizable?: boolean;
    comparer?: (a: any, b: any) => number;
 
    /** Options for data sorting. See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Collator */
-   sortOptions?: Cx.CollatorOptions;
+   sortOptions?: CollatorOptions;
 }
 
 interface GridRowLineConfig {
-   visible?: Cx.BooleanProp;
+   visible?: BooleanProp;
    columns: GridColumnConfig[];
 }
 
 interface GridRowConfig {
-   invalid?: Cx.BooleanProp;
-   valid?: Cx.BooleanProp;
-   style?: Cx.StyleProp;
-   class?: Cx.ClassProp;
-   className?: Cx.ClassProp;
+   invalid?: BooleanProp;
+   valid?: BooleanProp;
+   style?: StyleProp;
+   class?: ClassProp;
+   className?: ClassProp;
    line1?: GridRowLineConfig;
    line2?: GridRowLineConfig;
    line3?: GridRowLineConfig;
 }
 
-interface GridProps extends Cx.StyledContainerProps {
+interface GridProps extends StyledContainerProps {
    /** An array of records to be displayed in the grid. */
-   records?: Cx.Prop<Cx.Record[]>;
+   records?: Prop<Record[]>;
 
    /** Set to true to add a vertical scroll and a fixed header to the grid. */
    scrollable?: boolean;
 
    /** A binding used to store the sorting order list. Commonly used for server-side sorting. */
-   sorters?: Cx.SortersProp;
+   sorters?: SortersProp;
 
    /** A list of sorters to be prepended to the actual list of sorters. */
-   preSorters?: Cx.SortersProp;
+   preSorters?: SortersProp;
 
    /** A binding used to store the name of the field used for sorting grids. Available only if sorters are not used. */
-   sortField?: Cx.StringProp;
+   sortField?: StringProp;
 
-   /** A binding used to store the sort direction. Available only if sorters are not used. Possible values are "ASC" and "DESC". Deafults to "ASC". */
-   sortDirection?: Cx.StringProp;
+   /** A binding used to store the sort direction. Available only if sorters are not used. Possible values are "ASC" and "DESC". Defaults to "ASC". */
+   sortDirection?: StringProp;
 
    /** Default sort field. Used if neither sortField or sorters are set. */
    defaultSortField?: string;
@@ -159,13 +177,13 @@ interface GridProps extends Cx.StyledContainerProps {
    vlines?: boolean;
 
    /** Text to be displayed instead of an empty table. */
-   emptyText?: Cx.StringProp;
+   emptyText?: StringProp;
 
    /** Drag source configuration. Define mode as 'move' or 'copy` and additional data. */
-   dragSource?: Cx.StructuredProp;
+   dragSource?: StructuredProp;
 
    /** Drop zone configuration. Define mode as either preview or insertion. */
-   dropZone?: Cx.StructuredProp;
+   dropZone?: StructuredProp;
 
    /** Row configuration. See grid examples. */
    row?: GridRowConfig;
@@ -174,25 +192,25 @@ interface GridProps extends Cx.StyledContainerProps {
    columns?: GridColumnConfig[];
 
    /** Whenever columnParams change, columns are recalculated using the onGetColumn callback. */
-   columnParams?: Cx.Config;
+   columnParams?: Config;
 
    /** Selection configuration. */
-   selection?: Cx.Config;
+   selection?: Config;
 
    /** An array of grouping level definitions. Check allowed grouping level properties in the section below. */
    grouping?: GridGroupingConfig[];
 
    /** Params for grouping. Whenever params change grouping is recalculated using the onGetGrouping callback. */
-   groupingParams?: Cx.Config;
+   groupingParams?: Config;
 
    /**
     * Determines header appearance. Supported values are plain and default. Default mode is used if some of the columns are sortable.
     * Plain mode better suits reports and other scenarios in which users do not interact with the grid.
     */
-   headerMode?: Cx.StringProp;
+   headerMode?: StringProp;
 
    /** Set to true to add default border around the table. Automatically set if grid is scrollable. */
-   border?: Cx.BooleanProp;
+   border?: BooleanProp;
 
    /** Base CSS class to be applied to the element. Default is 'grid'. */
    baseClass?: string;
@@ -207,10 +225,10 @@ interface GridProps extends Cx.StyledContainerProps {
    showFooter?: boolean;
 
    /** Record alias. Default is $record. */
-   recordName?: string;
+   recordName?: RecordAlias;
 
    /** Record alias. Default is $record. */
-   recordAlias?: string;
+   recordAlias?: RecordAlias;
 
    /** Set to true if sorting is done remotely, on the server-side. Default value is false. */
    remoteSort?: boolean;
@@ -250,10 +268,10 @@ interface GridProps extends Cx.StyledContainerProps {
    dataAdapter?: any;
 
    /** Additional CSS class to be added to each grid row. */
-   rowClass?: Cx.ClassProp;
+   rowClass?: ClassProp;
 
    /** Additional CSS styles to be added to each grid row. */
-   rowStyle?: Cx.StyleProp;
+   rowStyle?: StyleProp;
 
    // drag-drop handlers
    onDrop?: (e: GridDragEvent, instance: Instance) => void;
@@ -270,10 +288,10 @@ interface GridProps extends Cx.StyledContainerProps {
    onColumnDropTest?: (e: DragEvent, instance: Instance) => boolean;
 
    /** Parameters that affect filtering. */
-   filterParams?: Cx.StructuredProp;
+   filterParams?: StructuredProp;
 
    /** Callback to create a filter function for given filter params. */
-   onCreateFilter?: (filterParams: any, instance?: Instance) => (record: Cx.Record) => boolean;
+   onCreateFilter?: (filterParams: any, instance?: Instance) => (record: Record) => boolean;
 
    /** Enable infinite scrolling */
    infinite?: boolean;
@@ -286,7 +304,7 @@ interface GridProps extends Cx.StyledContainerProps {
       pageInfo: {
          page: number;
          pageSize: number;
-         sorters?: Cx.Record[];
+         sorters?: Record[];
          sortField?: string;
          sortDirection?: string;
       },
@@ -305,25 +323,25 @@ interface GridProps extends Cx.StyledContainerProps {
    /** Set to true to enable cell editing. Please note that all editable columns should specify the editor field. */
    cellEditable?: boolean;
 
-   /** A callback function which is executed before a cell editor is initalized. Return false from the callback to prevent the cell from going into the edit mode. */
+   /** A callback function which is executed before a cell editor is initialized. Return false from the callback to prevent the cell from going into the edit mode. */
    onBeforeCellEdit?: (change, record) => any;
 
    /** A callback function which is executed after a cell has been successfully edited. */
    onCellEdited?: (change, record) => void;
 
    /** A callback function which is executed after a column has been resized. */
-   onColumnResize?: (data: { width: number; column: Cx.Record }, instance: Instance) => void;
+   onColumnResize?: (data: { width: number; column: Record }, instance: Instance) => void;
 
    /** Options for data sorting. See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Collator */
-   sortOptions?: Cx.CollatorOptions;
+   sortOptions?: CollatorOptions;
 
    onCreateIsRecordSelectable?: (
       params: any,
       instance: Instance
-   ) => (record: Cx.Record, options?: { range?: boolean; toggle?: boolean }) => boolean;
+   ) => (record: Record, options?: { range?: boolean; toggle?: boolean }) => boolean;
 
-   /** Parameters whose change will casuse scroll to be reset. */
-   scrollResetParams?: Cx.StructuredProp;
+   /** Parameters whose change will cause scroll to be reset. */
+   scrollResetParams?: StructuredProp;
 
    /** Enable precise (sub-pixel) measurements. Useful for grids with many columns. Better behavior at small zoom factors. */
    preciseMeasurements?: boolean;
@@ -332,7 +350,7 @@ interface GridProps extends Cx.StyledContainerProps {
    hoverChannel?: string;
 
    /** A value used to uniquely identify the record within the hover sync group. */
-   rowHoverId?: Cx.StringProp;
+   rowHoverId?: StringProp;
 
    /** Set to true or false to explicitly define if grid is allowed to receive focus.  */
    focusable?: boolean;
@@ -347,4 +365,4 @@ interface GridProps extends Cx.StyledContainerProps {
    allowsFileDrops?: boolean;
 }
 
-export class Grid extends Cx.Widget<GridProps> {}
+export class Grid extends Widget<GridProps> {}

package/src/widgets/grid/Grid.js

@@ -679,7 +679,7 @@ export class Grid extends Widget {
                         (hdinstPrev.widget.resizable || (headerPrev && headerPrev.data.resizable)) &&
                         headerPrev.data.colSpan < 2
                      ) {
-                        prevColumnResizer = this.renderResizer(instance, hdinstPrev, headerPrev, colIndex, true);
+                        prevColumnResizer = this.renderResizer(instance, hdinstPrev, headerPrev, colIndex - 1, true);
                      }
                   }
                }