npm - @genesislcap/grid-pro - Versions diffs - 14.26.7 → 14.26.8-alpha-692a398.0 - Mend

@genesislcap/grid-pro 14.26.7 → 14.26.8-alpha-692a398.0

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.

Files changed (25) hide show

package/dist/custom-elements.json +115 -4
package/dist/dts/grid-pro-genesis-datasource/grid-pro-genesis-datasource.d.ts.map +1 -1
package/dist/dts/grid-pro.d.ts +22 -6
package/dist/dts/grid-pro.d.ts.map +1 -1
package/dist/dts/utils/array.d.ts +9 -0
package/dist/dts/utils/array.d.ts.map +1 -0
package/dist/dts/utils/index.d.ts +1 -0
package/dist/dts/utils/index.d.ts.map +1 -1
package/dist/esm/grid-pro-genesis-datasource/grid-pro-genesis-datasource.js +1 -1
package/dist/esm/grid-pro.js +80 -43
package/dist/esm/utils/array.js +27 -0
package/dist/esm/utils/index.js +1 -0
package/dist/grid-pro.api.json +230 -6
package/dist/grid-pro.d.ts +30 -5
package/docs/api/grid-pro.converttokebabcase.md +13 -0
package/docs/api/grid-pro.gridpro.agattributes.md +1 -1
package/docs/api/grid-pro.gridpro.agpropertiesmap.md +1 -1
package/docs/api/grid-pro.gridpro.applytemplatedefinitions.md +2 -1
package/docs/api/grid-pro.gridpro.getsavedcolumnstate.md +21 -0
package/docs/api/grid-pro.gridpro.gridprogenesisdatasource.md +11 -0
package/docs/api/grid-pro.gridpro.md +5 -3
package/docs/api/grid-pro.md +2 -0
package/docs/api/grid-pro.mergeanddedupcoldefwithcolumnstate.md +31 -0
package/docs/api-report.md +13 -3
package/package.json +7 -7

package/dist/custom-elements.json CHANGED Viewed

