@mui/x-data-grid 6.18.3 → 6.18.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/CHANGELOG.md +42 -1
  2. package/components/cell/GridCell.js +15 -15
  3. package/index.js +1 -1
  4. package/legacy/components/cell/GridCell.js +14 -14
  5. package/legacy/index.js +1 -1
  6. package/legacy/locales/daDK.js +37 -39
  7. package/locales/daDK.js +37 -39
  8. package/modern/components/cell/GridCell.js +15 -15
  9. package/modern/index.js +1 -1
  10. package/modern/locales/daDK.js +37 -39
  11. package/node/components/cell/GridCell.js +15 -15
  12. package/node/index.js +1 -1
  13. package/node/locales/daDK.js +37 -39
  14. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,46 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## 6.18.4
7
+
8
+ _Dec 8, 2023_
9
+
10
+ We'd like to offer a big thanks to the 6 contributors who made this release possible. Here are some highlights ✨:
11
+
12
+ - 📚 Add [Pickers FAQ page](https://mui.com/x/react-date-pickers/faq/)
13
+ - 🌍 Improve Danish (da-DK) locale on Data Grid
14
+ - 🐞 Bugfixes
15
+
16
+ ### Data Grid
17
+
18
+ #### `@mui/x-data-grid@6.18.4`
19
+
20
+ - [DataGrid] Fix cell slot style override (#11215) @oliviertassinari
21
+ - [l10n] Improve Danish (da-DK) locale (#11346) @goibon
22
+
23
+ #### `@mui/x-data-grid-pro@6.18.4` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
24
+
25
+ Same changes as in `@mui/x-data-grid@6.18.4`.
26
+
27
+ #### `@mui/x-data-grid-premium@6.18.4` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
28
+
29
+ Same changes as in `@mui/x-data-grid-pro@6.18.4`.
30
+
31
+ ### Date Pickers
32
+
33
+ #### `@mui/x-date-pickers@6.18.4`
34
+
35
+ - [pickers] Fix `MultiSectionDigitalClock` issues (#11308) @LukasTy
36
+
37
+ #### `@mui/x-date-pickers-pro@6.18.4` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
38
+
39
+ Same changes as in `@mui/x-date-pickers@6.18.4`.
40
+
41
+ ### Docs
42
+
43
+ - [docs] Fix typo (#11323) @cadam11
44
+ - [docs] Add FAQ page (#11347) @noraleonte
45
+
6
46
  ## 6.18.3
7
47
 
8
48
  _Dec 4, 2023_
@@ -347,7 +387,7 @@ Same changes as in `@mui/x-date-pickers@6.16.3`, plus:
347
387
 
348
388
  - [charts] Add reference links to area + bar chart components (#10652) @michelengelen
349
389
  - [charts] Add reference links to line chart + sparkline components (#10650) @michelengelen
350
- - [charts] Add reference links to pie + scatter chart components (#10653) @michelengelen
390
+ - [charts] Add reference links to pie + scatter chart components (#10653) @michelengelen
351
391
  - [charts] Render only when `width` and `height` are resolved (#10714) @alexfauquette
352
392
  - [charts] Support animation on `BarChart` (#9926) @alexfauquette
353
393
  - [charts] Use new text component to avoid tick label overflow on x-axis (#10648) @alexfauquette
@@ -423,6 +463,7 @@ It adds line break support and avoids overlapping text in the legend.
423
463
  This comes with some breaking changes.
424
464
 
425
465
  - The DOM structure is modified. An intermediary `<tspan />` element has been added. This can impact how your style is applied.
466
+
426
467
  ```diff
427
468
  - <text>The label</text>
428
469
  + <text><tspan>The label</tspan></text>
package/components/cell/GridCell.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
3
3
  const _excluded = ["changeReason", "unstable_updateValueOnRender"],
4
- _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
5
- _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
4
+ _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "style", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
5
+ _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver", "style"],
6
6
  _excluded4 = ["changeReason", "unstable_updateValueOnRender"];
7
7
  import * as React from 'react';
8
8
  import PropTypes from 'prop-types';
@@ -171,6 +171,7 @@ const GridCell = /*#__PURE__*/React.forwardRef((props, ref) => {
171
171
  isSelected,
172
172
  rowId,
173
173
  tabIndex,
174
+ style: styleProp,
174
175
  value,
175
176
  width,
176
177
  className,
@@ -237,15 +238,14 @@ const GridCell = /*#__PURE__*/React.forwardRef((props, ref) => {
237
238
  border: 0
238
239
  };
239
240
  }
240
- const cellStyle = {
241
+ const cellStyle = _extends({
241
242
  minWidth: width,
242
243
  maxWidth: width,
243
244
  minHeight: height,
244
- maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
245
- };
246
-
245
+ maxHeight: height === 'auto' ? 'none' : height
246
+ }, styleProp);
247
247
  return cellStyle;
248
- }, [width, height, isNotVisible]);
248
+ }, [width, height, isNotVisible, styleProp]);
249
249
  React.useEffect(() => {
250
250
  if (!hasFocus || cellMode === GridCellModes.Edit) {
251
251
  return;
@@ -408,7 +408,8 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
408
408
  onKeyDown,
409
409
  onKeyUp,
410
410
  onDragEnter,
411
- onDragOver
411
+ onDragOver,
412
+ style: styleProp
412
413
  } = props,
413
414
  other = _objectWithoutPropertiesLoose(props, _excluded3);
414
415
  const apiRef = useGridApiContext();
@@ -499,22 +500,21 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
499
500
  }, [apiRef, field, rowId]);
500
501
  const style = React.useMemo(() => {
501
502
  if (isNotVisible) {
502
- return {
503
+ return _extends({
503
504
  padding: 0,
504
505
  opacity: 0,
505
506
  width: 0,
506
507
  border: 0
507
- };
508
+ }, styleProp);
508
509
  }
509
- const cellStyle = {
510
+ const cellStyle = _extends({
510
511
  minWidth: width,
511
512
  maxWidth: width,
512
513
  minHeight: height,
513
- maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
514
- };
515
-
514
+ maxHeight: height === 'auto' ? 'none' : height
515
+ }, styleProp);
516
516
  return cellStyle;
517
- }, [width, height, isNotVisible]);
517
+ }, [width, height, isNotVisible, styleProp]);
518
518
  React.useEffect(() => {
519
519
  if (!hasFocus || cellMode === GridCellModes.Edit) {
520
520
  return;
package/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/x-data-grid v6.18.3
2
+ * @mui/x-data-grid v6.18.4
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
package/legacy/components/cell/GridCell.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
3
3
  var _excluded = ["changeReason", "unstable_updateValueOnRender"],
4
- _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
5
- _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
4
+ _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "style", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
5
+ _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver", "style"],
6
6
  _excluded4 = ["changeReason", "unstable_updateValueOnRender"];
7
7
  import * as React from 'react';
8
8
  import PropTypes from 'prop-types';
@@ -165,6 +165,7 @@ var GridCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
165
165
  isSelected = props.isSelected,
166
166
  rowId = props.rowId,
167
167
  tabIndex = props.tabIndex,
168
+ styleProp = props.style,
168
169
  value = props.value,
169
170
  width = props.width,
170
171
  className = props.className,
@@ -238,15 +239,14 @@ var GridCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
238
239
  border: 0
239
240
  };
240
241
  }
241
- var cellStyle = {
242
+ var cellStyle = _extends({
242
243
  minWidth: width,
243
244
  maxWidth: width,
244
245
  minHeight: height,
245
- maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
246
- };
247
-
246
+ maxHeight: height === 'auto' ? 'none' : height
247
+ }, styleProp);
248
248
  return cellStyle;
249
- }, [width, height, isNotVisible]);
249
+ }, [width, height, isNotVisible, styleProp]);
250
250
  React.useEffect(function () {
251
251
  if (!hasFocus || cellMode === GridCellModes.Edit) {
252
252
  return;
@@ -412,6 +412,7 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
412
412
  onKeyUp = props.onKeyUp,
413
413
  onDragEnter = props.onDragEnter,
414
414
  onDragOver = props.onDragOver,
415
+ styleProp = props.style,
415
416
  other = _objectWithoutProperties(props, _excluded3);
416
417
  var apiRef = useGridApiContext();
417
418
  var rootProps = useGridRootProps();
@@ -507,22 +508,21 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
507
508
  }, [apiRef, field, rowId]);
508
509
  var style = React.useMemo(function () {
509
510
  if (isNotVisible) {
510
- return {
511
+ return _extends({
511
512
  padding: 0,
512
513
  opacity: 0,
513
514
  width: 0,
514
515
  border: 0
515
- };
516
+ }, styleProp);
516
517
  }
517
- var cellStyle = {
518
+ var cellStyle = _extends({
518
519
  minWidth: width,
519
520
  maxWidth: width,
520
521
  minHeight: height,
521
- maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
522
- };
523
-
522
+ maxHeight: height === 'auto' ? 'none' : height
523
+ }, styleProp);
524
524
  return cellStyle;
525
- }, [width, height, isNotVisible]);
525
+ }, [width, height, isNotVisible, styleProp]);
526
526
  React.useEffect(function () {
527
527
  if (!hasFocus || cellMode === GridCellModes.Edit) {
528
528
  return;
package/legacy/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/x-data-grid v6.18.3
2
+ * @mui/x-data-grid v6.18.4
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
package/legacy/locales/daDK.js CHANGED
@@ -49,47 +49,45 @@ var daDKGrid = {
49
49
  filterPanelInputLabel: 'Værdi',
50
50
  filterPanelInputPlaceholder: 'Filter værdi',
51
51
  // Filter operators text
52
- filterOperatorContains: 'Indeholder',
53
- filterOperatorEquals: 'Lig med',
54
- filterOperatorStartsWith: 'Begynder med',
55
- filterOperatorEndsWith: 'Ender med',
56
- filterOperatorIs: 'Er lig med',
57
- filterOperatorNot: 'Er ikke lig med',
58
- filterOperatorAfter: 'Efter',
59
- filterOperatorOnOrAfter: 'På eller efter',
60
- filterOperatorBefore: 'Før',
61
- filterOperatorOnOrBefore: 'På eller før',
62
- filterOperatorIsEmpty: 'Indeholder ikke data',
63
- filterOperatorIsNotEmpty: 'Indeholder data',
52
+ filterOperatorContains: 'indeholder',
53
+ filterOperatorEquals: 'lig med',
54
+ filterOperatorStartsWith: 'begynder med',
55
+ filterOperatorEndsWith: 'ender med',
56
+ filterOperatorIs: 'er lig med',
57
+ filterOperatorNot: 'er ikke lig med',
58
+ filterOperatorAfter: 'efter',
59
+ filterOperatorOnOrAfter: 'på eller efter',
60
+ filterOperatorBefore: 'før',
61
+ filterOperatorOnOrBefore: 'på eller før',
62
+ filterOperatorIsEmpty: 'indeholder ikke data',
63
+ filterOperatorIsNotEmpty: 'indeholder data',
64
64
  filterOperatorIsAnyOf: 'indeholder en af',
65
- // 'filterOperator=': '=',
66
- // 'filterOperator!=': '!=',
67
- // 'filterOperator>': '>',
68
- // 'filterOperator>=': '>=',
69
- // 'filterOperator<': '<',
70
- // 'filterOperator<=': '<=',
71
-
65
+ 'filterOperator=': '=',
66
+ 'filterOperator!=': '!=',
67
+ 'filterOperator>': '>',
68
+ 'filterOperator>=': '>=',
69
+ 'filterOperator<': '<',
70
+ 'filterOperator<=': '<=',
72
71
  // Header filter operators text
73
- // headerFilterOperatorContains: 'Contains',
74
- // headerFilterOperatorEquals: 'Equals',
75
- // headerFilterOperatorStartsWith: 'Starts with',
76
- // headerFilterOperatorEndsWith: 'Ends with',
77
- // headerFilterOperatorIs: 'Is',
78
- // headerFilterOperatorNot: 'Is not',
79
- // headerFilterOperatorAfter: 'Is after',
80
- // headerFilterOperatorOnOrAfter: 'Is on or after',
81
- // headerFilterOperatorBefore: 'Is before',
82
- // headerFilterOperatorOnOrBefore: 'Is on or before',
83
- // headerFilterOperatorIsEmpty: 'Is empty',
84
- // headerFilterOperatorIsNotEmpty: 'Is not empty',
85
- // headerFilterOperatorIsAnyOf: 'Is any of',
86
- // 'headerFilterOperator=': 'Equals',
87
- // 'headerFilterOperator!=': 'Not equals',
88
- // 'headerFilterOperator>': 'Greater than',
89
- // 'headerFilterOperator>=': 'Greater than or equal to',
90
- // 'headerFilterOperator<': 'Less than',
91
- // 'headerFilterOperator<=': 'Less than or equal to',
92
-
72
+ headerFilterOperatorContains: 'Indeholder',
73
+ headerFilterOperatorEquals: 'Lig med',
74
+ headerFilterOperatorStartsWith: 'Begynder med',
75
+ headerFilterOperatorEndsWith: 'Ender med',
76
+ headerFilterOperatorIs: 'Er lig med',
77
+ headerFilterOperatorNot: 'Er ikke lig med',
78
+ headerFilterOperatorAfter: 'Efter',
79
+ headerFilterOperatorOnOrAfter: 'På eller efter',
80
+ headerFilterOperatorBefore: 'Før',
81
+ headerFilterOperatorOnOrBefore: 'På eller før',
82
+ headerFilterOperatorIsEmpty: 'Indeholder ikke data',
83
+ headerFilterOperatorIsNotEmpty: 'Indeholder data',
84
+ headerFilterOperatorIsAnyOf: 'Indeholder en af',
85
+ 'headerFilterOperator=': 'Lig med',
86
+ 'headerFilterOperator!=': 'Ikke lig med',
87
+ 'headerFilterOperator>': 'Større end',
88
+ 'headerFilterOperator>=': 'Større end eller lig med',
89
+ 'headerFilterOperator<': 'Mindre end',
90
+ 'headerFilterOperator<=': 'Mindre end eller lig med',
93
91
  // Filter values text
94
92
  filterValueAny: 'hvilken som helst',
95
93
  filterValueTrue: 'positiv',
package/locales/daDK.js CHANGED
@@ -47,47 +47,45 @@ const daDKGrid = {
47
47
  filterPanelInputLabel: 'Værdi',
48
48
  filterPanelInputPlaceholder: 'Filter værdi',
49
49
  // Filter operators text
50
- filterOperatorContains: 'Indeholder',
51
- filterOperatorEquals: 'Lig med',
52
- filterOperatorStartsWith: 'Begynder med',
53
- filterOperatorEndsWith: 'Ender med',
54
- filterOperatorIs: 'Er lig med',
55
- filterOperatorNot: 'Er ikke lig med',
56
- filterOperatorAfter: 'Efter',
57
- filterOperatorOnOrAfter: 'På eller efter',
58
- filterOperatorBefore: 'Før',
59
- filterOperatorOnOrBefore: 'På eller før',
60
- filterOperatorIsEmpty: 'Indeholder ikke data',
61
- filterOperatorIsNotEmpty: 'Indeholder data',
50
+ filterOperatorContains: 'indeholder',
51
+ filterOperatorEquals: 'lig med',
52
+ filterOperatorStartsWith: 'begynder med',
53
+ filterOperatorEndsWith: 'ender med',
54
+ filterOperatorIs: 'er lig med',
55
+ filterOperatorNot: 'er ikke lig med',
56
+ filterOperatorAfter: 'efter',
57
+ filterOperatorOnOrAfter: 'på eller efter',
58
+ filterOperatorBefore: 'før',
59
+ filterOperatorOnOrBefore: 'på eller før',
60
+ filterOperatorIsEmpty: 'indeholder ikke data',
61
+ filterOperatorIsNotEmpty: 'indeholder data',
62
62
  filterOperatorIsAnyOf: 'indeholder en af',
63
- // 'filterOperator=': '=',
64
- // 'filterOperator!=': '!=',
65
- // 'filterOperator>': '>',
66
- // 'filterOperator>=': '>=',
67
- // 'filterOperator<': '<',
68
- // 'filterOperator<=': '<=',
69
-
63
+ 'filterOperator=': '=',
64
+ 'filterOperator!=': '!=',
65
+ 'filterOperator>': '>',
66
+ 'filterOperator>=': '>=',
67
+ 'filterOperator<': '<',
68
+ 'filterOperator<=': '<=',
70
69
  // Header filter operators text
71
- // headerFilterOperatorContains: 'Contains',
72
- // headerFilterOperatorEquals: 'Equals',
73
- // headerFilterOperatorStartsWith: 'Starts with',
74
- // headerFilterOperatorEndsWith: 'Ends with',
75
- // headerFilterOperatorIs: 'Is',
76
- // headerFilterOperatorNot: 'Is not',
77
- // headerFilterOperatorAfter: 'Is after',
78
- // headerFilterOperatorOnOrAfter: 'Is on or after',
79
- // headerFilterOperatorBefore: 'Is before',
80
- // headerFilterOperatorOnOrBefore: 'Is on or before',
81
- // headerFilterOperatorIsEmpty: 'Is empty',
82
- // headerFilterOperatorIsNotEmpty: 'Is not empty',
83
- // headerFilterOperatorIsAnyOf: 'Is any of',
84
- // 'headerFilterOperator=': 'Equals',
85
- // 'headerFilterOperator!=': 'Not equals',
86
- // 'headerFilterOperator>': 'Greater than',
87
- // 'headerFilterOperator>=': 'Greater than or equal to',
88
- // 'headerFilterOperator<': 'Less than',
89
- // 'headerFilterOperator<=': 'Less than or equal to',
90
-
70
+ headerFilterOperatorContains: 'Indeholder',
71
+ headerFilterOperatorEquals: 'Lig med',
72
+ headerFilterOperatorStartsWith: 'Begynder med',
73
+ headerFilterOperatorEndsWith: 'Ender med',
74
+ headerFilterOperatorIs: 'Er lig med',
75
+ headerFilterOperatorNot: 'Er ikke lig med',
76
+ headerFilterOperatorAfter: 'Efter',
77
+ headerFilterOperatorOnOrAfter: 'På eller efter',
78
+ headerFilterOperatorBefore: 'Før',
79
+ headerFilterOperatorOnOrBefore: 'På eller før',
80
+ headerFilterOperatorIsEmpty: 'Indeholder ikke data',
81
+ headerFilterOperatorIsNotEmpty: 'Indeholder data',
82
+ headerFilterOperatorIsAnyOf: 'Indeholder en af',
83
+ 'headerFilterOperator=': 'Lig med',
84
+ 'headerFilterOperator!=': 'Ikke lig med',
85
+ 'headerFilterOperator>': 'Større end',
86
+ 'headerFilterOperator>=': 'Større end eller lig med',
87
+ 'headerFilterOperator<': 'Mindre end',
88
+ 'headerFilterOperator<=': 'Mindre end eller lig med',
91
89
  // Filter values text
92
90
  filterValueAny: 'hvilken som helst',
93
91
  filterValueTrue: 'positiv',
package/modern/components/cell/GridCell.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
3
3
  const _excluded = ["changeReason", "unstable_updateValueOnRender"],
4
- _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
5
- _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
4
+ _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "style", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
5
+ _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver", "style"],
6
6
  _excluded4 = ["changeReason", "unstable_updateValueOnRender"];
7
7
  import * as React from 'react';
8
8
  import PropTypes from 'prop-types';
@@ -170,6 +170,7 @@ const GridCell = /*#__PURE__*/React.forwardRef((props, ref) => {
170
170
  isSelected,
171
171
  rowId,
172
172
  tabIndex,
173
+ style: styleProp,
173
174
  value,
174
175
  width,
175
176
  className,
@@ -236,15 +237,14 @@ const GridCell = /*#__PURE__*/React.forwardRef((props, ref) => {
236
237
  border: 0
237
238
  };
238
239
  }
239
- const cellStyle = {
240
+ const cellStyle = _extends({
240
241
  minWidth: width,
241
242
  maxWidth: width,
242
243
  minHeight: height,
243
- maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
244
- };
245
-
244
+ maxHeight: height === 'auto' ? 'none' : height
245
+ }, styleProp);
246
246
  return cellStyle;
247
- }, [width, height, isNotVisible]);
247
+ }, [width, height, isNotVisible, styleProp]);
248
248
  React.useEffect(() => {
249
249
  if (!hasFocus || cellMode === GridCellModes.Edit) {
250
250
  return;
@@ -406,7 +406,8 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
406
406
  onKeyDown,
407
407
  onKeyUp,
408
408
  onDragEnter,
409
- onDragOver
409
+ onDragOver,
410
+ style: styleProp
410
411
  } = props,
411
412
  other = _objectWithoutPropertiesLoose(props, _excluded3);
412
413
  const apiRef = useGridApiContext();
@@ -497,22 +498,21 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
497
498
  }, [apiRef, field, rowId]);
498
499
  const style = React.useMemo(() => {
499
500
  if (isNotVisible) {
500
- return {
501
+ return _extends({
501
502
  padding: 0,
502
503
  opacity: 0,
503
504
  width: 0,
504
505
  border: 0
505
- };
506
+ }, styleProp);
506
507
  }
507
- const cellStyle = {
508
+ const cellStyle = _extends({
508
509
  minWidth: width,
509
510
  maxWidth: width,
510
511
  minHeight: height,
511
- maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
512
- };
513
-
512
+ maxHeight: height === 'auto' ? 'none' : height
513
+ }, styleProp);
514
514
  return cellStyle;
515
- }, [width, height, isNotVisible]);
515
+ }, [width, height, isNotVisible, styleProp]);
516
516
  React.useEffect(() => {
517
517
  if (!hasFocus || cellMode === GridCellModes.Edit) {
518
518
  return;
package/modern/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/x-data-grid v6.18.3
2
+ * @mui/x-data-grid v6.18.4
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
package/modern/locales/daDK.js CHANGED
@@ -47,47 +47,45 @@ const daDKGrid = {
47
47
  filterPanelInputLabel: 'Værdi',
48
48
  filterPanelInputPlaceholder: 'Filter værdi',
49
49
  // Filter operators text
50
- filterOperatorContains: 'Indeholder',
51
- filterOperatorEquals: 'Lig med',
52
- filterOperatorStartsWith: 'Begynder med',
53
- filterOperatorEndsWith: 'Ender med',
54
- filterOperatorIs: 'Er lig med',
55
- filterOperatorNot: 'Er ikke lig med',
56
- filterOperatorAfter: 'Efter',
57
- filterOperatorOnOrAfter: 'På eller efter',
58
- filterOperatorBefore: 'Før',
59
- filterOperatorOnOrBefore: 'På eller før',
60
- filterOperatorIsEmpty: 'Indeholder ikke data',
61
- filterOperatorIsNotEmpty: 'Indeholder data',
50
+ filterOperatorContains: 'indeholder',
51
+ filterOperatorEquals: 'lig med',
52
+ filterOperatorStartsWith: 'begynder med',
53
+ filterOperatorEndsWith: 'ender med',
54
+ filterOperatorIs: 'er lig med',
55
+ filterOperatorNot: 'er ikke lig med',
56
+ filterOperatorAfter: 'efter',
57
+ filterOperatorOnOrAfter: 'på eller efter',
58
+ filterOperatorBefore: 'før',
59
+ filterOperatorOnOrBefore: 'på eller før',
60
+ filterOperatorIsEmpty: 'indeholder ikke data',
61
+ filterOperatorIsNotEmpty: 'indeholder data',
62
62
  filterOperatorIsAnyOf: 'indeholder en af',
63
- // 'filterOperator=': '=',
64
- // 'filterOperator!=': '!=',
65
- // 'filterOperator>': '>',
66
- // 'filterOperator>=': '>=',
67
- // 'filterOperator<': '<',
68
- // 'filterOperator<=': '<=',
69
-
63
+ 'filterOperator=': '=',
64
+ 'filterOperator!=': '!=',
65
+ 'filterOperator>': '>',
66
+ 'filterOperator>=': '>=',
67
+ 'filterOperator<': '<',
68
+ 'filterOperator<=': '<=',
70
69
  // Header filter operators text
71
- // headerFilterOperatorContains: 'Contains',
72
- // headerFilterOperatorEquals: 'Equals',
73
- // headerFilterOperatorStartsWith: 'Starts with',
74
- // headerFilterOperatorEndsWith: 'Ends with',
75
- // headerFilterOperatorIs: 'Is',
76
- // headerFilterOperatorNot: 'Is not',
77
- // headerFilterOperatorAfter: 'Is after',
78
- // headerFilterOperatorOnOrAfter: 'Is on or after',
79
- // headerFilterOperatorBefore: 'Is before',
80
- // headerFilterOperatorOnOrBefore: 'Is on or before',
81
- // headerFilterOperatorIsEmpty: 'Is empty',
82
- // headerFilterOperatorIsNotEmpty: 'Is not empty',
83
- // headerFilterOperatorIsAnyOf: 'Is any of',
84
- // 'headerFilterOperator=': 'Equals',
85
- // 'headerFilterOperator!=': 'Not equals',
86
- // 'headerFilterOperator>': 'Greater than',
87
- // 'headerFilterOperator>=': 'Greater than or equal to',
88
- // 'headerFilterOperator<': 'Less than',
89
- // 'headerFilterOperator<=': 'Less than or equal to',
90
-
70
+ headerFilterOperatorContains: 'Indeholder',
71
+ headerFilterOperatorEquals: 'Lig med',
72
+ headerFilterOperatorStartsWith: 'Begynder med',
73
+ headerFilterOperatorEndsWith: 'Ender med',
74
+ headerFilterOperatorIs: 'Er lig med',
75
+ headerFilterOperatorNot: 'Er ikke lig med',
76
+ headerFilterOperatorAfter: 'Efter',
77
+ headerFilterOperatorOnOrAfter: 'På eller efter',
78
+ headerFilterOperatorBefore: 'Før',
79
+ headerFilterOperatorOnOrBefore: 'På eller før',
80
+ headerFilterOperatorIsEmpty: 'Indeholder ikke data',
81
+ headerFilterOperatorIsNotEmpty: 'Indeholder data',
82
+ headerFilterOperatorIsAnyOf: 'Indeholder en af',
83
+ 'headerFilterOperator=': 'Lig med',
84
+ 'headerFilterOperator!=': 'Ikke lig med',
85
+ 'headerFilterOperator>': 'Større end',
86
+ 'headerFilterOperator>=': 'Større end eller lig med',
87
+ 'headerFilterOperator<': 'Mindre end',
88
+ 'headerFilterOperator<=': 'Mindre end eller lig med',
91
89
  // Filter values text
92
90
  filterValueAny: 'hvilken som helst',
93
91
  filterValueTrue: 'positiv',
package/node/components/cell/GridCell.js CHANGED
@@ -22,8 +22,8 @@ var _gridFocusStateSelector = require("../../hooks/features/focus/gridFocusState
22
22
  var _useGridParamsApi = require("../../hooks/features/rows/useGridParamsApi");
23
23
  var _jsxRuntime = require("react/jsx-runtime");
24
24
  const _excluded = ["changeReason", "unstable_updateValueOnRender"],
25
- _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
26
- _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
25
+ _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "style", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
26
+ _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver", "style"],
27
27
  _excluded4 = ["changeReason", "unstable_updateValueOnRender"];
28
28
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
29
29
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -179,6 +179,7 @@ const GridCell = exports.GridCell = /*#__PURE__*/React.forwardRef((props, ref) =
179
179
  isSelected,
180
180
  rowId,
181
181
  tabIndex,
182
+ style: styleProp,
182
183
  value,
183
184
  width,
184
185
  className,
@@ -245,15 +246,14 @@ const GridCell = exports.GridCell = /*#__PURE__*/React.forwardRef((props, ref) =
245
246
  border: 0
246
247
  };
247
248
  }
248
- const cellStyle = {
249
+ const cellStyle = (0, _extends2.default)({
249
250
  minWidth: width,
250
251
  maxWidth: width,
251
252
  minHeight: height,
252
- maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
253
- };
254
-
253
+ maxHeight: height === 'auto' ? 'none' : height
254
+ }, styleProp);
255
255
  return cellStyle;
256
- }, [width, height, isNotVisible]);
256
+ }, [width, height, isNotVisible, styleProp]);
257
257
  React.useEffect(() => {
258
258
  if (!hasFocus || cellMode === _models.GridCellModes.Edit) {
259
259
  return;
@@ -414,7 +414,8 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
414
414
  onKeyDown,
415
415
  onKeyUp,
416
416
  onDragEnter,
417
- onDragOver
417
+ onDragOver,
418
+ style: styleProp
418
419
  } = props,
419
420
  other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded3);
420
421
  const apiRef = (0, _useGridApiContext.useGridApiContext)();
@@ -505,22 +506,21 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
505
506
  }, [apiRef, field, rowId]);
506
507
  const style = React.useMemo(() => {
507
508
  if (isNotVisible) {
508
- return {
509
+ return (0, _extends2.default)({
509
510
  padding: 0,
510
511
  opacity: 0,
511
512
  width: 0,
512
513
  border: 0
513
- };
514
+ }, styleProp);
514
515
  }
515
- const cellStyle = {
516
+ const cellStyle = (0, _extends2.default)({
516
517
  minWidth: width,
517
518
  maxWidth: width,
518
519
  minHeight: height,
519
- maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
520
- };
521
-
520
+ maxHeight: height === 'auto' ? 'none' : height
521
+ }, styleProp);
522
522
  return cellStyle;
523
- }, [width, height, isNotVisible]);
523
+ }, [width, height, isNotVisible, styleProp]);
524
524
  React.useEffect(() => {
525
525
  if (!hasFocus || cellMode === _models.GridCellModes.Edit) {
526
526
  return;
package/node/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/x-data-grid v6.18.3
2
+ * @mui/x-data-grid v6.18.4
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
package/node/locales/daDK.js CHANGED
@@ -53,47 +53,45 @@ const daDKGrid = {
53
53
  filterPanelInputLabel: 'Værdi',
54
54
  filterPanelInputPlaceholder: 'Filter værdi',
55
55
  // Filter operators text
56
- filterOperatorContains: 'Indeholder',
57
- filterOperatorEquals: 'Lig med',
58
- filterOperatorStartsWith: 'Begynder med',
59
- filterOperatorEndsWith: 'Ender med',
60
- filterOperatorIs: 'Er lig med',
61
- filterOperatorNot: 'Er ikke lig med',
62
- filterOperatorAfter: 'Efter',
63
- filterOperatorOnOrAfter: 'På eller efter',
64
- filterOperatorBefore: 'Før',
65
- filterOperatorOnOrBefore: 'På eller før',
66
- filterOperatorIsEmpty: 'Indeholder ikke data',
67
- filterOperatorIsNotEmpty: 'Indeholder data',
56
+ filterOperatorContains: 'indeholder',
57
+ filterOperatorEquals: 'lig med',
58
+ filterOperatorStartsWith: 'begynder med',
59
+ filterOperatorEndsWith: 'ender med',
60
+ filterOperatorIs: 'er lig med',
61
+ filterOperatorNot: 'er ikke lig med',
62
+ filterOperatorAfter: 'efter',
63
+ filterOperatorOnOrAfter: 'på eller efter',
64
+ filterOperatorBefore: 'før',
65
+ filterOperatorOnOrBefore: 'på eller før',
66
+ filterOperatorIsEmpty: 'indeholder ikke data',
67
+ filterOperatorIsNotEmpty: 'indeholder data',
68
68
  filterOperatorIsAnyOf: 'indeholder en af',
69
- // 'filterOperator=': '=',
70
- // 'filterOperator!=': '!=',
71
- // 'filterOperator>': '>',
72
- // 'filterOperator>=': '>=',
73
- // 'filterOperator<': '<',
74
- // 'filterOperator<=': '<=',
75
-
69
+ 'filterOperator=': '=',
70
+ 'filterOperator!=': '!=',
71
+ 'filterOperator>': '>',
72
+ 'filterOperator>=': '>=',
73
+ 'filterOperator<': '<',
74
+ 'filterOperator<=': '<=',
76
75
  // Header filter operators text
77
- // headerFilterOperatorContains: 'Contains',
78
- // headerFilterOperatorEquals: 'Equals',
79
- // headerFilterOperatorStartsWith: 'Starts with',
80
- // headerFilterOperatorEndsWith: 'Ends with',
81
- // headerFilterOperatorIs: 'Is',
82
- // headerFilterOperatorNot: 'Is not',
83
- // headerFilterOperatorAfter: 'Is after',
84
- // headerFilterOperatorOnOrAfter: 'Is on or after',
85
- // headerFilterOperatorBefore: 'Is before',
86
- // headerFilterOperatorOnOrBefore: 'Is on or before',
87
- // headerFilterOperatorIsEmpty: 'Is empty',
88
- // headerFilterOperatorIsNotEmpty: 'Is not empty',
89
- // headerFilterOperatorIsAnyOf: 'Is any of',
90
- // 'headerFilterOperator=': 'Equals',
91
- // 'headerFilterOperator!=': 'Not equals',
92
- // 'headerFilterOperator>': 'Greater than',
93
- // 'headerFilterOperator>=': 'Greater than or equal to',
94
- // 'headerFilterOperator<': 'Less than',
95
- // 'headerFilterOperator<=': 'Less than or equal to',
96
-
76
+ headerFilterOperatorContains: 'Indeholder',
77
+ headerFilterOperatorEquals: 'Lig med',
78
+ headerFilterOperatorStartsWith: 'Begynder med',
79
+ headerFilterOperatorEndsWith: 'Ender med',
80
+ headerFilterOperatorIs: 'Er lig med',
81
+ headerFilterOperatorNot: 'Er ikke lig med',
82
+ headerFilterOperatorAfter: 'Efter',
83
+ headerFilterOperatorOnOrAfter: 'På eller efter',
84
+ headerFilterOperatorBefore: 'Før',
85
+ headerFilterOperatorOnOrBefore: 'På eller før',
86
+ headerFilterOperatorIsEmpty: 'Indeholder ikke data',
87
+ headerFilterOperatorIsNotEmpty: 'Indeholder data',
88
+ headerFilterOperatorIsAnyOf: 'Indeholder en af',
89
+ 'headerFilterOperator=': 'Lig med',
90
+ 'headerFilterOperator!=': 'Ikke lig med',
91
+ 'headerFilterOperator>': 'Større end',
92
+ 'headerFilterOperator>=': 'Større end eller lig med',
93
+ 'headerFilterOperator<': 'Mindre end',
94
+ 'headerFilterOperator<=': 'Mindre end eller lig med',
97
95
  // Filter values text
98
96
  filterValueAny: 'hvilken som helst',
99
97
  filterValueTrue: 'positiv',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mui/x-data-grid",
3
- "version": "6.18.3",
3
+ "version": "6.18.4",
4
4
  "description": "The community edition of the data grid component (MUI X).",
5
5
  "author": "MUI Team",
6
6
  "main": "./node/index.js",