From e40a486a092c0169b78a2e955ddea87ec9877b0c Mon Sep 17 00:00:00 2001 From: Clara Ni Date: Mon, 24 Feb 2025 14:10:31 +0100 Subject: [PATCH] ui-charts: replace several modules by ui-charts Signed-off-by: Clara Ni --- package-lock.json | 158 ++++-------------- package.json | 6 +- storybook/.storybook/main.ts | 1 + .../ManchetteSplit/ManchetteSplit.stories.tsx | 14 +- .../stories/ManchetteSplit/sampleData.ts | 34 ++++ .../TrackOccupancyDiagram.stories.tsx | 22 +-- ui-charts/README.md | 63 +++++++ {ui-spacetimechart => ui-charts}/package.json | 17 +- .../postcss.config.cjs | 0 .../rollup.config.js | 0 ui-charts/src/index.ts | 9 + .../Manchette}/components/Manchette.tsx | 0 .../Manchette}/components/Waypoint.tsx | 0 .../Manchette}/components/WaypointList.tsx | 0 .../manchette/Manchette}/components/consts.ts | 0 .../src/manchette/Manchette}/index.ts | 0 .../Manchette}/stories/Manchette.stories.tsx | 2 +- .../Manchette}/stories/Waypoint.stories.ts | 2 +- .../stories/WaypointList.stories.ts | 2 +- .../Manchette}/stories/assets/sampleData.ts | 0 .../src/manchette/Manchette}/styles/main.css | 0 .../manchette/Manchette}/styles/manchette.css | 0 .../Manchette}/styles/waypoint-list.css | 0 .../manchette/Manchette}/styles/waypoint.css | 0 .../src/manchette/Manchette}/types.ts | 0 .../src/manchette/Manchette}/utils/index.ts | 0 .../src/manchette/Manchette}/utils/vector.ts | 0 ui-charts/src/manchette/index.ts | 9 + .../__tests__/helpers.spec.ts | 0 .../assets/sampleData.ts | 2 +- .../ManchetteWithSpaceTimeChart.tsx | 9 +- .../useManchetteWithSpaceTimeChart}/consts.ts | 0 .../helpers.ts | 2 +- .../hooks/useManchetteWithSpaceTimeChart.ts | 5 +- .../hooks/usePaths.ts | 5 +- .../useManchetteWithSpaceTimeChart}/index.ts | 0 .../stories/Menu.tsx | 0 .../base-with-waypoint-menu.stories.tsx | 7 +- .../stories/base.stories.tsx | 7 +- .../stories/simple.stories.tsx | 3 +- .../styles/main.css | 0 .../styles/manchette.css | 0 .../styles/menu.css | 0 .../utils/index.ts | 0 .../utils/point.ts | 0 .../src/spaceTimeChart}/README.md | 0 .../spaceTimeChart}/__tests__/canvas.spec.ts | 0 .../__tests__/geometry.spec.ts | 0 .../spaceTimeChart}/__tests__/paths.spec.ts | 0 .../spaceTimeChart}/__tests__/scales.spec.ts | 0 .../__tests__/snapping.spec.ts | 0 .../assets/images/ScheduledMaintenanceUp.svg | 0 .../components/ConflictLayer.tsx | 0 .../components/ConflictTooltip.tsx | 0 .../components/OccupancyBlockLayer.tsx | 0 .../spaceTimeChart}/components/PathLayer.tsx | 0 .../components/PatternRect.tsx | 0 .../components/SpaceGraduations.tsx | 0 .../components/SpaceTimeChart.tsx | 0 .../components/TimeCaptions.tsx | 0 .../components/TimeGraduations.tsx | 0 .../components/WorkScheduleLayer.tsx | 0 .../src/spaceTimeChart}/config.ts | 0 .../src/spaceTimeChart}/hooks/useCanvas.ts | 0 .../hooks/useDevicePixelRatio.ts | 0 .../hooks/useMouseInteractions.ts | 0 .../spaceTimeChart}/hooks/useMouseTracking.ts | 0 .../src/spaceTimeChart}/hooks/useSize.ts | 0 .../src/spaceTimeChart}/index.ts | 0 .../src/spaceTimeChart}/lib/consts.ts | 0 .../src/spaceTimeChart}/lib/context.ts | 0 .../src/spaceTimeChart}/lib/theme.ts | 0 .../src/spaceTimeChart}/lib/types.ts | 5 +- .../stories/additional-data.stories.tsx | 4 +- .../stories/base-rendering.stories.tsx | 4 +- .../stories/custom-styles.stories.tsx | 4 +- .../stories/horizontal-zoom.stories.tsx | 2 +- .../stories/layers.stories.tsx | 4 +- .../stories/lib/components.tsx | 0 .../src/spaceTimeChart}/stories/lib/paths.ts | 0 .../src/spaceTimeChart}/stories/lib/utils.ts | 0 .../stories/measuring.stories.tsx | 4 +- .../stories/options.stories.tsx | 2 +- .../stories/paths-interactions.stories.tsx | 4 +- .../stories/performances.stories.tsx | 4 +- .../stories/scroll-navigation.stories.tsx | 4 +- .../spaceTimeChart}/stories/split.stories.tsx | 0 .../stories/stage-interactions.stories.tsx | 2 +- .../stories/work-schedules.stories.tsx | 0 .../src/spaceTimeChart}/styles/main.css | 0 .../src/spaceTimeChart}/types.ts | 0 .../utils/__tests__/canvas.spec.ts | 0 .../src/spaceTimeChart}/utils/canvas.ts | 0 .../src/spaceTimeChart}/utils/colors.ts | 0 .../src/spaceTimeChart}/utils/events.ts | 0 .../src/spaceTimeChart}/utils/geometry.ts | 0 .../src/spaceTimeChart}/utils/paths.ts | 0 .../src/spaceTimeChart}/utils/png.ts | 0 .../src/spaceTimeChart}/utils/scales.ts | 0 .../src/spaceTimeChart}/utils/snapping.ts | 0 .../src/spaceTimeChart}/utils/vectors.ts | 0 .../src/speedSpaceChart}/README.md | 16 +- .../speedSpaceChart}/__tests__/utils.spec.ts | 0 .../components/SpeedSpaceChart.tsx | 0 .../components/common/DetailsBox.tsx | 0 .../components/common/InteractionButtons.tsx | 0 .../components/common/SettingsPanel.tsx | 0 .../components/common/Tooltip.tsx | 0 .../src/speedSpaceChart}/components/const.ts | 0 .../components/helpers/drawElements/axisY.ts | 0 .../components/helpers/drawElements/curve.ts | 0 .../helpers/drawElements/declivity.ts | 2 +- .../helpers/drawElements/electricalProfile.ts | 0 .../helpers/drawElements/powerRestrictions.ts | 0 .../helpers/drawElements/reticle.ts | 0 .../helpers/drawElements/speedLimitTags.ts | 0 .../helpers/drawElements/speedLimits.ts | 0 .../components/helpers/drawElements/steps.ts | 0 .../components/helpers/drawElements/tickX.ts | 0 .../helpers/drawElements/tickYRight.ts | 0 .../components/helpers/frontFrame.ts | 0 .../components/helpers/layersManager.ts | 0 .../src/speedSpaceChart}/components/hooks.ts | 0 .../components/layers/CurveLayer.tsx | 0 .../components/layers/DeclivityLayer.tsx | 0 .../layers/ElectricalProfileLayer.tsx | 0 .../layers/FrontInteractivityLayer.tsx | 0 .../layers/PowerRestrictionsLayer.tsx | 0 .../components/layers/ReticleLayer.tsx | 0 .../components/layers/SpeedLimitTagsLayer.tsx | 0 .../components/layers/SpeedLimitsLayer.tsx | 0 .../components/layers/StepsLayer.tsx | 0 .../components/layers/TickLayerX.tsx | 0 .../components/layers/TickLayerY.tsx | 0 .../components/layers/TickLayerYRight.tsx | 0 .../components/layers/index.ts | 0 .../src/speedSpaceChart}/components/utils.ts | 0 .../src/speedSpaceChart}/index.ts | 0 .../stories/SpeedSpaceChart.stories.tsx | 2 +- .../speedSpaceChart}/stories/assets/const.ts | 0 .../stories/assets/path_properties_PMP_LM.ts | 0 .../assets/power_restrictions_PMP_LM.ts | 0 .../stories/assets/simulation_PMP_LM.ts | 0 .../stories/assets/speed_limit_tags_PMP_LM.ts | 0 .../src/speedSpaceChart}/stories/utils.ts | 0 .../src/speedSpaceChart}/styles/main.css | 0 .../src/speedSpaceChart}/types/chartTypes.ts | 0 .../speedSpaceChart}/types/simulationTypes.ts | 0 .../__tests__/utils.spec.ts | 0 .../components/TrackOccupancyCanvas.tsx | 0 .../components/TrackOccupancyManchette.tsx | 0 .../components/consts.ts | 0 .../drawElements/drawOccupancyZones.ts | 0 .../drawElements/drawOccupancyZonesTexts.ts | 0 .../helpers/drawElements/drawTrack.ts | 0 .../helpers/drawElements/drawTracks.ts | 0 .../components/layers/OccupancyZonesLayer.tsx | 6 +- .../components/layers/TracksLayer.tsx | 6 +- .../components/types.ts | 6 +- .../components/utils.ts | 0 .../src/trackOccupancyDiagram}/index.ts | 1 - .../trackOccupancyDiagram}/styles/main.css | 0 .../tailwind.config.js | 0 .../tsconfig.json | 0 .../vitest.config.mts | 2 +- ui-manchette-with-spacetimechart/package.json | 52 ------ .../postcss.config.cjs | 3 - ui-manchette/package.json | 49 ------ ui-manchette/postcss.config.cjs | 3 - ui-manchette/rollup.config.js | 3 - ui-manchette/tailwind.config.js | 6 - ui-manchette/tsconfig.json | 9 - ui-spacetimechart/rollup.config.js | 3 - ui-spacetimechart/tailwind.config.js | 6 - ui-spacetimechart/tsconfig.json | 9 - ui-speedspacechart/package.json | 55 ------ ui-speedspacechart/postcss.config.cjs | 2 - ui-speedspacechart/rollup.config.js | 3 - ui-speedspacechart/tailwind.config.js | 6 - ui-speedspacechart/tsconfig.json | 10 -- ui-trackoccupancydiagram/README.md | 0 ui-trackoccupancydiagram/package.json | 52 ------ ui-trackoccupancydiagram/rollup.config.js | 3 - ui-trackoccupancydiagram/tailwind.config.js | 6 - ui-trackoccupancydiagram/tsconfig.json | 10 -- 185 files changed, 227 insertions(+), 526 deletions(-) create mode 100644 storybook/stories/ManchetteSplit/sampleData.ts create mode 100644 ui-charts/README.md rename {ui-spacetimechart => ui-charts}/package.json (76%) rename {ui-spacetimechart => ui-charts}/postcss.config.cjs (100%) rename {ui-manchette-with-spacetimechart => ui-charts}/rollup.config.js (100%) create mode 100644 ui-charts/src/index.ts rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/components/Manchette.tsx (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/components/Waypoint.tsx (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/components/WaypointList.tsx (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/components/consts.ts (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/index.ts (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/stories/Manchette.stories.tsx (92%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/stories/Waypoint.stories.ts (90%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/stories/WaypointList.stories.ts (90%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/stories/assets/sampleData.ts (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/styles/main.css (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/styles/manchette.css (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/styles/waypoint-list.css (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/styles/waypoint.css (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/types.ts (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/utils/index.ts (100%) rename {ui-manchette/src => ui-charts/src/manchette/Manchette}/utils/vector.ts (100%) create mode 100644 ui-charts/src/manchette/index.ts rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/__tests__/helpers.spec.ts (100%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/assets/sampleData.ts (98%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/components/ManchetteWithSpaceTimeChart.tsx (94%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/consts.ts (100%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/helpers.ts (98%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/hooks/useManchetteWithSpaceTimeChart.ts (97%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/hooks/usePaths.ts (87%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/index.ts (100%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/stories/Menu.tsx (100%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/stories/base-with-waypoint-menu.stories.tsx (95%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/stories/base.stories.tsx (90%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/stories/simple.stories.tsx (82%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/styles/main.css (100%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/styles/manchette.css (100%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/styles/menu.css (100%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/utils/index.ts (100%) rename {ui-manchette-with-spacetimechart/src => ui-charts/src/manchette/useManchetteWithSpaceTimeChart}/utils/point.ts (100%) rename {ui-spacetimechart => ui-charts/src/spaceTimeChart}/README.md (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/__tests__/canvas.spec.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/__tests__/geometry.spec.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/__tests__/paths.spec.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/__tests__/scales.spec.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/__tests__/snapping.spec.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/assets/images/ScheduledMaintenanceUp.svg (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/ConflictLayer.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/ConflictTooltip.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/OccupancyBlockLayer.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/PathLayer.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/PatternRect.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/SpaceGraduations.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/SpaceTimeChart.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/TimeCaptions.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/TimeGraduations.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/components/WorkScheduleLayer.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/config.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/hooks/useCanvas.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/hooks/useDevicePixelRatio.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/hooks/useMouseInteractions.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/hooks/useMouseTracking.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/hooks/useSize.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/index.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/lib/consts.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/lib/context.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/lib/theme.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/lib/types.ts (98%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/additional-data.stories.tsx (98%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/base-rendering.stories.tsx (96%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/custom-styles.stories.tsx (98%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/horizontal-zoom.stories.tsx (98%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/layers.stories.tsx (98%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/lib/components.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/lib/paths.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/lib/utils.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/measuring.stories.tsx (97%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/options.stories.tsx (99%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/paths-interactions.stories.tsx (98%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/performances.stories.tsx (98%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/scroll-navigation.stories.tsx (98%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/split.stories.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/stage-interactions.stories.tsx (99%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/stories/work-schedules.stories.tsx (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/styles/main.css (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/types.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/__tests__/canvas.spec.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/canvas.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/colors.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/events.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/geometry.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/paths.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/png.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/scales.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/snapping.ts (100%) rename {ui-spacetimechart/src => ui-charts/src/spaceTimeChart}/utils/vectors.ts (100%) rename {ui-speedspacechart => ui-charts/src/speedSpaceChart}/README.md (91%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/__tests__/utils.spec.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/SpeedSpaceChart.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/common/DetailsBox.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/common/InteractionButtons.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/common/SettingsPanel.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/common/Tooltip.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/const.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/axisY.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/curve.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/declivity.ts (96%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/electricalProfile.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/powerRestrictions.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/reticle.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/speedLimitTags.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/speedLimits.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/steps.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/tickX.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/drawElements/tickYRight.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/frontFrame.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/helpers/layersManager.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/hooks.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/CurveLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/DeclivityLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/ElectricalProfileLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/FrontInteractivityLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/PowerRestrictionsLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/ReticleLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/SpeedLimitTagsLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/SpeedLimitsLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/StepsLayer.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/TickLayerX.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/TickLayerY.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/TickLayerYRight.tsx (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/layers/index.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/components/utils.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/index.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/stories/SpeedSpaceChart.stories.tsx (97%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/stories/assets/const.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/stories/assets/path_properties_PMP_LM.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/stories/assets/power_restrictions_PMP_LM.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/stories/assets/simulation_PMP_LM.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/stories/assets/speed_limit_tags_PMP_LM.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/stories/utils.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/styles/main.css (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/types/chartTypes.ts (100%) rename {ui-speedspacechart/src => ui-charts/src/speedSpaceChart}/types/simulationTypes.ts (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/__tests__/utils.spec.ts (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/TrackOccupancyCanvas.tsx (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/TrackOccupancyManchette.tsx (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/consts.ts (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/helpers/drawElements/drawOccupancyZones.ts (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/helpers/drawElements/drawOccupancyZonesTexts.ts (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/helpers/drawElements/drawTrack.ts (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/helpers/drawElements/drawTracks.ts (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/layers/OccupancyZonesLayer.tsx (90%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/layers/TracksLayer.tsx (89%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/types.ts (87%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/components/utils.ts (100%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/index.ts (81%) rename {ui-trackoccupancydiagram/src => ui-charts/src/trackOccupancyDiagram}/styles/main.css (100%) rename {ui-manchette-with-spacetimechart => ui-charts}/tailwind.config.js (100%) rename {ui-manchette-with-spacetimechart => ui-charts}/tsconfig.json (100%) rename {ui-spacetimechart => ui-charts}/vitest.config.mts (79%) delete mode 100644 ui-manchette-with-spacetimechart/package.json delete mode 100644 ui-manchette-with-spacetimechart/postcss.config.cjs delete mode 100644 ui-manchette/package.json delete mode 100644 ui-manchette/postcss.config.cjs delete mode 100644 ui-manchette/rollup.config.js delete mode 100644 ui-manchette/tailwind.config.js delete mode 100644 ui-manchette/tsconfig.json delete mode 100644 ui-spacetimechart/rollup.config.js delete mode 100644 ui-spacetimechart/tailwind.config.js delete mode 100644 ui-spacetimechart/tsconfig.json delete mode 100644 ui-speedspacechart/package.json delete mode 100644 ui-speedspacechart/postcss.config.cjs delete mode 100644 ui-speedspacechart/rollup.config.js delete mode 100644 ui-speedspacechart/tailwind.config.js delete mode 100644 ui-speedspacechart/tsconfig.json delete mode 100644 ui-trackoccupancydiagram/README.md delete mode 100644 ui-trackoccupancydiagram/package.json delete mode 100644 ui-trackoccupancydiagram/rollup.config.js delete mode 100644 ui-trackoccupancydiagram/tailwind.config.js delete mode 100644 ui-trackoccupancydiagram/tsconfig.json diff --git a/package-lock.json b/package-lock.json index 02f2ede25..f6bcf0642 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,12 +10,8 @@ "workspaces": [ "ui-icons", "ui-core", - "ui-spacetimechart", - "ui-speedspacechart", + "ui-charts", "ui-warped-map", - "ui-manchette", - "ui-manchette-with-spacetimechart", - "ui-trackoccupancydiagram", "storybook" ], "devDependencies": { @@ -3444,6 +3440,10 @@ "resolved": "storybook", "link": true }, + "node_modules/@osrd-project/ui-charts": { + "resolved": "ui-charts", + "link": true + }, "node_modules/@osrd-project/ui-core": { "resolved": "ui-core", "link": true @@ -3452,26 +3452,6 @@ "resolved": "ui-icons", "link": true }, - "node_modules/@osrd-project/ui-manchette": { - "resolved": "ui-manchette", - "link": true - }, - "node_modules/@osrd-project/ui-manchette-with-spacetimechart": { - "resolved": "ui-manchette-with-spacetimechart", - "link": true - }, - "node_modules/@osrd-project/ui-spacetimechart": { - "resolved": "ui-spacetimechart", - "link": true - }, - "node_modules/@osrd-project/ui-speedspacechart": { - "resolved": "ui-speedspacechart", - "link": true - }, - "node_modules/@osrd-project/ui-trackoccupancydiagram": { - "resolved": "ui-trackoccupancydiagram", - "link": true - }, "node_modules/@osrd-project/ui-warped-map": { "resolved": "ui-warped-map", "link": true @@ -5432,6 +5412,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-3.1.1.tgz", "integrity": "sha512-SFCr4edNkZ1bGaLzGz7rgR1bRzVX4MmMxwsIa3/Bh6ose8v+hRpneoizHv0KChdjxaXyjRtaMq7sCuZSzPomQA==", + "dev": true, "license": "MIT" }, "node_modules/@types/d3-color": { @@ -12100,10 +12081,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.isequal": { - "version": "4.5.0", - "license": "MIT" - }, "node_modules/lodash.ismatch": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", @@ -19082,6 +19059,33 @@ "storybook-addon-run-script": "^0.1.4" } }, + "ui-charts": { + "name": "@osrd-project/ui-charts", + "version": "0.0.1-dev", + "license": "LGPL-3.0-or-later", + "dependencies": { + "@osrd-project/ui-core": "0.0.1-dev", + "@osrd-project/ui-icons": "0.0.1-dev", + "chroma-js": "^3.1.1", + "d3-selection": "^3.0.0", + "d3-zoom": "^3.0.0", + "lodash": "^4.17.21" + }, + "devDependencies": { + "@types/chroma-js": "^3.1.0", + "@types/d3-selection": "^3.0.0", + "@types/d3-zoom": "^3.0.0", + "@types/file-saver": "^2.0.7", + "file-saver": "^2.0.5", + "vitest": "^3.0.2" + }, + "peerDependencies": { + "classnames": ">=2.5", + "react": ">=18.0", + "react-dom": ">=18.0", + "tailwindcss": ">=3.4" + } + }, "ui-core": { "name": "@osrd-project/ui-core", "version": "0.0.1-dev", @@ -19185,102 +19189,6 @@ "url": "https://opencollective.com/svgo" } }, - "ui-manchette": { - "name": "@osrd-project/ui-manchette", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "dependencies": { - "@osrd-project/ui-core": "0.0.1-dev", - "@osrd-project/ui-icons": "0.0.1-dev", - "classnames": "^2.5.1", - "lodash.isequal": "^4.5.0" - }, - "devDependencies": { - "tailwindcss": "^3.4.1" - }, - "peerDependencies": { - "react": ">=18.0" - } - }, - "ui-manchette-with-spacetimechart": { - "name": "@osrd-project/ui-manchette-with-spacetimechart", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "dependencies": { - "@osrd-project/ui-manchette": "0.0.1-dev", - "@osrd-project/ui-spacetimechart": "0.0.1-dev", - "@osrd-project/ui-speedspacechart": "0.0.1-dev", - "classnames": "^2.5.1", - "lodash": "^4.17.21", - "lodash.isequal": "^4.5.0" - }, - "devDependencies": { - "tailwindcss": "^3.4.1" - }, - "peerDependencies": { - "react": ">=18.0" - } - }, - "ui-spacetimechart": { - "name": "@osrd-project/ui-spacetimechart", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "dependencies": { - "@types/chroma-js": "^3.1.0", - "chroma-js": "^3.1.1", - "lodash": "^4.17.21" - }, - "devDependencies": { - "@types/file-saver": "^2.0.7", - "file-saver": "^2.0.5" - }, - "peerDependencies": { - "classnames": ">=2.5", - "react": ">=18.0", - "react-dom": ">=18.0", - "tailwindcss": ">=3.4" - } - }, - "ui-speedspacechart": { - "name": "@osrd-project/ui-speedspacechart", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "dependencies": { - "@osrd-project/ui-core": "0.0.1-dev", - "@osrd-project/ui-icons": "0.0.1-dev", - "chroma-js": "^3.1.1", - "classnames": "^2.5.1", - "d3-selection": "^3.0.0", - "d3-zoom": "^3.0.0" - }, - "devDependencies": { - "@types/chroma-js": "^3.1.0", - "@types/d3-selection": "^3.0.0", - "@types/d3-zoom": "^3.0.0", - "tailwindcss": "^3.4.1" - }, - "peerDependencies": { - "react": ">=18.0" - } - }, - "ui-trackoccupancydiagram": { - "name": "@osrd-project/ui-trackoccupancydiagram", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "dependencies": { - "@osrd-project/ui-core": "0.0.1-dev", - "chroma-js": "^3.1.1", - "classnames": "^2.5.1", - "lodash": "^4.17.21" - }, - "devDependencies": { - "@types/chroma-js": "^3.1.0", - "tailwindcss": "^3.4.1" - }, - "peerDependencies": { - "react": ">=18.0" - } - }, "ui-warped-map": { "name": "@osrd-project/ui-warped-map", "version": "0.0.1-dev", diff --git a/package.json b/package.json index c63eee52e..65bed9bdc 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,8 @@ "workspaces": [ "ui-icons", "ui-core", - "ui-spacetimechart", - "ui-speedspacechart", + "ui-charts", "ui-warped-map", - "ui-manchette", - "ui-manchette-with-spacetimechart", - "ui-trackoccupancydiagram", "storybook" ], "engines": { diff --git a/storybook/.storybook/main.ts b/storybook/.storybook/main.ts index 8b4d1a290..22230d8fa 100644 --- a/storybook/.storybook/main.ts +++ b/storybook/.storybook/main.ts @@ -5,6 +5,7 @@ const config: StorybookConfig = { stories: [ // TODO: remove this when every stories are migrated to `@osrd-project/storybook/stories/` '../../ui-*/src/stories/**/*.stories.@(js|jsx|mjs|ts|tsx)', + '../../ui-charts/src/**/stories/**/*.stories.@(js|jsx|mjs|ts|tsx)', '../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)', ], addons: [ diff --git a/storybook/stories/ManchetteSplit/ManchetteSplit.stories.tsx b/storybook/stories/ManchetteSplit/ManchetteSplit.stories.tsx index 194aa914a..6cf26914f 100644 --- a/storybook/stories/ManchetteSplit/ManchetteSplit.stories.tsx +++ b/storybook/stories/ManchetteSplit/ManchetteSplit.stories.tsx @@ -1,11 +1,11 @@ import React from 'react'; +import '@osrd-project/ui-charts/dist/theme.css'; +import { Manchette } from '@osrd-project/ui-charts'; import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-manchette/dist/theme.css'; import type { Meta, StoryObj } from '@storybook/react'; -import Manchette from '@osrd-project/ui-manchette'; -import { SAMPLE_WAYPOINTS } from '../../../ui-manchette/src/stories/assets/sampleData'; +import WAYPOINTS_DATA from './sampleData'; const meta: Meta = { component: Manchette, @@ -26,12 +26,12 @@ const customDiv = ( export const Default: Story = { args: { contents: [ - SAMPLE_WAYPOINTS[0], + WAYPOINTS_DATA[0], customDiv, - SAMPLE_WAYPOINTS[1], - SAMPLE_WAYPOINTS[2], + WAYPOINTS_DATA[1], + WAYPOINTS_DATA[2], customDiv, - SAMPLE_WAYPOINTS[3], + WAYPOINTS_DATA[3], customDiv, ], }, diff --git a/storybook/stories/ManchetteSplit/sampleData.ts b/storybook/stories/ManchetteSplit/sampleData.ts new file mode 100644 index 000000000..2bb85d51a --- /dev/null +++ b/storybook/stories/ManchetteSplit/sampleData.ts @@ -0,0 +1,34 @@ +import { type Waypoint } from '@osrd-project/ui-charts'; + +const WAYPOINTS_DATA: Waypoint[] = [ + { + id: 'South_West_station', + name: 'South_West_station', + secondaryCode: 'BV', + position: 0, + weight: 100, + }, + { + id: 'Mid_West_station', + name: 'Mid_West_station', + secondaryCode: 'BV', + position: 13000000, + weight: 30, + }, + { + id: 'Mid_East_station', + name: 'Mid_East_station', + secondaryCode: 'BV', + position: 27550000, + weight: 50, + }, + { + id: 'North_East_station', + name: 'North_East_station', + secondaryCode: 'BV', + position: 47050000, + weight: 100, + }, +]; + +export default WAYPOINTS_DATA; diff --git a/storybook/stories/TrackOccupancyDiagram/TrackOccupancyDiagram.stories.tsx b/storybook/stories/TrackOccupancyDiagram/TrackOccupancyDiagram.stories.tsx index f11775fea..0b1c80ed5 100755 --- a/storybook/stories/TrackOccupancyDiagram/TrackOccupancyDiagram.stories.tsx +++ b/storybook/stories/TrackOccupancyDiagram/TrackOccupancyDiagram.stories.tsx @@ -3,24 +3,24 @@ import React, { useEffect, useMemo, useState } from 'react'; import type { Meta, StoryObj } from '@storybook/react'; import { KebabHorizontal } from '../../../ui-icons/src/index'; -import TimeCaptions from '../../../ui-spacetimechart/src/components/TimeCaptions'; -import { useCanvas, useDraw } from '../../../ui-spacetimechart/src/hooks/useCanvas'; -import { useMouseInteractions } from '../../../ui-spacetimechart/src/hooks/useMouseInteractions'; -import { useMouseTracking } from '../../../ui-spacetimechart/src/hooks/useMouseTracking'; -import { useSize } from '../../../ui-spacetimechart/src/hooks/useSize'; -import { DEFAULT_THEME } from '../../../ui-spacetimechart/src/lib/consts'; +import TimeCaptions from '../../../ui-charts/src/spaceTimeChart/components/TimeCaptions'; +import { useCanvas, useDraw } from '../../../ui-charts/src/spaceTimeChart/hooks/useCanvas'; +import { useMouseInteractions } from '../../../ui-charts/src/spaceTimeChart/hooks/useMouseInteractions'; +import { useMouseTracking } from '../../../ui-charts/src/spaceTimeChart/hooks/useMouseTracking'; +import { useSize } from '../../../ui-charts/src/spaceTimeChart/hooks/useSize'; +import { DEFAULT_THEME } from '../../../ui-charts/src/spaceTimeChart/lib/consts'; import { CanvasContext, MouseContext, SpaceTimeChartContext, -} from '../../../ui-spacetimechart/src/lib/context'; +} from '../../../ui-charts/src/spaceTimeChart/lib/context'; import type { MouseContextType, SpaceTimeChartContextType, PickingElement, SpaceTimeChartTheme, -} from '../../../ui-spacetimechart/src/lib/types'; -import { OPERATIONAL_POINTS } from '../../../ui-spacetimechart/src/stories/lib/paths'; +} from '../../../ui-charts/src/spaceTimeChart/lib/types'; +import { OPERATIONAL_POINTS } from '../../../ui-charts/src/spaceTimeChart/stories/lib/paths'; import { getTimeToPixel, getSpaceToPixel, @@ -29,11 +29,11 @@ import { getPixelToSpace, getPointToData, spaceScalesToBinaryTree, -} from '../../../ui-spacetimechart/src/utils/scales'; +} from '../../../ui-charts/src/spaceTimeChart/utils/scales'; import { TrackOccupancyManchette, TrackOccupancyCanvas, -} from '../../../ui-trackoccupancydiagram/src/index'; +} from '../../../ui-charts/src/trackOccupancyDiagram/index'; import occupancyZones from '../samples/TrackOccupancyDiagramSamples/occupancyZones'; import tracks from '../samples/TrackOccupancyDiagramSamples/tracks'; diff --git a/ui-charts/README.md b/ui-charts/README.md new file mode 100644 index 000000000..047c80da2 --- /dev/null +++ b/ui-charts/README.md @@ -0,0 +1,63 @@ +# ui-charts + +`ui-charts` is a library of charts and diagrams, designed by the project OSRD. + +## Installation +To install the `ui-charts` package, run the following command in your project directory: +```sh +npm install @osrd-project/ui-charts +``` + + +## Space Time Chart +The `SpaceTimeChart` is a React component designed to visualize train paths on a spacetime chart, +where the default horizontal axis (Ox) represents time and the default vertical axis (Oy) represents space +(axis can be swapped). + +Paths, graduations and labels are rendered on **canvas elements**. For interaction detection, shapes +are rendered on a separate layer with unique colors using a technique known as **"picking"**. + +`SpaceTimeChart` is solely responsible for rendering and does not manage any state internally. +All state management, including paths, offsets, scales, and zoom levels, must be handled by the +parent component. + +You can have a look at its stories [here](https://openrailassociation.github.io/osrd-ui/?path=/story/spacetimechart-rendering--default-args) +or [here](https://openrailassociation.github.io/osrd-ui/?path=/story/manchette-with-spacetimechart-rendering--waypoint-menu) with its manchette. + + +## Speed Space Chart +The `SpeedSpaceChart` is a React component designed to visualize the speed profile of a train along +a path. +It also allow to visualize some data along the path, such as the electrical profiles, the max speed profile, +the power restrictions, etc. + +You can have a look at its stories [here](https://openrailassociation.github.io/osrd-ui/?path=/story/trackoccupancydiagram-rendering--track-occupancy-diagram-story-default). + + + +## Track Occupancy Diagram +The `TrackOccupancyDiagram` is a React component designed to visualize the track occupancy in station. + +You can have a look at its story [here](https://openrailassociation.github.io/osrd-ui/?path=/story/trackoccupancydiagram-rendering--track-occupancy-diagram-story-default). + + +## Resources + +There are multiple places to get information on how to do things with `ui-charts`: + +- **Storybook Integration**: Discover a variety of usage scenarios and configurations in the + Storybook stories located in `src/stories` for each chart or diagram. +- **Unit Tests**: Refer to `src/__tests__` for practical demonstrations of helper functions from the + `src/utils` folder. + + +## Contributing + +Contributions are welcome! Please refer to the repository's main README.md and CODE_OF_CONDUCT.md +for more details on how to contribute. + + +## License + +This project is licensed under the GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - see +the LICENSE file for details. diff --git a/ui-spacetimechart/package.json b/ui-charts/package.json similarity index 76% rename from ui-spacetimechart/package.json rename to ui-charts/package.json index 0bb37ec4e..e56233298 100644 --- a/ui-spacetimechart/package.json +++ b/ui-charts/package.json @@ -1,12 +1,12 @@ { - "name": "@osrd-project/ui-spacetimechart", + "name": "@osrd-project/ui-charts", "version": "0.0.1-dev", "license": "LGPL-3.0-or-later", "bugs": "https://github.com/osrd-project/osrd-ui/issues", "repository": { "type": "git", "url": "https://github.com/osrd-project/osrd-ui.git", - "directory": "ui-spacetimechart" + "directory": "ui-charts" }, "publishConfig": { "access": "public" @@ -27,11 +27,10 @@ } }, "scripts": { - "rollup": "rollup -c", "clean": "rimraf dist", - "build": "npm run rollup", + "build": "rollup -c --failAfterWarnings", "watch": "rollup -c -w", - "test": "vitest run --dir src/__tests__", + "test": "vitest run", "prepublishOnly": "npm run clean && npm run build", "lint": "eslint src --max-warnings 0", "lint:fix": "eslint src --fix" @@ -43,12 +42,18 @@ "tailwindcss": ">=3.4" }, "dependencies": { - "@types/chroma-js": "^3.1.0", + "@osrd-project/ui-core": "0.0.1-dev", + "@osrd-project/ui-icons": "0.0.1-dev", "chroma-js": "^3.1.1", + "d3-selection": "^3.0.0", + "d3-zoom": "^3.0.0", "lodash": "^4.17.21" }, "devDependencies": { + "@types/chroma-js": "^3.1.0", "@types/file-saver": "^2.0.7", + "@types/d3-selection": "^3.0.0", + "@types/d3-zoom": "^3.0.0", "file-saver": "^2.0.5" } } diff --git a/ui-spacetimechart/postcss.config.cjs b/ui-charts/postcss.config.cjs similarity index 100% rename from ui-spacetimechart/postcss.config.cjs rename to ui-charts/postcss.config.cjs diff --git a/ui-manchette-with-spacetimechart/rollup.config.js b/ui-charts/rollup.config.js similarity index 100% rename from ui-manchette-with-spacetimechart/rollup.config.js rename to ui-charts/rollup.config.js diff --git a/ui-charts/src/index.ts b/ui-charts/src/index.ts new file mode 100644 index 000000000..ad47b686a --- /dev/null +++ b/ui-charts/src/index.ts @@ -0,0 +1,9 @@ +import '@osrd-project/ui-core/dist/theme.css'; + +export * from './spaceTimeChart'; + +export * from './manchette'; + +export * from './speedSpaceChart'; + +export * from './trackOccupancyDiagram'; diff --git a/ui-manchette/src/components/Manchette.tsx b/ui-charts/src/manchette/Manchette/components/Manchette.tsx similarity index 100% rename from ui-manchette/src/components/Manchette.tsx rename to ui-charts/src/manchette/Manchette/components/Manchette.tsx diff --git a/ui-manchette/src/components/Waypoint.tsx b/ui-charts/src/manchette/Manchette/components/Waypoint.tsx similarity index 100% rename from ui-manchette/src/components/Waypoint.tsx rename to ui-charts/src/manchette/Manchette/components/Waypoint.tsx diff --git a/ui-manchette/src/components/WaypointList.tsx b/ui-charts/src/manchette/Manchette/components/WaypointList.tsx similarity index 100% rename from ui-manchette/src/components/WaypointList.tsx rename to ui-charts/src/manchette/Manchette/components/WaypointList.tsx diff --git a/ui-manchette/src/components/consts.ts b/ui-charts/src/manchette/Manchette/components/consts.ts similarity index 100% rename from ui-manchette/src/components/consts.ts rename to ui-charts/src/manchette/Manchette/components/consts.ts diff --git a/ui-manchette/src/index.ts b/ui-charts/src/manchette/Manchette/index.ts similarity index 100% rename from ui-manchette/src/index.ts rename to ui-charts/src/manchette/Manchette/index.ts diff --git a/ui-manchette/src/stories/Manchette.stories.tsx b/ui-charts/src/manchette/Manchette/stories/Manchette.stories.tsx similarity index 92% rename from ui-manchette/src/stories/Manchette.stories.tsx rename to ui-charts/src/manchette/Manchette/stories/Manchette.stories.tsx index 6674cf38b..56b50e32a 100644 --- a/ui-manchette/src/stories/Manchette.stories.tsx +++ b/ui-charts/src/manchette/Manchette/stories/Manchette.stories.tsx @@ -1,5 +1,5 @@ import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-manchette/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; import type { Meta, StoryObj } from '@storybook/react'; import { SAMPLE_WAYPOINTS } from './assets/sampleData'; diff --git a/ui-manchette/src/stories/Waypoint.stories.ts b/ui-charts/src/manchette/Manchette/stories/Waypoint.stories.ts similarity index 90% rename from ui-manchette/src/stories/Waypoint.stories.ts rename to ui-charts/src/manchette/Manchette/stories/Waypoint.stories.ts index 550ed8efa..4d4ca7769 100644 --- a/ui-manchette/src/stories/Waypoint.stories.ts +++ b/ui-charts/src/manchette/Manchette/stories/Waypoint.stories.ts @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-manchette/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; import { SAMPLE_WAYPOINTS } from './assets/sampleData'; import Waypoint from '../components/Waypoint'; diff --git a/ui-manchette/src/stories/WaypointList.stories.ts b/ui-charts/src/manchette/Manchette/stories/WaypointList.stories.ts similarity index 90% rename from ui-manchette/src/stories/WaypointList.stories.ts rename to ui-charts/src/manchette/Manchette/stories/WaypointList.stories.ts index cfb360106..afb42f37c 100644 --- a/ui-manchette/src/stories/WaypointList.stories.ts +++ b/ui-charts/src/manchette/Manchette/stories/WaypointList.stories.ts @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-manchette/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; import { SAMPLE_WAYPOINTS } from './assets/sampleData'; import WaypointList from '../components/WaypointList'; diff --git a/ui-manchette/src/stories/assets/sampleData.ts b/ui-charts/src/manchette/Manchette/stories/assets/sampleData.ts similarity index 100% rename from ui-manchette/src/stories/assets/sampleData.ts rename to ui-charts/src/manchette/Manchette/stories/assets/sampleData.ts diff --git a/ui-manchette/src/styles/main.css b/ui-charts/src/manchette/Manchette/styles/main.css similarity index 100% rename from ui-manchette/src/styles/main.css rename to ui-charts/src/manchette/Manchette/styles/main.css diff --git a/ui-manchette/src/styles/manchette.css b/ui-charts/src/manchette/Manchette/styles/manchette.css similarity index 100% rename from ui-manchette/src/styles/manchette.css rename to ui-charts/src/manchette/Manchette/styles/manchette.css diff --git a/ui-manchette/src/styles/waypoint-list.css b/ui-charts/src/manchette/Manchette/styles/waypoint-list.css similarity index 100% rename from ui-manchette/src/styles/waypoint-list.css rename to ui-charts/src/manchette/Manchette/styles/waypoint-list.css diff --git a/ui-manchette/src/styles/waypoint.css b/ui-charts/src/manchette/Manchette/styles/waypoint.css similarity index 100% rename from ui-manchette/src/styles/waypoint.css rename to ui-charts/src/manchette/Manchette/styles/waypoint.css diff --git a/ui-manchette/src/types.ts b/ui-charts/src/manchette/Manchette/types.ts similarity index 100% rename from ui-manchette/src/types.ts rename to ui-charts/src/manchette/Manchette/types.ts diff --git a/ui-manchette/src/utils/index.ts b/ui-charts/src/manchette/Manchette/utils/index.ts similarity index 100% rename from ui-manchette/src/utils/index.ts rename to ui-charts/src/manchette/Manchette/utils/index.ts diff --git a/ui-manchette/src/utils/vector.ts b/ui-charts/src/manchette/Manchette/utils/vector.ts similarity index 100% rename from ui-manchette/src/utils/vector.ts rename to ui-charts/src/manchette/Manchette/utils/vector.ts diff --git a/ui-charts/src/manchette/index.ts b/ui-charts/src/manchette/index.ts new file mode 100644 index 000000000..d946e6c75 --- /dev/null +++ b/ui-charts/src/manchette/index.ts @@ -0,0 +1,9 @@ +export { + default as Manchette, + type WaypointMenuData, + type Waypoint, + type ProjectPathTrainResult, + type InteractiveWaypoint, +} from './Manchette'; + +export * from './useManchetteWithSpaceTimeChart'; diff --git a/ui-manchette-with-spacetimechart/src/__tests__/helpers.spec.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/__tests__/helpers.spec.ts similarity index 100% rename from ui-manchette-with-spacetimechart/src/__tests__/helpers.spec.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/__tests__/helpers.spec.ts diff --git a/ui-manchette-with-spacetimechart/src/assets/sampleData.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/assets/sampleData.ts similarity index 98% rename from ui-manchette-with-spacetimechart/src/assets/sampleData.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/assets/sampleData.ts index e73caaac7..39d83624a 100644 --- a/ui-manchette-with-spacetimechart/src/assets/sampleData.ts +++ b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/assets/sampleData.ts @@ -1,4 +1,4 @@ -import { type ProjectPathTrainResult, type Waypoint } from '@osrd-project/ui-manchette'; +import { type ProjectPathTrainResult, type Waypoint } from '../../Manchette'; export const SAMPLE_WAYPOINTS: Waypoint[] = [ { diff --git a/ui-manchette-with-spacetimechart/src/components/ManchetteWithSpaceTimeChart.tsx b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/components/ManchetteWithSpaceTimeChart.tsx similarity index 94% rename from ui-manchette-with-spacetimechart/src/components/ManchetteWithSpaceTimeChart.tsx rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/components/ManchetteWithSpaceTimeChart.tsx index 7a66c4b16..ad45dd7b6 100644 --- a/ui-manchette-with-spacetimechart/src/components/ManchetteWithSpaceTimeChart.tsx +++ b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/components/ManchetteWithSpaceTimeChart.tsx @@ -1,16 +1,11 @@ import React, { useRef } from 'react'; +import { PathLayer, SpaceTimeChart, type SpaceTimeChartProps } from '../../../spaceTimeChart'; import Manchette, { type ProjectPathTrainResult, type Waypoint, type ManchetteProps, -} from '@osrd-project/ui-manchette'; -import { - PathLayer, - SpaceTimeChart, - type SpaceTimeChartProps, -} from '@osrd-project/ui-spacetimechart'; - +} from '../../Manchette'; import useManchetteWithSpaceTimeChart from '../hooks/useManchetteWithSpaceTimeChart'; export type ManchetteWithSpaceTimeChartProps = { diff --git a/ui-manchette-with-spacetimechart/src/consts.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/consts.ts similarity index 100% rename from ui-manchette-with-spacetimechart/src/consts.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/consts.ts diff --git a/ui-manchette-with-spacetimechart/src/helpers.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/helpers.ts similarity index 98% rename from ui-manchette-with-spacetimechart/src/helpers.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/helpers.ts index d2763fdd3..3e1e92925 100644 --- a/ui-manchette-with-spacetimechart/src/helpers.ts +++ b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/helpers.ts @@ -1,4 +1,3 @@ -import type { InteractiveWaypoint, Waypoint } from '@osrd-project/ui-manchette'; import { clamp } from 'lodash'; import { @@ -9,6 +8,7 @@ import { MIN_ZOOM_X, } from './consts'; import { calcTotalDistance, getHeightWithoutLastWaypoint } from './utils'; +import type { InteractiveWaypoint, Waypoint } from '../Manchette'; type WaypointsOptions = { isProportional: boolean; yZoom: number; height: number }; diff --git a/ui-manchette-with-spacetimechart/src/hooks/useManchetteWithSpaceTimeChart.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/hooks/useManchetteWithSpaceTimeChart.ts similarity index 97% rename from ui-manchette-with-spacetimechart/src/hooks/useManchetteWithSpaceTimeChart.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/hooks/useManchetteWithSpaceTimeChart.ts index 0b3d17d84..e4c0c0444 100644 --- a/ui-manchette-with-spacetimechart/src/hooks/useManchetteWithSpaceTimeChart.ts +++ b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/hooks/useManchetteWithSpaceTimeChart.ts @@ -1,9 +1,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; -import type { ProjectPathTrainResult, Waypoint } from '@osrd-project/ui-manchette'; -import type { SpaceScale, SpaceTimeChartProps } from '@osrd-project/ui-spacetimechart'; - import usePaths from './usePaths'; +import type { SpaceScale, SpaceTimeChartProps } from '../../../spaceTimeChart'; +import type { ProjectPathTrainResult, Waypoint } from '../../Manchette'; import { MAX_ZOOM_Y, MIN_ZOOM_Y, ZOOM_Y_DELTA, DEFAULT_ZOOM_MS_PER_PX } from '../consts'; import { computeWaypointsToDisplay, diff --git a/ui-manchette-with-spacetimechart/src/hooks/usePaths.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/hooks/usePaths.ts similarity index 87% rename from ui-manchette-with-spacetimechart/src/hooks/usePaths.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/hooks/usePaths.ts index 1e6cc76ac..16e9d0ab3 100644 --- a/ui-manchette-with-spacetimechart/src/hooks/usePaths.ts +++ b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/hooks/usePaths.ts @@ -1,8 +1,7 @@ import { useMemo } from 'react'; -import { type ProjectPathTrainResult } from '@osrd-project/ui-manchette'; -import { type PathLevel } from '@osrd-project/ui-spacetimechart'; - +import { type PathLevel } from '../../../spaceTimeChart'; +import { type ProjectPathTrainResult } from '../../Manchette'; import { PATH_COLOR_DEFAULT } from '../consts'; const transformCurve = (curve: ProjectPathTrainResult['spaceTimeCurves'][0], departureTime: Date) => diff --git a/ui-manchette-with-spacetimechart/src/index.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/index.ts similarity index 100% rename from ui-manchette-with-spacetimechart/src/index.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/index.ts diff --git a/ui-manchette-with-spacetimechart/src/stories/Menu.tsx b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/Menu.tsx similarity index 100% rename from ui-manchette-with-spacetimechart/src/stories/Menu.tsx rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/Menu.tsx diff --git a/ui-manchette-with-spacetimechart/src/stories/base-with-waypoint-menu.stories.tsx b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base-with-waypoint-menu.stories.tsx similarity index 95% rename from ui-manchette-with-spacetimechart/src/stories/base-with-waypoint-menu.stories.tsx rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base-with-waypoint-menu.stories.tsx index de604fe1d..62fa8cab0 100644 --- a/ui-manchette-with-spacetimechart/src/stories/base-with-waypoint-menu.stories.tsx +++ b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base-with-waypoint-menu.stories.tsx @@ -1,16 +1,15 @@ import React, { useEffect, useRef, useState } from 'react'; import { EyeClosed, Telescope } from '@osrd-project/ui-icons'; -import Manchette, { type ProjectPathTrainResult, type Waypoint } from '@osrd-project/ui-manchette'; -import { PathLayer, SpaceTimeChart } from '@osrd-project/ui-spacetimechart'; import type { Meta } from '@storybook/react'; import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-manchette/dist/theme.css'; -import '@osrd-project/ui-manchette-with-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; import cx from 'classnames'; import { createPortal } from 'react-dom'; import Menu, { type MenuItem } from './Menu'; +import { PathLayer, SpaceTimeChart } from '../../../spaceTimeChart'; +import Manchette, { type ProjectPathTrainResult, type Waypoint } from '../../Manchette'; import { SAMPLE_WAYPOINTS, SAMPLE_PATHS_DATA } from '../assets/sampleData'; import useManchettesWithSpaceTimeChart from '../hooks/useManchetteWithSpaceTimeChart'; diff --git a/ui-manchette-with-spacetimechart/src/stories/base.stories.tsx b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base.stories.tsx similarity index 90% rename from ui-manchette-with-spacetimechart/src/stories/base.stories.tsx rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base.stories.tsx index 92e168cee..ffdb2f8d8 100644 --- a/ui-manchette-with-spacetimechart/src/stories/base.stories.tsx +++ b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base.stories.tsx @@ -1,13 +1,12 @@ import React, { useRef } from 'react'; -import Manchette, { type ProjectPathTrainResult, type Waypoint } from '@osrd-project/ui-manchette'; -import { PathLayer, SpaceTimeChart } from '@osrd-project/ui-spacetimechart'; import type { Meta } from '@storybook/react'; import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-manchette/dist/theme.css'; -import '@osrd-project/ui-manchette-with-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; +import { PathLayer, SpaceTimeChart } from '../../../spaceTimeChart'; +import Manchette, { type ProjectPathTrainResult, type Waypoint } from '../../Manchette'; import { SAMPLE_WAYPOINTS, SAMPLE_PATHS_DATA } from '../assets/sampleData'; import useManchettesWithSpaceTimeChart from '../hooks/useManchetteWithSpaceTimeChart'; diff --git a/ui-manchette-with-spacetimechart/src/stories/simple.stories.tsx b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/simple.stories.tsx similarity index 82% rename from ui-manchette-with-spacetimechart/src/stories/simple.stories.tsx rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/simple.stories.tsx index e2a3a6c11..3b5c0881a 100644 --- a/ui-manchette-with-spacetimechart/src/stories/simple.stories.tsx +++ b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/simple.stories.tsx @@ -1,8 +1,7 @@ import type { Meta } from '@storybook/react'; import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-manchette/dist/theme.css'; -import '@osrd-project/ui-manchette-with-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; import { SAMPLE_WAYPOINTS, SAMPLE_PATHS_DATA } from '../assets/sampleData'; import ManchetteWithSpaceTimeChart from '../components/ManchetteWithSpaceTimeChart'; diff --git a/ui-manchette-with-spacetimechart/src/styles/main.css b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/styles/main.css similarity index 100% rename from ui-manchette-with-spacetimechart/src/styles/main.css rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/styles/main.css diff --git a/ui-manchette-with-spacetimechart/src/styles/manchette.css b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/styles/manchette.css similarity index 100% rename from ui-manchette-with-spacetimechart/src/styles/manchette.css rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/styles/manchette.css diff --git a/ui-manchette-with-spacetimechart/src/styles/menu.css b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/styles/menu.css similarity index 100% rename from ui-manchette-with-spacetimechart/src/styles/menu.css rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/styles/menu.css diff --git a/ui-manchette-with-spacetimechart/src/utils/index.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/utils/index.ts similarity index 100% rename from ui-manchette-with-spacetimechart/src/utils/index.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/utils/index.ts diff --git a/ui-manchette-with-spacetimechart/src/utils/point.ts b/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/utils/point.ts similarity index 100% rename from ui-manchette-with-spacetimechart/src/utils/point.ts rename to ui-charts/src/manchette/useManchetteWithSpaceTimeChart/utils/point.ts diff --git a/ui-spacetimechart/README.md b/ui-charts/src/spaceTimeChart/README.md similarity index 100% rename from ui-spacetimechart/README.md rename to ui-charts/src/spaceTimeChart/README.md diff --git a/ui-spacetimechart/src/__tests__/canvas.spec.ts b/ui-charts/src/spaceTimeChart/__tests__/canvas.spec.ts similarity index 100% rename from ui-spacetimechart/src/__tests__/canvas.spec.ts rename to ui-charts/src/spaceTimeChart/__tests__/canvas.spec.ts diff --git a/ui-spacetimechart/src/__tests__/geometry.spec.ts b/ui-charts/src/spaceTimeChart/__tests__/geometry.spec.ts similarity index 100% rename from ui-spacetimechart/src/__tests__/geometry.spec.ts rename to ui-charts/src/spaceTimeChart/__tests__/geometry.spec.ts diff --git a/ui-spacetimechart/src/__tests__/paths.spec.ts b/ui-charts/src/spaceTimeChart/__tests__/paths.spec.ts similarity index 100% rename from ui-spacetimechart/src/__tests__/paths.spec.ts rename to ui-charts/src/spaceTimeChart/__tests__/paths.spec.ts diff --git a/ui-spacetimechart/src/__tests__/scales.spec.ts b/ui-charts/src/spaceTimeChart/__tests__/scales.spec.ts similarity index 100% rename from ui-spacetimechart/src/__tests__/scales.spec.ts rename to ui-charts/src/spaceTimeChart/__tests__/scales.spec.ts diff --git a/ui-spacetimechart/src/__tests__/snapping.spec.ts b/ui-charts/src/spaceTimeChart/__tests__/snapping.spec.ts similarity index 100% rename from ui-spacetimechart/src/__tests__/snapping.spec.ts rename to ui-charts/src/spaceTimeChart/__tests__/snapping.spec.ts diff --git a/ui-spacetimechart/src/assets/images/ScheduledMaintenanceUp.svg b/ui-charts/src/spaceTimeChart/assets/images/ScheduledMaintenanceUp.svg similarity index 100% rename from ui-spacetimechart/src/assets/images/ScheduledMaintenanceUp.svg rename to ui-charts/src/spaceTimeChart/assets/images/ScheduledMaintenanceUp.svg diff --git a/ui-spacetimechart/src/components/ConflictLayer.tsx b/ui-charts/src/spaceTimeChart/components/ConflictLayer.tsx similarity index 100% rename from ui-spacetimechart/src/components/ConflictLayer.tsx rename to ui-charts/src/spaceTimeChart/components/ConflictLayer.tsx diff --git a/ui-spacetimechart/src/components/ConflictTooltip.tsx b/ui-charts/src/spaceTimeChart/components/ConflictTooltip.tsx similarity index 100% rename from ui-spacetimechart/src/components/ConflictTooltip.tsx rename to ui-charts/src/spaceTimeChart/components/ConflictTooltip.tsx diff --git a/ui-spacetimechart/src/components/OccupancyBlockLayer.tsx b/ui-charts/src/spaceTimeChart/components/OccupancyBlockLayer.tsx similarity index 100% rename from ui-spacetimechart/src/components/OccupancyBlockLayer.tsx rename to ui-charts/src/spaceTimeChart/components/OccupancyBlockLayer.tsx diff --git a/ui-spacetimechart/src/components/PathLayer.tsx b/ui-charts/src/spaceTimeChart/components/PathLayer.tsx similarity index 100% rename from ui-spacetimechart/src/components/PathLayer.tsx rename to ui-charts/src/spaceTimeChart/components/PathLayer.tsx diff --git a/ui-spacetimechart/src/components/PatternRect.tsx b/ui-charts/src/spaceTimeChart/components/PatternRect.tsx similarity index 100% rename from ui-spacetimechart/src/components/PatternRect.tsx rename to ui-charts/src/spaceTimeChart/components/PatternRect.tsx diff --git a/ui-spacetimechart/src/components/SpaceGraduations.tsx b/ui-charts/src/spaceTimeChart/components/SpaceGraduations.tsx similarity index 100% rename from ui-spacetimechart/src/components/SpaceGraduations.tsx rename to ui-charts/src/spaceTimeChart/components/SpaceGraduations.tsx diff --git a/ui-spacetimechart/src/components/SpaceTimeChart.tsx b/ui-charts/src/spaceTimeChart/components/SpaceTimeChart.tsx similarity index 100% rename from ui-spacetimechart/src/components/SpaceTimeChart.tsx rename to ui-charts/src/spaceTimeChart/components/SpaceTimeChart.tsx diff --git a/ui-spacetimechart/src/components/TimeCaptions.tsx b/ui-charts/src/spaceTimeChart/components/TimeCaptions.tsx similarity index 100% rename from ui-spacetimechart/src/components/TimeCaptions.tsx rename to ui-charts/src/spaceTimeChart/components/TimeCaptions.tsx diff --git a/ui-spacetimechart/src/components/TimeGraduations.tsx b/ui-charts/src/spaceTimeChart/components/TimeGraduations.tsx similarity index 100% rename from ui-spacetimechart/src/components/TimeGraduations.tsx rename to ui-charts/src/spaceTimeChart/components/TimeGraduations.tsx diff --git a/ui-spacetimechart/src/components/WorkScheduleLayer.tsx b/ui-charts/src/spaceTimeChart/components/WorkScheduleLayer.tsx similarity index 100% rename from ui-spacetimechart/src/components/WorkScheduleLayer.tsx rename to ui-charts/src/spaceTimeChart/components/WorkScheduleLayer.tsx diff --git a/ui-spacetimechart/src/config.ts b/ui-charts/src/spaceTimeChart/config.ts similarity index 100% rename from ui-spacetimechart/src/config.ts rename to ui-charts/src/spaceTimeChart/config.ts diff --git a/ui-spacetimechart/src/hooks/useCanvas.ts b/ui-charts/src/spaceTimeChart/hooks/useCanvas.ts similarity index 100% rename from ui-spacetimechart/src/hooks/useCanvas.ts rename to ui-charts/src/spaceTimeChart/hooks/useCanvas.ts diff --git a/ui-spacetimechart/src/hooks/useDevicePixelRatio.ts b/ui-charts/src/spaceTimeChart/hooks/useDevicePixelRatio.ts similarity index 100% rename from ui-spacetimechart/src/hooks/useDevicePixelRatio.ts rename to ui-charts/src/spaceTimeChart/hooks/useDevicePixelRatio.ts diff --git a/ui-spacetimechart/src/hooks/useMouseInteractions.ts b/ui-charts/src/spaceTimeChart/hooks/useMouseInteractions.ts similarity index 100% rename from ui-spacetimechart/src/hooks/useMouseInteractions.ts rename to ui-charts/src/spaceTimeChart/hooks/useMouseInteractions.ts diff --git a/ui-spacetimechart/src/hooks/useMouseTracking.ts b/ui-charts/src/spaceTimeChart/hooks/useMouseTracking.ts similarity index 100% rename from ui-spacetimechart/src/hooks/useMouseTracking.ts rename to ui-charts/src/spaceTimeChart/hooks/useMouseTracking.ts diff --git a/ui-spacetimechart/src/hooks/useSize.ts b/ui-charts/src/spaceTimeChart/hooks/useSize.ts similarity index 100% rename from ui-spacetimechart/src/hooks/useSize.ts rename to ui-charts/src/spaceTimeChart/hooks/useSize.ts diff --git a/ui-spacetimechart/src/index.ts b/ui-charts/src/spaceTimeChart/index.ts similarity index 100% rename from ui-spacetimechart/src/index.ts rename to ui-charts/src/spaceTimeChart/index.ts diff --git a/ui-spacetimechart/src/lib/consts.ts b/ui-charts/src/spaceTimeChart/lib/consts.ts similarity index 100% rename from ui-spacetimechart/src/lib/consts.ts rename to ui-charts/src/spaceTimeChart/lib/consts.ts diff --git a/ui-spacetimechart/src/lib/context.ts b/ui-charts/src/spaceTimeChart/lib/context.ts similarity index 100% rename from ui-spacetimechart/src/lib/context.ts rename to ui-charts/src/spaceTimeChart/lib/context.ts diff --git a/ui-spacetimechart/src/lib/theme.ts b/ui-charts/src/spaceTimeChart/lib/theme.ts similarity index 100% rename from ui-spacetimechart/src/lib/theme.ts rename to ui-charts/src/spaceTimeChart/lib/theme.ts diff --git a/ui-spacetimechart/src/lib/types.ts b/ui-charts/src/spaceTimeChart/lib/types.ts similarity index 98% rename from ui-spacetimechart/src/lib/types.ts rename to ui-charts/src/spaceTimeChart/lib/types.ts index ed89d662c..483a70163 100644 --- a/ui-spacetimechart/src/lib/types.ts +++ b/ui-charts/src/spaceTimeChart/lib/types.ts @@ -1,9 +1,6 @@ import { type HTMLProps, type ReactNode } from 'react'; -import type { - Track, - OccupancyZone, -} from '@osrd-project/ui-trackoccupancydiagram/dist/components/types'; +import type { Track, OccupancyZone } from '../../trackOccupancyDiagram/components/types'; // GLOBAL UTILITY TYPES: export type Point = { diff --git a/ui-spacetimechart/src/stories/additional-data.stories.tsx b/ui-charts/src/spaceTimeChart/stories/additional-data.stories.tsx similarity index 98% rename from ui-spacetimechart/src/stories/additional-data.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/additional-data.stories.tsx index f4a8053b5..d034abb6d 100644 --- a/ui-spacetimechart/src/stories/additional-data.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/additional-data.stories.tsx @@ -4,7 +4,7 @@ import type { Meta } from '@storybook/react'; import cx from 'classnames'; import { clamp, inRange } from 'lodash'; -import { SpaceTimeChart, PathLayer } from '../'; +import { SpaceTimeChart, PathLayer } from '..'; import { MouseTracker } from './lib/components'; import { OPERATIONAL_POINTS, PATHS, START_DATE } from './lib/paths'; import { @@ -20,7 +20,7 @@ import { AMBIANT_A10, ERROR_30, ERROR_60, HOUR, KILOMETER, MINUTE } from '../lib import { type DrawingFunction, type Point } from '../lib/types'; import { getDiff } from '../utils/vectors'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; const MONO_TRACK_SPACES = [ { from: 6 * KILOMETER, to: 24 * KILOMETER }, diff --git a/ui-spacetimechart/src/stories/base-rendering.stories.tsx b/ui-charts/src/spaceTimeChart/stories/base-rendering.stories.tsx similarity index 96% rename from ui-spacetimechart/src/stories/base-rendering.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/base-rendering.stories.tsx index fa722264b..f4c822689 100644 --- a/ui-spacetimechart/src/stories/base-rendering.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/base-rendering.stories.tsx @@ -2,11 +2,11 @@ import React from 'react'; import type { Meta } from '@storybook/react'; -import { SpaceTimeChart, PathLayer } from '../'; +import { SpaceTimeChart, PathLayer } from '..'; import { OPERATIONAL_POINTS, PATHS } from './lib/paths'; import { X_ZOOM_LEVEL, Y_ZOOM_LEVEL } from './lib/utils'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; type WrapperProps = { xZoomLevel: number; diff --git a/ui-spacetimechart/src/stories/custom-styles.stories.tsx b/ui-charts/src/spaceTimeChart/stories/custom-styles.stories.tsx similarity index 98% rename from ui-spacetimechart/src/stories/custom-styles.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/custom-styles.stories.tsx index 657942ef4..3c26c5dc0 100644 --- a/ui-spacetimechart/src/stories/custom-styles.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/custom-styles.stories.tsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import type { Meta } from '@storybook/react'; import cx from 'classnames'; -import { PathLayer, SpaceTimeChart } from '../'; +import { PathLayer, SpaceTimeChart } from '..'; import { OPERATIONAL_POINTS, PATHS } from './lib/paths'; import { MAX_X_ZOOM, @@ -16,7 +16,7 @@ import { import { type Point } from '../lib/types'; import { getDiff } from '../utils/vectors'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; const DEFAULT_COLOR_1 = '#FF511A'; const DEFAULT_COLOR_2 = '#FF8B61'; diff --git a/ui-spacetimechart/src/stories/horizontal-zoom.stories.tsx b/ui-charts/src/spaceTimeChart/stories/horizontal-zoom.stories.tsx similarity index 98% rename from ui-spacetimechart/src/stories/horizontal-zoom.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/horizontal-zoom.stories.tsx index 4dd76e021..2ac0facb9 100644 --- a/ui-spacetimechart/src/stories/horizontal-zoom.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/horizontal-zoom.stories.tsx @@ -5,7 +5,7 @@ import type { Meta } from '@storybook/react'; import { clamp } from 'lodash'; import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; import { OPERATIONAL_POINTS, PATHS } from './lib/paths'; import { PathLayer } from '../components/PathLayer'; diff --git a/ui-spacetimechart/src/stories/layers.stories.tsx b/ui-charts/src/spaceTimeChart/stories/layers.stories.tsx similarity index 98% rename from ui-spacetimechart/src/stories/layers.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/layers.stories.tsx index 5888d9ebe..52af92616 100644 --- a/ui-spacetimechart/src/stories/layers.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/layers.stories.tsx @@ -9,7 +9,7 @@ import { OccupancyBlockLayer, SpaceTimeChart, PathLayer, -} from '../'; +} from '..'; import { OPERATIONAL_POINTS, PATHS, START_DATE } from './lib/paths'; import { X_ZOOM_LEVEL, Y_ZOOM_LEVEL } from './lib/utils'; import { @@ -21,7 +21,7 @@ import { } from '../lib/consts'; import type { Point } from '../lib/types'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; const CONFLICTS = [ { diff --git a/ui-spacetimechart/src/stories/lib/components.tsx b/ui-charts/src/spaceTimeChart/stories/lib/components.tsx similarity index 100% rename from ui-spacetimechart/src/stories/lib/components.tsx rename to ui-charts/src/spaceTimeChart/stories/lib/components.tsx diff --git a/ui-spacetimechart/src/stories/lib/paths.ts b/ui-charts/src/spaceTimeChart/stories/lib/paths.ts similarity index 100% rename from ui-spacetimechart/src/stories/lib/paths.ts rename to ui-charts/src/spaceTimeChart/stories/lib/paths.ts diff --git a/ui-spacetimechart/src/stories/lib/utils.ts b/ui-charts/src/spaceTimeChart/stories/lib/utils.ts similarity index 100% rename from ui-spacetimechart/src/stories/lib/utils.ts rename to ui-charts/src/spaceTimeChart/stories/lib/utils.ts diff --git a/ui-spacetimechart/src/stories/measuring.stories.tsx b/ui-charts/src/spaceTimeChart/stories/measuring.stories.tsx similarity index 97% rename from ui-spacetimechart/src/stories/measuring.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/measuring.stories.tsx index c81141fef..d09488c3d 100644 --- a/ui-spacetimechart/src/stories/measuring.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/measuring.stories.tsx @@ -3,14 +3,14 @@ import React, { useState } from 'react'; import type { Meta } from '@storybook/react'; import cx from 'classnames'; -import { SpaceTimeChart, PathLayer } from '../'; +import { SpaceTimeChart, PathLayer } from '..'; import { MouseTracker } from './lib/components'; import { OPERATIONAL_POINTS, PATHS } from './lib/paths'; import { X_ZOOM_LEVEL, Y_ZOOM_LEVEL, zoom } from './lib/utils'; import { type DataPoint, type Point } from '../lib/types'; import { getDiff } from '../utils/vectors'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; type WrapperProps = { spaceScaleType: 'linear' | 'proportional'; diff --git a/ui-spacetimechart/src/stories/options.stories.tsx b/ui-charts/src/spaceTimeChart/stories/options.stories.tsx similarity index 99% rename from ui-spacetimechart/src/stories/options.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/options.stories.tsx index a9d5eaebb..4dd868faa 100644 --- a/ui-spacetimechart/src/stories/options.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/options.stories.tsx @@ -4,7 +4,7 @@ import type { Meta } from '@storybook/react'; import cx from 'classnames'; import FileSaver from 'file-saver'; -import { SpaceTimeChart, PathLayer } from '../'; +import { SpaceTimeChart, PathLayer } from '..'; import { MouseTracker } from './lib/components'; import { OPERATIONAL_POINTS, PATHS } from './lib/paths'; import { diff --git a/ui-spacetimechart/src/stories/paths-interactions.stories.tsx b/ui-charts/src/spaceTimeChart/stories/paths-interactions.stories.tsx similarity index 98% rename from ui-spacetimechart/src/stories/paths-interactions.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/paths-interactions.stories.tsx index 2eb8ba09c..e96e8589e 100644 --- a/ui-spacetimechart/src/stories/paths-interactions.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/paths-interactions.stories.tsx @@ -4,13 +4,13 @@ import type { Meta } from '@storybook/react'; import cx from 'classnames'; import { keyBy } from 'lodash'; -import { SpaceTimeChart, PathLayer } from '../'; +import { SpaceTimeChart, PathLayer } from '..'; import { OPERATIONAL_POINTS, PATHS } from './lib/paths'; import { X_ZOOM_LEVEL, Y_ZOOM_LEVEL, zoom } from './lib/utils'; import { type PathData, type Point } from '../lib/types'; import { getDiff } from '../utils/vectors'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; function delayPath(path: T, newTimeOrigin: number): T { const delay = newTimeOrigin - path.points[0].time; diff --git a/ui-spacetimechart/src/stories/performances.stories.tsx b/ui-charts/src/spaceTimeChart/stories/performances.stories.tsx similarity index 98% rename from ui-spacetimechart/src/stories/performances.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/performances.stories.tsx index 2d0a21611..476bf17ab 100644 --- a/ui-spacetimechart/src/stories/performances.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/performances.stories.tsx @@ -4,14 +4,14 @@ import { type Meta } from '@storybook/react'; import cx from 'classnames'; import { random, range } from 'lodash'; -import { SpaceTimeChart, PathLayer } from '../'; +import { SpaceTimeChart, PathLayer } from '..'; import { getPaths, type PATHS } from './lib/paths'; import { X_ZOOM_LEVEL, Y_ZOOM_LEVEL, zoom } from './lib/utils'; import { KILOMETER, MINUTE } from '../lib/consts'; import { type OperationalPoint, type Point } from '../lib/types'; import { getDiff } from '../utils/vectors'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; const DATE_OFFSET = +new Date('2024/01/01'); const COLORS = [ diff --git a/ui-spacetimechart/src/stories/scroll-navigation.stories.tsx b/ui-charts/src/spaceTimeChart/stories/scroll-navigation.stories.tsx similarity index 98% rename from ui-spacetimechart/src/stories/scroll-navigation.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/scroll-navigation.stories.tsx index 25a17d5b1..748f5bd0e 100644 --- a/ui-spacetimechart/src/stories/scroll-navigation.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/scroll-navigation.stories.tsx @@ -4,7 +4,7 @@ import type { Meta } from '@storybook/react'; import cx from 'classnames'; import { keyBy } from 'lodash'; -import { SpaceTimeChart, PathLayer } from '../'; +import { SpaceTimeChart, PathLayer } from '..'; import { OPERATIONAL_POINTS, PATHS } from './lib/paths'; import { X_ZOOM_LEVEL, Y_ZOOM_LEVEL, zoom } from './lib/utils'; import { type Point } from '../lib/types'; @@ -12,7 +12,7 @@ import { isPathOnScreen } from '../utils/geometry'; import { getSpaceAtTime } from '../utils/scales'; import { getDiff } from '../utils/vectors'; -import '@osrd-project/ui-spacetimechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; const PATHS_DICT = keyBy(PATHS, 'id'); diff --git a/ui-spacetimechart/src/stories/split.stories.tsx b/ui-charts/src/spaceTimeChart/stories/split.stories.tsx similarity index 100% rename from ui-spacetimechart/src/stories/split.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/split.stories.tsx diff --git a/ui-spacetimechart/src/stories/stage-interactions.stories.tsx b/ui-charts/src/spaceTimeChart/stories/stage-interactions.stories.tsx similarity index 99% rename from ui-spacetimechart/src/stories/stage-interactions.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/stage-interactions.stories.tsx index 0923103ee..597d00134 100644 --- a/ui-spacetimechart/src/stories/stage-interactions.stories.tsx +++ b/ui-charts/src/spaceTimeChart/stories/stage-interactions.stories.tsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import type { Meta } from '@storybook/react'; import cx from 'classnames'; -import { SpaceTimeChart, PathLayer } from '../'; +import { SpaceTimeChart, PathLayer } from '..'; import { OPERATIONAL_POINTS, PATHS } from './lib/paths'; import { MAX_X_ZOOM, diff --git a/ui-spacetimechart/src/stories/work-schedules.stories.tsx b/ui-charts/src/spaceTimeChart/stories/work-schedules.stories.tsx similarity index 100% rename from ui-spacetimechart/src/stories/work-schedules.stories.tsx rename to ui-charts/src/spaceTimeChart/stories/work-schedules.stories.tsx diff --git a/ui-spacetimechart/src/styles/main.css b/ui-charts/src/spaceTimeChart/styles/main.css similarity index 100% rename from ui-spacetimechart/src/styles/main.css rename to ui-charts/src/spaceTimeChart/styles/main.css diff --git a/ui-spacetimechart/src/types.ts b/ui-charts/src/spaceTimeChart/types.ts similarity index 100% rename from ui-spacetimechart/src/types.ts rename to ui-charts/src/spaceTimeChart/types.ts diff --git a/ui-spacetimechart/src/utils/__tests__/canvas.spec.ts b/ui-charts/src/spaceTimeChart/utils/__tests__/canvas.spec.ts similarity index 100% rename from ui-spacetimechart/src/utils/__tests__/canvas.spec.ts rename to ui-charts/src/spaceTimeChart/utils/__tests__/canvas.spec.ts diff --git a/ui-spacetimechart/src/utils/canvas.ts b/ui-charts/src/spaceTimeChart/utils/canvas.ts similarity index 100% rename from ui-spacetimechart/src/utils/canvas.ts rename to ui-charts/src/spaceTimeChart/utils/canvas.ts diff --git a/ui-spacetimechart/src/utils/colors.ts b/ui-charts/src/spaceTimeChart/utils/colors.ts similarity index 100% rename from ui-spacetimechart/src/utils/colors.ts rename to ui-charts/src/spaceTimeChart/utils/colors.ts diff --git a/ui-spacetimechart/src/utils/events.ts b/ui-charts/src/spaceTimeChart/utils/events.ts similarity index 100% rename from ui-spacetimechart/src/utils/events.ts rename to ui-charts/src/spaceTimeChart/utils/events.ts diff --git a/ui-spacetimechart/src/utils/geometry.ts b/ui-charts/src/spaceTimeChart/utils/geometry.ts similarity index 100% rename from ui-spacetimechart/src/utils/geometry.ts rename to ui-charts/src/spaceTimeChart/utils/geometry.ts diff --git a/ui-spacetimechart/src/utils/paths.ts b/ui-charts/src/spaceTimeChart/utils/paths.ts similarity index 100% rename from ui-spacetimechart/src/utils/paths.ts rename to ui-charts/src/spaceTimeChart/utils/paths.ts diff --git a/ui-spacetimechart/src/utils/png.ts b/ui-charts/src/spaceTimeChart/utils/png.ts similarity index 100% rename from ui-spacetimechart/src/utils/png.ts rename to ui-charts/src/spaceTimeChart/utils/png.ts diff --git a/ui-spacetimechart/src/utils/scales.ts b/ui-charts/src/spaceTimeChart/utils/scales.ts similarity index 100% rename from ui-spacetimechart/src/utils/scales.ts rename to ui-charts/src/spaceTimeChart/utils/scales.ts diff --git a/ui-spacetimechart/src/utils/snapping.ts b/ui-charts/src/spaceTimeChart/utils/snapping.ts similarity index 100% rename from ui-spacetimechart/src/utils/snapping.ts rename to ui-charts/src/spaceTimeChart/utils/snapping.ts diff --git a/ui-spacetimechart/src/utils/vectors.ts b/ui-charts/src/spaceTimeChart/utils/vectors.ts similarity index 100% rename from ui-spacetimechart/src/utils/vectors.ts rename to ui-charts/src/spaceTimeChart/utils/vectors.ts diff --git a/ui-speedspacechart/README.md b/ui-charts/src/speedSpaceChart/README.md similarity index 91% rename from ui-speedspacechart/README.md rename to ui-charts/src/speedSpaceChart/README.md index ce0ae8f30..2bfb9e892 100644 --- a/ui-speedspacechart/README.md +++ b/ui-charts/src/speedSpaceChart/README.md @@ -1,8 +1,8 @@ # ui-speedspacechart -The `ui-speedspacechart` package is part of the OSRD project, providing a specialized chart -component designed to visualize speed and space data in a dynamic and interactive way. It leverages -modern web technologies to offer a rich user experience for data analysis and presentation. +The `speed-space-chart` is a specialized chart component designed to visualize speed and +space data in a dynamic and interactive way. It leverages modern web technologies to offer +a rich user experience for data analysis and presentation. ## Features @@ -13,20 +13,12 @@ modern web technologies to offer a rich user experience for data analysis and pr requirements. - **High Performance**: Optimized for performance, even with large datasets. -## Installation - -To install the `ui-speedspacechart` package, run the following command in your project directory: - -```sh -npm install @osrd-project/ui-speedspacechart -``` - ## Usage To use the `SpeedSpaceChart` component in your project: ```js -import SpeedSpaceChart from '@osrd-project/ui-speedspacechart'; +import { SpeedSpaceChart } from '@osrd-project/ui-charts'; const App = () => { return ( diff --git a/ui-speedspacechart/src/__tests__/utils.spec.ts b/ui-charts/src/speedSpaceChart/__tests__/utils.spec.ts similarity index 100% rename from ui-speedspacechart/src/__tests__/utils.spec.ts rename to ui-charts/src/speedSpaceChart/__tests__/utils.spec.ts diff --git a/ui-speedspacechart/src/components/SpeedSpaceChart.tsx b/ui-charts/src/speedSpaceChart/components/SpeedSpaceChart.tsx similarity index 100% rename from ui-speedspacechart/src/components/SpeedSpaceChart.tsx rename to ui-charts/src/speedSpaceChart/components/SpeedSpaceChart.tsx diff --git a/ui-speedspacechart/src/components/common/DetailsBox.tsx b/ui-charts/src/speedSpaceChart/components/common/DetailsBox.tsx similarity index 100% rename from ui-speedspacechart/src/components/common/DetailsBox.tsx rename to ui-charts/src/speedSpaceChart/components/common/DetailsBox.tsx diff --git a/ui-speedspacechart/src/components/common/InteractionButtons.tsx b/ui-charts/src/speedSpaceChart/components/common/InteractionButtons.tsx similarity index 100% rename from ui-speedspacechart/src/components/common/InteractionButtons.tsx rename to ui-charts/src/speedSpaceChart/components/common/InteractionButtons.tsx diff --git a/ui-speedspacechart/src/components/common/SettingsPanel.tsx b/ui-charts/src/speedSpaceChart/components/common/SettingsPanel.tsx similarity index 100% rename from ui-speedspacechart/src/components/common/SettingsPanel.tsx rename to ui-charts/src/speedSpaceChart/components/common/SettingsPanel.tsx diff --git a/ui-speedspacechart/src/components/common/Tooltip.tsx b/ui-charts/src/speedSpaceChart/components/common/Tooltip.tsx similarity index 100% rename from ui-speedspacechart/src/components/common/Tooltip.tsx rename to ui-charts/src/speedSpaceChart/components/common/Tooltip.tsx diff --git a/ui-speedspacechart/src/components/const.ts b/ui-charts/src/speedSpaceChart/components/const.ts similarity index 100% rename from ui-speedspacechart/src/components/const.ts rename to ui-charts/src/speedSpaceChart/components/const.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/axisY.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/axisY.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/axisY.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/axisY.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/curve.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/curve.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/curve.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/curve.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/declivity.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/declivity.ts similarity index 96% rename from ui-speedspacechart/src/components/helpers/drawElements/declivity.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/declivity.ts index 769f528a1..17e7e1770 100644 --- a/ui-speedspacechart/src/components/helpers/drawElements/declivity.ts +++ b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/declivity.ts @@ -1,5 +1,5 @@ -import { MARGINS, SLOPE_FILL_COLOR } from '../../../components/const'; import type { DrawFunctionParams } from '../../../types/chartTypes'; +import { MARGINS, SLOPE_FILL_COLOR } from '../../const'; import { clearCanvas, maxPositionValue, slopesValues } from '../../utils'; const { CURVE_MARGIN_SIDES, MARGIN_TOP, MARGIN_BOTTOM, RIGHT_TICK_MARGINS } = MARGINS; diff --git a/ui-speedspacechart/src/components/helpers/drawElements/electricalProfile.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/electricalProfile.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/electricalProfile.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/electricalProfile.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/powerRestrictions.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/powerRestrictions.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/powerRestrictions.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/powerRestrictions.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/reticle.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/reticle.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/reticle.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/reticle.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/speedLimitTags.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/speedLimitTags.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/speedLimitTags.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/speedLimitTags.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/speedLimits.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/speedLimits.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/speedLimits.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/speedLimits.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/steps.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/steps.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/steps.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/steps.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/tickX.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/tickX.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/tickX.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/tickX.ts diff --git a/ui-speedspacechart/src/components/helpers/drawElements/tickYRight.ts b/ui-charts/src/speedSpaceChart/components/helpers/drawElements/tickYRight.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/drawElements/tickYRight.ts rename to ui-charts/src/speedSpaceChart/components/helpers/drawElements/tickYRight.ts diff --git a/ui-speedspacechart/src/components/helpers/frontFrame.ts b/ui-charts/src/speedSpaceChart/components/helpers/frontFrame.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/frontFrame.ts rename to ui-charts/src/speedSpaceChart/components/helpers/frontFrame.ts diff --git a/ui-speedspacechart/src/components/helpers/layersManager.ts b/ui-charts/src/speedSpaceChart/components/helpers/layersManager.ts similarity index 100% rename from ui-speedspacechart/src/components/helpers/layersManager.ts rename to ui-charts/src/speedSpaceChart/components/helpers/layersManager.ts diff --git a/ui-speedspacechart/src/components/hooks.ts b/ui-charts/src/speedSpaceChart/components/hooks.ts similarity index 100% rename from ui-speedspacechart/src/components/hooks.ts rename to ui-charts/src/speedSpaceChart/components/hooks.ts diff --git a/ui-speedspacechart/src/components/layers/CurveLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/CurveLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/CurveLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/CurveLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/DeclivityLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/DeclivityLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/DeclivityLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/DeclivityLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/ElectricalProfileLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/ElectricalProfileLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/ElectricalProfileLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/ElectricalProfileLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/FrontInteractivityLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/FrontInteractivityLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/FrontInteractivityLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/FrontInteractivityLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/PowerRestrictionsLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/PowerRestrictionsLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/PowerRestrictionsLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/PowerRestrictionsLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/ReticleLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/ReticleLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/ReticleLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/ReticleLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/SpeedLimitTagsLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/SpeedLimitTagsLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/SpeedLimitTagsLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/SpeedLimitTagsLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/SpeedLimitsLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/SpeedLimitsLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/SpeedLimitsLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/SpeedLimitsLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/StepsLayer.tsx b/ui-charts/src/speedSpaceChart/components/layers/StepsLayer.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/StepsLayer.tsx rename to ui-charts/src/speedSpaceChart/components/layers/StepsLayer.tsx diff --git a/ui-speedspacechart/src/components/layers/TickLayerX.tsx b/ui-charts/src/speedSpaceChart/components/layers/TickLayerX.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/TickLayerX.tsx rename to ui-charts/src/speedSpaceChart/components/layers/TickLayerX.tsx diff --git a/ui-speedspacechart/src/components/layers/TickLayerY.tsx b/ui-charts/src/speedSpaceChart/components/layers/TickLayerY.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/TickLayerY.tsx rename to ui-charts/src/speedSpaceChart/components/layers/TickLayerY.tsx diff --git a/ui-speedspacechart/src/components/layers/TickLayerYRight.tsx b/ui-charts/src/speedSpaceChart/components/layers/TickLayerYRight.tsx similarity index 100% rename from ui-speedspacechart/src/components/layers/TickLayerYRight.tsx rename to ui-charts/src/speedSpaceChart/components/layers/TickLayerYRight.tsx diff --git a/ui-speedspacechart/src/components/layers/index.ts b/ui-charts/src/speedSpaceChart/components/layers/index.ts similarity index 100% rename from ui-speedspacechart/src/components/layers/index.ts rename to ui-charts/src/speedSpaceChart/components/layers/index.ts diff --git a/ui-speedspacechart/src/components/utils.ts b/ui-charts/src/speedSpaceChart/components/utils.ts similarity index 100% rename from ui-speedspacechart/src/components/utils.ts rename to ui-charts/src/speedSpaceChart/components/utils.ts diff --git a/ui-speedspacechart/src/index.ts b/ui-charts/src/speedSpaceChart/index.ts similarity index 100% rename from ui-speedspacechart/src/index.ts rename to ui-charts/src/speedSpaceChart/index.ts diff --git a/ui-speedspacechart/src/stories/SpeedSpaceChart.stories.tsx b/ui-charts/src/speedSpaceChart/stories/SpeedSpaceChart.stories.tsx similarity index 97% rename from ui-speedspacechart/src/stories/SpeedSpaceChart.stories.tsx rename to ui-charts/src/speedSpaceChart/stories/SpeedSpaceChart.stories.tsx index aaa177902..d9d358540 100644 --- a/ui-speedspacechart/src/stories/SpeedSpaceChart.stories.tsx +++ b/ui-charts/src/speedSpaceChart/stories/SpeedSpaceChart.stories.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react'; import type { Meta, StoryObj } from '@storybook/react'; import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-speedspacechart/dist/theme.css'; +import '@osrd-project/ui-charts/dist/theme.css'; import { translations as defaultTranslation } from './assets/const'; import { pathPropertiesPmpLm } from './assets/path_properties_PMP_LM'; import { powerRestrictionsPmpLm } from './assets/power_restrictions_PMP_LM'; diff --git a/ui-speedspacechart/src/stories/assets/const.ts b/ui-charts/src/speedSpaceChart/stories/assets/const.ts similarity index 100% rename from ui-speedspacechart/src/stories/assets/const.ts rename to ui-charts/src/speedSpaceChart/stories/assets/const.ts diff --git a/ui-speedspacechart/src/stories/assets/path_properties_PMP_LM.ts b/ui-charts/src/speedSpaceChart/stories/assets/path_properties_PMP_LM.ts similarity index 100% rename from ui-speedspacechart/src/stories/assets/path_properties_PMP_LM.ts rename to ui-charts/src/speedSpaceChart/stories/assets/path_properties_PMP_LM.ts diff --git a/ui-speedspacechart/src/stories/assets/power_restrictions_PMP_LM.ts b/ui-charts/src/speedSpaceChart/stories/assets/power_restrictions_PMP_LM.ts similarity index 100% rename from ui-speedspacechart/src/stories/assets/power_restrictions_PMP_LM.ts rename to ui-charts/src/speedSpaceChart/stories/assets/power_restrictions_PMP_LM.ts diff --git a/ui-speedspacechart/src/stories/assets/simulation_PMP_LM.ts b/ui-charts/src/speedSpaceChart/stories/assets/simulation_PMP_LM.ts similarity index 100% rename from ui-speedspacechart/src/stories/assets/simulation_PMP_LM.ts rename to ui-charts/src/speedSpaceChart/stories/assets/simulation_PMP_LM.ts diff --git a/ui-speedspacechart/src/stories/assets/speed_limit_tags_PMP_LM.ts b/ui-charts/src/speedSpaceChart/stories/assets/speed_limit_tags_PMP_LM.ts similarity index 100% rename from ui-speedspacechart/src/stories/assets/speed_limit_tags_PMP_LM.ts rename to ui-charts/src/speedSpaceChart/stories/assets/speed_limit_tags_PMP_LM.ts diff --git a/ui-speedspacechart/src/stories/utils.ts b/ui-charts/src/speedSpaceChart/stories/utils.ts similarity index 100% rename from ui-speedspacechart/src/stories/utils.ts rename to ui-charts/src/speedSpaceChart/stories/utils.ts diff --git a/ui-speedspacechart/src/styles/main.css b/ui-charts/src/speedSpaceChart/styles/main.css similarity index 100% rename from ui-speedspacechart/src/styles/main.css rename to ui-charts/src/speedSpaceChart/styles/main.css diff --git a/ui-speedspacechart/src/types/chartTypes.ts b/ui-charts/src/speedSpaceChart/types/chartTypes.ts similarity index 100% rename from ui-speedspacechart/src/types/chartTypes.ts rename to ui-charts/src/speedSpaceChart/types/chartTypes.ts diff --git a/ui-speedspacechart/src/types/simulationTypes.ts b/ui-charts/src/speedSpaceChart/types/simulationTypes.ts similarity index 100% rename from ui-speedspacechart/src/types/simulationTypes.ts rename to ui-charts/src/speedSpaceChart/types/simulationTypes.ts diff --git a/ui-trackoccupancydiagram/src/__tests__/utils.spec.ts b/ui-charts/src/trackOccupancyDiagram/__tests__/utils.spec.ts similarity index 100% rename from ui-trackoccupancydiagram/src/__tests__/utils.spec.ts rename to ui-charts/src/trackOccupancyDiagram/__tests__/utils.spec.ts diff --git a/ui-trackoccupancydiagram/src/components/TrackOccupancyCanvas.tsx b/ui-charts/src/trackOccupancyDiagram/components/TrackOccupancyCanvas.tsx similarity index 100% rename from ui-trackoccupancydiagram/src/components/TrackOccupancyCanvas.tsx rename to ui-charts/src/trackOccupancyDiagram/components/TrackOccupancyCanvas.tsx diff --git a/ui-trackoccupancydiagram/src/components/TrackOccupancyManchette.tsx b/ui-charts/src/trackOccupancyDiagram/components/TrackOccupancyManchette.tsx similarity index 100% rename from ui-trackoccupancydiagram/src/components/TrackOccupancyManchette.tsx rename to ui-charts/src/trackOccupancyDiagram/components/TrackOccupancyManchette.tsx diff --git a/ui-trackoccupancydiagram/src/components/consts.ts b/ui-charts/src/trackOccupancyDiagram/components/consts.ts similarity index 100% rename from ui-trackoccupancydiagram/src/components/consts.ts rename to ui-charts/src/trackOccupancyDiagram/components/consts.ts diff --git a/ui-trackoccupancydiagram/src/components/helpers/drawElements/drawOccupancyZones.ts b/ui-charts/src/trackOccupancyDiagram/components/helpers/drawElements/drawOccupancyZones.ts similarity index 100% rename from ui-trackoccupancydiagram/src/components/helpers/drawElements/drawOccupancyZones.ts rename to ui-charts/src/trackOccupancyDiagram/components/helpers/drawElements/drawOccupancyZones.ts diff --git a/ui-trackoccupancydiagram/src/components/helpers/drawElements/drawOccupancyZonesTexts.ts b/ui-charts/src/trackOccupancyDiagram/components/helpers/drawElements/drawOccupancyZonesTexts.ts similarity index 100% rename from ui-trackoccupancydiagram/src/components/helpers/drawElements/drawOccupancyZonesTexts.ts rename to ui-charts/src/trackOccupancyDiagram/components/helpers/drawElements/drawOccupancyZonesTexts.ts diff --git a/ui-trackoccupancydiagram/src/components/helpers/drawElements/drawTrack.ts b/ui-charts/src/trackOccupancyDiagram/components/helpers/drawElements/drawTrack.ts similarity index 100% rename from ui-trackoccupancydiagram/src/components/helpers/drawElements/drawTrack.ts rename to ui-charts/src/trackOccupancyDiagram/components/helpers/drawElements/drawTrack.ts diff --git a/ui-trackoccupancydiagram/src/components/helpers/drawElements/drawTracks.ts b/ui-charts/src/trackOccupancyDiagram/components/helpers/drawElements/drawTracks.ts similarity index 100% rename from ui-trackoccupancydiagram/src/components/helpers/drawElements/drawTracks.ts rename to ui-charts/src/trackOccupancyDiagram/components/helpers/drawElements/drawTracks.ts diff --git a/ui-trackoccupancydiagram/src/components/layers/OccupancyZonesLayer.tsx b/ui-charts/src/trackOccupancyDiagram/components/layers/OccupancyZonesLayer.tsx similarity index 90% rename from ui-trackoccupancydiagram/src/components/layers/OccupancyZonesLayer.tsx rename to ui-charts/src/trackOccupancyDiagram/components/layers/OccupancyZonesLayer.tsx index e86eb71e6..fabc0ada0 100755 --- a/ui-trackoccupancydiagram/src/components/layers/OccupancyZonesLayer.tsx +++ b/ui-charts/src/trackOccupancyDiagram/components/layers/OccupancyZonesLayer.tsx @@ -1,10 +1,6 @@ import { useCallback } from 'react'; -import { - type LayerType, - type DrawingFunction, -} from '@osrd-project/ui-spacetimechart/src/lib/types'; - +import { type LayerType, type DrawingFunction } from '../../../spaceTimeChart/lib/types'; import { drawOccupancyZones } from '../helpers/drawElements/drawOccupancyZones'; const OccupancyZonesLayer = ({ diff --git a/ui-trackoccupancydiagram/src/components/layers/TracksLayer.tsx b/ui-charts/src/trackOccupancyDiagram/components/layers/TracksLayer.tsx similarity index 89% rename from ui-trackoccupancydiagram/src/components/layers/TracksLayer.tsx rename to ui-charts/src/trackOccupancyDiagram/components/layers/TracksLayer.tsx index 3bcf37a89..81672ba94 100644 --- a/ui-trackoccupancydiagram/src/components/layers/TracksLayer.tsx +++ b/ui-charts/src/trackOccupancyDiagram/components/layers/TracksLayer.tsx @@ -1,10 +1,6 @@ import { useCallback } from 'react'; -import { - type LayerType, - type DrawingFunction, -} from '@osrd-project/ui-spacetimechart/src/lib/types'; - +import { type LayerType, type DrawingFunction } from '../../../spaceTimeChart/lib/types'; import { drawTracks } from '../helpers/drawElements/drawTracks'; const TracksLayer = ({ useDraw }: { useDraw: (layer: LayerType, fn: DrawingFunction) => void }) => { diff --git a/ui-trackoccupancydiagram/src/components/types.ts b/ui-charts/src/trackOccupancyDiagram/components/types.ts similarity index 87% rename from ui-trackoccupancydiagram/src/components/types.ts rename to ui-charts/src/trackOccupancyDiagram/components/types.ts index 1d37e276e..bddf7d341 100755 --- a/ui-trackoccupancydiagram/src/components/types.ts +++ b/ui-charts/src/trackOccupancyDiagram/components/types.ts @@ -1,9 +1,5 @@ -import { - type DrawingFunction, - type LayerType, -} from '@osrd-project/ui-spacetimechart/src/lib/types'; - import { type TICKS_PATTERN } from './consts'; +import { type DrawingFunction, type LayerType } from '../../spaceTimeChart/lib/types'; export type Track = { id: string; diff --git a/ui-trackoccupancydiagram/src/components/utils.ts b/ui-charts/src/trackOccupancyDiagram/components/utils.ts similarity index 100% rename from ui-trackoccupancydiagram/src/components/utils.ts rename to ui-charts/src/trackOccupancyDiagram/components/utils.ts diff --git a/ui-trackoccupancydiagram/src/index.ts b/ui-charts/src/trackOccupancyDiagram/index.ts similarity index 81% rename from ui-trackoccupancydiagram/src/index.ts rename to ui-charts/src/trackOccupancyDiagram/index.ts index 32bfef2f5..f09b94e75 100644 --- a/ui-trackoccupancydiagram/src/index.ts +++ b/ui-charts/src/trackOccupancyDiagram/index.ts @@ -1,4 +1,3 @@ -import '@osrd-project/ui-core/dist/theme.css'; import './styles/main.css'; export { default as TrackOccupancyCanvas } from './components/TrackOccupancyCanvas'; diff --git a/ui-trackoccupancydiagram/src/styles/main.css b/ui-charts/src/trackOccupancyDiagram/styles/main.css similarity index 100% rename from ui-trackoccupancydiagram/src/styles/main.css rename to ui-charts/src/trackOccupancyDiagram/styles/main.css diff --git a/ui-manchette-with-spacetimechart/tailwind.config.js b/ui-charts/tailwind.config.js similarity index 100% rename from ui-manchette-with-spacetimechart/tailwind.config.js rename to ui-charts/tailwind.config.js diff --git a/ui-manchette-with-spacetimechart/tsconfig.json b/ui-charts/tsconfig.json similarity index 100% rename from ui-manchette-with-spacetimechart/tsconfig.json rename to ui-charts/tsconfig.json diff --git a/ui-spacetimechart/vitest.config.mts b/ui-charts/vitest.config.mts similarity index 79% rename from ui-spacetimechart/vitest.config.mts rename to ui-charts/vitest.config.mts index afe249ed5..b8c99fd4e 100644 --- a/ui-spacetimechart/vitest.config.mts +++ b/ui-charts/vitest.config.mts @@ -3,6 +3,6 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ mode: 'benchmark', test: { - include: ['*.spec.ts'], + include: ['**/*.spec.ts'], }, }); diff --git a/ui-manchette-with-spacetimechart/package.json b/ui-manchette-with-spacetimechart/package.json deleted file mode 100644 index f3a25d7fc..000000000 --- a/ui-manchette-with-spacetimechart/package.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "@osrd-project/ui-manchette-with-spacetimechart", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "bugs": "https://github.com/osrd-project/osrd-ui/issues", - "repository": { - "type": "git", - "url": "https://github.com/osrd-project/osrd-ui.git", - "directory": "ui-manchette-with-spacetimechart" - }, - "publishConfig": { - "access": "public" - }, - "type": "module", - "module": "./dist/index.esm.js", - "types": "./dist/index.d.ts", - "main": "./dist/index.esm.js", - "style": "dist/theme.css", - "files": [ - "/dist" - ], - "exports": { - "./dist/theme.css": "./dist/theme.css", - ".": { - "types": "./dist/index.d.ts", - "default": "./dist/index.esm.js" - } - }, - "scripts": { - "clean": "rimraf dist", - "build": "rollup -c --failAfterWarnings", - "watch": "rollup -c -w", - "prepublishOnly": "npm run clean && npm run build", - "lint": "eslint src --max-warnings 0", - "lint:fix": "eslint src --fix", - "test": "vitest run --dir src/__tests__" - }, - "dependencies": { - "@osrd-project/ui-manchette": "0.0.1-dev", - "@osrd-project/ui-spacetimechart": "0.0.1-dev", - "@osrd-project/ui-speedspacechart": "0.0.1-dev", - "classnames": "^2.5.1", - "lodash": "^4.17.21", - "lodash.isequal": "^4.5.0" - }, - "peerDependencies": { - "react": ">=18.0" - }, - "devDependencies": { - "tailwindcss": "^3.4.1" - } -} diff --git a/ui-manchette-with-spacetimechart/postcss.config.cjs b/ui-manchette-with-spacetimechart/postcss.config.cjs deleted file mode 100644 index 16c305a25..000000000 --- a/ui-manchette-with-spacetimechart/postcss.config.cjs +++ /dev/null @@ -1,3 +0,0 @@ -const generateBasePostcssConfig = require('../postcss-base.config.cjs'); - -module.exports = generateBasePostcssConfig(); diff --git a/ui-manchette/package.json b/ui-manchette/package.json deleted file mode 100644 index aeb794956..000000000 --- a/ui-manchette/package.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "@osrd-project/ui-manchette", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "bugs": "https://github.com/osrd-project/osrd-ui/issues", - "repository": { - "type": "git", - "url": "https://github.com/osrd-project/osrd-ui.git", - "directory": "ui-manchette" - }, - "publishConfig": { - "access": "public" - }, - "type": "module", - "module": "./dist/index.esm.js", - "types": "./dist/index.d.ts", - "main": "./dist/index.esm.js", - "style": "dist/theme.css", - "files": [ - "/dist" - ], - "exports": { - "./dist/theme.css": "./dist/theme.css", - ".": { - "types": "./dist/index.d.ts", - "default": "./dist/index.esm.js" - } - }, - "scripts": { - "clean": "rimraf dist", - "build": "rollup -c --failAfterWarnings", - "watch": "rollup -c -w", - "prepublishOnly": "npm run clean && npm run build", - "lint": "eslint src --max-warnings 0", - "lint:fix": "eslint src --fix" - }, - "dependencies": { - "@osrd-project/ui-icons": "0.0.1-dev", - "@osrd-project/ui-core": "0.0.1-dev", - "classnames": "^2.5.1", - "lodash.isequal": "^4.5.0" - }, - "peerDependencies": { - "react": ">=18.0" - }, - "devDependencies": { - "tailwindcss": "^3.4.1" - } -} diff --git a/ui-manchette/postcss.config.cjs b/ui-manchette/postcss.config.cjs deleted file mode 100644 index 16c305a25..000000000 --- a/ui-manchette/postcss.config.cjs +++ /dev/null @@ -1,3 +0,0 @@ -const generateBasePostcssConfig = require('../postcss-base.config.cjs'); - -module.exports = generateBasePostcssConfig(); diff --git a/ui-manchette/rollup.config.js b/ui-manchette/rollup.config.js deleted file mode 100644 index fefa4fb63..000000000 --- a/ui-manchette/rollup.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import generateBaseRollupConfig from '../rollup-base.config.js'; - -export default generateBaseRollupConfig(); diff --git a/ui-manchette/tailwind.config.js b/ui-manchette/tailwind.config.js deleted file mode 100644 index 899a9c7fc..000000000 --- a/ui-manchette/tailwind.config.js +++ /dev/null @@ -1,6 +0,0 @@ -import osrdUiPreset from '../tailwind-preset.js'; -/** @type {import('tailwindcss').Config} */ -export default { - presets: [osrdUiPreset], - content: ['./src/**/*.{js,jsx,ts,tsx}'], -}; diff --git a/ui-manchette/tsconfig.json b/ui-manchette/tsconfig.json deleted file mode 100644 index be895df65..000000000 --- a/ui-manchette/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "include": ["./src/**/*"], - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist", - "declarationDir": "./dist" - } -} diff --git a/ui-spacetimechart/rollup.config.js b/ui-spacetimechart/rollup.config.js deleted file mode 100644 index fefa4fb63..000000000 --- a/ui-spacetimechart/rollup.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import generateBaseRollupConfig from '../rollup-base.config.js'; - -export default generateBaseRollupConfig(); diff --git a/ui-spacetimechart/tailwind.config.js b/ui-spacetimechart/tailwind.config.js deleted file mode 100644 index 899a9c7fc..000000000 --- a/ui-spacetimechart/tailwind.config.js +++ /dev/null @@ -1,6 +0,0 @@ -import osrdUiPreset from '../tailwind-preset.js'; -/** @type {import('tailwindcss').Config} */ -export default { - presets: [osrdUiPreset], - content: ['./src/**/*.{js,jsx,ts,tsx}'], -}; diff --git a/ui-spacetimechart/tsconfig.json b/ui-spacetimechart/tsconfig.json deleted file mode 100644 index be895df65..000000000 --- a/ui-spacetimechart/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "include": ["./src/**/*"], - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist", - "declarationDir": "./dist" - } -} diff --git a/ui-speedspacechart/package.json b/ui-speedspacechart/package.json deleted file mode 100644 index 0b5edef23..000000000 --- a/ui-speedspacechart/package.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "name": "@osrd-project/ui-speedspacechart", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "bugs": "https://github.com/osrd-project/osrd-ui/issues", - "repository": { - "type": "git", - "url": "https://github.com/osrd-project/osrd-ui.git", - "directory": "ui-speedspacechart" - }, - "publishConfig": { - "access": "public" - }, - "type": "module", - "module": "./dist/index.esm.js", - "types": "./dist/index.d.ts", - "main": "./dist/index.esm.js", - "style": "dist/theme.css", - "files": [ - "/dist" - ], - "exports": { - "./dist/theme.css": "./dist/theme.css", - ".": { - "types": "./dist/index.d.ts", - "default": "./dist/index.esm.js" - } - }, - "scripts": { - "clean": "rimraf dist", - "build": "rollup -c --failAfterWarnings", - "watch": "rollup -c -w", - "test": "vitest run --dir src/__tests__", - "prepublishOnly": "npm run clean && npm run build", - "lint": "eslint src --max-warnings 0", - "lint:fix": "eslint src --fix" - }, - "dependencies": { - "@osrd-project/ui-core": "0.0.1-dev", - "@osrd-project/ui-icons": "0.0.1-dev", - "chroma-js": "^3.1.1", - "classnames": "^2.5.1", - "d3-selection": "^3.0.0", - "d3-zoom": "^3.0.0" - }, - "peerDependencies": { - "react": ">=18.0" - }, - "devDependencies": { - "@types/chroma-js": "^3.1.0", - "@types/d3-selection": "^3.0.0", - "@types/d3-zoom": "^3.0.0", - "tailwindcss": "^3.4.1" - } -} diff --git a/ui-speedspacechart/postcss.config.cjs b/ui-speedspacechart/postcss.config.cjs deleted file mode 100644 index 4ca4ba200..000000000 --- a/ui-speedspacechart/postcss.config.cjs +++ /dev/null @@ -1,2 +0,0 @@ -const generateBasePostcssConfig = require('../postcss-base.config.cjs'); -module.exports = generateBasePostcssConfig(); diff --git a/ui-speedspacechart/rollup.config.js b/ui-speedspacechart/rollup.config.js deleted file mode 100644 index fefa4fb63..000000000 --- a/ui-speedspacechart/rollup.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import generateBaseRollupConfig from '../rollup-base.config.js'; - -export default generateBaseRollupConfig(); diff --git a/ui-speedspacechart/tailwind.config.js b/ui-speedspacechart/tailwind.config.js deleted file mode 100644 index 899a9c7fc..000000000 --- a/ui-speedspacechart/tailwind.config.js +++ /dev/null @@ -1,6 +0,0 @@ -import osrdUiPreset from '../tailwind-preset.js'; -/** @type {import('tailwindcss').Config} */ -export default { - presets: [osrdUiPreset], - content: ['./src/**/*.{js,jsx,ts,tsx}'], -}; diff --git a/ui-speedspacechart/tsconfig.json b/ui-speedspacechart/tsconfig.json deleted file mode 100644 index 8e45cdf93..000000000 --- a/ui-speedspacechart/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "include": ["./src/**/*"], - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist", - "declarationDir": "./dist", - "typeRoots": ["./node_modules/@types", "../raw.d.ts"] - } -} diff --git a/ui-trackoccupancydiagram/README.md b/ui-trackoccupancydiagram/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-trackoccupancydiagram/package.json b/ui-trackoccupancydiagram/package.json deleted file mode 100644 index 79bc70c48..000000000 --- a/ui-trackoccupancydiagram/package.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "@osrd-project/ui-trackoccupancydiagram", - "version": "0.0.1-dev", - "license": "LGPL-3.0-or-later", - "bugs": "https://github.com/osrd-project/osrd-ui/issues", - "repository": { - "type": "git", - "url": "https://github.com/osrd-project/osrd-ui.git", - "directory": "ui-trackoccupancydiagram" - }, - "publishConfig": { - "access": "public" - }, - "type": "module", - "module": "./dist/index.esm.js", - "types": "./dist/index.d.ts", - "main": "./dist/index.esm.js", - "style": "dist/theme.css", - "files": [ - "/dist" - ], - "exports": { - "./dist/theme.css": "./dist/theme.css", - ".": { - "types": "./dist/index.d.ts", - "default": "./dist/index.esm.js" - } - }, - "scripts": { - "rollup": "rollup -c", - "clean": "rimraf dist", - "build": "npm run rollup", - "watch": "rollup -c -w", - "test": "vitest run --dir src/__tests__", - "prepublishOnly": "npm run clean && npm run build", - "lint": "eslint src --max-warnings 0", - "lint:fix": "eslint src --fix" - }, - "dependencies": { - "@osrd-project/ui-core": "0.0.1-dev", - "chroma-js": "^3.1.1", - "classnames": "^2.5.1", - "lodash": "^4.17.21" - }, - "peerDependencies": { - "react": ">=18.0" - }, - "devDependencies": { - "@types/chroma-js": "^3.1.0", - "tailwindcss": "^3.4.1" - } -} diff --git a/ui-trackoccupancydiagram/rollup.config.js b/ui-trackoccupancydiagram/rollup.config.js deleted file mode 100644 index fefa4fb63..000000000 --- a/ui-trackoccupancydiagram/rollup.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import generateBaseRollupConfig from '../rollup-base.config.js'; - -export default generateBaseRollupConfig(); diff --git a/ui-trackoccupancydiagram/tailwind.config.js b/ui-trackoccupancydiagram/tailwind.config.js deleted file mode 100644 index 899a9c7fc..000000000 --- a/ui-trackoccupancydiagram/tailwind.config.js +++ /dev/null @@ -1,6 +0,0 @@ -import osrdUiPreset from '../tailwind-preset.js'; -/** @type {import('tailwindcss').Config} */ -export default { - presets: [osrdUiPreset], - content: ['./src/**/*.{js,jsx,ts,tsx}'], -}; diff --git a/ui-trackoccupancydiagram/tsconfig.json b/ui-trackoccupancydiagram/tsconfig.json deleted file mode 100644 index 8e45cdf93..000000000 --- a/ui-trackoccupancydiagram/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "include": ["./src/**/*"], - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist", - "declarationDir": "./dist", - "typeRoots": ["./node_modules/@types", "../raw.d.ts"] - } -}