@@ -263,6 +263,26 @@
       "kind": "javascript-module",
       "path": "src/grid-pro.ts",
       "declarations": [
+        {
+          "kind": "function",
+          "name": "convertToKebabCase",
+          "parameters": [
+            {
+              "name": "value",
+              "type": {
+                "text": "string"
+              },
+              "description": "The value to convert to Kebab case."
+            }
+          ],
+          "description": "Convert string values from 'camelCase' to 'kebab-case'",
+          "return": {
+            "type": {
+              "text": ""
+            }
+          },
+          "privacy": "public"
+        },
         {
           "kind": "class",
           "description": "The Grid Pro element.",
@@ -429,15 +449,18 @@
             {
               "kind": "field",
               "name": "agAttributes",
-              "privacy": "protected",
               "type": {
-                "text": "object"
+                "text": "Record<string, string>"
               },
+              "privacy": "protected",
               "default": "{}"
             },
             {
               "kind": "field",
               "name": "agPropertiesMap",
+              "type": {
+                "text": "Record<string, string>"
+              },
               "privacy": "protected"
             },
             {
@@ -493,7 +516,7 @@
             },
             {
               "kind": "method",
-              "name": "serialiseStoreTableConfig",
+              "name": "saveColumnState",
               "privacy": "private",
               "return": {
                 "type": {
@@ -503,7 +526,18 @@
             },
             {
               "kind": "method",
-              "name": "rehydrateTableConfig",
+              "name": "getSavedColumnState",
+              "return": {
+                "type": {
+                  "text": "ColumnState[]"
+                }
+              },
+              "description": "Gets the saved grid ColumnState[] from local storage",
+              "privacy": "public"
+            },
+            {
+              "kind": "method",
+              "name": "restoreColumnState",
               "privacy": "private",
               "return": {
                 "type": {
@@ -519,6 +553,14 @@
               },
               "privacy": "public"
             },
+            {
+              "kind": "field",
+              "name": "gridProGenesisDatasource",
+              "type": {
+                "text": "GridProGenesisDatasource"
+              },
+              "readonly": true
+            },
             {
               "kind": "method",
               "name": "enableFlashingRows",
@@ -534,6 +576,10 @@
                   "type": {
                     "text": "ColDef[]"
                   }
+                },
+                {
+                  "name": "deferredColumnDefs",
+                  "default": "false"
                 }
               ]
             },
@@ -885,6 +931,14 @@
         }
       ],
       "exports": [
+        {
+          "kind": "js",
+          "name": "convertToKebabCase",
+          "declaration": {
+            "name": "convertToKebabCase",
+            "module": "src/grid-pro.ts"
+          }
+        },
         {
           "kind": "js",
           "name": "GridPro",
@@ -5173,11 +5227,68 @@
       "declarations": [],
       "exports": []
     },
+    {
+      "kind": "javascript-module",
+      "path": "src/utils/array.ts",
+      "declarations": [
+        {
+          "kind": "function",
+          "name": "mergeAndDedupColDefWithColumnState",
+          "return": {
+            "type": {
+              "text": "ColDef[]"
+            }
+          },
+          "parameters": [
+            {
+              "name": "colDefs",
+              "type": {
+                "text": "ColDef[]"
+              }
+            },
+            {
+              "name": "columnStates",
+              "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.",
+          "privacy": "public"
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "mergeAndDedupColDefWithColumnState",
+          "declaration": {
+            "name": "mergeAndDedupColDefWithColumnState",
+            "module": "src/utils/array.ts"
+          }
+        }
+      ]
+    },
     {
       "kind": "javascript-module",
       "path": "src/utils/index.ts",
       "declarations": [],
       "exports": [
+        {
+          "kind": "js",
+          "name": "*",
+          "declaration": {
+            "name": "*",
+            "package": "./array"
+          }
+        },
         {
           "kind": "js",
           "name": "*",

package/dist/dts/grid-pro-genesis-datasource/grid-pro-genesis-datasource.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid-pro-genesis-datasource.d.ts","sourceRoot":"","sources":["../../../src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,WAAW,EAAsB,MAAM,yBAAyB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,UAAU,EAWX,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;;;;;;;;;;;;;;;;;;;;;;;IA0G7D;;;;OAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA7FL;;;;GAIG;AACH,qBAGa,wBAAyB,SAAQ,6BAAiC;IACpE,OAAO,EAAG,OAAO,CAAC;IACf,UAAU,EAAG,UAAU,CAAC;IAExB,mBAAmB,EAAE,WAAW,CAAC;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACgC,UAAU,UAAS;IACvC,OAAO,EAAE,MAAM,CAAmC;IAClD,OAAO,EAAE,MAAM,CAAoC;IAC/B,UAAU,UAAS;IACvC,OAAO,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACa,YAAY,EAAE,MAAM,CAAC;IAC3D,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAK3B,OAAO,UAAS;IACZ,KAAK,SAAa;IACgB,qBAAqB,UAAS;IAE/F,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,aAAa,CAAe;IAEpC,OAAO,CAAC,6BAA6B,CAAQ;IAC7C,OAAO,CAAC,mBAAmB,CAAS;IAEpC,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,aAAa,CAAqB;IAE1C,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,MAAM,CAAwE;IAEtF,iBAAiB;IAsBjB,oBAAoB;IAQX,SAAS,IAAI,IAAI;IAO1B,OAAO,KAAK,MAAM,GAEjB;IAID;;;;OAIG;IACH,IAAI;IAkCJ;;;OAGG;IACH,MAAM;IAIN;;;;OAIG;IACH,KAAK;IA8BL;;;OAGG;IACH,OAAO;IAKP,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;YAUP,gBAAgB;IAiD9B,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAmC9B,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,eAAe;~~IA0CvB~~,OAAO,CAAC,aAAa;IAMrB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IASjD,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAK9C,YAAY,CAAC,SAAS,EAAE,MAAM;CAItC"}
1	+ {"version":3,"file":"grid-pro-genesis-datasource.d.ts","sourceRoot":"","sources":["../../../src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,WAAW,EAAsB,MAAM,yBAAyB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,UAAU,EAWX,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;;;;;;;;;;;;;;;;;;;;;;;IA0G7D;;;;OAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA7FL;;;;GAIG;AACH,qBAGa,wBAAyB,SAAQ,6BAAiC;IACpE,OAAO,EAAG,OAAO,CAAC;IACf,UAAU,EAAG,UAAU,CAAC;IAExB,mBAAmB,EAAE,WAAW,CAAC;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACgC,UAAU,UAAS;IACvC,OAAO,EAAE,MAAM,CAAmC;IAClD,OAAO,EAAE,MAAM,CAAoC;IAC/B,UAAU,UAAS;IACvC,OAAO,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACa,YAAY,EAAE,MAAM,CAAC;IAC3D,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAK3B,OAAO,UAAS;IACZ,KAAK,SAAa;IACgB,qBAAqB,UAAS;IAE/F,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,aAAa,CAAe;IAEpC,OAAO,CAAC,6BAA6B,CAAQ;IAC7C,OAAO,CAAC,mBAAmB,CAAS;IAEpC,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,aAAa,CAAqB;IAE1C,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,MAAM,CAAwE;IAEtF,iBAAiB;IAsBjB,oBAAoB;IAQX,SAAS,IAAI,IAAI;IAO1B,OAAO,KAAK,MAAM,GAEjB;IAID;;;;OAIG;IACH,IAAI;IAkCJ;;;OAGG;IACH,MAAM;IAIN;;;;OAIG;IACH,KAAK;IA8BL;;;OAGG;IACH,OAAO;IAKP,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;YAUP,gBAAgB;IAiD9B,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAmC9B,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,eAAe;IA6CvB,OAAO,CAAC,aAAa;IAMrB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IASjD,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAK9C,YAAY,CAAC,SAAS,EAAE,MAAM;CAItC"}

package/dist/dts/grid-pro.d.ts CHANGED Viewed

@@ -1,6 +1,14 @@
-import { Grid, ColumnApi, GridApi, GridOptions, ColDef } from '@ag-grid-community/core';
+import { Grid, ColumnApi, GridApi, GridOptions, ColDef, ColumnState } from '@ag-grid-community/core';
 import { FoundationElement } from '@microsoft/fast-foundation';
+import { GridProGenesisDatasource } from './grid-pro-genesis-datasource';
 import { GridComponents } from './grid-pro.types';
+/**
+ * Convert string values from 'camelCase' to 'kebab-case'
+ * @param value - The value to convert to Kebab case.
+ * @returns The Kebab case result.
+ * @public
+ */
+export declare const convertToKebabCase: (value: string) => string;
 declare const GridPro_base: (new (...args: any[]) => {
     "__#1@#_container": import("@genesislcap/foundation-utils").FoundationLayoutContainer | import("@genesislcap/foundation-utils").LayoutCacheContainer | import("@genesislcap/foundation-utils").DOMContainer;
     cloneNode(deep?: boolean): Node;
@@ -363,8 +371,8 @@ export declare class GridPro extends GridPro_base {
     gridComponents: {
         [componentName: string]: any;
     };
-    protected agAttributes: any;
-    protected agPropertiesMap: any;
+    protected agAttributes: Record<string, string>;
+    protected agPropertiesMap: Record<string, string>;
     protected agGridOptions: GridOptions;
     protected initialised: boolean;
     private rehydrationAttempted;
@@ -384,15 +392,23 @@ export declare class GridPro extends GridPro_base {
      * @internal
      */
     private removeConfigWidthsToAutosize;
-    private serialiseStoreTableConfig;
-    private rehydrateTableConfig;
+    private saveColumnState;
+    /**
+     * Gets the saved grid ColumnState[] from local storage
+     * @remarks This is used to restore the grid state when the grid is rehydrated
+     * @privateRemarks Not using `columnApi.get|setColumnState()` for these flows as it doesn't work setting new columnDefs vs different ordering.
+     * @public
+     */
+    getSavedColumnState(): ColumnState[];
+    private restoreColumnState;
     /**
      * @public
      */
     get gridOptions(): GridOptions;
+    get gridProGenesisDatasource(): GridProGenesisDatasource;
     set gridOptions(options: GridOptions);
     private enableFlashingRows;
-    applyTemplateDefinitions(columnDefs?: ColDef[]): ColDef<any>[];
+    applyTemplateDefinitions(columnDefs?: ColDef[], deferredColumnDefs?: boolean): ColDef<any>[];
     get observedAttributes(): string[];
     agAttributeChangedCallback(attName: any, oldValue: any, newValue: any): void;
     globalEventListener(eventType: any, event: any): void;

package/dist/dts/grid-pro.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid-pro.d.ts","sourceRoot":"","sources":["../../src/grid-pro.ts"],"names":[],"mappings":"AACA,OAAO,EACL,IAAI,EACJ,SAAS,EACT,OAAO,EAEP,WAAW,EACX,MAAM,~~EAKP~~,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;~~AAc~~/D,OAAO,EAKL,cAAc,EACf,MAAM,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~AAgB1B~~;;;;;GAKG;AACH,qBAAa,OAAQ,SAAQ,YAAiC;IAChD,SAAS,EAAG,SAAS,CAAC;IACtB,OAAO,EAAG,OAAO,CAAC;IACrB,OAAO,CAAC,OAAO,CAAU;IAIlC,sBAAsB,EAAE,OAAO,CAAS;IACwB,mBAAmB,EAAE,OAAO,CACpF;IACmB,kBAAkB,EAAE,OAAO,CAAS;IAE/D;;OAEG;IAC2D,kBAAkB,EAAE,OAAO,CAAS;IAEjD,qBAAqB,EAAE,MAAM,CAAC;IAE/E;;;;OAIG;IACsD,qBAAqB,UAAS;IACvF;;;OAGG;IACH,OAAO,CAAC,SAAS,CAAwB;IAG7B,YAAY,SAAyB;IAC3C,mBAAmB,SAAqB;IAClC,kBAAkB,EAAE,GAAG,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAsB;IACzC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAYnC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,IAAI,CAAC;IACb,QAAQ,EAAE,eAAe,CAAC;IAC1B,cAAc,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAE7D,SAAS,CAAC,YAAY,~~MAAC~~;~~IACvB~~,SAAS,CAAC,eAAe,~~MAAC~~;~~IAC1B~~,SAAS,CAAC,aAAa,EAAE,WAAW,CAAC;IACrC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,OAAO,CAAC,oBAAoB,CAAS;;IAarC,iBAAiB,IAAI,IAAI;IAyBzB,oBAAoB,IAAI,IAAI;IAQ5B,wBAAwB,CAAC,qBAAqB,EAAE,cAAc,GAAG,cAAc;IAc/E,uBAAuB,IAAI,OAAO;IAOlC;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IAW/B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,~~yBAAyB~~;~~IAcjC~~,OAAO,CAAC,~~oBAAoB~~;~~IAa5B~~;;OAEG;IACH,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,WAAW,CAAC,OAAO,EAAE,WAAW,~~EA2EnC~~;IAED,OAAO,CAAC,kBAAkB;IAiB1B,wBAAwB,CAAC,UAAU,GAAE,MAAM,EAAO;~~IAgClD~~,IAAI,kBAAkB,aAerB;IAED,0BAA0B,CAAC,OAAO,KAAA,EAAE,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAqBtD,mBAAmB,CAAC,SAAS,KAAA,EAAE,KAAK,KAAA;IAiBpC,OAAO,CAAC,eAAe,CAAa;IAEpC,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,eAAe;CAMxB;AAED;;;;;GAKG;AACH,eAAO,MAAM,8BAA8B,EAAE,cAA0B,CAAC;AAExE;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;CAEhC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;kBAM5B,CAAC"}
1	+ {"version":3,"file":"grid-pro.d.ts","sourceRoot":"","sources":["../../src/grid-pro.ts"],"names":[],"mappings":"AACA,OAAO,EACL,IAAI,EACJ,SAAS,EACT,OAAO,EAEP,WAAW,EACX,MAAM,EAIN,WAAW,EACZ,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAO/D,OAAO,EACL,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAIvC,OAAO,EAKL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAU1B;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,UAAW,MAAM,WACS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAM1D;;;;;GAKG;AACH,qBAAa,OAAQ,SAAQ,YAAiC;IAChD,SAAS,EAAG,SAAS,CAAC;IACtB,OAAO,EAAG,OAAO,CAAC;IACrB,OAAO,CAAC,OAAO,CAAU;IAIlC,sBAAsB,EAAE,OAAO,CAAS;IACwB,mBAAmB,EAAE,OAAO,CACpF;IACmB,kBAAkB,EAAE,OAAO,CAAS;IAE/D;;OAEG;IAC2D,kBAAkB,EAAE,OAAO,CAAS;IAEjD,qBAAqB,EAAE,MAAM,CAAC;IAE/E;;;;OAIG;IACsD,qBAAqB,UAAS;IACvF;;;OAGG;IACH,OAAO,CAAC,SAAS,CAAwB;IAG7B,YAAY,SAAyB;IAC3C,mBAAmB,SAAqB;IAClC,kBAAkB,EAAE,GAAG,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAsB;IACzC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAYnC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,IAAI,CAAC;IACb,QAAQ,EAAE,eAAe,CAAC;IAC1B,cAAc,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAE7D,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,SAAS,CAAC,aAAa,EAAE,WAAW,CAAC;IACrC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,OAAO,CAAC,oBAAoB,CAAS;;IAarC,iBAAiB,IAAI,IAAI;IAyBzB,oBAAoB,IAAI,IAAI;IAQ5B,wBAAwB,CAAC,qBAAqB,EAAE,cAAc,GAAG,cAAc;IAc/E,uBAAuB,IAAI,OAAO;IAOlC;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IAW/B;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,eAAe;IAkBvB;;;;;OAKG;IACH,mBAAmB,IAAI,WAAW,EAAE;IAapC,OAAO,CAAC,kBAAkB;IAa1B;;OAEG;IACH,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,wBAAwB,IAAI,wBAAwB,CAEvD;IAED,IAAI,WAAW,CAAC,OAAO,EAAE,WAAW,EA6EnC;IAED,OAAO,CAAC,kBAAkB;IAiB1B,wBAAwB,CAAC,UAAU,GAAE,MAAM,EAAO,EAAE,kBAAkB,UAAQ;IAyC9E,IAAI,kBAAkB,aAerB;IAED,0BAA0B,CAAC,OAAO,KAAA,EAAE,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAqBtD,mBAAmB,CAAC,SAAS,KAAA,EAAE,KAAK,KAAA;IAiBpC,OAAO,CAAC,eAAe,CAAa;IAEpC,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,eAAe;CAMxB;AAED;;;;;GAKG;AACH,eAAO,MAAM,8BAA8B,EAAE,cAA0B,CAAC;AAExE;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;CAEhC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;kBAM5B,CAAC"}

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

@@ -0,0 +1,9 @@
+import { ColDef, ColumnState } from '@ag-grid-community/core';
+/**
+ * Merges two arrays, one of `ColDef` and one of `ColumnState`, and deduplicates them.
+ * @remarks ColDef uses `field` and ColumnState uses `colId` to identify columns.
+ * @privateRemarks For restoring saved `ColumnState` but also keep custom renderers and other `ColDef` properties.
+ * @public
+ */
+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 ADDED Viewed

	@@ -0,0 +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,EAC3B,SAAS,SAAU,EACnB,SAAS,SAAU,GAClB,MAAM,EAAE,CAuBV"}

package/dist/dts/utils/index.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
+export * from './array';
 export * from './logger';
 //# sourceMappingURL=index.d.ts.map

package/dist/dts/utils/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC"}

package/dist/esm/grid-pro-genesis-datasource/grid-pro-genesis-datasource.js CHANGED Viewed

@@ -326,7 +326,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
             }
             return Object.assign(Object.assign({ field: field.name }, cellConfigs), templateColDef);
         });
-        const colDefsMergedWithTemplateDefs = this.agGrid.applyTemplateDefinitions(colDefsFromGenesisData);
+        const colDefsMergedWithTemplateDefs = this.agGrid.applyTemplateDefinitions(colDefsFromGenesisData, true);
         return colDefsMergedWithTemplateDefs;
     }
     buildCriteria() {

package/dist/esm/grid-pro.js CHANGED Viewed

@@ -16,12 +16,19 @@ import { DEBOUNCED_RESIZE_TIME } from './grid-pro.definitions';
 import { foundationGridProStyles as styles } from './grid-pro.styles';
 import { gridProTemplate as template } from './grid-pro.template';
 import { AgGridTheme, GridProRendererTypes, agThemeFontsId, agThemeTokenMapClassname, } from './grid-pro.types';
+import { mergeAndDedupColDefWithColumnState } from './utils';
 GridProGenesisDatasource;
 GridProGenesisDatasourceNext;
 GridProCell;
 GridColumn;
 ModuleRegistry.registerModules([CsvExportModule, ClientSideRowModelModule]);
-const hypenateAndLowercase = (property) => property.replace('/([a-z])([A-Z])/g', '$1-$2').toLowerCase();
+/**
+ * Convert string values from 'camelCase' to 'kebab-case'
+ * @param value - The value to convert to Kebab case.
+ * @returns The Kebab case result.
+ * @public
+ */
+export const convertToKebabCase = (value) => value.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
 /**
  * The Grid Pro element.
  * @remarks Grid Pro is a Web Component wrapper around the AG Grid Community library.
@@ -62,7 +69,7 @@ export class GridPro extends LifecycleMixin(FoundationElement) {
         this.agAttributes = {};
         this.agPropertiesMap = ComponentUtil.ALL_PROPERTIES.reduce((map, property) => {
             map[property.toLowerCase()] = property;
-            map[hypenateAndLowercase(property)] = property;
+            map[convertToKebabCase(property)] = property;
             return map;
         }, {});
     }
@@ -134,28 +141,45 @@ export class GridPro extends LifecycleMixin(FoundationElement) {
     removeConfigWidthsToAutosize(colState) {
         return colState.map((col) => (Object.assign(Object.assign({}, col), { width: null })));
     }
-    serialiseStoreTableConfig() {
+    saveColumnState() {
         if (this.rehydrationAttempted && this.statePersistanceEnabled()) {
             const existingOptions = JSON.parse(this.session.getLocalStorageItem('gridOptions') || '{}');
-            let colState = this.agGridOptions.columnApi.getColumnState();
+            let colState = this.columnApi.getColumnState();
             colState = this.gridAutosizingEnabled
                 ? this.removeConfigWidthsToAutosize(colState)
                 : colState;
+            if (colState.length === 0)
+                return;
             existingOptions[this.persistColumnStateKey] = JSON.stringify(colState);
             this.session.setLocalStorageItem('gridOptions', JSON.stringify(existingOptions));
         }
     }
-    rehydrateTableConfig() {
-        this.rehydrationAttempted = true;
-        if (this.statePersistanceEnabled() && this.session.getLocalStorageItem('gridOptions')) {
-            const allGridOptions = JSON.parse(this.session.getLocalStorageItem('gridOptions'));
+    /**
+     * Gets the saved grid ColumnState[] from local storage
+     * @remarks This is used to restore the grid state when the grid is rehydrated
+     * @privateRemarks Not using `columnApi.get|setColumnState()` for these flows as it doesn't work setting new columnDefs vs different ordering.
+     * @public
+     */
+    getSavedColumnState() {
+        const localStorageGridOptions = this.session.getLocalStorageItem('gridOptions');
+        if (this.statePersistanceEnabled() && localStorageGridOptions) {
+            const allGridOptions = JSON.parse(localStorageGridOptions);
             if (this.persistColumnStateKey in allGridOptions) {
-                this.agGridOptions.columnApi.applyColumnState({
-                    state: JSON.parse(allGridOptions[this.persistColumnStateKey]),
-                    applyOrder: true,
-                });
+                return JSON.parse(allGridOptions[this.persistColumnStateKey]);
             }
         }
+        return [];
+    }
+    restoreColumnState() {
+        var _a;
+        this.rehydrationAttempted = true;
+        const colState = this.getSavedColumnState();
+        if (colState && colState.length > 0) {
+            (_a = this.columnApi) === null || _a === void 0 ? void 0 : _a.applyColumnState({
+                state: colState,
+                applyOrder: true,
+            });
+        }
     }
     /**
      * @public
@@ -163,13 +187,15 @@ export class GridPro extends LifecycleMixin(FoundationElement) {
     get gridOptions() {
         return this.agGridOptions;
     }
+    get gridProGenesisDatasource() {
+        return this.querySelector('grid-pro-genesis-datasource');
+    }
     set gridOptions(options) {
         const globalEventListener = this.globalEventListener.bind(this);
         const gridOnChangeCallback = () => {
-            this.serialiseStoreTableConfig.bind(this)();
+            this.saveColumnState.bind(this)();
             this.debouncedColumnAutosize.bind(this)();
         };
-        const rehydrateTableConfig = this.rehydrateTableConfig.bind(this);
         Array.from(this.attributes).forEach((attribute) => {
             const attrName = this.agPropertiesMap[attribute.name];
             if (!attrName)
@@ -181,7 +207,7 @@ export class GridPro extends LifecycleMixin(FoundationElement) {
                 filter: true,
                 resizable: true,
                 sortable: true,
-            }, columnDefs: this.applyTemplateDefinitions(columnDefs), components: this.combineAllGridComponents(components), suppressDragLeaveHidesColumns: true }, this.eventsAndCallbacks), { onGridReady: (params) => {
+            }, components: this.combineAllGridComponents(components), suppressDragLeaveHidesColumns: true }, this.eventsAndCallbacks), { onGridReady: (params) => {
                 var _a, _b;
                 this.gridApi = (_a = options.api) !== null && _a !== void 0 ? _a : params.api;
                 this.columnApi = (_b = options.columnApi) !== null && _b !== void 0 ? _b : params.columnApi;
@@ -192,11 +218,14 @@ export class GridPro extends LifecycleMixin(FoundationElement) {
                     params,
                     gridId: this.id,
                 });
-                rehydrateTableConfig();
+                this.restoreColumnState.bind(this)();
                 this.debouncedColumnAutosize.bind(this)();
             }, onFirstDataRendered: () => {
-                this.enableFlashingRows.bind(this);
+                this.enableFlashingRows.bind(this)();
             }, onColumnPinned: gridOnChangeCallback, onColumnResized: gridOnChangeCallback, onColumnMoved: gridOnChangeCallback, onDisplayedColumnsChanged: gridOnChangeCallback, onFilterChanged: gridOnChangeCallback, onGridSizeChanged: gridOnChangeCallback, onSortChanged: gridOnChangeCallback }), rest);
+        if (!this.gridProGenesisDatasource) {
+            derivedOptions.columnDefs = this.applyTemplateDefinitions(columnDefs);
+        }
         this.agGridOptions = Object.assign(Object.assign({}, this.agGridOptions), ComponentUtil.copyAttributesToGridOptions(derivedOptions, this.agAttributes));
         const gridParams = {
             globalEventListener: globalEventListener,
@@ -226,40 +255,48 @@ export class GridPro extends LifecycleMixin(FoundationElement) {
             });
         }
     }
-    applyTemplateDefinitions(columnDefs = []) {
+    applyTemplateDefinitions(columnDefs = [], deferredColumnDefs = false) {
         const agColumnNodes = this.querySelectorAll(this.columnComponentName);
         const overrides = Array.from(agColumnNodes).map((x) => { var _a; return (_a = x.definition) === null || _a === void 0 ? void 0 : _a.field; });
-        if (agColumnNodes.length === 0)
-            return columnDefs;
-        const mergedColumnDefs = [
-            ...(columnDefs ? columnDefs.filter((g) => !overrides.includes(g.field)) : []),
-            ...Array.from(agColumnNodes).map((x) => {
-                var _a;
-                if (this.enableCellFlashing && x.definition.enableCellChangeFlash === undefined) {
-                    x.definition.enableCellChangeFlash = true;
-                }
-                // Applies the default valueformatter for given data type, if unspecified in user colDefs
-                // Skip if autoCellRendererByType is disabled
-                if (!this.autoCellRendererByType || x.definition.valueFormatter) {
+        let colDefsToReturn = [];
+        if (agColumnNodes.length === 0) {
+            colDefsToReturn = columnDefs;
+        }
+        else {
+            colDefsToReturn = [
+                ...(columnDefs ? columnDefs.filter((g) => !overrides.includes(g.field)) : []),
+                ...Array.from(agColumnNodes).map((x) => {
+                    var _a;
+                    if (this.enableCellFlashing && x.definition.enableCellChangeFlash === undefined) {
+                        x.definition.enableCellChangeFlash = true;
+                    }
+                    // Applies the default valueformatter for given data type, if unspecified in user colDefs
+                    // Skip if autoCellRendererByType is disabled
+                    if (!this.autoCellRendererByType || x.definition.valueFormatter) {
+                        return x.definition;
+                    }
+                    const typeValueFormatter = (_a = columnDefs === null || columnDefs === void 0 ? void 0 : columnDefs.find((colDef) => x.definition.field === colDef.field)) === null || _a === void 0 ? void 0 : _a.valueFormatter;
+                    if (typeValueFormatter) {
+                        x.definition.valueFormatter = typeValueFormatter;
+                    }
                     return x.definition;
-                }
-                const typeValueFormatter = (_a = columnDefs === null || columnDefs === void 0 ? void 0 : columnDefs.find((colDef) => x.definition.field === colDef.field)) === null || _a === void 0 ? void 0 : _a.valueFormatter;
-                if (typeValueFormatter) {
-                    x.definition.valueFormatter = typeValueFormatter;
-                }
-                return x.definition;
-            }),
-        ];
-        return mergedColumnDefs;
+                }),
+            ];
+        }
+        if (this.gridProGenesisDatasource && deferredColumnDefs) {
+            const savedColumnState = this.getSavedColumnState();
+            return mergeAndDedupColDefWithColumnState(colDefsToReturn, savedColumnState);
+        }
+        return colDefsToReturn;
     }
     get observedAttributes() {
-        // allow properties to be supplied either lowercased or hyphenated
+        // allow properties to be supplied either lowercased or kebab-cased
         // this allows the user to either supply (for example) enableSorting or enabled-sorting
         // properties lowercased
         const lowerCasedPropertyNames = ComponentUtil.ALL_PROPERTIES.map((property) => property.toLowerCase());
-        // properties hyphenated
-        const hyphenatedPropertyNames = ComponentUtil.ALL_PROPERTIES.map((property) => hypenateAndLowercase(property));
-        return lowerCasedPropertyNames.concat(hyphenatedPropertyNames);
+        // properties kebab-cased
+        const kebabCasePropertyNames = ComponentUtil.ALL_PROPERTIES.map((property) => convertToKebabCase(property));
+        return lowerCasedPropertyNames.concat(kebabCasePropertyNames);
     }
     agAttributeChangedCallback(attName, oldValue, newValue) {
         if (oldValue === newValue) {

package/dist/esm/utils/array.js ADDED Viewed

@@ -0,0 +1,27 @@
+/**
+ * Merges two arrays, one of `ColDef` and one of `ColumnState`, and deduplicates them.
+ * @remarks ColDef uses `field` and ColumnState uses `colId` to identify columns.
+ * @privateRemarks For restoring saved `ColumnState` but also keep custom renderers and other `ColDef` properties.
+ * @public
+ */
+export function mergeAndDedupColDefWithColumnState(colDefs, columnStates, arr1Field = 'field', arr2Field = 'colId') {
+    const merged = {};
+    const deduplicated = [];
+    columnStates.forEach((state) => {
+        const matchingColDef = colDefs.find((item) => item[arr1Field] === state[arr2Field]);
+        if (matchingColDef) {
+            const colDefStateMerge = Object.assign(Object.assign({}, matchingColDef), state);
+            delete colDefStateMerge.colId;
+            merged[matchingColDef[arr1Field]] = colDefStateMerge;
+            deduplicated.push(colDefStateMerge);
+        }
+    });
+    colDefs.forEach((def) => {
+        if (!merged.hasOwnProperty(def[arr1Field])) {
+            const newObj = Object.assign({}, def);
+            merged[def[arr1Field]] = newObj;
+            deduplicated.push(newObj);
+        }
+    });
+    return deduplicated;
+}

package/dist/esm/utils/index.js CHANGED Viewed

	@@ -1 +1,2 @@
1	+ export * from './array';
1 2	export * from './logger';

package/dist/grid-pro.api.json CHANGED Viewed

@@ -3035,6 +3035,29 @@
             "endIndex": 6
           }
         },
+        {
+          "kind": "Variable",
+          "canonicalReference": "@genesislcap/grid-pro!convertToKebabCase:var",
+          "docComment": "/**\n * Convert string values from 'camelCase' to 'kebab-case'\n *\n * @param value - The value to convert to Kebab case.\n *\n * @returns The Kebab case result.\n *\n * @public\n */\n",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "convertToKebabCase: "
+            },
+            {
+              "kind": "Content",
+              "text": "(value: string) => string"
+            }
+          ],
+          "fileUrlPath": "src/grid-pro.ts",
+          "isReadonly": true,
+          "releaseTag": "Public",
+          "name": "convertToKebabCase",
+          "variableTypeTokenRange": {
+            "startIndex": 1,
+            "endIndex": 2
+          }
+        },
         {
           "kind": "Function",
           "canonicalReference": "@genesislcap/grid-pro!dateTimeValueFormatter:function(1)",
@@ -4848,9 +4871,14 @@
                   "kind": "Content",
                   "text": "protected agAttributes: "
                 },
+                {
+                  "kind": "Reference",
+                  "text": "Record",
+                  "canonicalReference": "!Record:type"
+                },
                 {
                   "kind": "Content",
-                  "text": "any"
+                  "text": "<string, string>"
                 },
                 {
                   "kind": "Content",
@@ -4863,7 +4891,7 @@
               "name": "agAttributes",
               "propertyTypeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 2
+                "endIndex": 3
               },
               "isStatic": false,
               "isProtected": true,
@@ -4940,9 +4968,14 @@
                   "kind": "Content",
                   "text": "protected agPropertiesMap: "
                 },
+                {
+                  "kind": "Reference",
+                  "text": "Record",
+                  "canonicalReference": "!Record:type"
+                },
                 {
                   "kind": "Content",
-                  "text": "any"
+                  "text": "<string, string>"
                 },
                 {
                   "kind": "Content",
@@ -4955,7 +4988,7 @@
               "name": "agPropertiesMap",
               "propertyTypeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 2
+                "endIndex": 3
               },
               "isStatic": false,
               "isProtected": true,
@@ -4979,6 +5012,14 @@
                   "kind": "Content",
                   "text": "[]"
                 },
+                {
+                  "kind": "Content",
+                  "text": ", deferredColumnDefs?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
                 {
                   "kind": "Content",
                   "text": "): "
@@ -4999,8 +5040,8 @@
               ],
               "isStatic": false,
               "returnTypeTokenRange": {
-                "startIndex": 4,
-                "endIndex": 6
+                "startIndex": 6,
+                "endIndex": 8
               },
               "releaseTag": "Public",
               "isProtected": false,
@@ -5013,6 +5054,14 @@
                     "endIndex": 3
                   },
                   "isOptional": true
+                },
+                {
+                  "parameterName": "deferredColumnDefs",
+                  "parameterTypeTokenRange": {
+                    "startIndex": 4,
+                    "endIndex": 5
+                  },
+                  "isOptional": true
                 }
               ],
               "isOptional": false,
@@ -5342,6 +5391,42 @@
               "isProtected": false,
               "isAbstract": false
             },
