Skip to content

Commit 6d237b7

Browse files
committed
Merge commit 'aea0bd2aadc915733d4d94e11333b58e68732c47' into fix-datagrid-test
2 parents da20d2c + aea0bd2 commit 6d237b7

File tree

17 files changed

+21
-1019
lines changed

17 files changed

+21
-1019
lines changed

.mocharc.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

package.json

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
"@types/chai": "catalog:",
103103
"@types/chai-dom": "^1.11.3",
104104
"@types/fs-extra": "^11.0.4",
105-
"@types/karma": "catalog:",
106105
"@types/lodash": "catalog:",
107106
"@types/mocha": "^10.0.10",
108107
"@types/node": "^22.15.30",
@@ -163,17 +162,10 @@
163162
"jss": "^10.10.0",
164163
"jss-plugin-template": "^10.10.0",
165164
"jss-rtl": "^0.3.0",
166-
"karma": "^6.4.4",
167-
"karma-chrome-launcher": "^3.2.0",
168-
"karma-mocha": "^2.0.1",
169-
"karma-parallel": "^0.3.1",
170-
"karma-sourcemap-loader": "^0.4.0",
171-
"karma-webpack": "^5.0.1",
172165
"lerna": "^8.2.2",
173166
"lodash": "catalog:",
174167
"magic-string": "^0.30.17",
175168
"markdownlint-cli2": "^0.18.1",
176-
"mocha": "^11.5.0",
177169
"moment": "catalog:",
178170
"moment-timezone": "catalog:",
179171
"null-loader": "^4.0.1",
@@ -206,18 +198,5 @@
206198
"packageManager": "[email protected]",
207199
"engines": {
208200
"pnpm": "10.12.1"
209-
},
210-
"pnpm": {
211-
"patchedDependencies": {
212-
213-
},
214-
"onlyBuiltDependencies": [
215-
"@swc/core",
216-
"@vvago/vale",
217-
"core-js",
218-
"esbuild",
219-
"nx",
220-
"sharp"
221-
]
222201
}
223202
}

packages/x-charts-pro/.mocharc.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

packages/x-charts/src/Toolbar/Toolbar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const ToolbarRoot = styled('div', {
1616
justifyContent: 'end',
1717
gap: theme.spacing(0.25),
1818
padding: theme.spacing(0.5),
19+
marginBottom: theme.spacing(1.5),
1920
minHeight: 44,
2021
boxSizing: 'border-box',
2122
border: `1px solid ${(theme.vars || theme).palette.divider}`,

packages/x-scheduler/src/joy/internals/components/time-grid/TimeGrid.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646

4747
.TimeGridHeader[style*='--has-scroll: 1'] .TimeGridHeaderRow {
4848
overflow-y: scroll;
49+
overflow-x: hidden;
4950
scrollbar-color: transparent transparent;
5051
}
5152

@@ -59,6 +60,7 @@
5960

6061
.TimeGridHeader[style*='--has-scroll: 1'] .TimeGridAllDayEventsRow {
6162
overflow-y: scroll;
63+
overflow-x: hidden;
6264
scrollbar-color: transparent transparent;
6365
}
6466

@@ -138,6 +140,7 @@
138140
.TimeGridTimeAxis {
139141
display: flex;
140142
flex-direction: column;
143+
flex-shrink: 0;
141144
width: var(--fixed-cell-width);
142145
}
143146

patches/[email protected]

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)