Skip to content

Commit 95ef4f0

Browse files
JCQuintasJCQuintas
authored
Merge branch 'master' into initialhiddenitems
2 parents 207afad + ec26b75 commit 95ef4f0

File tree

140 files changed

+725
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+725
-87
lines changed

‎docs/data/charts/sankey/sankey.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: React Sankey chart
33
productId: x-charts
4-
components: SankeyChart, SankeyPlot, SankeyTooltip, SankeyTooltipContent, SankeyDataProvider
4+
components: SankeyChart, SankeyPlot, SankeyTooltip, SankeyTooltipContent, SankeyDataProvider, FocusedSankeyNode, FocusedSankeyLink
55
---
66

77
# Charts - Sankey [<span class="plan-pro"></span>](/x/introduction/licensing/#pro-plan 'Pro plan')🧪

‎docs/data/chartsApiPages.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,16 @@ const chartsApiPages: MuiPage[] = [
178178
title: 'FocusedHeatmapCell',
179179
plan: 'pro',
180180
},
181+
{
182+
pathname: '/x/api/charts/focused-sankey-link',
183+
title: 'FocusedSankeyLink',
184+
plan: 'pro',
185+
},
186+
{
187+
pathname: '/x/api/charts/focused-sankey-node',
188+
title: 'FocusedSankeyNode',
189+
plan: 'pro',
190+
},
181191
{
182192
pathname: '/x/api/charts/funnel-chart',
183193
title: 'FunnelChart',

‎docs/data/data-grid/editing/custom-edit-component.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const columns: GridColDef[] = [
2222
```
2323

2424
The `renderEditCell()` property receives all params from `GridRenderEditCellParams`, which extends `GridCellParams`.
25-
Additionally, the props added during [pre-processing](#validation) are also available in the params.
25+
Additionally, the props added during [pre-processing](/x/react-data-grid/editing/#validation) are also available in the params.
2626
These are the most important params to consider:
2727

2828
- `value`: contains the current value of the cell in edit mode, overriding the value from `GridCellParams`
@@ -98,7 +98,7 @@ This second click can be avoided if the first click also stops the edit mode.
9898
To create an edit component with auto-stop, call `apiRef.current.stopCellEditMode()` after setting the new value.
9999
Since `apiRef.current.setEditCellValue()` may do additional processing, you must wait for it to resolve before stopping the edit mode.
100100
Also, it is a good practice to check if `apiRef.current.setEditCellValue()` has returned `true`.
101-
It will be `false` if `preProcessEditProps()` set an error during [validation](#validation).
101+
It will be `false` if `preProcessEditProps()` set an error during [validation](/x/react-data-grid/editing/#validation).
102102

103103
```tsx
104104
const handleChange = async (event: SelectChangeEvent) => {

‎docs/data/data-grid/editing/editing-events.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<p class="description">Using editing events.</p>
44

5-
The interactions that [start](#start-editing) and [stop](#stop-editing) trigger `'cellEditStart'` and `'cellEditStop'` [events](/x/react-data-grid/events/), respectively.
6-
For [row editing](#row-editing), the events are `'rowEditStart'` and `'rowEditStop'`.
5+
The interactions that [start](/x/react-data-grid/editing/#start-editing) and [stop](/x/react-data-grid/editing/#stop-editing) trigger `'cellEditStart'` and `'cellEditStop'` [events](/x/react-data-grid/events/), respectively.
6+
For [row editing](/x/react-data-grid/editing/#row-editing), the events are `'rowEditStart'` and `'rowEditStop'`.
77
You can control how these events are handled to customize editing behavior.
88

99
For convenience, you can also listen to these events using their respective props:

‎docs/data/data-grid/editing/persistence.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
## The `processRowUpdate()` callback
66

7-
When the user performs an action to [stop editing](#stop-editing), the `processRowUpdate()` callback is triggered.
7+
When the user performs an action to [stop editing](/x/react-data-grid/editing/#stop-editing), the `processRowUpdate()` callback is triggered.
88
Use it to send the new values to the server and save them into a database or other storage method.
99
The callback is called with three arguments:
1010

11-
1. The updated row with the new values returned by the [`valueSetter()`](#value-parser-and-value-setter).
11+
1. The updated row with the new values returned by the [`valueSetter()`](/x/react-data-grid/editing/#value-parser-and-value-setter).
1212
2. The original values of the row before editing.
1313
3. An object with additional properties such as `rowId`.
1414

@@ -53,7 +53,7 @@ If you need to cancel the save process on `processRowUpdate()`—for instance, w
5353
2. Resolve the promise with the second argument (original row before editing), so that the internal state is not updated, and the cell exits edit mode.
5454

5555
The following demo implements the first option: rejecting the promise.
56-
Instead of [validating](#validation) while typing, it simulates validation on the server.
56+
Instead of [validating](/x/react-data-grid/editing/#validation) while typing, it simulates validation on the server.
5757
If the new name is empty, the promise responsible for saving the row will be rejected, and the cell will remain in edit mode.
5858

5959
The demo also shows that `processRowUpdate()` can pre-process the row model that will be saved into the internal state.

‎docs/data/scheduler/datasets/timezone-instant-based-events.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,15 @@ export const initialEvents = [
119119
rrule: { freq: 'WEEKLY', byDay: ['FR'] },
120120
exDates: ['2025-03-21T02:00:00Z'],
121121
},
122+
// Paris crossing the DST jump (Mar 30, 2025)
123+
// 01:30 local → 03:30 local (the 02:00–03:00 hour does not exist)
124+
// This renders from 01:30 to 03:30.
125+
{
126+
id: 'paris-cross-jump',
127+
title: 'Paris crosses DST jump',
128+
start: '2025-03-30T00:30:00Z',
129+
end: '2025-03-30T01:30:00Z',
130+
timezone: 'Europe/Paris',
131+
resource: 'paris',
132+
},
122133
];

‎docs/data/scheduler/datasets/timezone-instant-based-events.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,15 @@ export const initialEvents: TimezoneEvent[] = [
137137
rrule: { freq: 'WEEKLY', byDay: ['FR'] },
138138
exDates: ['2025-03-21T02:00:00Z'],
139139
},
140+
// Paris crossing the DST jump (Mar 30, 2025)
141+
// 01:30 local → 03:30 local (the 02:00–03:00 hour does not exist)
142+
// This renders from 01:30 to 03:30.
143+
{
144+
id: 'paris-cross-jump',
145+
title: 'Paris crosses DST jump',
146+
start: '2025-03-30T00:30:00Z',
147+
end: '2025-03-30T01:30:00Z',
148+
timezone: 'Europe/Paris',
149+
resource: 'paris',
150+
},
140151
];

‎docs/pages/x/api/charts/focused-sankey-link.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import * as React from 'react';
2+
import ApiPage from 'docs/src/modules/components/ApiPage';
3+
import mapApiPageTranslations from 'docs/src/modules/utils/mapApiPageTranslations';
4+
import jsonPageContent from './focused-sankey-link.json';
5+
6+
export default function Page(props) {
7+
const { descriptions } = props;
8+
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
9+
}
10+
11+
export async function getStaticProps() {
12+
const req = require.context(
13+
'docsx/translations/api-docs/charts/focused-sankey-link',
14+
false,
15+
/\.\/focused-sankey-link.*\.json$/,
16+
);
17+
const descriptions = mapApiPageTranslations(req);
18+
19+
return { props: { descriptions } };
20+
}

‎docs/pages/x/api/charts/focused-sankey-link.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"props": {},
3+
"name": "FocusedSankeyLink",
4+
"imports": [
5+
"import { FocusedSankeyLink } from '@mui/x-charts-pro/SankeyChart';",
6+
"import { FocusedSankeyLink } from '@mui/x-charts-pro';"
7+
],
8+
"classes": [],
9+
"muiName": "MuiFocusedSankeyLink",
10+
"filename": "/packages/x-charts-pro/src/SankeyChart/FocusedSankeyLink.tsx",
11+
"inheritance": null,
12+
"demos": "<ul><li><a href=\"/x/react-charts/sankey/\">Charts - Sankey <a href=\"/x/introduction/licensing/#pro-plan\" title=\"Pro plan\"><span class=\"plan-pro\"></span></a>🧪</a></li></ul>",
13+
"cssComponent": false
14+
}

‎docs/pages/x/api/charts/focused-sankey-node.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import * as React from 'react';
2+
import ApiPage from 'docs/src/modules/components/ApiPage';
3+
import mapApiPageTranslations from 'docs/src/modules/utils/mapApiPageTranslations';
4+
import jsonPageContent from './focused-sankey-node.json';
5+
6+
export default function Page(props) {
7+
const { descriptions } = props;
8+
return <ApiPage descriptions={descriptions} pageContent={jsonPageContent} />;
9+
}
10+
11+
export async function getStaticProps() {
12+
const req = require.context(
13+
'docsx/translations/api-docs/charts/focused-sankey-node',
14+
false,
15+
/\.\/focused-sankey-node.*\.json$/,
16+
);
17+
const descriptions = mapApiPageTranslations(req);
18+
19+
return { props: { descriptions } };
20+
}

0 commit comments

Comments
 (0)