feat: reimplement highlight row, node-extend & fix few issues (#1134)

* feat: reimplement highlight row, node-extend & fix few issues
ghiscoding · Dec 21, 2023 · c047781 · c047781
1 parent aa531f3
commit c047781
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 105 deletions.
diff --git a/packages/aurelia-slickgrid/package.json b/packages/aurelia-slickgrid/package.json
@@ -51,12 +51,13 @@
     "@aurelia/i18n": "latest",
     "@aurelia/runtime": "latest",
     "@aurelia/runtime-html": "latest",
-    "@slickgrid-universal/common": "~4.0.3",
-    "@slickgrid-universal/custom-footer-component": "~4.0.3",
-    "@slickgrid-universal/empty-warning-component": "~4.0.3",
-    "@slickgrid-universal/event-pub-sub": "~4.0.2",
-    "@slickgrid-universal/pagination-component": "~4.0.3",
-    "@slickgrid-universal/row-detail-view-plugin": "~4.0.3",
+    "@slickgrid-universal/common": "~4.1.0",
+    "@slickgrid-universal/custom-footer-component": "~4.1.0",
+    "@slickgrid-universal/empty-warning-component": "~4.1.0",
+    "@slickgrid-universal/event-pub-sub": "~4.1.0",
+    "@slickgrid-universal/pagination-component": "~4.1.0",
+    "@slickgrid-universal/row-detail-view-plugin": "~4.1.0",
+    "@slickgrid-universal/utils": "^4.1.0",
     "dequal": "^2.0.3",
     "dompurify": "^3.0.6",
     "moment-mini": "^2.29.4",

diff --git a/packages/aurelia-slickgrid/src/custom-elements/aurelia-slickgrid.ts b/packages/aurelia-slickgrid/src/custom-elements/aurelia-slickgrid.ts
@@ -47,12 +47,12 @@ import {
   emptyElement,
   ExtensionName,
   GridStateType,
-  Utils as SlickUtils,
 } from '@slickgrid-universal/common';
 import { EventPubSubService } from '@slickgrid-universal/event-pub-sub';
 import { SlickFooterComponent } from '@slickgrid-universal/custom-footer-component';
 import { SlickEmptyWarningComponent } from '@slickgrid-universal/empty-warning-component';
 import { SlickPaginationComponent } from '@slickgrid-universal/pagination-component';
+import { extend } from '@slickgrid-universal/utils';
 
 import { bindable, BindingMode, CollectionKind, customElement, IContainer, IEventAggregator, IDisposable, IObserverLocator } from 'aurelia';
 import { ICollectionSubscriber, ICollectionObserver } from '@aurelia/runtime';
@@ -1299,7 +1299,7 @@ export class AureliaSlickgridCustomElement {
     gridOptions.enablePagination = ((gridOptions.backendServiceApi && gridOptions.enablePagination === undefined) ? true : gridOptions.enablePagination) || false;
 
     // use extend to deep merge & copy to avoid immutable properties being changed in GlobalGridOptions after a route change
-    const options = SlickUtils.extend(true, {}, GlobalGridOptions, gridOptions) as GridOption;
+    const options = extend(true, {}, GlobalGridOptions, gridOptions) as GridOption;
 
     // using copy extend to do a deep clone has an unwanted side on objects and pageSizes but ES6 spread has other worst side effects
     // so we will just overwrite the pageSizes when needed, this is the only one causing issues so far.

diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -49,15 +49,15 @@
     "@faker-js/faker": "^8.3.1",
     "@fnando/sparkline": "^0.3.10",
     "@popperjs/core": "^2.11.8",
-    "@slickgrid-universal/common": "~4.0.3",
-    "@slickgrid-universal/composite-editor-component": "~4.0.3",
-    "@slickgrid-universal/custom-tooltip-plugin": "~4.0.3",
-    "@slickgrid-universal/excel-export": "~4.0.3",
-    "@slickgrid-universal/graphql": "~4.0.3",
-    "@slickgrid-universal/odata": "~4.0.3",
-    "@slickgrid-universal/row-detail-view-plugin": "~4.0.3",
-    "@slickgrid-universal/rxjs-observable": "~4.0.3",
-    "@slickgrid-universal/text-export": "~4.0.3",
+    "@slickgrid-universal/common": "~4.1.0",
+    "@slickgrid-universal/composite-editor-component": "~4.1.0",
+    "@slickgrid-universal/custom-tooltip-plugin": "~4.1.0",
+    "@slickgrid-universal/excel-export": "~4.1.0",
+    "@slickgrid-universal/graphql": "~4.1.0",
+    "@slickgrid-universal/odata": "~4.1.0",
+    "@slickgrid-universal/row-detail-view-plugin": "~4.1.0",
+    "@slickgrid-universal/rxjs-observable": "~4.1.0",
+    "@slickgrid-universal/text-export": "~4.1.0",
     "aurelia": "latest",
     "aurelia-slickgrid": "workspace:*",
     "bootstrap": "^5.3.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/cypress/e2e/example11.cy.ts b/test/cypress/e2e/example11.cy.ts
@@ -1,4 +1,5 @@
 describe('Example 11 - Add / Update / Highlight a Datagrid Item', () => {
+  const GRID_ROW_HEIGHT = 35;
   const fullTitles = ['', 'Title', 'Duration (days)', '% Complete', 'Start', 'Finish', 'Effort Driven'];
 
   it('should display Example title', () => {
@@ -93,8 +94,8 @@ describe('Example 11 - Add / Update / Highlight a Datagrid Item', () => {
   it('should scroll to top and expect certain rows on top', () => {
     cy.get('[data-test="scroll-top-btn"]').click();
 
-    cy.get('#grid11').find('.slick-row:visible:nth(0) .slick-cell:nth(1)').should('contain.text', 'Task 1001');
-    cy.get('#grid11').find('.slick-row:visible:nth(1) .slick-cell:nth(1)').should('contain.text', 'Task 1000');
-    cy.get('#grid11').find('.slick-row:visible:nth(2) .slick-cell:nth(1)').should('contain.text', 'Task 1');
+    cy.get(`[style="top: ${GRID_ROW_HEIGHT * 0}px;"] > .slick-cell:nth(1)`).should('contain', 'Task 1001');
+    cy.get(`[style="top: ${GRID_ROW_HEIGHT * 1}px;"] > .slick-cell:nth(1)`).should('contain', 'Task 100');
+    cy.get(`[style="top: ${GRID_ROW_HEIGHT * 2}px;"] > .slick-cell:nth(1)`).should('contain', 'Task 1');
   });
 });