From 957a36dd951695dbc00d708d9f7c2d9891094cb2 Mon Sep 17 00:00:00 2001
From: Vildan Softic <zewa666@gmail.com>
Date: Mon, 5 Feb 2024 20:57:35 +0100
Subject: [PATCH 1/8] fix: provide row and cell to copy key handler

---
 .../vite-demo-vanilla-bundle/src/examples/example19.html  | 6 ++++--
 .../vite-demo-vanilla-bundle/src/examples/example19.ts    | 8 ++++++++
 .../common/src/extensions/slickCellExcelCopyManager.ts    | 4 ++--
 .../common/src/extensions/slickCellExternalCopyManager.ts | 6 +++---
 .../src/interfaces/excelCopyBufferOption.interface.ts     | 2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/examples/vite-demo-vanilla-bundle/src/examples/example19.html b/examples/vite-demo-vanilla-bundle/src/examples/example19.html
index 95581f7d2..759f9ac72 100644
--- a/examples/vite-demo-vanilla-bundle/src/examples/example19.html
+++ b/examples/vite-demo-vanilla-bundle/src/examples/example19.html
@@ -18,8 +18,10 @@ <h3 class="title is-3">
 </h3>
 
 <h5 class="title is-5 mb-3">
-  Grid - using <code>enableExcelCopyBuffer</code> which uses <code>SlickCellSelectionModel</code><br />
-  The complete first row and the cells C - E of the second row are not allowing to paste values.
+  <p>Grid - using <code>enableExcelCopyBuffer</code> which uses <code>SlickCellSelectionModel</code></p>
+  <p>The complete first row and the cells C - E of the second row are not allowing to paste values. </p>
+  <p>Additionally the columns are configured to <code>exportWithFormatter</code> and a custom formatter that renders the cells coordinates or value if available.
+  When selecting one or more cells and pressing CTRL + C, the ExcelCopyBuffer will be filled with the formatter outputs of the selected cells.</p>
 </h5>
 <h6 class="title is-6">
   <button class="button is-small is-primary" onclick.delegate="togglePagination()"
diff --git a/examples/vite-demo-vanilla-bundle/src/examples/example19.ts b/examples/vite-demo-vanilla-bundle/src/examples/example19.ts
index a3208a462..25141eb68 100644
--- a/examples/vite-demo-vanilla-bundle/src/examples/example19.ts
+++ b/examples/vite-demo-vanilla-bundle/src/examples/example19.ts
@@ -91,6 +91,14 @@ export default class Example19 {
           : String.fromCharCode('A'.charCodeAt(0) + (Math.floor(i / 26)) - 1) + String.fromCharCode('A'.charCodeAt(0) + (i % 26)),
         field: String(i),
         minWidth: 60,
+        exportWithFormatter: true,
+        formatter: (row: number, cell: number, value: any) => {
+          if (value !== null && value !== undefined) {
+            return value;
+          }
+
+          return `${row + 1}:${cell + 1}`;
+        },
         width: 60,
         editor: { model: Editors.text }
       });
