Skip to content

Commit

Permalink
ui-charts: replace several modules by ui-charts
Browse files Browse the repository at this point in the history
Signed-off-by: Clara Ni <[email protected]>
  • Loading branch information
clarani committed Mar 5, 2025
1 parent 1066a18 commit e40a486
Show file tree
Hide file tree
Showing 185 changed files with 227 additions and 526 deletions.
158 changes: 33 additions & 125 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions storybook/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
14 changes: 7 additions & 7 deletions storybook/stories/ManchetteSplit/ManchetteSplit.stories.tsx
Original file line number Diff line number Diff line change
@@ -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<typeof Manchette> = {
component: Manchette,
Expand All @@ -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,
],
},
Expand Down
34 changes: 34 additions & 0 deletions storybook/stories/ManchetteSplit/sampleData.ts
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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';

Expand Down
Loading

0 comments on commit e40a486

Please sign in to comment.