@slickgrid-universal/row-detail-view-plugin 5.14.0 → 9.0.2

package/dist/{types/index.d.ts.map → index.d.ts.map}

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

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC"}

package/dist/{types/slickRowDetailView.d.ts → slickRowDetailView.d.ts}

@@ -1,5 +1,5 @@
 import { SlickEvent, SlickEventHandler } from '@slickgrid-universal/common';
-import type { Column, ExternalResource, FormatterResultWithHtml, GridOption, OnAfterRowDetailToggleArgs, OnBeforeRowDetailToggleArgs, OnRowBackToViewportRangeArgs, OnRowDetailAsyncEndUpdateArgs, OnRowDetailAsyncResponseArgs, OnRowOutOfViewportRangeArgs, PubSubService, RowDetailView, RowDetailViewOption, SlickGrid, SlickRowDetailView as UniversalRowDetailView, SlickDataView, SlickEventData, UsabilityOverrideFn } from '@slickgrid-universal/common';
+import type { Column, ExternalResource, FormatterResultWithHtml, GridOption, OnAfterRowDetailToggleArgs, OnBeforeRowDetailToggleArgs, OnRowBackOrOutOfViewportRangeArgs, OnRowDetailAsyncEndUpdateArgs, OnRowDetailAsyncResponseArgs, PubSubService, RowDetailView, RowDetailViewOption, SlickGrid, SlickRowDetailView as UniversalRowDetailView, SlickDataView, SlickEventData, UsabilityOverrideFn } from '@slickgrid-universal/common';
 /**
  * A plugin to add Row Detail Panel View (for example providing order detail info when clicking on the order row in the grid)
  * Original StackOverflow question & article making this possible (thanks to violet313)
@@ -18,11 +18,11 @@ export declare class SlickRowDetailView implements ExternalResource, UniversalRo
     /** Fired before the row detail gets toggled */
     onBeforeRowDetailToggle: SlickEvent<OnBeforeRowDetailToggleArgs>;
     /** Fired just before a row becomes out of viewport range (you can use this event to save inner Grid State before it gets destroyed) */
-    onBeforeRowOutOfViewportRange: SlickEvent<OnRowOutOfViewportRangeArgs>;
+    onBeforeRowOutOfViewportRange: SlickEvent<OnRowBackOrOutOfViewportRangeArgs>;
     /** Fired after the row detail gets toggled */
-    onRowBackToViewportRange: SlickEvent<OnRowBackToViewportRangeArgs>;
+    onRowBackToViewportRange: SlickEvent<OnRowBackOrOutOfViewportRangeArgs>;
     /** Fired after a row becomes out of viewport range (when user can't see the row anymore) */
-    onRowOutOfViewportRange: SlickEvent<OnRowOutOfViewportRangeArgs>;
+    onRowOutOfViewportRange: SlickEvent<OnRowBackOrOutOfViewportRangeArgs>;
     protected _addonOptions: RowDetailView;
     protected _dataViewIdProperty: string;
     protected _eventHandler: SlickEventHandler;
@@ -60,7 +60,7 @@ export declare class SlickRowDetailView implements ExternalResource, UniversalRo
     init(grid: SlickGrid): void;
     /** Dispose of the Slick Row Detail View */
     dispose(): void;
-    create(columnDefinitions: Column[], gridOptions: GridOption): UniversalRowDetailView | null;
+    create(columns: Column[], gridOptions: GridOption): UniversalRowDetailView | null;
     /** Get current plugin options */
     getOptions(): RowDetailViewOption;
     /** set or change some of the plugin options */
