Merge pull request #521 from ghiscoding/feat/internal-row-selections

feat(plugins): move Checkbox and Row Selection plugins to universal
ghiscoding · Oct 15, 2021 · 5429c91 · 5429c91
2 parents f7d4e44 + 44c7731
commit 5429c91
Show file tree

Hide file tree

Showing 37 changed files with 1,860 additions and 623 deletions.
diff --git a/examples/webpack-demo-vanilla-bundle/src/examples/example07.html b/examples/webpack-demo-vanilla-bundle/src/examples/example07.html
@@ -50,7 +50,7 @@ <h3 class="title is-3">
     <span class.bind="sortingEnabledClass"></span>
     <span>Toggle Sorting</span>
   </button>
-  <button class="button is-small" data-test="delete-clear-filters-btn" onclick.delegate="clearFilters()">
+  <button class="button is-small" data-test="clear-filters-btn" onclick.delegate="clearFilters()">
     <span class="icon mdi mdi-close"></span>
     <span>Clear Filters</span>
   </button>

diff --git a/packages/common/src/editors/autoCompleteEditor.ts b/packages/common/src/editors/autoCompleteEditor.ts
@@ -135,7 +135,7 @@ export class AutoCompleteEditor implements Editor {
 
   /** Getter for the Grid Options pulled through the Grid Object */
   get gridOptions(): GridOption {
-    return (this.grid && this.grid.getOptions) ? this.grid.getOptions() : {};
+    return this.grid?.getOptions?.() ?? {};
   }
 
   /** jQuery UI AutoComplete instance */

diff --git a/packages/common/src/enums/slickPluginList.enum.ts b/packages/common/src/enums/slickPluginList.enum.ts
@@ -1,10 +1,8 @@
 import {
-  SlickCheckboxSelectColumn,
   SlickEditorLock,
   SlickGroupItemMetadataProvider,
   SlickRowDetailView,
   SlickRowMoveManager,
-  SlickRowSelectionModel,
 } from '../interfaces/index';
 import {
   SlickAutoTooltip,
@@ -13,10 +11,12 @@ import {
   SlickCellRangeDecorator,
   SlickCellRangeSelector,
   SlickCellSelectionModel,
+  SlickCheckboxSelectColumn,
   SlickContextMenu,
   SlickDraggableGrouping,
   SlickHeaderButtons,
   SlickHeaderMenu,
+  SlickRowSelectionModel,
 } from '../plugins/index';
 
 export type SlickPluginList =

diff --git a/packages/common/src/extensions/__tests__/checkboxSelectorExtension.spec.ts b/packages/common/src/extensions/__tests__/checkboxSelectorExtension.spec.ts
diff --git a/packages/common/src/extensions/__tests__/extensionUtility.spec.ts b/packages/common/src/extensions/__tests__/extensionUtility.spec.ts
@@ -16,7 +16,6 @@ const mockAddon = jest.fn().mockImplementation(() => ({
   destroy: jest.fn()
 }));
 
-jest.mock('slickgrid/plugins/slick.rowselectionmodel', () => mockAddon);
 jest.mock('slickgrid/plugins/slick.rowdetailview', () => mockAddon);
 jest.mock('slickgrid/plugins/slick.rowmovemanager', () => mockAddon);
 

diff --git a/packages/common/src/extensions/__tests__/rowDetailViewExtension.spec.ts b/packages/common/src/extensions/__tests__/rowDetailViewExtension.spec.ts
@@ -25,9 +25,6 @@ Slick.Plugins = {
   RowDetailView: mockAddon
 } as any;
 
-jest.mock('slickgrid/plugins/slick.rowselectionmodel', () => mockSelectionModel);
-Slick.RowSelectionModel = mockSelectionModel;
-
 describe('rowDetailViewExtension', () => {
   it('should display a not implemented when calling "create" method', () => {
     expect(() => RowDetailViewExtension.prototype.create!([] as Column[], {} as GridOption)).toThrow('[Slickgrid-Universal] RowDetailViewExtension "create" method is not yet implemented');

diff --git a/packages/common/src/extensions/__tests__/rowMoveManagerExtension.spec.ts b/packages/common/src/extensions/__tests__/rowMoveManagerExtension.spec.ts
@@ -2,6 +2,7 @@ import { RowMoveManagerExtension } from '../rowMoveManagerExtension';
 import { SharedService } from '../../services/shared.service';
 import { TranslateServiceStub } from '../../../../../test/translateServiceStub';
 import { Column, GridOption, RowMoveManager, SlickGrid, SlickNamespace, SlickRowMoveManager } from '../../interfaces/index';
+import { SlickRowSelectionModel } from '../../plugins/slickRowSelectionModel';
 
 declare const Slick: SlickNamespace;
 
@@ -20,18 +21,26 @@ const mockAddon = jest.fn().mockImplementation(() => ({
   onMoveRows: new Slick.Event(),
 }));
 
-const mockSelectionModel = jest.fn().mockImplementation(() => ({
+const mockRowSelectionModel = {
+  constructor: jest.fn(),
   init: jest.fn(),
-  destroy: jest.fn()
+  destroy: jest.fn(),
+  dispose: jest.fn(),
+  getSelectedRows: jest.fn(),
+  setSelectedRows: jest.fn(),
+  getSelectedRanges: jest.fn(),
+  setSelectedRanges: jest.fn(),
+  onSelectedRangesChanged: new Slick.Event(),
+} as unknown as SlickRowSelectionModel;
+
+jest.mock('../../plugins/slickRowSelectionModel', () => ({
+  SlickRowSelectionModel: jest.fn().mockImplementation(() => mockRowSelectionModel),
 }));
 
 describe('rowMoveManagerExtension', () => {
   jest.mock('slickgrid/plugins/slick.rowmovemanager', () => mockAddon);
   Slick.RowMoveManager = mockAddon;
 
-  jest.mock('slickgrid/plugins/slick.rowselectionmodel', () => mockSelectionModel);
-  Slick.RowSelectionModel = mockSelectionModel;
-
   let sharedService: SharedService;
   let translateService: TranslateServiceStub;
   let extension: RowMoveManagerExtension;

diff --git a/packages/common/src/extensions/__tests__/rowSelectionExtension.spec.ts b/packages/common/src/extensions/__tests__/rowSelectionExtension.spec.ts