@genesislcap/grid-pro 14.64.4-alpha-732a0c5.0 → 14.65.0

package/dist/custom-elements.json

@@ -3838,6 +3838,14 @@
               "type": {
                 "text": "ColumnState[]"
               }
+            },
+            {
+              "name": "arr1Field",
+              "default": "'field'"
+            },
+            {
+              "name": "arr2Field",
+              "default": "'colId'"
             }
           ],
           "description": "Merges two arrays, one of `ColDef` and one of `ColumnState`, and deduplicates them.",

package/dist/dts/utils/array.d.ts

@@ -5,5 +5,5 @@ import { ColDef, ColumnState } from '@ag-grid-community/core';
  * @privateRemarks For restoring saved `ColumnState` but also keep custom renderers and other `ColDef` properties.
  * @public
  */
-export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[]): ColDef[];
+export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[], arr1Field?: string, arr2Field?: string): ColDef[];
 //# sourceMappingURL=array.d.ts.map

package/dist/dts/utils/array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../../src/utils/array.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE9D;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,WAAW,EAAE,GAC1B,MAAM,EAAE,CA8BV"}
+{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../../src/utils/array.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE9D;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,WAAW,EAAE,EAC3B,SAAS,SAAU,EACnB,SAAS,SAAU,GAClB,MAAM,EAAE,CAuBV"}

package/dist/esm/utils/array.js

@@ -4,24 +4,22 @@
  * @privateRemarks For restoring saved `ColumnState` but also keep custom renderers and other `ColDef` properties.
  * @public
  */
-export function mergeAndDedupColDefWithColumnState(colDefs, columnStates) {
+export function mergeAndDedupColDefWithColumnState(colDefs, columnStates, arr1Field = 'field', arr2Field = 'colId') {
     const merged = {};
     const deduplicated = [];
-    const fieldProp = 'field';
-    const colIdProp = 'colId';
     columnStates.forEach((state) => {
-        const matchingColDef = colDefs.find((item) => item[fieldProp] === state[colIdProp] ||
-            (item[colIdProp] && item[colIdProp] === state[colIdProp]));
+        const matchingColDef = colDefs.find((item) => item[arr1Field] === state[arr2Field]);
         if (matchingColDef) {
             const colDefStateMerge = Object.assign(Object.assign({}, matchingColDef), state);
-            merged[matchingColDef[fieldProp]] = colDefStateMerge;
+            delete colDefStateMerge[arr2Field];
+            merged[matchingColDef[arr1Field]] = colDefStateMerge;
             deduplicated.push(colDefStateMerge);
         }
     });
     colDefs.forEach((def) => {
-        if (!merged.hasOwnProperty(def[fieldProp])) {
+        if (!merged.hasOwnProperty(def[arr1Field])) {
             const newObj = Object.assign({}, def);
-            merged[def[fieldProp]] = newObj;
+            merged[def[arr1Field]] = newObj;
             deduplicated.push(newObj);
         }
     });

package/dist/grid-pro.api.json

@@ -7778,6 +7778,22 @@
               "kind": "Content",
               "text": "[]"
             },
+            {
+              "kind": "Content",
+              "text": ", arr1Field?: "
+            },
+            {
+              "kind": "Content",
+              "text": "string"
+            },
+            {
+              "kind": "Content",
+              "text": ", arr2Field?: "
+            },
+            {
+              "kind": "Content",
+              "text": "string"
+            },
             {
               "kind": "Content",
               "text": "): "
@@ -7798,8 +7814,8 @@
           ],
           "fileUrlPath": "src/utils/array.ts",
           "returnTypeTokenRange": {
-            "startIndex": 7,
-            "endIndex": 9
+            "startIndex": 11,
+            "endIndex": 13
           },
           "releaseTag": "Public",
           "overloadIndex": 1,
@@ -7819,6 +7835,22 @@
                 "endIndex": 6
               },
               "isOptional": false
+            },
+            {
+              "parameterName": "arr1Field",
+              "parameterTypeTokenRange": {
+                "startIndex": 7,
+                "endIndex": 8
+              },
+              "isOptional": true
+            },
+            {
+              "parameterName": "arr2Field",
+              "parameterTypeTokenRange": {
+                "startIndex": 9,
+                "endIndex": 10
+              },
+              "isOptional": true
             }
           ],
           "name": "mergeAndDedupColDefWithColumnState"

