Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update Slickgrid-Universal to fix a few UI issues #1293

Merged
merged 4 commits into from
Nov 30, 2024
Merged

fix: update Slickgrid-Universal to fix a few UI issues #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fc71cd
fix: update Slickgrid-Universal to fix a few UI issues
ghiscoding Nov 30, 2024
4d65932
chore: sync pnpm lock file
ghiscoding Nov 30, 2024
bc01fe8
chore: fix failing Cypress test
ghiscoding Nov 30, 2024
27921a3
chore: fix failing Cypress test
ghiscoding Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@jest/types": "^29.6.3",
"@lerna-lite/cli": "^3.10.1",
"@lerna-lite/publish": "^3.10.1",
"@slickgrid-universal/common": "^5.10.1",
"@slickgrid-universal/common": "^5.10.2",
"@types/jest": "^29.5.14",
"@types/node": "^22.10.1",
"conventional-changelog-conventionalcommits": "^7.0.2",
Expand Down
14 changes: 7 additions & 7 deletions packages/aurelia-slickgrid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
"@aurelia/runtime": "^2.0.0-beta.22",
"@aurelia/runtime-html": "^2.0.0-beta.22",
"@formkit/tempo": "^0.1.2",
"@slickgrid-universal/common": "~5.10.1",
"@slickgrid-universal/custom-footer-component": "~5.10.1",
"@slickgrid-universal/empty-warning-component": "~5.10.1",
"@slickgrid-universal/event-pub-sub": "~5.9.0",
"@slickgrid-universal/pagination-component": "~5.10.1",
"@slickgrid-universal/row-detail-view-plugin": "~5.10.1",
"@slickgrid-universal/utils": "~5.9.0",
"@slickgrid-universal/common": "~5.10.2",
"@slickgrid-universal/custom-footer-component": "~5.10.2",
"@slickgrid-universal/empty-warning-component": "~5.10.2",
"@slickgrid-universal/event-pub-sub": "~5.10.2",
"@slickgrid-universal/pagination-component": "~5.10.2",
"@slickgrid-universal/row-detail-view-plugin": "~5.10.2",
"@slickgrid-universal/utils": "~5.10.2",
"dequal": "^2.0.3",
"sortablejs": "^1.15.6"
},
Expand Down
5 changes: 4 additions & 1 deletion packages/aurelia-slickgrid/src/models/gridOption.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import type { I18N } from '@aurelia/i18n';
import type { Column, GridOption as UniversalGridOption } from '@slickgrid-universal/common';
import type { BasePaginationComponent, Column, GridOption as UniversalGridOption } from '@slickgrid-universal/common';

import type { RowDetailView } from './rowDetailView.interface';

export interface GridOption<C extends Column = Column> extends UniversalGridOption<C> {
/** External Custom Pagination Component that can be provided by the user */
customPaginationComponent?: typeof BasePaginationComponent;

/** I18N translation service instance */
i18n?: I18N;

Expand Down
20 changes: 10 additions & 10 deletions packages/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@
"@fnando/sparkline": "^0.3.10",
"@formkit/tempo": "^0.1.2",
"@popperjs/core": "^2.11.8",
"@slickgrid-universal/common": "^5.10.1",
"@slickgrid-universal/composite-editor-component": "^5.10.1",
"@slickgrid-universal/custom-tooltip-plugin": "^5.10.1",
"@slickgrid-universal/excel-export": "^5.10.1",
"@slickgrid-universal/graphql": "^5.10.1",
"@slickgrid-universal/odata": "^5.10.1",
"@slickgrid-universal/row-detail-view-plugin": "^5.10.1",
"@slickgrid-universal/rxjs-observable": "^5.10.1",
"@slickgrid-universal/text-export": "^5.10.1",
"@slickgrid-universal/common": "^5.10.2",
"@slickgrid-universal/composite-editor-component": "^5.10.2",
"@slickgrid-universal/custom-tooltip-plugin": "^5.10.2",
"@slickgrid-universal/excel-export": "^5.10.2",
"@slickgrid-universal/graphql": "^5.10.2",
"@slickgrid-universal/odata": "^5.10.2",
"@slickgrid-universal/row-detail-view-plugin": "^5.10.2",
"@slickgrid-universal/rxjs-observable": "^5.10.2",
"@slickgrid-universal/text-export": "^5.10.2",
"aurelia": "^2.0.0-beta.22",
"aurelia-slickgrid": "workspace:*",
"bootstrap": "^5.3.3",
"i18next": "^23.16.5",
"i18next": "^23.16.8",
"i18next-fetch-backend": "^6.0.0",
"rxjs": "^7.8.1"
},
Expand Down
7 changes: 7 additions & 0 deletions packages/demo/src/examples/slickgrid/example10.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,13 @@ export class Example10 {
}
}

// Toggle the Pagination of Grid2
// IMPORTANT, the Pagination MUST BE CREATED on initial page load before you can start toggling it
// Basically you cannot toggle a Pagination that doesn't exist (must created at the time as the grid)
isGrid2WithPaginationChanged() {
this.aureliaGrid2.paginationService!.togglePaginationVisibility(this.isGrid2WithPagination);
}

onGrid1SelectedRowsChanged(_e: Event, args: any) {
const grid = args && args.grid;
if (Array.isArray(args.rows)) {
Expand Down
Loading