+            {
+              "kind": "Method",
+              "canonicalReference": "@genesislcap/grid-pro!GridPro#getSavedColumnState:member(1)",
+              "docComment": "/**\n * Gets the saved grid ColumnState[] from local storage\n *\n * @remarks\n *\n * This is used to restore the grid state when the grid is rehydrated\n *\n * @public\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "getSavedColumnState(): "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "ColumnState",
+                  "canonicalReference": "@ag-grid-community/core!ColumnState:interface"
+                },
+                {
+                  "kind": "Content",
+                  "text": "[]"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isStatic": false,
+              "returnTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              },
+              "releaseTag": "Public",
+              "isProtected": false,
+              "overloadIndex": 1,
+              "parameters": [],
+              "isOptional": false,
+              "isAbstract": false,
+              "name": "getSavedColumnState"
+            },
             {
               "kind": "Method",
               "canonicalReference": "@genesislcap/grid-pro!GridPro#globalEventListener:member(1)",
@@ -5567,6 +5652,37 @@
               "isProtected": false,
               "isAbstract": false
             },
+            {
+              "kind": "Property",
+              "canonicalReference": "@genesislcap/grid-pro!GridPro#gridProGenesisDatasource:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "get gridProGenesisDatasource(): "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "GridProGenesisDatasource",
+                  "canonicalReference": "@genesislcap/grid-pro!GridProGenesisDatasource:class"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": true,
+              "isOptional": false,
+              "releaseTag": "Public",
+              "name": "gridProGenesisDatasource",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              },
+              "isStatic": false,
+              "isProtected": false,
+              "isAbstract": false
+            },
             {
               "kind": "Property",
               "canonicalReference": "@genesislcap/grid-pro!GridPro#gridSlot:member",
@@ -7503,6 +7619,114 @@
             "endIndex": 3
           }
         },
