From 86859e1a989131554b5413c5784cd419504486f3 Mon Sep 17 00:00:00 2001 From: Laurent Fasani Date: Wed, 15 May 2024 17:44:12 +0200 Subject: [PATCH] [2837] Enhance gantt scroll bar management * Table and Calendar headers are always displayed * An horizontal scroll bar is set on the gantt part * Table content and gantt content are scrollable synchronously Bug: https://github.com/eclipse-sirius/sirius-web/issues/2837 Signed-off-by: Laurent Fasani --- CHANGELOG.adoc | 3 ++- package-lock.json | 22 +++++++++---------- .../sirius-components-gantt/package.json | 4 ++-- .../frontend/sirius-web/package.json | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 652f2c7390c..2988320b7fe 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -73,7 +73,7 @@ Accordingly, `IObjectSearchService` and `IIdentityService` now handle actual `IE - Move to docker compose v2 for our GitHub Actions workflow. - [test] Switch to ArchUnit 1.3.0 to restore architectural tests which were failing recently -- https://github.com/eclipse-sirius/sirius-web/issues/3277[#3277] [gantt] Move to @ObeoNetwork/gantt-task-react 0.4.9 to benefit for enhancements +- https://github.com/eclipse-sirius/sirius-web/issues/2837[#2837] [gantt] Move to @ObeoNetwork/gantt-task-react 0.4.13 to benefit for enhancements === Bug fixes @@ -371,6 +371,7 @@ In other scenarios, the default creation position border remains the eastern one - https://github.com/eclipse-sirius/sirius-web/issues/3220[#3220] [deck] Add documentation - https://github.com/eclipse-sirius/sirius-web/issues/3178[#3178] [portal] Add documentation for portals - https://github.com/eclipse-sirius/sirius-web/issues/2890[#2890] [portal] Display the contents of a Portal in the Representations view +- https://github.com/eclipse-sirius/sirius-web/issues/2837[#2837] [gantt] Enhance gantt scroll bar management == v2024.1.0 diff --git a/package-lock.json b/package-lock.json index 431406b4d9c..9e743261719 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1571,9 +1571,9 @@ } }, "node_modules/@ObeoNetwork/gantt-task-react": { - "version": "0.4.9", - "resolved": "https://npm.pkg.github.com/download/@ObeoNetwork/gantt-task-react/0.4.9/c8a8fa0c3ec657f40bdfbe4318c985405c670d2d", - "integrity": "sha512-SLHDvEQV2VHk/rF1XZQhq7Q/UuPFCAOqBq6xGI4ag1eejGg40wphUq9CM5/blorp4QqLwPCFHJ7DCYTdOXrJ5g==", + "version": "0.4.13", + "resolved": "https://npm.pkg.github.com/download/@ObeoNetwork/gantt-task-react/0.4.13/b1ae62bb70652b4a89fc0f109a8bca9bc5179fc5", + "integrity": "sha512-1ucxIiTbQwjgfxuqMdNZmsGzD8QeiMWeAPG7Q29rMZ0druEk2EY+yKHdxA4A0nsCqhhZrVmK13yMHwoZSrpSbQ==", "license": "MIT", "dependencies": { "@floating-ui/dom": "1.1.1", @@ -6941,7 +6941,7 @@ "@eclipse-sirius/sirius-components-tsconfig": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", - "@ObeoNetwork/gantt-task-react": "0.4.9", + "@ObeoNetwork/gantt-task-react": "0.4.13", "@types/react": "17.0.37", "@vitejs/plugin-react": "4.0.4", "@xstate/react": "1.6.3", @@ -6959,7 +6959,7 @@ "@eclipse-sirius/sirius-components-core": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", - "@ObeoNetwork/gantt-task-react": "0.4.9", + "@ObeoNetwork/gantt-task-react": "0.4.13", "@xstate/react": "1.6.3", "graphql": "16.8.0", "react": "17.0.2", @@ -7067,7 +7067,7 @@ "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", "@material-ui/lab": "4.0.0-alpha.61", - "@ObeoNetwork/gantt-task-react": "0.4.9", + "@ObeoNetwork/gantt-task-react": "0.4.13", "@ObeoNetwork/react-trello": "2.4.11", "@types/react": "17.0.37", "@types/react-router-dom": "5.3.3", @@ -7948,7 +7948,7 @@ "@eclipse-sirius/sirius-components-tsconfig": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", - "@ObeoNetwork/gantt-task-react": "0.4.9", + "@ObeoNetwork/gantt-task-react": "0.4.13", "@types/react": "17.0.37", "@vitejs/plugin-react": "4.0.4", "@xstate/react": "1.6.3", @@ -8151,7 +8151,7 @@ "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", "@material-ui/lab": "4.0.0-alpha.61", - "@ObeoNetwork/gantt-task-react": "0.4.9", + "@ObeoNetwork/gantt-task-react": "0.4.13", "@ObeoNetwork/react-trello": "2.4.11", "@testing-library/jest-dom": "5.14.1", "@testing-library/react": "12.1.2", @@ -8915,9 +8915,9 @@ } }, "@ObeoNetwork/gantt-task-react": { - "version": "0.4.9", - "resolved": "https://npm.pkg.github.com/download/@ObeoNetwork/gantt-task-react/0.4.9/c8a8fa0c3ec657f40bdfbe4318c985405c670d2d", - "integrity": "sha512-SLHDvEQV2VHk/rF1XZQhq7Q/UuPFCAOqBq6xGI4ag1eejGg40wphUq9CM5/blorp4QqLwPCFHJ7DCYTdOXrJ5g==", + "version": "0.4.13", + "resolved": "https://npm.pkg.github.com/download/@ObeoNetwork/gantt-task-react/0.4.13/b1ae62bb70652b4a89fc0f109a8bca9bc5179fc5", + "integrity": "sha512-1ucxIiTbQwjgfxuqMdNZmsGzD8QeiMWeAPG7Q29rMZ0druEk2EY+yKHdxA4A0nsCqhhZrVmK13yMHwoZSrpSbQ==", "requires": { "@floating-ui/dom": "1.1.1", "@floating-ui/react": "0.19.0", diff --git a/packages/gantt/frontend/sirius-components-gantt/package.json b/packages/gantt/frontend/sirius-components-gantt/package.json index 6abacc10002..897a5c2a6ac 100644 --- a/packages/gantt/frontend/sirius-components-gantt/package.json +++ b/packages/gantt/frontend/sirius-components-gantt/package.json @@ -31,7 +31,7 @@ }, "peerDependencies": { "@apollo/client": "3.8.1", - "@ObeoNetwork/gantt-task-react": "0.4.9", + "@ObeoNetwork/gantt-task-react": "0.4.13", "@eclipse-sirius/sirius-components-core": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", @@ -47,7 +47,7 @@ "@eclipse-sirius/sirius-components-tsconfig": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", - "@ObeoNetwork/gantt-task-react": "0.4.9", + "@ObeoNetwork/gantt-task-react": "0.4.13", "@types/react": "17.0.37", "@vitejs/plugin-react": "4.0.4", "@xstate/react": "1.6.3", diff --git a/packages/sirius-web/frontend/sirius-web/package.json b/packages/sirius-web/frontend/sirius-web/package.json index dbb642f61e9..0cb0040ea11 100644 --- a/packages/sirius-web/frontend/sirius-web/package.json +++ b/packages/sirius-web/frontend/sirius-web/package.json @@ -30,7 +30,7 @@ "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", "@material-ui/lab": "4.0.0-alpha.61", - "@ObeoNetwork/gantt-task-react": "0.4.9", + "@ObeoNetwork/gantt-task-react": "0.4.13", "@ObeoNetwork/react-trello": "2.4.11", "@types/react": "17.0.37", "@types/react-router-dom": "5.3.3",