diff --git a/packages/common/src/extensions/slickCellExcelCopyManager.ts b/packages/common/src/extensions/slickCellExcelCopyManager.ts
index a1fa1a736..664811206 100644
--- a/packages/common/src/extensions/slickCellExcelCopyManager.ts
+++ b/packages/common/src/extensions/slickCellExcelCopyManager.ts
@@ -142,13 +142,13 @@ export class SlickCellExcelCopyManager {
       clipboardCommandHandler: (editCommand: EditCommand) => {
         this._undoRedoBuffer.queueAndExecuteCommand.call(this._undoRedoBuffer, editCommand);
       },
-      dataItemColumnValueExtractor: (item: any, columnDef: Column) => {
+      dataItemColumnValueExtractor: (item: any, columnDef: Column, row: number = 0, cell: number = 0) => {
         // when grid or cell is not editable, we will possibly evaluate the Formatter if it was passed
         // to decide if we evaluate the Formatter, we will use the same flag from Export which is "exportWithFormatter"
         if (!this.gridOptions.editable || !columnDef.editor) {
           const isEvaluatingFormatter = (columnDef.exportWithFormatter !== undefined) ? columnDef.exportWithFormatter : (this.gridOptions.textExportOptions?.exportWithFormatter);
           if (columnDef.formatter && isEvaluatingFormatter) {
-            const formattedOutput = columnDef.formatter(0, 0, item[columnDef.field], columnDef, item, this._grid);
+            const formattedOutput = columnDef.formatter(row, cell, item[columnDef.field], columnDef, item, this._grid);
             const cellResult = isPrimitiveOrHTML(formattedOutput) ? formattedOutput : (formattedOutput as FormatterResultWithHtml).html || (formattedOutput as FormatterResultWithText).text;
             if (columnDef.sanitizeDataExport || (this.gridOptions.textExportOptions?.sanitizeDataExport)) {
               const outputString = (cellResult instanceof HTMLElement) ? cellResult.innerHTML : cellResult as string;
diff --git a/packages/common/src/extensions/slickCellExternalCopyManager.ts b/packages/common/src/extensions/slickCellExternalCopyManager.ts
index ebb73d0f5..d22872538 100644
--- a/packages/common/src/extensions/slickCellExternalCopyManager.ts
+++ b/packages/common/src/extensions/slickCellExternalCopyManager.ts
@@ -115,9 +115,9 @@ export class SlickCellExternalCopyManager {
     return getHtmlStringOutput(columnDef.name || '', 'innerHTML');
   }
 
-  getDataItemValueForColumn(item: any, columnDef: Column, event: SlickEventData) {
+  getDataItemValueForColumn(item: any, columnDef: Column, row: number, cell: number, event: SlickEventData) {
     if (typeof this._addonOptions.dataItemColumnValueExtractor === 'function') {
-      const val = this._addonOptions.dataItemColumnValueExtractor(item, columnDef) as string | HTMLElement;
+      const val = this._addonOptions.dataItemColumnValueExtractor(item, columnDef, row, cell) as string | HTMLElement;
       if (val) {
         return (val instanceof HTMLElement) ? stripTags(val.innerHTML) : val;
       }
@@ -433,7 +433,7 @@ export class SlickCellExternalCopyManager {
                   ? stripTags((columns[j].name as HTMLElement).innerHTML)
                   : columns[j].name as string;
                 if (colName.length > 0 && !columns[j].hidden) {
-                  clipTextCells.push(this.getDataItemValueForColumn(dt, columns[j], e));
+                  clipTextCells.push(this.getDataItemValueForColumn(dt, columns[j], i, j, e));
                 }
               }
               clipTextRows.push(clipTextCells.join('\t'));
diff --git a/packages/common/src/interfaces/excelCopyBufferOption.interface.ts b/packages/common/src/interfaces/excelCopyBufferOption.interface.ts
index 09e2002a0..5cc7d89fa 100644
--- a/packages/common/src/interfaces/excelCopyBufferOption.interface.ts
+++ b/packages/common/src/interfaces/excelCopyBufferOption.interface.ts
@@ -17,7 +17,7 @@ export interface ExcelCopyBufferOption<T = any> {
   copiedCellStyleLayerKey?: string;
 
   /** option to specify a custom column value extractor function */
-  dataItemColumnValueExtractor?: (item: any, columnDef: Column<T>) => string | HTMLElement | DocumentFragment | FormatterResultWithHtml | FormatterResultWithText | null;
+  dataItemColumnValueExtractor?: (item: any, columnDef: Column<T>, row?: number, cell?: number) => string | HTMLElement | DocumentFragment | FormatterResultWithHtml | FormatterResultWithText | null;
 
   /** option to specify a custom column value setter function */
   dataItemColumnValueSetter?: (item: any, columnDef: Column<T>, value: any) => string | FormatterResultWithHtml | FormatterResultWithText | null;

From 111645cce37837a8e0fc51d84973ce36012840f9 Mon Sep 17 00:00:00 2001
From: Vildan Softic <zewa666@gmail.com>
Date: Mon, 5 Feb 2024 20:58:17 +0100
Subject: [PATCH 2/8] feat: bypass formatter export limitation if current cell
 is not in edit mode

---
 .../slickCellExcelCopyManager.spec.ts         | 32 ++++++++++++++++---
 .../extensions/slickCellExcelCopyManager.ts   |  5 ++-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/packages/common/src/extensions/__tests__/slickCellExcelCopyManager.spec.ts b/packages/common/src/extensions/__tests__/slickCellExcelCopyManager.spec.ts
index 8555a59ed..283a25993 100644
--- a/packages/common/src/extensions/__tests__/slickCellExcelCopyManager.spec.ts
+++ b/packages/common/src/extensions/__tests__/slickCellExcelCopyManager.spec.ts
@@ -1,10 +1,10 @@
 import type { EditCommand, Formatter, GridOption } from '../../interfaces/index';
-import { Formatters } from '../../formatters';
 import { SharedService } from '../../services/shared.service';
 import { SlickCellExcelCopyManager } from '../slickCellExcelCopyManager';
 import { SlickCellSelectionModel } from '../slickCellSelectionModel';
 import { SlickCellExternalCopyManager } from '../slickCellExternalCopyManager';
 import { SlickEvent, SlickEventData, SlickGrid, SlickRange } from '../../core/index';
+import { Editors } from '../../editors';
 
 jest.mock('flatpickr', () => { });
 
@@ -17,6 +17,8 @@ const gridStub = {
   getData: jest.fn(),
   getOptions: jest.fn(),
   getSelectionModel: jest.fn(),
+  getActiveCell: jest.fn(),
+  getCellEditor: jest.fn(),
   getEditorLock: () => getEditorLockMock,
   focus: jest.fn(),
   registerPlugin: jest.fn(),
@@ -356,14 +358,36 @@ describe('CellExcelCopyManager', () => {
       expect(output).toBe('John');
     });
 
-    it('should return null when calling "dataItemColumnValueExtractor" callback without editable', () => {
+    it('should return null when calling "dataItemColumnValueExtractor" callback with editable and editor, which is active on the current cell', () => {
+      jest.spyOn(gridStub, 'getOptions').mockReturnValue(gridOptionsMock);
+      plugin.init(gridStub);
+      (gridStub.getCellEditor as jest.Mock).mockReturnValue({});
+      (gridStub.getActiveCell as jest.Mock).mockReturnValue({ row: 6, cell: 6 });
+
+      const output = plugin.addonOptions!.dataItemColumnValueExtractor!({ firstName: '<b>John</b>', lastName: 'Doe' }, { id: 'firstName', field: 'firstName', exportWithFormatter: true,  editor: { model: Editors.text }, formatter: myBoldFormatter}, 6, 6);
+
+      expect(output).toBeNull();
+    });
+
+    it('should forward provided row and cell to formatter when calling "dataItemColumnValueExtractor"', () => {
+      jest.spyOn(SharedService.prototype, 'gridOptions', 'get').mockReturnValue(gridOptionsMock);
+      plugin.init(gridStub);
+
+      const rowCellFormatter: Formatter = (row, cell) => `${row}:${cell}`;
+      const output = plugin.addonOptions!.dataItemColumnValueExtractor!({ firstName: '<b>John</b>', lastName: 'Doe' }, { id: 'firstName', field: 'firstName', exportWithFormatter: true, formatter: rowCellFormatter }, 6, 6);
+
+      expect(output).toBe('6:6');
+    });
+
+    it('should format output even if not editable and an editor is configured but a formatter is defined', () => {
       gridOptionsMock.editable = false;
       jest.spyOn(SharedService.prototype, 'gridOptions', 'get').mockReturnValue(gridOptionsMock);
       plugin.init(gridStub);
 
-      const output = plugin.addonOptions!.dataItemColumnValueExtractor!({ firstName: '<b>John</b>', lastName: 'Doe' }, { id: 'firstName', field: 'firstName' });
+      const rowCellFormatter: Formatter = (row, cell) => `${row}:${cell}`;
+      const output = plugin.addonOptions!.dataItemColumnValueExtractor!({ firstName: '<b>John</b>', lastName: 'Doe' }, { id: 'firstName', field: 'firstName', exportWithFormatter: true, editor: { model: Editors.text }, formatter: rowCellFormatter }, 6, 6);
 
-      expect(output).toBeNull();
+      expect(output).toBe('6:6');
     });
   });
 });
\ No newline at end of file
diff --git a/packages/common/src/extensions/slickCellExcelCopyManager.ts b/packages/common/src/extensions/slickCellExcelCopyManager.ts
index 664811206..d9c808776 100644
--- a/packages/common/src/extensions/slickCellExcelCopyManager.ts
+++ b/packages/common/src/extensions/slickCellExcelCopyManager.ts
@@ -145,7 +145,10 @@ export class SlickCellExcelCopyManager {
       dataItemColumnValueExtractor: (item: any, columnDef: Column, row: number = 0, cell: number = 0) => {
         // when grid or cell is not editable, we will possibly evaluate the Formatter if it was passed
         // to decide if we evaluate the Formatter, we will use the same flag from Export which is "exportWithFormatter"
-        if (!this.gridOptions.editable || !columnDef.editor) {
+        const activeCell = this._grid.getActiveCell();
+        const isActiveEditorCurrentCell = this._grid.getCellEditor() && activeCell?.row === row && activeCell?.cell === cell;
+
+        if (!this.gridOptions.editable || !columnDef.editor || !isActiveEditorCurrentCell) {
           const isEvaluatingFormatter = (columnDef.exportWithFormatter !== undefined) ? columnDef.exportWithFormatter : (this.gridOptions.textExportOptions?.exportWithFormatter);
           if (columnDef.formatter && isEvaluatingFormatter) {
             const formattedOutput = columnDef.formatter(row, cell, item[columnDef.field], columnDef, item, this._grid);

From b09dff0df096f96d144d22fd07c54ab04c413b7b Mon Sep 17 00:00:00 2001
From: Vildan Softic <zewa666@gmail.com>
Date: Tue, 6 Feb 2024 20:57:36 +0100
Subject: [PATCH 3/8] chore: add lint rule for inferrable types

---
 .eslintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc b/.eslintrc
index 73cd4ae56..ddda4685d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -39,6 +39,7 @@
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-inferrable-types": "error",
     "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_", "destructuredArrayIgnorePattern": "^_" }],
     "@typescript-eslint/quotes": ["error", "single", { "allowTemplateLiterals": true }],
     "@typescript-eslint/semi": "error",

From 01468cf55a9535ddf716bb733c0a94e5fb180dfc Mon Sep 17 00:00:00 2001
From: Vildan Softic <zewa666@gmail.com>
Date: Tue, 6 Feb 2024 20:58:22 +0100
Subject: [PATCH 4/8] chore: disable prettier for project

---
 .prettierignore | 1 +
 package.json    | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..fa29cdfff
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+**
\ No newline at end of file
diff --git a/package.json b/package.json
index 180cf9525..6fbd7c1ca 100644
--- a/package.json
+++ b/package.json
@@ -95,9 +95,5 @@
   "funding": {
     "type": "ko_fi",
     "url": "https://ko-fi.com/ghiscoding"
-  },
-  "prettier": {
-    "singleQuote": true,
-    "printWidth": 120
   }
 }
\ No newline at end of file

From 8b830a447d078660d35431b53a51cfc1554c2a96 Mon Sep 17 00:00:00 2001
From: Vildan Softic <zewa666@gmail.com>
Date: Tue, 6 Feb 2024 20:58:50 +0100
Subject: [PATCH 5/8] chore: fix review feedback

---
 examples/vite-demo-vanilla-bundle/src/examples/example19.ts | 2 +-
 packages/common/src/extensions/slickCellExcelCopyManager.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/vite-demo-vanilla-bundle/src/examples/example19.ts b/examples/vite-demo-vanilla-bundle/src/examples/example19.ts
index 25141eb68..acd8c41e2 100644
--- a/examples/vite-demo-vanilla-bundle/src/examples/example19.ts
+++ b/examples/vite-demo-vanilla-bundle/src/examples/example19.ts
@@ -92,7 +92,7 @@ export default class Example19 {
         field: String(i),
         minWidth: 60,
         exportWithFormatter: true,
-        formatter: (row: number, cell: number, value: any) => {
+        formatter: (row, cell, value) => {
           if (value !== null && value !== undefined) {
             return value;
           }
diff --git a/packages/common/src/extensions/slickCellExcelCopyManager.ts b/packages/common/src/extensions/slickCellExcelCopyManager.ts
index d9c808776..2a4a141d9 100644
--- a/packages/common/src/extensions/slickCellExcelCopyManager.ts
+++ b/packages/common/src/extensions/slickCellExcelCopyManager.ts
@@ -142,7 +142,7 @@ export class SlickCellExcelCopyManager {
       clipboardCommandHandler: (editCommand: EditCommand) => {
         this._undoRedoBuffer.queueAndExecuteCommand.call(this._undoRedoBuffer, editCommand);
       },
-      dataItemColumnValueExtractor: (item: any, columnDef: Column, row: number = 0, cell: number = 0) => {
+      dataItemColumnValueExtractor: (item: any, columnDef: Column, row = 0, cell = 0) => {
         // when grid or cell is not editable, we will possibly evaluate the Formatter if it was passed
         // to decide if we evaluate the Formatter, we will use the same flag from Export which is "exportWithFormatter"
         const activeCell = this._grid.getActiveCell();

From 82654d00b336e65952ec7ee04a14d1f3132b968f Mon Sep 17 00:00:00 2001
From: Vildan Softic <zewa666@gmail.com>
Date: Wed, 7 Feb 2024 20:28:43 +0100
Subject: [PATCH 6/8] chore: add husky with pre-push to run linter

---
 .husky/pre-push | 1 +
 package.json    | 4 +++-
 pnpm-lock.yaml  | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 .husky/pre-push

diff --git a/.husky/pre-push b/.husky/pre-push
new file mode 100644
index 000000000..3867a0feb
--- /dev/null
+++ b/.husky/pre-push
@@ -0,0 +1 @@
+npm run lint
diff --git a/package.json b/package.json
index 6fbd7c1ca..feae8cef6 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,8 @@
     "lint": "eslint packages --ext .ts",
     "test": "jest --runInBand --coverage=true --config ./test/jest.config.ts",
     "test:ci": "jest --runInBand --coverage=true --ci --config ./test/jest.config.ts",
-    "test:watch": "cross-env TZ='America/New_York' jest --watch --config ./test/jest.config.ts"
+    "test:watch": "cross-env TZ='America/New_York' jest --watch --config ./test/jest.config.ts",
+    "prepare": "husky"
   },
   "comments": {
     "new-version": "To create a new version with Lerna-Lite, simply run the following script (1) 'roll-new-release'.",
@@ -74,6 +75,7 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",
     "flatpickr": "^4.6.13",
+    "husky": "^9.0.10",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 518ed7ead..4d0ef6ecf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -62,6 +62,9 @@ importers:
       flatpickr:
         specifier: ^4.6.13
         version: 4.6.13
+      husky:
+        specifier: ^9.0.10
+        version: 9.0.10
       jest:
         specifier: ^29.7.0
         version: 29.7.0(@types/node@20.11.16)(ts-node@10.9.2)
@@ -5277,6 +5280,12 @@ packages:
     engines: {node: '>=16.17.0'}
     dev: true
 
+  /husky@9.0.10:
+    resolution: {integrity: sha512-TQGNknoiy6bURzIO77pPRu+XHi6zI7T93rX+QnJsoYFf3xdjKOur+IlfqzJGMHIK/wXrLg+GsvMs8Op7vI2jVA==}
+    engines: {node: '>=18'}
+    hasBin: true
+    dev: true
+
   /iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}

From 055717edc0d44f8c34ff4af08fd766946a4337d9 Mon Sep 17 00:00:00 2001
From: Vildan Softic <zewa666@gmail.com>
Date: Wed, 7 Feb 2024 20:30:17 +0100
Subject: [PATCH 7/8] chore: linter fixes

---
 packages/common/src/core/slickDataview.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/common/src/core/slickDataview.ts b/packages/common/src/core/slickDataview.ts
index e978116cf..85f10068a 100644
--- a/packages/common/src/core/slickDataview.ts
+++ b/packages/common/src/core/slickDataview.ts
@@ -1040,7 +1040,7 @@ export class SlickDataView<TData extends SlickDataItem = any> implements CustomD
     return retval;
   }
 
-  protected compileFilter(stopRunningIfCSPSafeIsActive: boolean = false): FilterFn<TData> | null {
+  protected compileFilter(stopRunningIfCSPSafeIsActive = false): FilterFn<TData> | null {
     if (stopRunningIfCSPSafeIsActive) {
       return null;
     }
@@ -1081,7 +1081,7 @@ export class SlickDataView<TData extends SlickDataItem = any> implements CustomD
     return fn;
   }
 
-  protected compileFilterWithCaching(stopRunningIfCSPSafeIsActive: boolean = false): FilterFn<TData> | null {
+  protected compileFilterWithCaching(stopRunningIfCSPSafeIsActive = false): FilterFn<TData> | null {
     if (stopRunningIfCSPSafeIsActive) {
       return null;
     }

From 6a0a9ec016959501a5fa9665a2fdbbe538ad8e68 Mon Sep 17 00:00:00 2001
From: Vildan Softic <zewa666@gmail.com>
Date: Wed, 7 Feb 2024 20:40:31 +0100
Subject: [PATCH 8/8] chore: one more linter fix

---
 packages/common/src/core/slickCore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/common/src/core/slickCore.ts b/packages/common/src/core/slickCore.ts
index 35b8b1cca..13de0af3c 100644
--- a/packages/common/src/core/slickCore.ts
+++ b/packages/common/src/core/slickCore.ts
@@ -447,7 +447,7 @@ export class SlickGroup extends SlickNonDataItem {
    * @property groupingKey
    * @type {Object}
    */
-  groupingKey: any = null;
+  groupingKey = null;
 
   constructor() {
     super();