+        {
+          "kind": "Function",
+          "canonicalReference": "@genesislcap/grid-pro!mergeAndDedupColDefWithColumnState:function(1)",
+          "docComment": "/**\n * Merges two arrays, one of `ColDef` and one of `ColumnState`, and deduplicates them.\n *\n * @remarks\n *\n * ColDef uses `field` and ColumnState uses `colId` to identify columns.\n *\n * @public\n */\n",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export declare function mergeAndDedupColDefWithColumnState(colDefs: "
+            },
+            {
+              "kind": "Reference",
+              "text": "ColDef",
+              "canonicalReference": "@ag-grid-community/core!ColDef:interface"
+            },
+            {
+              "kind": "Content",
+              "text": "[]"
+            },
+            {
+              "kind": "Content",
+              "text": ", columnStates: "
+            },
+            {
+              "kind": "Reference",
+              "text": "ColumnState",
+              "canonicalReference": "@ag-grid-community/core!ColumnState:interface"
+            },
+            {
+              "kind": "Content",
+              "text": "[]"
+            },
+            {
+              "kind": "Content",
+              "text": ", arr1Field?: "
+            },
+            {
+              "kind": "Content",
+              "text": "string"
+            },
+            {
+              "kind": "Content",
+              "text": ", arr2Field?: "
+            },
+            {
+              "kind": "Content",
+              "text": "string"
+            },
+            {
+              "kind": "Content",
+              "text": "): "
+            },
+            {
+              "kind": "Reference",
+              "text": "ColDef",
+              "canonicalReference": "@ag-grid-community/core!ColDef:interface"
+            },
+            {
+              "kind": "Content",
+              "text": "[]"
+            },
+            {
+              "kind": "Content",
+              "text": ";"
+            }
+          ],
+          "fileUrlPath": "src/utils/array.ts",
+          "returnTypeTokenRange": {
+            "startIndex": 11,
+            "endIndex": 13
+          },
+          "releaseTag": "Public",
+          "overloadIndex": 1,
+          "parameters": [
+            {
+              "parameterName": "colDefs",
+              "parameterTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              },
+              "isOptional": false
+            },
+            {
+              "parameterName": "columnStates",
+              "parameterTypeTokenRange": {
+                "startIndex": 4,
+                "endIndex": 6
+              },
+              "isOptional": false
+            },
+            {
+              "parameterName": "arr1Field",
+              "parameterTypeTokenRange": {
+                "startIndex": 7,
+                "endIndex": 8
+              },
+              "isOptional": true
+            },
+            {
+              "parameterName": "arr2Field",
+              "parameterTypeTokenRange": {
+                "startIndex": 9,
+                "endIndex": 10
+              },
+              "isOptional": true
+            }
+          ],
+          "name": "mergeAndDedupColDefWithColumnState"
+        },
         {
           "kind": "Class",
           "canonicalReference": "@genesislcap/grid-pro!SelectRenderer:class",

package/dist/grid-pro.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ import { Binding } from '@microsoft/fast-element';
 import { CaptureType } from '@microsoft/fast-element';
 import { ColDef } from '@ag-grid-community/core';
 import { ColumnApi } from '@ag-grid-community/core';
+import { ColumnState } from '@ag-grid-community/core';
 import { Connect } from '@genesislcap/foundation-comms';
 import type { Container } from '@microsoft/fast-foundation';
 import { Controller } from '@microsoft/fast-element';
@@ -397,6 +398,14 @@ export declare const CellTemplate: ViewTemplate<GridProCell, any>;
  */
 export declare const ColumnTemplate: ViewTemplate<GridColumn, any>;
+/**
+ * Convert string values from 'camelCase' to 'kebab-case'
+ * @param value - The value to convert to Kebab case.
+ * @returns The Kebab case result.
+ * @public
+ */
+export declare const convertToKebabCase: (value: string) => string;
 /**
  * Returns a formatted date time value from the Grid Pro cell value.
  * @param param - A ValueFormatterParams object.
@@ -819,8 +828,8 @@ export declare class GridPro extends GridPro_base {
     gridComponents: {
         [componentName: string]: any;
     };
-    protected agAttributes: any;
-    protected agPropertiesMap: any;
+    protected agAttributes: Record<string, string>;
+    protected agPropertiesMap: Record<string, string>;
     protected agGridOptions: GridOptions;
     protected initialised: boolean;
     private rehydrationAttempted;
@@ -840,15 +849,23 @@ export declare class GridPro extends GridPro_base {
      * @internal
      */
     private removeConfigWidthsToAutosize;
-    private serialiseStoreTableConfig;
-    private rehydrateTableConfig;
+    private saveColumnState;
+    /**
+     * Gets the saved grid ColumnState[] from local storage
+     * @remarks This is used to restore the grid state when the grid is rehydrated
+     * @privateRemarks Not using `columnApi.get|setColumnState()` for these flows as it doesn't work setting new columnDefs vs different ordering.
+     * @public
+     */
+    getSavedColumnState(): ColumnState[];
+    private restoreColumnState;
     /**
      * @public
      */
     get gridOptions(): GridOptions;
+    get gridProGenesisDatasource(): GridProGenesisDatasource;
     set gridOptions(options: GridOptions);
     private enableFlashingRows;
-    applyTemplateDefinitions(columnDefs?: ColDef[]): ColDef<any>[];
+    applyTemplateDefinitions(columnDefs?: ColDef[], deferredColumnDefs?: boolean): ColDef<any>[];
     get observedAttributes(): string[];
     agAttributeChangedCallback(attName: any, oldValue: any, newValue: any): void;
     globalEventListener(eventType: any, event: any): void;
@@ -1986,6 +2003,14 @@ export declare const gridProTemplate: ViewTemplate;
  */
 export declare const logger: Logger;
+/**
+ * Merges two arrays, one of `ColDef` and one of `ColumnState`, and deduplicates them.
+ * @remarks ColDef uses `field` and ColumnState uses `colId` to identify columns.
+ * @privateRemarks For restoring saved `ColumnState` but also keep custom renderers and other `ColDef` properties.
+ * @public
+ */
+export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[], arr1Field?: string, arr2Field?: string): ColDef[];
 declare interface SelectCellRendererParams extends ICellRendererParams {
     accessor: string;
     defaultValue?: string;

package/docs/api/grid-pro.converttokebabcase.md ADDED Viewed

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+[Home](./index.md) &gt; [@genesislcap/grid-pro](./grid-pro.md) &gt; [convertToKebabCase](./grid-pro.converttokebabcase.md)
+## convertToKebabCase variable
+Convert string values from 'camelCase' to 'kebab-case'
+**Signature:**
+```typescript
+convertToKebabCase: (value: string) => string
+```

package/docs/api/grid-pro.gridpro.agattributes.md CHANGED Viewed

@@ -7,5 +7,5 @@
 **Signature:**
 ```typescript
-protected agAttributes: any;
+protected agAttributes: Record<string, string>;
 ```

package/docs/api/grid-pro.gridpro.agpropertiesmap.md CHANGED Viewed

@@ -7,5 +7,5 @@
 **Signature:**
 ```typescript
-protected agPropertiesMap: any;
+protected agPropertiesMap: Record<string, string>;
 ```

package/docs/api/grid-pro.gridpro.applytemplatedefinitions.md CHANGED Viewed

@@ -7,7 +7,7 @@
 **Signature:**
 ```typescript
-applyTemplateDefinitions(columnDefs?: ColDef[]): ColDef<any>[];
+applyTemplateDefinitions(columnDefs?: ColDef[], deferredColumnDefs?: boolean): ColDef<any>[];
 ```
 ## Parameters
@@ -15,6 +15,7 @@ applyTemplateDefinitions(columnDefs?: ColDef[]): ColDef<any>[];
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  columnDefs | ColDef\[\] | _(Optional)_ |
+|  deferredColumnDefs | boolean | _(Optional)_ |
 **Returns:**

package/docs/api/grid-pro.gridpro.getsavedcolumnstate.md ADDED Viewed

@@ -0,0 +1,21 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+[Home](./index.md) &gt; [@genesislcap/grid-pro](./grid-pro.md) &gt; [GridPro](./grid-pro.gridpro.md) &gt; [getSavedColumnState](./grid-pro.gridpro.getsavedcolumnstate.md)
+## GridPro.getSavedColumnState() method
+Gets the saved grid ColumnState\[\] from local storage
+**Signature:**
+```typescript
+getSavedColumnState(): ColumnState[];
+```
+**Returns:**
+ColumnState\[\]
+## Remarks
+This is used to restore the grid state when the grid is rehydrated

package/docs/api/grid-pro.gridpro.gridprogenesisdatasource.md ADDED Viewed

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+[Home](./index.md) &gt; [@genesislcap/grid-pro](./grid-pro.md) &gt; [GridPro](./grid-pro.gridpro.md) &gt; [gridProGenesisDatasource](./grid-pro.gridpro.gridprogenesisdatasource.md)
+## GridPro.gridProGenesisDatasource property
+**Signature:**
+```typescript
+get gridProGenesisDatasource(): GridProGenesisDatasource;
+```

package/docs/api/grid-pro.gridpro.md CHANGED Viewed

@@ -27,10 +27,10 @@ Grid Pro is a Web Component wrapper around the AG Grid Community library.
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [agAttributes](./grid-pro.gridpro.agattributes.md) | <code>protected</code> | any |  |
+|  [agAttributes](./grid-pro.gridpro.agattributes.md) | <code>protected</code> | Record&lt;string, string&gt; |  |
 |  [agGrid](./grid-pro.gridpro.aggrid.md) |  | Grid |  |
 |  [agGridOptions](./grid-pro.gridpro.aggridoptions.md) | <code>protected</code> | GridOptions |  |
-|  [agPropertiesMap](./grid-pro.gridpro.agpropertiesmap.md) | <code>protected</code> | any |  |
+|  [agPropertiesMap](./grid-pro.gridpro.agpropertiesmap.md) | <code>protected</code> | Record&lt;string, string&gt; |  |
 |  [autoCellRendererByType](./grid-pro.gridpro.autocellrendererbytype.md) |  | boolean |  |
 |  [classNames](./grid-pro.gridpro.classnames.md) |  | string |  |
 |  [columnApi](./grid-pro.gridpro.columnapi.md) |  | ColumnApi |  |
@@ -43,6 +43,7 @@ Grid Pro is a Web Component wrapper around the AG Grid Community library.
 |  [gridComponents](./grid-pro.gridpro.gridcomponents.md) |  | { \[componentName: string\]: any; } |  |
 |  [gridFontFace](./grid-pro.gridpro.gridfontface.md) |  | string |  |
 |  [gridOptions](./grid-pro.gridpro.gridoptions.md) |  | GridOptions |  |
+|  [gridProGenesisDatasource](./grid-pro.gridpro.gridprogenesisdatasource.md) | <code>readonly</code> | [GridProGenesisDatasource](./grid-pro.gridprogenesisdatasource.md) |  |
 |  [gridSlot](./grid-pro.gridpro.gridslot.md) |  | HTMLSlotElement |  |
 |  [headerHeight](./grid-pro.gridpro.headerheight.md) |  | number |  |
 |  [initialised](./grid-pro.gridpro.initialised.md) | <code>protected</code> | boolean |  |
@@ -57,10 +58,11 @@ Grid Pro is a Web Component wrapper around the AG Grid Community library.
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
 |  [agAttributeChangedCallback(attName, oldValue, newValue)](./grid-pro.gridpro.agattributechangedcallback.md) |  |  |
-|  [applyTemplateDefinitions(columnDefs)](./grid-pro.gridpro.applytemplatedefinitions.md) |  |  |
+|  [applyTemplateDefinitions(columnDefs, deferredColumnDefs)](./grid-pro.gridpro.applytemplatedefinitions.md) |  |  |
 |  [combineAllGridComponents(gridOptionsComponents)](./grid-pro.gridpro.combineallgridcomponents.md) |  |  |
 |  [connectedCallback()](./grid-pro.gridpro.connectedcallback.md) |  |  |
 |  [disconnectedCallback()](./grid-pro.gridpro.disconnectedcallback.md) |  |  |
+|  [getSavedColumnState()](./grid-pro.gridpro.getsavedcolumnstate.md) |  | Gets the saved grid ColumnState\[\] from local storage |
 |  [globalEventListener(eventType, event)](./grid-pro.gridpro.globaleventlistener.md) |  |  |
 |  [statePersistanceEnabled()](./grid-pro.gridpro.statepersistanceenabled.md) |  |  |
 |  [themeChanged(oldValue, newValue)](./grid-pro.gridpro.themechanged.md) |  |  |

package/docs/api/grid-pro.md CHANGED Viewed

@@ -34,6 +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, arr1Field, arr2Field)](./grid-pro.mergeanddedupcoldefwithcolumnstate.md) | Merges two arrays, one of <code>ColDef</code> and one of <code>ColumnState</code>, and deduplicates them. |
 ## Variables