package/dist/grid-pro.d.ts

@@ -2057,7 +2057,7 @@ export declare const logger: Logger;
  * @privateRemarks For restoring saved `ColumnState` but also keep custom renderers and other `ColDef` properties.
  * @public
  */
-export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[]): ColDef[];
+export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[], arr1Field?: string, arr2Field?: string): ColDef[];
 
 declare interface SelectCellRendererParams extends ICellRendererParams {
     accessor: string;

package/docs/api/grid-pro.md

@@ -34,7 +34,7 @@
 |  [dateTimeValueFormatter({ value })](./grid-pro.datetimevalueformatter.md) | Returns a formatted date time value from the Grid Pro cell value. |
 |  [dateValueFormatter({ value })](./grid-pro.datevalueformatter.md) | Returns a formatted date value from the Grid Pro cell value. |
 |  [gridProColumns(itemsBinding, includeRenderers)](./grid-pro.gridprocolumns.md) | A directive that renders a set of grid-pro-column elements from a given input binding |
-|  [mergeAndDedupColDefWithColumnState(colDefs, columnStates)](./grid-pro.mergeanddedupcoldefwithcolumnstate.md) | Merges two arrays, one of <code>ColDef</code> and one of <code>ColumnState</code>, and deduplicates them. |
+|  [mergeAndDedupColDefWithColumnState(colDefs, columnStates, arr1Field, arr2Field)](./grid-pro.mergeanddedupcoldefwithcolumnstate.md) | Merges two arrays, one of <code>ColDef</code> and one of <code>ColumnState</code>, and deduplicates them. |
 
 ## Variables
 

package/docs/api/grid-pro.mergeanddedupcoldefwithcolumnstate.md

@@ -9,7 +9,7 @@ Merges two arrays, one of `ColDef` and one of `ColumnState`<!-- -->, and dedupli
 **Signature:**
 
 ```typescript
-export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[]): ColDef[];
+export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[], arr1Field?: string, arr2Field?: string): ColDef[];
 ```
 
 ## Parameters
@@ -18,6 +18,8 @@ export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], co
 |  --- | --- | --- |
 |  colDefs | ColDef\[\] |  |
 |  columnStates | ColumnState\[\] |  |
+|  arr1Field | string | _(Optional)_ |
+|  arr2Field | string | _(Optional)_ |
 
 **Returns:**
 

package/docs/api-report.md

@@ -752,7 +752,7 @@ export const gridProTemplate: ViewTemplate;
 export const logger: Logger;
 
 // @public
-export function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[]): ColDef[];
+export function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[], arr1Field?: string, arr2Field?: string): ColDef[];
 
 // @public
 export class SelectRenderer extends FoundationElement implements ICellRendererComp {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/grid-pro",
   "description": "Genesis Foundation AG Grid",
-  "version": "14.64.4-alpha-732a0c5.0",
+  "version": "14.65.0",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -28,14 +28,14 @@
     "test:debug": "genx test --debug"
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.64.4-alpha-732a0c5.0",
-    "@genesislcap/genx": "14.64.4-alpha-732a0c5.0",
+    "@genesislcap/foundation-testing": "14.65.0",
+    "@genesislcap/genx": "14.65.0",
     "rimraf": "^3.0.2"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.64.4-alpha-732a0c5.0",
-    "@genesislcap/foundation-ui": "14.64.4-alpha-732a0c5.0",
-    "@genesislcap/foundation-utils": "14.64.4-alpha-732a0c5.0",
+    "@genesislcap/foundation-comms": "14.65.0",
+    "@genesislcap/foundation-ui": "14.65.0",
+    "@genesislcap/foundation-utils": "14.65.0",
     "@microsoft/fast-colors": "^5.1.4",
     "@microsoft/fast-components": "^2.21.3",
     "@microsoft/fast-element": "^1.7.0",
@@ -58,5 +58,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "200e750a61c62012f0dd942ffce072929549a263"
+  "gitHead": "127bc648c049b8ed12d259fd8f6cf861b309e575"
 }