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

Jump to bottom

ROU-11327: Fix tooltip issue with Grouped Columns and increment version #437

Merged
merged 4 commits into from
Oct 31, 2024
Merged

ROU-11327: Fix tooltip issue with Grouped Columns and increment version #437

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9d9a9f
Fix tooltip issue with Grouped Columns and increment version
gnbm Oct 29, 2024
2e54db6
Update ToolTip.ts
gnbm Oct 30, 2024
fcbac18
Update ToolTip.ts
gnbm Oct 30, 2024
8fb451a
Update ToolTip.ts
gnbm Oct 31, 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 gulp/DefaultSpecs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const constants = {

// Store the default project specifications
const specs = {
version: '2.17.0',
version: '2.18.0',
name: 'OutSystems DataGrid',
description: '',
url: 'Website:\n • ' + constants.websiteUrl,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "outsystems-datagrid",
"version": "2.17.0",
"version": "2.18.0",
"description": "OutSystems Data Grid for Reactive Web",
"author": "UI Components Team",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion src/OSFramework/DataGrid/Constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
namespace OSFramework.DataGrid.Constants {
/* OutSystems Data Grid Version */
export const OSDataGridVersion = '2.17.0';
export const OSDataGridVersion = '2.18.0';
/* OutSystems null values */
export const OSNullDate = '1900-01-01';
export const OSNullDateTime = '1900-01-01T00:00:00';
Expand Down
12 changes: 10 additions & 2 deletions src/Providers/DataGrid/Wijmo/Features/ToolTip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@ namespace Providers.DataGrid.Wijmo.Feature {
this._setCellTooltip(_currTarget, ht.getColumn().binding, ht.row);
}
} else if (cellType === wijmo.grid.CellType.ColumnHeader) {
// If the Column Header is from a Group Column, we need to use a different approach that the regular header
if (_currTarget.classList.contains(Helper.Constants.CssClasses.ColumnGroup)) {
// If the Column Header is from a Group Column, we need to use a different approach than the regular header
// We can check if the current target is a ColumnGroup by checking its class and if it has columns or columnGroups
if (
_currTarget.classList.contains(Helper.Constants.CssClasses.ColumnGroup) &&
((ht.getColumn(true)._binding === undefined &&
(ht.getColumn(true) as wijmo.grid.ColumnGroup).columns !== undefined &&
(ht.getColumn(true) as wijmo.grid.ColumnGroup).columns.length > 0) ||
((ht.getColumn(true) as wijmo.grid.ColumnGroup).columnGroups !== undefined &&
(ht.getColumn(true) as wijmo.grid.ColumnGroup).columnGroups.length > 0))
gnbm marked this conversation as resolved.
Show resolved Hide resolved
) {
this._setColumnGroupHeaderTooltip(_currTarget);
} else {
this._setHeaderTooltip(_currTarget, ht);
Expand Down
Loading