@@ -58,6 +59,7 @@
 |  [agThemeTokenMapCSS](./grid-pro.agthemetokenmapcss.md) | Generates the CSS for a given GridPro theme name and token map |
 |  [CellTemplate](./grid-pro.celltemplate.md) | The Grid Pro Cell Template. |
 |  [ColumnTemplate](./grid-pro.columntemplate.md) | The Grid Pro Column Template. |
+|  [convertToKebabCase](./grid-pro.converttokebabcase.md) | Convert string values from 'camelCase' to 'kebab-case' |
 |  [defaultAgGridFontFace](./grid-pro.defaultaggridfontface.md) | The default font face for Grid Pro (agGridAlpine). |
 |  [defaultGridProConfig](./grid-pro.defaultgridproconfig.md) | Grid Pro default configuration. |
 |  [foundationAgBooleanRenderer](./grid-pro.foundationagbooleanrenderer.md) | A function that returns a Foundation Boolean Renderer registration for configuring the component with a DesignSystem. |

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

@@ -0,0 +1,31 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+[Home](./index.md) &gt; [@genesislcap/grid-pro](./grid-pro.md) &gt; [mergeAndDedupColDefWithColumnState](./grid-pro.mergeanddedupcoldefwithcolumnstate.md)
+## mergeAndDedupColDefWithColumnState() function
+Merges two arrays, one of `ColDef` and one of `ColumnState`<!-- -->, and deduplicates them.
+**Signature:**
+```typescript
+export declare function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[], arr1Field?: string, arr2Field?: string): ColDef[];
+```
+## Parameters
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  colDefs | ColDef\[\] |  |
+|  columnStates | ColumnState\[\] |  |
+|  arr1Field | string | _(Optional)_ |
+|  arr2Field | string | _(Optional)_ |
+**Returns:**
+ColDef\[\]
+## Remarks
+ColDef uses `field` and ColumnState uses `colId` to identify columns.