@@ -77,11 +77,10 @@ export declare class SlickRowDetailView implements ExternalResource, UniversalRo
     saveDetailView(item: any): void;
     /**
      * subscribe to the onAsyncResponse so that the plugin knows when the user server side calls finished
-     * the response has to be as "args.item" (or "args.itemDetail") with it's data back
+     * the response has to be as "args.item" with it's data back
      */
     handleOnAsyncResponse(e: SlickEventData, args: {
         item: any;
-        itemDetail: any;
         detailView?: any;
     }): void;
     /**

package/dist/slickRowDetailView.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slickRowDetailView.d.ts","sourceRoot":"","sources":["../src/slickRowDetailView.ts"],"names":[],"mappings":"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"}

package/dist/{esm/slickRowDetailView.js → slickRowDetailView.js}

@@ -145,7 +145,7 @@ export class SlickRowDetailView {
         this._renderedViewportRowIds.clear();
         clearTimeout(this._backViewportTimer);
     }
-    create(columnDefinitions, gridOptions) {
+    create(columns, gridOptions) {
         if (!gridOptions.rowDetailView) {
             throw new Error('[Slickgrid-Universal] The Row Detail View requires options to be passed via the "rowDetailView" property of the Grid Options');
         }
@@ -154,22 +154,22 @@ export class SlickRowDetailView {
         if (typeof this._addonOptions.expandableOverride === 'function') {
             this.expandableOverride(this._addonOptions.expandableOverride);
         }
-        if (Array.isArray(columnDefinitions) && gridOptions) {
+        if (Array.isArray(columns) && gridOptions) {
             const newRowDetailViewColumn = this.getColumnDefinition();
             // add new row detail column unless it was already added
-            if (!columnDefinitions.some((col) => col.id === newRowDetailViewColumn.id)) {
-                const rowDetailColDef = Array.isArray(columnDefinitions) && columnDefinitions.find((col) => col?.behavior === 'selectAndMove');
+            if (!columns.some((col) => col.id === newRowDetailViewColumn.id)) {
+                const rowDetailColDef = Array.isArray(columns) && columns.find((col) => col?.behavior === 'selectAndMove');
                 const finalRowDetailViewColumn = rowDetailColDef ? rowDetailColDef : newRowDetailViewColumn;
                 // column index position in the grid
                 const columnPosition = gridOptions?.rowDetailView?.columnIndexPosition ?? 0;
                 if (columnPosition > 0) {
-                    columnDefinitions.splice(columnPosition, 0, finalRowDetailViewColumn);
+                    columns.splice(columnPosition, 0, finalRowDetailViewColumn);
                 }
                 else {
-                    columnDefinitions.unshift(finalRowDetailViewColumn);
+                    columns.unshift(finalRowDetailViewColumn);
                 }
                 this.pubSubService.publish(`onPluginColumnsChanged`, {
-                    columns: columnDefinitions,
+                    columns,
                     pluginName: this.pluginName,
                 });
             }
@@ -241,7 +241,6 @@ export class SlickRowDetailView {
         else {
             this.onAsyncResponse.notify({
                 item,
-                itemDetail: item,
                 detailView: item[`${this._keyPrefix}detailContent`],
                 grid: this._grid,
             });
@@ -273,15 +272,15 @@ export class SlickRowDetailView {
     }
     /**
      * subscribe to the onAsyncResponse so that the plugin knows when the user server side calls finished
-     * the response has to be as "args.item" (or "args.itemDetail") with it's data back
+     * the response has to be as "args.item" with it's data back
      */
     handleOnAsyncResponse(e, args) {
-        if (!args || (!args.item && !args.itemDetail)) {
+        if (!args || !args.item) {
             console.error('SlickRowDetailView plugin requires the onAsyncResponse() to supply "args.item" property.');
             return;
         }
-        // @deprecated `args.itemDetail` we accept item/itemDetail, just get the one which has data
-        const itemDetail = args.item || args.itemDetail;
+        // get item detail argument
+        const itemDetail = args.item;
         // if we just want to load in a view directly we can use detailView property to do so
         itemDetail[`${this._keyPrefix}detailContent`] = args.detailView ?? this._addonOptions?.postTemplate?.(itemDetail);
         itemDetail[`${this._keyPrefix}detailViewLoaded`] = true;
@@ -291,7 +290,6 @@ export class SlickRowDetailView {
         this.onAsyncEndUpdate.notify({
             grid: this._grid,
             item: itemDetail,
-            itemDetail,
         }, e, this);
     }
     /**

package/dist/slickRowDetailView.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slickRowDetailView.js","sourceRoot":"","sources":["../src/slickRowDetailView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,iBAAiB,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAoBnH,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAErE;;;;;GAKG;AACH,MAAM,OAAO,kBAAkB;IA6D7B,uFAAuF;IACvF,YAA+B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QA7D3D,KAAK;QACL,aAAa;QACb,eAAU,GAAG,eAAwB,CAAC;QA0B5B,wBAAmB,GAAG,IAAI,CAAC;QAE3B,wBAAmB,GAA+B,IAAI,CAAC;QACvD,oBAAe,GAAyB,IAAI,GAAG,EAAE,CAAC;QAElD,mBAAc,GAAG,CAAC,CAAC;QACnB,aAAQ,GAAG,EAAE,CAAC;QACd,eAAU,GAAG,EAAE,CAAC;QAChB,kBAAa,GAAgB,IAAI,GAAG,EAAE,CAAC;QACvC,yBAAoB,GAAyB,IAAI,GAAG,EAAE,CAAC;QACvD,4BAAuB,GAAyB,IAAI,GAAG,EAAE,CAAC;QAC1D,iBAAY,GAAyB,IAAI,GAAG,EAAE,CAAC;QAG/C,cAAS,GAAG;YACpB,kBAAkB,EAAE,IAAI;YACxB,QAAQ,EAAE,kBAAkB;YAC5B,KAAK,EAAE,kBAAkB;YACzB,QAAQ,EAAE,mBAAmB;YAC7B,iBAAiB,EAAE,IAAI;YACvB,cAAc,EAAE,SAAS;YACzB,aAAa,EAAE,SAAS;YACxB,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,KAAK;YAClB,sBAAsB,EAAE,IAAI;YAC5B,eAAe,EAAE,KAAK;YACtB,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,EAAE;SACkB,CAAC;QAI5B,IAAI,CAAC,aAAa,GAAG,IAAI,iBAAiB,EAAE,CAAC;QAC7C,IAAI,CAAC,gBAAgB,GAAG,IAAI,UAAU,CAAgC,kBAAkB,CAAC,CAAC;QAC1F,IAAI,CAAC,eAAe,GAAG,IAAI,UAAU,CAA+B,iBAAiB,CAAC,CAAC;QACvF,IAAI,CAAC,sBAAsB,GAAG,IAAI,UAAU,CAA6B,wBAAwB,CAAC,CAAC;QACnG,IAAI,CAAC,uBAAuB,GAAG,IAAI,UAAU,CAA8B,yBAAyB,CAAC,CAAC;QACtG,IAAI,CAAC,6BAA6B,GAAG,IAAI,UAAU,CAAoC,+BAA+B,CAAC,CAAC;QACxH,IAAI,CAAC,wBAAwB,GAAG,IAAI,UAAU,CAAoC,0BAA0B,CAAC,CAAC;QAC9G,IAAI,CAAC,uBAAuB,GAAG,IAAI,UAAU,CAAoC,yBAAyB,CAAC,CAAC;IAC9G,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,0CAA0C;IAC1C,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO,EAAiB,CAAC;IAC9C,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,iEAAiE;IACjE,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACxC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACrD,CAAC;IAED,IAAI,mBAAmB,CAAC,MAA8B;QACpD,IAAI,CAAC,oBAAoB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,IAAe;QAClB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,CAAkB,CAAC;QACzG,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,SAAS,IAAI,IAAI,CAAC;QAExD,wCAAwC;QACxC,UAAU,CAAC,8BAA8B,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAEpE,iHAAiH;QACjH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,CAAC,CAAC;QAEjE,IAAI,CAAC,aAAa;aACf,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1D,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;aAChE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC9E,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAE/F,sIAAsI;QACtI,IAAI,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC;YACzC,yEAAyE;YACzE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;YACjE,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;YACrE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACrE,MAAM,gBAAgB,GAAa,EAAE,CAAC;YACtC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;YAE1E,qFAAqF;YACrF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACtC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC7C,IAAI,GAAG,KAAK,SAAS,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACvD,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,qEAAqE;YACrE,iIAAiI;YACjI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAClC,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACnD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC7B,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC;oBACtE,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;wBACnB,gBAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;oBACxC,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;YAC5C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,qGAAqG;QACrG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1F,qFAAqF;QACrF,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;YAChE,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,QAAQ,EAAE,iBAAiB,EAAE,IAAI,IAAI,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,2CAA2C;IAC3C,OAAO;QACL,IAAI,CAAC,aAAa,EAAE,cAAc,EAAE,CAAC;QACrC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,CAAC;QACrC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,OAAiB,EAAE,WAAuB;QAC/C,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CACb,8HAA8H,CAC/H,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,aAAa,CAAkB,CAAC;QAElG,0GAA0G;QAC1G,IAAI,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;YAChE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,WAAW,EAAE,CAAC;YAC1C,MAAM,sBAAsB,GAAW,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAElE,wDAAwD;YACxD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,sBAAsB,CAAC,EAAE,CAAC,EAAE,CAAC;gBACjE,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,eAAe,CAAC,CAAC;gBAC3G,MAAM,wBAAwB,GAAG,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,sBAAsB,CAAC;gBAE5F,oCAAoC;gBACpC,MAAM,cAAc,GAAG,WAAW,EAAE,aAAa,EAAE,mBAAmB,IAAI,CAAC,CAAC;gBAC5E,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;oBACvB,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,EAAE,wBAAwB,CAAC,CAAC;gBAC9D,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;gBAC5C,CAAC;gBAED,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,wBAAwB,EAAE;oBACnD,OAAO;oBACP,UAAU,EAAE,IAAI,CAAC,UAAU;iBAC5B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,IAAyC,CAAC;IACnD,CAAC;IAED,iCAAiC;IACjC,UAAU;QACR,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,+CAA+C;IAC/C,UAAU,CAAC,OAAqC;QAC9C,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAkB,CAAC;QACpF,IAAI,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,CAAC;YACxC,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAED,qCAAqC;IACrC,WAAW;QACT,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC5B,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACtC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAED,gDAAgD;IAChD,kBAAkB,CAAC,MAAuB,EAAE,oBAAoB,GAAG,KAAK;QACtE,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC9B,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC/C,4DAA4D;QAC5D,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,GAAG,IAAI,CAAC;QAC3C,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;YACtE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,IAAI,CAAC,CAAC;QAE/D,sDAAsD;QACtD,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QACrI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAEzD,wGAAwG;QACxG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,kEAAkE;IAClE,gBAAgB,CAAC,MAAuB;QACtC,IAAI,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,CAAC;YACxC,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE/C,wGAAwG;QACxG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,GAAG,KAAK,CAAC;QAC5C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEjC,mGAAmG;QACnG,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,eAAe,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,kBAAkB,CAAC,GAAG,KAAK,CAAC;QACrD,CAAC;QAED,+BAA+B;QAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,kBAAkB,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YACxF,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,eAAe,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;QACpF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;gBAC1B,IAAI;gBACJ,UAAU,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,eAAe,CAAC;gBACnD,IAAI,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,IAAI,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,IAAI,CAAC,CAAC;QAE/D,oBAAoB;QACpB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,gFAAgF;IAChF,iBAAiB;QACf,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,CAAC;QACrC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED,iDAAiD;IACjD,cAAc,CAAC,IAAS;QACtB,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,OAAO,qBAAqB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;YAC3G,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC5B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvB,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,eAAe,CAAC,GAAG,IAAI,CAAC;gBACjD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,qBAAqB,CAAC,CAAiB,EAAE,IAAqC;QAC5E,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CAAC,0FAA0F,CAAC,CAAC;YAC1G,OAAO;QACT,CAAC;QAED,2BAA2B;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;QAE7B,qFAAqF;QACrF,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC,UAAU,CAAC,CAAC;QAClH,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,kBAAkB,CAAC,GAAG,IAAI,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,UAAU,CAAC,CAAC;QAE3E,8DAA8D;QAC9D,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAC1B;YACE,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,IAAI,EAAE,UAAU;SACjB,EACD,CAAC,EACD,IAAI,CACL,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,kBAAkB,CAAC,UAA+B;QAChD,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC;IACxC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED,8FAA8F;IAC9F,mBAAmB;QACjB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEjF,OAAO;YACL,EAAE,EAAE,QAAQ;YACZ,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,EAAE;YACR,kBAAkB,EAAE,IAAI,CAAC,aAAa,EAAE,kBAAkB;YAC1D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE;YAC3C,iBAAiB,EAAE,IAAI;YACvB,uBAAuB,EAAE,IAAI;YAC7B,mBAAmB,EAAE,IAAI;YACzB,gBAAgB,EAAE,IAAI;YACtB,qBAAqB,EAAE,IAAI;YAC3B,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC;YACnD,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;YAC3C,SAAS,EAAE,KAAK;YAChB,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO;YACnC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK;SAChC,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,iBAAiB;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1C,CAAC;IAED,mDAAmD;IACnD,oBAAoB;QAClB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC/C,CAAC;IAED,4GAA4G;IAC5G,aAAa,CAAC,IAAS;QACrB,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,EAAE,CAAC;YAC5E,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iCAAiC;IACjC,gBAAgB,CAAC,IAAS;QACxB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,gCAAgC;QAChC,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAiB,IAAI,IAAI,CAAC,OAAO,yBAAyB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACxI,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAiB,IAAI,IAAI,CAAC,OAAO,oBAAoB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAC9H,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAiB,IAAI,IAAI,CAAC,OAAO,qBAAqB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAE5H,IAAI,CAAC,aAAa,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;YACtE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,SAAmB,CAAC,CAAC,kBAAkB;QAC1E,MAAM,UAAU,GAAG,EAAE,CAAC,CAAC,8CAA8C;QAErE,mDAAmD;QACnD,aAAa,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC;QAEnC,sFAAsF;QACtF,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC;QAE9C,6BAA6B;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;QAEnD,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,SAAS,CAAC,CAAC;QAC3F,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,GAAG,UAAU,CAAC;QAE9C,IAAI,YAAY,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,SAAS,CAAC;QACrE,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YACnH,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,OAAQ,GAAG,SAAS,CAAC;YACvD,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;QACrE,CAAC;QAED,iFAAiF;QACjF,IAAI,IAAI,CAAC,WAAW,CAAC,YAAa,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,EAAE,CAAC;YAC3E,iHAAiH;YACjH,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;QAED,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,eAAe,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzF,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,YAAY,YAAY,SAAS,IAAI,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAW,CAAC;QACrF,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;YACtE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,GAAG,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5E,CAAC;QAED,gCAAgC;QAChC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,0BAA0B,CAAC,YAAY,GAAG,IAAI,EAAE,KAAc;QAC5D,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAEtC,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAW,CAAC;YAC1D,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAErE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAC;YACtE,IAAI,CAAC,oBAAoB,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;YAC9E,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;YACrD,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;gBAC3C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAC,CAAC;gBACzE,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC;oBACpB,MAAM,GAAG,MAAM,CAAC;gBAClB,CAAC;YACH,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,GAAG,cAAc,CAAC;YACzC,IAAI,QAAQ,GAAG,MAAM,IAAI,MAAM,GAAG,QAAQ,IAAI,QAAQ,GAAG,IAAI,CAAC,oBAAqB,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;gBACjG,QAAQ,GAAG,MAAM,CAAC;YACpB,CAAC;YACD,IAAI,CAAC,oBAAoB,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;YAEjD,IACE,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC;gBACzC,IAAI,CAAC,oBAAoB;gBACzB,MAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,QAAQ;gBAC5C,MAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM;gBAC1C,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAC3B,CAAC;gBACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAClC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;YACvD,CAAC;iBAAM,IACL,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAChE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC3B,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC;oBACxC,IAAI,CAAC,oBAAoB;oBACzB,CAAC,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,IAAI,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,EAC7F,CAAC;gBACD,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,WAAW,EAAE,CAAC;QAChB,CAAC;IACH,CAAC;IAED,KAAK;IACL,sBAAsB;IACtB,qBAAqB;IAErB;;;OAGG;IACO,0BAA0B,CAAC,IAAS;QAC5C,0GAA0G;QAC1G,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;QAE9C,2DAA2D;QAC3D,uEAAuE;QACvE,MAAM,UAAU,GAAG,EAAE,CAAC,CAAC,8CAA8C;QACrE,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,SAAU,CAAC,CAAC;QAC7G,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,SAAU,CAAC;QACvG,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC3E,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;YACtE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAES,oBAAoB,CAAC,IAAS,EAAE,MAAwB,EAAE,YAAY,GAAG,IAAI;QACrF,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC9C,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;gBACrB,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACzC,YAAY,IAAI,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,CAAC;YAC9D,CAAC;iBAAM,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC5C,YAAY,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;IAES,uBAAuB,CAAC,GAAW,EAAE,WAAgB,EAAE,IAAe;QAC9E,IAAI,OAAO,IAAI,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oFAAoF;IAC1E,cAAc,CAAC,MAAW,EAAE,MAAW;QAC/C,MAAM,IAAI,GAAQ,EAAE,CAAC;QAErB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1C,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YACpB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,MAAM,EAAE,CAAC;QAEjF,4CAA4C;QAC5C,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,GAAG,IAAI,CAAC;QAC3C,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,GAAG,IAAI,CAAC;QAC3C,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,GAAG,MAAM,CAAC;QAC1C,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,GAAG,MAAM,CAAC;QAE1C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2DAA2D;IACjD,wBAAwB,CAChC,GAAW,EACX,KAAa,EACb,IAAS,EACT,OAAe,EACf,WAAgB,EAChB,IAAe;QAEf,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC;YAC1D,OAAO,EAAE,CAAC;QACZ,CAAC;aAAM,CAAC;YACN,IAAI,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC7D,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,GAAG,IAAI,CAAC;gBAClD,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,qCAAqC;gBACvF,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,kDAAkD;gBAC/F,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,GAAG,KAAK,CAAC;gBACnD,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,GAAG,SAAS,CAAC;gBACpD,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC9C,CAAC;YAED,IAAI,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,EAAE,CAAC;gBAC/C,iBAAiB;YACnB,CAAC;iBAAM,IAAI,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,EAAE,CAAC;gBACtD,IAAI,gBAAgB,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,UAAU,CAAC;gBACtE,IAAI,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;oBACtC,gBAAgB,IAAI,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gBACxD,CAAC;gBACD,OAAO,gBAAgB,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,eAAe,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7F,CAAC;iBAAM,CAAC;gBACN,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,CAAC,CAAC;gBAClD,IAAI,YAAY,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,SAAU,CAAC;gBAErG,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,OAAQ,EAAE,CAAC;oBAC7H,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,OAAQ,GAAG,SAAU,CAAC;oBACxD,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,aAAa,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;gBAC5E,CAAC;gBAED,sDAAsD;gBACtD,IAAI,eAAe,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,YAAY,CAAC;gBACvE,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;oBACrC,eAAe,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;gBACtD,CAAC;gBAED,oFAAoF;gBACpF,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,KAAK,EAAE;oBACrD,SAAS,EAAE,sCAAsC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;oBACxF,KAAK,EAAE,EAAE,MAAM,EAAE,GAAG,YAAY,IAAI,EAAE,GAAG,EAAE,GAAG,SAAS,IAAI,EAAE;iBAC9D,CAAC,CAAC;gBACH,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,KAAK,EAAE;oBAChD,SAAS,EAAE,wCAAwC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;iBAC3F,CAAC,CAAC;gBACH,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,KAAK,EAAE;oBACjD,SAAS,EAAE,mBAAmB,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;iBACtE,CAAC,CAAC;gBACH,IAAI,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,eAAe,CAAC,YAAY,WAAW,EAAE,CAAC;oBAC1E,kBAAkB,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,eAAe,CAAC,CAAC,CAAC;gBACjF,CAAC;qBAAM,CAAC;oBACN,kBAAkB,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,UAAU,eAAe,CAAC,CAAC,CAAC;gBAC/G,CAAC;gBAED,iBAAiB,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;gBAClD,sBAAsB,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;gBAEtD,MAAM,MAAM,GAA4B;oBACtC,IAAI,EAAE,gBAAgB,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACxF,wBAAwB,EAAE,sBAAsB;iBACjD,CAAC;gBAEF,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,qFAAqF;IAC3E,uBAAuB,CAAC,IAAS;QACzC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,WAAW,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,+BAA+B;IACrB,WAAW,CAAC,CAAiB,EAAE,IAAmC;QAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAErD,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACpE,oCAAoC;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrD,kBAAkB;YAClB,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;gBACxJ,4BAA4B;gBAC5B,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC;oBAC7F,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,CAAC,CAAC,wBAAwB,EAAE,CAAC;oBAC7B,OAAO;gBACT,CAAC;gBAED,mCAAmC;gBACnC,yEAAyE;gBACzE,MAAM,wBAAwB,GAAG,IAAI,CAAC,CAAC,yGAAyG;gBAChJ,IACE,IAAI,CAAC,uBAAuB;qBACzB,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,wBAAwB,CAAC;qBAClF,cAAc,EAAE,KAAK,KAAK,EAC7B,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,wFAAwF;gBACxF,wFAAwF;gBACxF,kFAAkF;gBAClF,MAAM,eAAe,GAAU,EAAE,CAAC;gBAClC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBAC9C,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBACtC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;oBAC7C,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,OAAO,CAAC,GAAG,IAAI,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;wBACvF,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;wBAC/C,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC3B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;oBACjC,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;gBAE/C,kCAAkC;gBAClC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAChC;oBACE,IAAI,EAAE,IAAI,CAAC,KAAK;oBAChB,IAAI,EAAE,WAAW;oBACjB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;iBAC1F,EACD,CAAC,EACD,IAAI,CACL,CAAC;gBAEF,gDAAgD;gBAChD,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;gBAE9E,CAAC,CAAC,eAAe,EAAE,CAAC;gBACpB,CAAC,CAAC,wBAAwB,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IAES,eAAe,CAAC,QAAgB;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE5C,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,6BAA6B,CAAC,MAAM,CACvC;gBACE,IAAI,EAAE,IAAI,CAAC,KAAK;gBAChB,IAAI;gBACJ,KAAK;gBACL,QAAQ;gBACR,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBACzF,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;aAC1E,EACD,IAAI,EACJ,IAAI,CACL,CAAC;YACF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAES,mBAAmB,CAAC,IAAS;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC3F,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE5C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CACjC;YACE,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,IAAI;YACJ,KAAK;YACL,QAAQ;YACR,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACzF,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;SAC1E,EACD,IAAI,EACJ,IAAI,CACL,CAAC;IACJ,CAAC;IAES,gCAAgC,CAAC,IAAS;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC3F,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE5C,qGAAqG;QACrG,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,OAAO,oBAAoB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,CAAC;YACjG,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAClC;gBACE,IAAI,EAAE,IAAI,CAAC,KAAK;gBAChB,IAAI;gBACJ,KAAK;gBACL,QAAQ;gBACR,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBACzF,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;aAC3E,EACD,IAAI,EACJ,IAAI,CACL,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;OAGG;IACO,wBAAwB,CAAC,IAAS;QAC1C,6BAA6B;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAW,CAAC;QAClF,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAChD,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,GAAG,MAAM,EAAE,CAAC;gBAClD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YACtE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,sBAAsB,CAAC,KAAsB,EAAE,QAAiB;QACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEtD,IAAI,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC;aAAM,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;YACjC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACnC,CAAC;IAES,kBAAkB,CAAC,SAAiB,EAAE,WAAgB;QAC9D,IAAI,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACrE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC5B,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YAC1C,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;CACF"}

package/package.json

@@ -1,19 +1,17 @@
 {
   "name": "@slickgrid-universal/row-detail-view-plugin",
-  "version": "5.14.0",
+  "version": "9.0.2",
   "description": "SlickRowDetail plugin - A plugin to add Row Detail Panel",
-  "main": "./dist/cjs/index.js",
-  "types": "./dist/types/index.d.ts",
+  "type": "module",
+  "main": "./dist/index.js",
   "exports": {
     ".": {
-      "types": "./dist/types/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "default": "./dist/esm/index.js"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
-  "module": "./dist/esm/index.js",
+  "types": "./dist/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -38,8 +36,8 @@
     "not dead"
   ],
   "dependencies": {
-    "@slickgrid-universal/common": "5.14.0",
-    "@slickgrid-universal/utils": "5.12.0"
+    "@slickgrid-universal/common": "9.0.2",
+    "@slickgrid-universal/utils": "9.0.0"
   },
-  "gitHead": "a80f07fbdfb4292b1ccf7b89008d74f16a40b89f"
+  "gitHead": "56537f4dbc96bcfbf7905e297e1c606c7b65e1b8"
 }

package/src/slickRowDetailView.ts

@@ -6,10 +6,9 @@ import type {
   GridOption,
   OnAfterRowDetailToggleArgs,
   OnBeforeRowDetailToggleArgs,
-  OnRowBackToViewportRangeArgs,
+  OnRowBackOrOutOfViewportRangeArgs,
   OnRowDetailAsyncEndUpdateArgs,
   OnRowDetailAsyncResponseArgs,
-  OnRowOutOfViewportRangeArgs,
   PubSubService,
   RowDetailView,
   RowDetailViewOption,
@@ -45,13 +44,13 @@ export class SlickRowDetailView implements ExternalResource, UniversalRowDetailV
   onBeforeRowDetailToggle: SlickEvent<OnBeforeRowDetailToggleArgs>;
 
   /** Fired just before a row becomes out of viewport range (you can use this event to save inner Grid State before it gets destroyed) */
-  onBeforeRowOutOfViewportRange: SlickEvent<OnRowOutOfViewportRangeArgs>;
+  onBeforeRowOutOfViewportRange: SlickEvent<OnRowBackOrOutOfViewportRangeArgs>;
 
   /** Fired after the row detail gets toggled */
-  onRowBackToViewportRange: SlickEvent<OnRowBackToViewportRangeArgs>;
+  onRowBackToViewportRange: SlickEvent<OnRowBackOrOutOfViewportRangeArgs>;
 
   /** Fired after a row becomes out of viewport range (when user can't see the row anymore) */
-  onRowOutOfViewportRange: SlickEvent<OnRowOutOfViewportRangeArgs>;
+  onRowOutOfViewportRange: SlickEvent<OnRowBackOrOutOfViewportRangeArgs>;
 
   // --
   // protected props
@@ -95,9 +94,9 @@ export class SlickRowDetailView implements ExternalResource, UniversalRowDetailV
     this.onAsyncResponse = new SlickEvent<OnRowDetailAsyncResponseArgs>('onAsyncResponse');
     this.onAfterRowDetailToggle = new SlickEvent<OnAfterRowDetailToggleArgs>('onAfterRowDetailToggle');
     this.onBeforeRowDetailToggle = new SlickEvent<OnBeforeRowDetailToggleArgs>('onBeforeRowDetailToggle');
-    this.onBeforeRowOutOfViewportRange = new SlickEvent<OnRowOutOfViewportRangeArgs>('onBeforeRowOutOfViewportRange');
-    this.onRowBackToViewportRange = new SlickEvent<OnRowBackToViewportRangeArgs>('onRowBackToViewportRange');
-    this.onRowOutOfViewportRange = new SlickEvent<OnRowOutOfViewportRangeArgs>('onRowOutOfViewportRange');
+    this.onBeforeRowOutOfViewportRange = new SlickEvent<OnRowBackOrOutOfViewportRangeArgs>('onBeforeRowOutOfViewportRange');
+    this.onRowBackToViewportRange = new SlickEvent<OnRowBackOrOutOfViewportRangeArgs>('onRowBackToViewportRange');
+    this.onRowOutOfViewportRange = new SlickEvent<OnRowBackOrOutOfViewportRangeArgs>('onRowOutOfViewportRange');
   }
 
   get addonOptions(): RowDetailView {
@@ -218,7 +217,7 @@ export class SlickRowDetailView implements ExternalResource, UniversalRowDetailV
     clearTimeout(this._backViewportTimer);
   }
 
-  create(columnDefinitions: Column[], gridOptions: GridOption): UniversalRowDetailView | null {
+  create(columns: Column[], gridOptions: GridOption): UniversalRowDetailView | null {
     if (!gridOptions.rowDetailView) {
       throw new Error(
         '[Slickgrid-Universal] The Row Detail View requires options to be passed via the "rowDetailView" property of the Grid Options'
@@ -232,24 +231,24 @@ export class SlickRowDetailView implements ExternalResource, UniversalRowDetailV
       this.expandableOverride(this._addonOptions.expandableOverride);
     }
 
-    if (Array.isArray(columnDefinitions) && gridOptions) {
+    if (Array.isArray(columns) && gridOptions) {
       const newRowDetailViewColumn: Column = this.getColumnDefinition();
 
       // add new row detail column unless it was already added
-      if (!columnDefinitions.some((col) => col.id === newRowDetailViewColumn.id)) {
-        const rowDetailColDef = Array.isArray(columnDefinitions) && columnDefinitions.find((col) => col?.behavior === 'selectAndMove');
+      if (!columns.some((col) => col.id === newRowDetailViewColumn.id)) {
+        const rowDetailColDef = Array.isArray(columns) && columns.find((col) => col?.behavior === 'selectAndMove');
         const finalRowDetailViewColumn = rowDetailColDef ? rowDetailColDef : newRowDetailViewColumn;
 
         // column index position in the grid
         const columnPosition = gridOptions?.rowDetailView?.columnIndexPosition ?? 0;
         if (columnPosition > 0) {
-          columnDefinitions.splice(columnPosition, 0, finalRowDetailViewColumn);
+          columns.splice(columnPosition, 0, finalRowDetailViewColumn);
         } else {
-          columnDefinitions.unshift(finalRowDetailViewColumn);
+          columns.unshift(finalRowDetailViewColumn);
         }
 
         this.pubSubService.publish(`onPluginColumnsChanged`, {
-          columns: columnDefinitions,
+          columns,
           pluginName: this.pluginName,
         });
       }
@@ -333,7 +332,6 @@ export class SlickRowDetailView implements ExternalResource, UniversalRowDetailV
     } else {
       this.onAsyncResponse.notify({
         item,
-        itemDetail: item,
         detailView: item[`${this._keyPrefix}detailContent`],
         grid: this._grid,
       });
@@ -370,16 +368,16 @@ export class SlickRowDetailView implements ExternalResource, UniversalRowDetailV
 
   /**
    * subscribe to the onAsyncResponse so that the plugin knows when the user server side calls finished
-   * the response has to be as "args.item" (or "args.itemDetail") with it's data back
+   * the response has to be as "args.item" with it's data back
    */
-  handleOnAsyncResponse(e: SlickEventData, args: { item: any; itemDetail: any; detailView?: any }): void {
-    if (!args || (!args.item && !args.itemDetail)) {
+  handleOnAsyncResponse(e: SlickEventData, args: { item: any; detailView?: any }): void {
+    if (!args || !args.item) {
       console.error('SlickRowDetailView plugin requires the onAsyncResponse() to supply "args.item" property.');
       return;
     }
 
-    // @deprecated `args.itemDetail` we accept item/itemDetail, just get the one which has data
-    const itemDetail = args.item || args.itemDetail;
+    // get item detail argument
+    const itemDetail = args.item;
 
     // if we just want to load in a view directly we can use detailView property to do so
     itemDetail[`${this._keyPrefix}detailContent`] = args.detailView ?? this._addonOptions?.postTemplate?.(itemDetail);
@@ -392,7 +390,6 @@ export class SlickRowDetailView implements ExternalResource, UniversalRowDetailV
       {
         grid: this._grid,
         item: itemDetail,
-        itemDetail,
       },
       e,
       this

package/dist/cjs/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./slickRowDetailView.js"), exports);
-//# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAwC"}