igniteui-angular 13.0.2 → 13.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,6 +4,7 @@ import { DefaultSortingStrategy } from '../../data-operations/sorting-strategy';
4
4
  const DATE_TYPE = 'date';
5
5
  const TIME_TYPE = 'time';
6
6
  const DATE_TIME_TYPE = 'dateTime';
7
+ const STRING_TYPE = 'string';
7
8
  export class IgxSorting {
8
9
  sort(data, expressions, grid) {
9
10
  return this.sortDataRecursive(data, expressions, 0, grid);
@@ -17,7 +18,8 @@ export class IgxSorting {
17
18
  const column = grid ? grid.getColumnByName(expressions[level].fieldName) : null;
18
19
  const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;
19
20
  const isTime = column?.dataType === TIME_TYPE;
20
- const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate);
21
+ const isString = column?.dataType === STRING_TYPE;
22
+ const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate, isString);
21
23
  const groupRow = {
22
24
  expression: expressions[level],
23
25
  level,
@@ -71,16 +73,22 @@ export class IgxSorting {
71
73
  }
72
74
  return resolvedValue;
73
75
  }
74
- groupedRecordsByExpression(data, index, expression, isDate = false) {
76
+ groupedRecordsByExpression(data, index, expression, isDate = false, isString) {
75
77
  const res = [];
76
78
  const key = expression.fieldName;
77
79
  const len = data.length;
78
- const groupval = this.getFieldValue(data[index], key, isDate);
80
+ let groupval = this.getFieldValue(data[index], key, isDate);
79
81
  res.push(data[index]);
80
82
  index++;
81
83
  const comparer = expression.groupingComparer || DefaultSortingStrategy.instance().compareValues;
82
84
  for (let i = index; i < len; i++) {
83
- if (comparer(this.getFieldValue(data[i], key, isDate), groupval) === 0) {
85
+ let fieldValue = this.getFieldValue(data[i], key, isDate);
86
+ if (expression.ignoreCase && isString) {
87
+ // when column's dataType is string but the value is number
88
+ fieldValue = fieldValue?.toString().toLowerCase();
89
+ groupval = groupval?.toString().toLowerCase();
90
+ }
91
+ if (comparer(fieldValue, groupval) === 0) {
84
92
  res.push(data[i]);
85
93
  }
86
94
  else {
@@ -107,13 +115,14 @@ export class IgxSorting {
107
115
  const column = grid?.getColumnByName(expr.fieldName);
108
116
  const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;
109
117
  const isTime = column?.dataType === TIME_TYPE;
118
+ const isString = column?.dataType === STRING_TYPE;
110
119
  data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue, isDate, isTime);
111
120
  if (expressionIndex === exprsLen - 1) {
112
121
  return data;
113
122
  }
114
123
  // in case of multiple sorting
115
124
  for (i = 0; i < dataLen; i++) {
116
- gbData = this.groupedRecordsByExpression(data, i, expr, isDate);
125
+ gbData = this.groupedRecordsByExpression(data, i, expr, isDate, isString);
117
126
  gbDataLen = gbData.length;
118
127
  if (gbDataLen > 1) {
119
128
  gbData = this.sortDataRecursive(gbData, expressions, expressionIndex + 1, grid);
@@ -151,4 +160,4 @@ export class IgxDataRecordSorting extends IgxSorting {
151
160
  return super.getFieldValue(obj.data, key, isDate, isTime);
152
161
  }
153
162
  }
154
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../../../../../../projects/igniteui-angular/src/lib/grids/common/strategy.ts"],"names":[],"mappings":"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","sourcesContent":["import { cloneArray, parseDate, resolveNestedPath } from '../../core/utils';\nimport { IGroupByExpandState } from '../../data-operations/groupby-expand-state.interface';\nimport { IGroupByRecord } from '../../data-operations/groupby-record.interface';\nimport { IGroupingState } from '../../data-operations/groupby-state.interface';\nimport { IGroupingExpression } from '../../data-operations/grouping-expression.interface';\nimport { IGroupByResult } from '../../data-operations/grouping-result.interface';\nimport { getHierarchy, isHierarchyMatch } from '../../data-operations/operations';\nimport { DefaultSortingStrategy, ISortingExpression } from '../../data-operations/sorting-strategy';\nimport { GridType } from './grid.interface';\n\nconst DATE_TYPE = 'date';\nconst TIME_TYPE = 'time';\nconst DATE_TIME_TYPE = 'dateTime';\n\nexport interface IGridSortingStrategy {\n    sort(data: any[], expressions: ISortingExpression[], grid?: GridType): any[];\n}\n\nexport interface IGridGroupingStrategy extends IGridSortingStrategy {\n    groupBy(data: any[], state: IGroupingState, grid?: any, groupsRecords?: any[], fullResult?: IGroupByResult): IGroupByResult;\n}\n\nexport class IgxSorting implements IGridSortingStrategy {\n    public sort(data: any[], expressions: ISortingExpression[], grid?: GridType): any[] {\n        return this.sortDataRecursive(data, expressions, 0, grid);\n    }\n\n    protected groupDataRecursive(\n        data: any[],\n        state: IGroupingState,\n        level: number,\n        parent: IGroupByRecord,\n        metadata: IGroupByRecord[],\n        grid: GridType = null,\n        groupsRecords: any[] = [],\n        fullResult: IGroupByResult = { data: [], metadata: [] }\n    ): any[] {\n        const expressions = state.expressions;\n        const expansion = state.expansion;\n        let i = 0;\n        let result = [];\n        while (i < data.length) {\n            const column = grid ? grid.getColumnByName(expressions[level].fieldName) : null;\n            const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;\n            const isTime = column?.dataType === TIME_TYPE;\n            const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate);\n            const groupRow: IGroupByRecord = {\n                expression: expressions[level],\n                level,\n                records: cloneArray(group),\n                value: this.getFieldValue(group[0], expressions[level].fieldName, isDate, isTime),\n                groupParent: parent,\n                groups: [],\n                height: grid ? grid.renderedRowHeight : null,\n                column\n            };\n            if (parent) {\n                parent.groups.push(groupRow);\n            } else {\n                groupsRecords.push(groupRow);\n            }\n            const hierarchy = getHierarchy(groupRow);\n            const expandState: IGroupByExpandState = expansion.find((s) =>\n                isHierarchyMatch(s.hierarchy || [{ fieldName: groupRow.expression.fieldName, value: groupRow.value }], hierarchy));\n            const expanded = expandState ? expandState.expanded : state.defaultExpanded;\n            let recursiveResult;\n            result.push(groupRow);\n            metadata.push(null);\n            fullResult.data.push(groupRow);\n            fullResult.metadata.push(null);\n            if (level < expressions.length - 1) {\n                recursiveResult = this.groupDataRecursive(group, state, level + 1, groupRow,\n                    expanded ? metadata : [], grid, groupsRecords, fullResult);\n                if (expanded) {\n                    result = result.concat(recursiveResult);\n                }\n            } else {\n                for (const groupItem of group) {\n                    fullResult.metadata.push(groupRow);\n                    fullResult.data.push(groupItem);\n                }\n                if (expanded) {\n                    metadata.push(...fullResult.metadata.slice(fullResult.metadata.length - group.length));\n                    result.push(...fullResult.data.slice(fullResult.data.length - group.length));\n                }\n            }\n            i += group.length;\n        }\n        return result;\n    }\n\n    protected getFieldValue<T>(obj: T, key: string, isDate: boolean = false, isTime: boolean = false) {\n        let resolvedValue = resolveNestedPath(obj, key);\n        if (isDate || isTime) {\n            const date = parseDate(resolvedValue);\n            resolvedValue = isTime && date ?\n                new Date().setHours(date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds()) : date;\n\n        }\n        return resolvedValue;\n    }\n\n    private groupedRecordsByExpression<T>(\n        data: T[],\n        index: number,\n        expression: IGroupingExpression,\n        isDate: boolean = false\n    ): T[] {\n        const res = [];\n        const key = expression.fieldName;\n        const len = data.length;\n        const groupval = this.getFieldValue(data[index], key, isDate);\n        res.push(data[index]);\n        index++;\n        const comparer = expression.groupingComparer || DefaultSortingStrategy.instance().compareValues;\n        for (let i = index; i < len; i++) {\n            if (comparer(this.getFieldValue(data[i], key, isDate), groupval) === 0) {\n                res.push(data[i]);\n            } else {\n                break;\n            }\n        }\n        return res;\n    }\n\n    private sortDataRecursive<T>(\n        data: T[],\n        expressions: ISortingExpression[],\n        expressionIndex: number = 0,\n        grid: GridType\n    ): T[] {\n        let i: number;\n        let j: number;\n        let gbData: T[];\n        let gbDataLen: number;\n        const exprsLen = expressions.length;\n        const dataLen = data.length;\n\n        expressionIndex = expressionIndex || 0;\n        if (expressionIndex >= exprsLen || dataLen <= 1) {\n            return data;\n        }\n        const expr = expressions[expressionIndex];\n        if (!expr.strategy) {\n            expr.strategy = DefaultSortingStrategy.instance() as any;\n        }\n        const column = grid?.getColumnByName(expr.fieldName);\n        const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;\n        const isTime = column?.dataType === TIME_TYPE;\n        data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue, isDate, isTime);\n        if (expressionIndex === exprsLen - 1) {\n            return data;\n        }\n        // in case of multiple sorting\n        for (i = 0; i < dataLen; i++) {\n            gbData = this.groupedRecordsByExpression(data, i, expr, isDate);\n            gbDataLen = gbData.length;\n            if (gbDataLen > 1) {\n                gbData = this.sortDataRecursive(gbData, expressions, expressionIndex + 1, grid);\n            }\n            for (j = 0; j < gbDataLen; j++) {\n                data[i + j] = gbData[j];\n            }\n            i += gbDataLen - 1;\n        }\n        return data;\n    }\n}\n\nexport class IgxGrouping extends IgxSorting implements IGridGroupingStrategy {\n    public groupBy(data: any[], state: IGroupingState, grid?: any,\n        groupsRecords?: any[], fullResult: IGroupByResult = { data: [], metadata: [] }): IGroupByResult {\n        const metadata: IGroupByRecord[] = [];\n        const grouping = this.groupDataRecursive(data, state, 0, null, metadata, grid, groupsRecords, fullResult);\n        return {\n            data: grouping,\n            metadata\n        };\n    }\n}\n\nexport class NoopSortingStrategy implements IGridSortingStrategy {\n    private static _instance: NoopSortingStrategy = null;\n\n    private constructor() { }\n\n    public static instance() {\n        return this._instance || (this._instance = new NoopSortingStrategy());\n    }\n\n    public sort(data: any[]): any[] {\n        return data;\n    }\n}\n\nexport class IgxDataRecordSorting extends IgxSorting {\n\n    protected getFieldValue(obj: any, key: string, isDate: boolean = false, isTime: boolean = false): any {\n        return super.getFieldValue(obj.data, key, isDate, isTime);\n    }\n}\n"]}
163
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../../../../../../projects/igniteui-angular/src/lib/grids/common/strategy.ts"],"names":[],"mappings":"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","sourcesContent":["import { cloneArray, parseDate, resolveNestedPath } from '../../core/utils';\nimport { IGroupByExpandState } from '../../data-operations/groupby-expand-state.interface';\nimport { IGroupByRecord } from '../../data-operations/groupby-record.interface';\nimport { IGroupingState } from '../../data-operations/groupby-state.interface';\nimport { IGroupingExpression } from '../../data-operations/grouping-expression.interface';\nimport { IGroupByResult } from '../../data-operations/grouping-result.interface';\nimport { getHierarchy, isHierarchyMatch } from '../../data-operations/operations';\nimport { DefaultSortingStrategy, ISortingExpression } from '../../data-operations/sorting-strategy';\nimport { GridType } from './grid.interface';\n\nconst DATE_TYPE = 'date';\nconst TIME_TYPE = 'time';\nconst DATE_TIME_TYPE = 'dateTime';\nconst STRING_TYPE = 'string';\n\nexport interface IGridSortingStrategy {\n    sort(data: any[], expressions: ISortingExpression[], grid?: GridType): any[];\n}\n\nexport interface IGridGroupingStrategy extends IGridSortingStrategy {\n    groupBy(data: any[], state: IGroupingState, grid?: any, groupsRecords?: any[], fullResult?: IGroupByResult): IGroupByResult;\n}\n\nexport class IgxSorting implements IGridSortingStrategy {\n    public sort(data: any[], expressions: ISortingExpression[], grid?: GridType): any[] {\n        return this.sortDataRecursive(data, expressions, 0, grid);\n    }\n\n    protected groupDataRecursive(\n        data: any[],\n        state: IGroupingState,\n        level: number,\n        parent: IGroupByRecord,\n        metadata: IGroupByRecord[],\n        grid: GridType = null,\n        groupsRecords: any[] = [],\n        fullResult: IGroupByResult = { data: [], metadata: [] }\n    ): any[] {\n        const expressions = state.expressions;\n        const expansion = state.expansion;\n        let i = 0;\n        let result = [];\n        while (i < data.length) {\n            const column = grid ? grid.getColumnByName(expressions[level].fieldName) : null;\n            const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;\n            const isTime = column?.dataType === TIME_TYPE;\n            const isString = column?.dataType === STRING_TYPE;\n            const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate, isString);\n            const groupRow: IGroupByRecord = {\n                expression: expressions[level],\n                level,\n                records: cloneArray(group),\n                value: this.getFieldValue(group[0], expressions[level].fieldName, isDate, isTime),\n                groupParent: parent,\n                groups: [],\n                height: grid ? grid.renderedRowHeight : null,\n                column\n            };\n            if (parent) {\n                parent.groups.push(groupRow);\n            } else {\n                groupsRecords.push(groupRow);\n            }\n            const hierarchy = getHierarchy(groupRow);\n            const expandState: IGroupByExpandState = expansion.find((s) =>\n                isHierarchyMatch(s.hierarchy || [{ fieldName: groupRow.expression.fieldName, value: groupRow.value }], hierarchy));\n            const expanded = expandState ? expandState.expanded : state.defaultExpanded;\n            let recursiveResult;\n            result.push(groupRow);\n            metadata.push(null);\n            fullResult.data.push(groupRow);\n            fullResult.metadata.push(null);\n            if (level < expressions.length - 1) {\n                recursiveResult = this.groupDataRecursive(group, state, level + 1, groupRow,\n                    expanded ? metadata : [], grid, groupsRecords, fullResult);\n                if (expanded) {\n                    result = result.concat(recursiveResult);\n                }\n            } else {\n                for (const groupItem of group) {\n                    fullResult.metadata.push(groupRow);\n                    fullResult.data.push(groupItem);\n                }\n                if (expanded) {\n                    metadata.push(...fullResult.metadata.slice(fullResult.metadata.length - group.length));\n                    result.push(...fullResult.data.slice(fullResult.data.length - group.length));\n                }\n            }\n            i += group.length;\n        }\n        return result;\n    }\n\n    protected getFieldValue<T>(obj: T, key: string, isDate: boolean = false, isTime: boolean = false) {\n        let resolvedValue = resolveNestedPath(obj, key);\n        if (isDate || isTime) {\n            const date = parseDate(resolvedValue);\n            resolvedValue = isTime && date ?\n                new Date().setHours(date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds()) : date;\n\n        }\n        return resolvedValue;\n    }\n\n    private groupedRecordsByExpression<T>(\n        data: T[],\n        index: number,\n        expression: IGroupingExpression,\n        isDate: boolean = false,\n        isString: boolean\n    ): T[] {\n        const res = [];\n        const key = expression.fieldName;\n        const len = data.length;\n        let groupval = this.getFieldValue(data[index], key, isDate);\n        res.push(data[index]);\n        index++;\n        const comparer = expression.groupingComparer || DefaultSortingStrategy.instance().compareValues;\n        for (let i = index; i < len; i++) {\n            let fieldValue = this.getFieldValue(data[i], key, isDate);\n            if (expression.ignoreCase && isString) {\n                // when column's dataType is string but the value is number\n                fieldValue = fieldValue?.toString().toLowerCase();\n                groupval = groupval?.toString().toLowerCase();\n            }\n            if (comparer(fieldValue, groupval) === 0) {\n                res.push(data[i]);\n            } else {\n                break;\n            }\n        }\n        return res;\n    }\n\n    private sortDataRecursive<T>(\n        data: T[],\n        expressions: ISortingExpression[],\n        expressionIndex: number = 0,\n        grid: GridType\n    ): T[] {\n        let i: number;\n        let j: number;\n        let gbData: T[];\n        let gbDataLen: number;\n        const exprsLen = expressions.length;\n        const dataLen = data.length;\n\n        expressionIndex = expressionIndex || 0;\n        if (expressionIndex >= exprsLen || dataLen <= 1) {\n            return data;\n        }\n        const expr = expressions[expressionIndex];\n        if (!expr.strategy) {\n            expr.strategy = DefaultSortingStrategy.instance() as any;\n        }\n        const column = grid?.getColumnByName(expr.fieldName);\n        const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;\n        const isTime = column?.dataType === TIME_TYPE;\n        const isString = column?.dataType === STRING_TYPE;\n        data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue, isDate, isTime);\n        if (expressionIndex === exprsLen - 1) {\n            return data;\n        }\n        // in case of multiple sorting\n        for (i = 0; i < dataLen; i++) {\n            gbData = this.groupedRecordsByExpression(data, i, expr, isDate, isString);\n            gbDataLen = gbData.length;\n            if (gbDataLen > 1) {\n                gbData = this.sortDataRecursive(gbData, expressions, expressionIndex + 1, grid);\n            }\n            for (j = 0; j < gbDataLen; j++) {\n                data[i + j] = gbData[j];\n            }\n            i += gbDataLen - 1;\n        }\n        return data;\n    }\n}\n\nexport class IgxGrouping extends IgxSorting implements IGridGroupingStrategy {\n    public groupBy(data: any[], state: IGroupingState, grid?: any,\n        groupsRecords?: any[], fullResult: IGroupByResult = { data: [], metadata: [] }): IGroupByResult {\n        const metadata: IGroupByRecord[] = [];\n        const grouping = this.groupDataRecursive(data, state, 0, null, metadata, grid, groupsRecords, fullResult);\n        return {\n            data: grouping,\n            metadata\n        };\n    }\n}\n\nexport class NoopSortingStrategy implements IGridSortingStrategy {\n    private static _instance: NoopSortingStrategy = null;\n\n    private constructor() { }\n\n    public static instance() {\n        return this._instance || (this._instance = new NoopSortingStrategy());\n    }\n\n    public sort(data: any[]): any[] {\n        return data;\n    }\n}\n\nexport class IgxDataRecordSorting extends IgxSorting {\n\n    protected getFieldValue(obj: any, key: string, isDate: boolean = false, isTime: boolean = false): any {\n        return super.getFieldValue(obj.data, key, isDate, isTime);\n    }\n}\n"]}
@@ -1894,6 +1894,7 @@ DefaultSortingStrategy._instance = null;
1894
1894
  const DATE_TYPE = 'date';
1895
1895
  const TIME_TYPE = 'time';
1896
1896
  const DATE_TIME_TYPE = 'dateTime';
1897
+ const STRING_TYPE = 'string';
1897
1898
  class IgxSorting {
1898
1899
  sort(data, expressions, grid) {
1899
1900
  return this.sortDataRecursive(data, expressions, 0, grid);
@@ -1907,7 +1908,8 @@ class IgxSorting {
1907
1908
  const column = grid ? grid.getColumnByName(expressions[level].fieldName) : null;
1908
1909
  const isDate = (column === null || column === void 0 ? void 0 : column.dataType) === DATE_TYPE || (column === null || column === void 0 ? void 0 : column.dataType) === DATE_TIME_TYPE;
1909
1910
  const isTime = (column === null || column === void 0 ? void 0 : column.dataType) === TIME_TYPE;
1910
- const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate);
1911
+ const isString = (column === null || column === void 0 ? void 0 : column.dataType) === STRING_TYPE;
1912
+ const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate, isString);
1911
1913
  const groupRow = {
1912
1914
  expression: expressions[level],
1913
1915
  level,
@@ -1961,16 +1963,22 @@ class IgxSorting {
1961
1963
  }
1962
1964
  return resolvedValue;
1963
1965
  }
1964
- groupedRecordsByExpression(data, index, expression, isDate = false) {
1966
+ groupedRecordsByExpression(data, index, expression, isDate = false, isString) {
1965
1967
  const res = [];
1966
1968
  const key = expression.fieldName;
1967
1969
  const len = data.length;
1968
- const groupval = this.getFieldValue(data[index], key, isDate);
1970
+ let groupval = this.getFieldValue(data[index], key, isDate);
1969
1971
  res.push(data[index]);
1970
1972
  index++;
1971
1973
  const comparer = expression.groupingComparer || DefaultSortingStrategy.instance().compareValues;
1972
1974
  for (let i = index; i < len; i++) {
1973
- if (comparer(this.getFieldValue(data[i], key, isDate), groupval) === 0) {
1975
+ let fieldValue = this.getFieldValue(data[i], key, isDate);
1976
+ if (expression.ignoreCase && isString) {
1977
+ // when column's dataType is string but the value is number
1978
+ fieldValue = fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.toString().toLowerCase();
1979
+ groupval = groupval === null || groupval === void 0 ? void 0 : groupval.toString().toLowerCase();
1980
+ }
1981
+ if (comparer(fieldValue, groupval) === 0) {
1974
1982
  res.push(data[i]);
1975
1983
  }
1976
1984
  else {
@@ -1997,13 +2005,14 @@ class IgxSorting {
1997
2005
  const column = grid === null || grid === void 0 ? void 0 : grid.getColumnByName(expr.fieldName);
1998
2006
  const isDate = (column === null || column === void 0 ? void 0 : column.dataType) === DATE_TYPE || (column === null || column === void 0 ? void 0 : column.dataType) === DATE_TIME_TYPE;
1999
2007
  const isTime = (column === null || column === void 0 ? void 0 : column.dataType) === TIME_TYPE;
2008
+ const isString = (column === null || column === void 0 ? void 0 : column.dataType) === STRING_TYPE;
2000
2009
  data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue, isDate, isTime);
2001
2010
  if (expressionIndex === exprsLen - 1) {
2002
2011
  return data;
2003
2012
  }
2004
2013
  // in case of multiple sorting
2005
2014
  for (i = 0; i < dataLen; i++) {
2006
- gbData = this.groupedRecordsByExpression(data, i, expr, isDate);
2015
+ gbData = this.groupedRecordsByExpression(data, i, expr, isDate, isString);
2007
2016
  gbDataLen = gbData.length;
2008
2017
  if (gbDataLen > 1) {
2009
2018
  gbData = this.sortDataRecursive(gbData, expressions, expressionIndex + 1, grid);