package/docs/api-report.md CHANGED Viewed

@@ -15,6 +15,7 @@ import { Binding } from '@microsoft/fast-element';
 import { CaptureType } from '@microsoft/fast-element';
 import { ColDef } from '@ag-grid-community/core';
 import { ColumnApi } from '@ag-grid-community/core';
+import { ColumnState } from '@ag-grid-community/core';
 import { Connect } from '@genesislcap/foundation-comms';
 import type { Container } from '@microsoft/fast-foundation';
 import { Controller } from '@microsoft/fast-element';
@@ -320,6 +321,9 @@ export const CellTemplate: ViewTemplate<GridProCell, any>;
 // @public
 export const ColumnTemplate: ViewTemplate<GridColumn, any>;
+// @public
+export const convertToKebabCase: (value: string) => string;
 // @public
 export function dateTimeValueFormatter({ value }: ValueFormatterParams): any;
@@ -545,15 +549,15 @@ export class GridPro extends GridPro_base {
     // (undocumented)
     agAttributeChangedCallback(attName: any, oldValue: any, newValue: any): void;
     // (undocumented)
-    protected agAttributes: any;
+    protected agAttributes: Record<string, string>;
     // (undocumented)
     agGrid: Grid;
     // (undocumented)
     protected agGridOptions: GridOptions;
     // (undocumented)
-    protected agPropertiesMap: any;
+    protected agPropertiesMap: Record<string, string>;
     // (undocumented)
-    applyTemplateDefinitions(columnDefs?: ColDef[]): ColDef<any>[];
+    applyTemplateDefinitions(columnDefs?: ColDef[], deferredColumnDefs?: boolean): ColDef<any>[];
     // (undocumented)
     autoCellRendererByType: boolean;
     // (undocumented)
@@ -573,6 +577,7 @@ export class GridPro extends GridPro_base {
     enabledRowFlashing: boolean;
     // (undocumented)
     eventsAndCallbacks: any;
+    getSavedColumnState(): ColumnState[];
     // (undocumented)
     globalEventListener(eventType: any, event: any): void;
     // (undocumented)
@@ -588,6 +593,8 @@ export class GridPro extends GridPro_base {
     get gridOptions(): GridOptions;
     set gridOptions(options: GridOptions);
     // (undocumented)
+    get gridProGenesisDatasource(): GridProGenesisDatasource;
+    // (undocumented)
     gridSlot: HTMLSlotElement;
     // (undocumented)
     headerHeight: number;
@@ -753,6 +760,9 @@ export const gridProTemplate: ViewTemplate;
 // @public
 export const logger: Logger;
+// @public
+export function mergeAndDedupColDefWithColumnState(colDefs: ColDef[], columnStates: ColumnState[], arr1Field?: string, arr2Field?: string): ColDef[];
 // @public
 export class SelectRenderer extends FoundationElement implements ICellRendererComp {
     // (undocumented)

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/grid-pro",
   "description": "Genesis Foundation AG Grid",
-  "version": "14.26.7",
+  "version": "14.26.8-alpha-692a398.0",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -21,8 +21,8 @@
     "serve": "genx serve"
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "^14.26.7",
-    "@genesislcap/genx": "^14.26.7",
+    "@genesislcap/foundation-testing": "14.26.8-alpha-692a398.0",
+    "@genesislcap/genx": "14.26.8-alpha-692a398.0",
     "@playwright/test": "^1.18.1",
     "bulma": "^0.9.3",
     "c8": "^7.11.0",
@@ -38,9 +38,9 @@
     "watchlist": "^0.3.1"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "^14.26.7",
-    "@genesislcap/foundation-ui": "^14.26.7",
-    "@genesislcap/foundation-utils": "^14.26.7",
+    "@genesislcap/foundation-comms": "14.26.8-alpha-692a398.0",
+    "@genesislcap/foundation-ui": "14.26.8-alpha-692a398.0",
+    "@genesislcap/foundation-utils": "14.26.8-alpha-692a398.0",
     "@microsoft/fast-colors": "^5.1.4",
     "@microsoft/fast-components": "^2.21.3",
     "@microsoft/fast-element": "^1.7.0",
@@ -66,5 +66,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "52910dfe41ec45c2b29b970137a848315897e6f4"
+  "gitHead": "af81f305950dfd60a07aa021261f865c16721be9"
 }