@instructure/ui-grid 10.26.1 → 11.0.0
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.
- package/CHANGELOG.md +23 -2
- package/es/Grid/index.js +2 -2
- package/es/Grid/props.js +1 -14
- package/es/GridCol/index.js +2 -2
- package/es/GridCol/props.js +1 -29
- package/es/GridRow/index.js +2 -2
- package/es/GridRow/props.js +1 -15
- package/lib/Grid/index.js +1 -1
- package/lib/Grid/props.js +1 -15
- package/lib/GridCol/index.js +1 -1
- package/lib/GridCol/props.js +1 -30
- package/lib/GridRow/index.js +1 -1
- package/lib/GridRow/props.js +1 -16
- package/package.json +12 -15
- package/src/Grid/index.tsx +1 -2
- package/src/Grid/props.ts +2 -29
- package/src/GridCol/index.tsx +1 -2
- package/src/GridCol/props.ts +2 -53
- package/src/GridRow/index.tsx +1 -2
- package/src/GridRow/props.ts +2 -29
- package/tsconfig.build.json +0 -2
- package/tsconfig.build.tsbuildinfo +1 -1
- package/types/Grid/index.d.ts +0 -9
- package/types/Grid/index.d.ts.map +1 -1
- package/types/Grid/props.d.ts +2 -3
- package/types/Grid/props.d.ts.map +1 -1
- package/types/GridCol/index.d.ts +0 -25
- package/types/GridCol/index.d.ts.map +1 -1
- package/types/GridCol/props.d.ts +2 -3
- package/types/GridCol/props.d.ts.map +1 -1
- package/types/GridRow/index.d.ts +0 -10
- package/types/GridRow/index.d.ts.map +1 -1
- package/types/GridRow/props.d.ts +2 -3
- package/types/GridRow/props.d.ts.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,9 +3,30 @@
|
|
|
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
|
+
# [11.0.0](https://github.com/instructure/instructure-ui/compare/v10.26.0...v11.0.0) (2025-10-06)
|
|
7
7
|
|
|
8
|
-
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **many:** instUI v11 release ([36f5438](https://github.com/instructure/instructure-ui/commit/36f54382669186227ba24798bbf7201ef2f5cd4c))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### BREAKING CHANGES
|
|
15
|
+
|
|
16
|
+
* **many:** InstUI v11 contains the following breaking changes:
|
|
17
|
+
- React 16 and 17 are no longer supported
|
|
18
|
+
- remove `PropTypes` from all packages
|
|
19
|
+
- remove `CodeEditor` component
|
|
20
|
+
- remove `@instui/theme-registry` package
|
|
21
|
+
- remove `@testable`, `@experimental`, `@hack` decorators
|
|
22
|
+
- InstUISettingsProvider's `as` prop is removed
|
|
23
|
+
- `canvas.use()`, `canvasHighContrast.use()` functions are removed
|
|
24
|
+
- `canvasThemeLocal`, `canvasHighContrastThemeLocal` are removed
|
|
25
|
+
- `variables` field on theme objects are removed
|
|
26
|
+
- remove deprecated props from Table: Row's `isStacked`, Body's
|
|
27
|
+
`isStacked`, `hover`, and `headers`
|
|
28
|
+
- `Table`'s `caption` prop is now required
|
|
29
|
+
- `ui-dom-utils`'s `getComputedStyle` can now return `undefined`
|
|
9
30
|
|
|
10
31
|
|
|
11
32
|
|
package/es/Grid/index.js
CHANGED
|
@@ -33,7 +33,7 @@ import { GridCol } from '../GridCol';
|
|
|
33
33
|
import { withStyle } from '@instructure/emotion';
|
|
34
34
|
import generateStyle from './styles';
|
|
35
35
|
import generateComponentTheme from './theme';
|
|
36
|
-
import {
|
|
36
|
+
import { allowedProps } from './props';
|
|
37
37
|
import { jsx as _jsx } from "@emotion/react/jsx-runtime";
|
|
38
38
|
/**
|
|
39
39
|
---
|
|
@@ -86,7 +86,7 @@ let Grid = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class
|
|
|
86
86
|
children: this.renderChildren()
|
|
87
87
|
});
|
|
88
88
|
}
|
|
89
|
-
}, _Grid.displayName = "Grid", _Grid.componentId = 'Grid', _Grid.
|
|
89
|
+
}, _Grid.displayName = "Grid", _Grid.componentId = 'Grid', _Grid.allowedProps = allowedProps, _Grid.defaultProps = {
|
|
90
90
|
colSpacing: 'medium',
|
|
91
91
|
rowSpacing: 'medium',
|
|
92
92
|
hAlign: 'start',
|
package/es/Grid/props.js
CHANGED
|
@@ -22,18 +22,5 @@
|
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
|
-
import PropTypes from 'prop-types';
|
|
26
|
-
import { Children as ChildrenPropTypes } from '@instructure/ui-prop-types';
|
|
27
|
-
import { ScreenReaderContent } from '@instructure/ui-a11y-content';
|
|
28
|
-
import { GridRow } from '../GridRow';
|
|
29
|
-
const propTypes = {
|
|
30
|
-
children: ChildrenPropTypes.oneOf([GridRow, ScreenReaderContent]),
|
|
31
|
-
colSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
32
|
-
rowSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
33
|
-
hAlign: PropTypes.oneOf(['start', 'center', 'end', 'space-around', 'space-between']),
|
|
34
|
-
vAlign: PropTypes.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
35
|
-
startAt: PropTypes.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
36
|
-
visualDebug: PropTypes.bool
|
|
37
|
-
};
|
|
38
25
|
const allowedProps = ['children', 'colSpacing', 'rowSpacing', 'hAlign', 'vAlign', 'startAt', 'visualDebug'];
|
|
39
|
-
export {
|
|
26
|
+
export { allowedProps };
|
package/es/GridCol/index.js
CHANGED
|
@@ -29,7 +29,7 @@ import { withStyle } from '@instructure/emotion';
|
|
|
29
29
|
import { logWarn as warn } from '@instructure/console';
|
|
30
30
|
import generateStyle from './styles';
|
|
31
31
|
import generateComponentTheme from './theme';
|
|
32
|
-
import {
|
|
32
|
+
import { allowedProps } from './props';
|
|
33
33
|
import { jsx as _jsx } from "@emotion/react/jsx-runtime";
|
|
34
34
|
/**
|
|
35
35
|
---
|
|
@@ -91,7 +91,7 @@ let GridCol = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_cl
|
|
|
91
91
|
children: children
|
|
92
92
|
});
|
|
93
93
|
}
|
|
94
|
-
}, _GridCol.displayName = "GridCol", _GridCol.componentId = 'Grid.Col', _GridCol.
|
|
94
|
+
}, _GridCol.displayName = "GridCol", _GridCol.componentId = 'Grid.Col', _GridCol.allowedProps = allowedProps, _GridCol.defaultProps = {
|
|
95
95
|
textAlign: 'inherit',
|
|
96
96
|
children: null,
|
|
97
97
|
isLastCol: false,
|
package/es/GridCol/props.js
CHANGED
|
@@ -22,33 +22,5 @@
|
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
|
-
import PropTypes from 'prop-types';
|
|
26
|
-
// TODO: get numcols from theme config
|
|
27
|
-
const COL_WIDTHS = PropTypes.oneOfType([PropTypes.number, PropTypes.oneOf(['auto'])]);
|
|
28
|
-
const propTypes = {
|
|
29
|
-
children: PropTypes.node,
|
|
30
|
-
colSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
31
|
-
rowSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
32
|
-
textAlign: PropTypes.oneOf(['start', 'end', 'center', 'inherit']),
|
|
33
|
-
hAlign: PropTypes.oneOf(['start', 'center', 'end', 'space-around', 'space-between']),
|
|
34
|
-
vAlign: PropTypes.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
35
|
-
startAt: PropTypes.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
36
|
-
visualDebug: PropTypes.bool,
|
|
37
|
-
width: PropTypes.oneOfType([COL_WIDTHS, PropTypes.shape({
|
|
38
|
-
small: COL_WIDTHS,
|
|
39
|
-
medium: COL_WIDTHS,
|
|
40
|
-
large: COL_WIDTHS,
|
|
41
|
-
xLarge: COL_WIDTHS
|
|
42
|
-
})]),
|
|
43
|
-
offset: PropTypes.oneOfType([COL_WIDTHS, PropTypes.shape({
|
|
44
|
-
small: COL_WIDTHS,
|
|
45
|
-
medium: COL_WIDTHS,
|
|
46
|
-
large: COL_WIDTHS,
|
|
47
|
-
xLarge: COL_WIDTHS
|
|
48
|
-
})]),
|
|
49
|
-
isLastRow: PropTypes.bool,
|
|
50
|
-
isLastCol: PropTypes.bool,
|
|
51
|
-
elementRef: PropTypes.func
|
|
52
|
-
};
|
|
53
25
|
const allowedProps = ['children', 'colSpacing', 'rowSpacing', 'textAlign', 'hAlign', 'vAlign', 'startAt', 'visualDebug', 'width', 'offset', 'isLastRow', 'isLastCol', 'elementRef'];
|
|
54
|
-
export {
|
|
26
|
+
export { allowedProps };
|
package/es/GridRow/index.js
CHANGED
|
@@ -32,7 +32,7 @@ import { GridCol } from '../GridCol';
|
|
|
32
32
|
import { withStyle } from '@instructure/emotion';
|
|
33
33
|
import generateStyle from './styles';
|
|
34
34
|
import generateComponentTheme from './theme';
|
|
35
|
-
import {
|
|
35
|
+
import { allowedProps } from './props';
|
|
36
36
|
import { jsx as _jsx } from "@emotion/react/jsx-runtime";
|
|
37
37
|
/**
|
|
38
38
|
---
|
|
@@ -86,7 +86,7 @@ let GridRow = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_cl
|
|
|
86
86
|
children: this.renderChildren()
|
|
87
87
|
});
|
|
88
88
|
}
|
|
89
|
-
}, _GridRow.displayName = "GridRow", _GridRow.componentId = 'Grid.Row', _GridRow.
|
|
89
|
+
}, _GridRow.displayName = "GridRow", _GridRow.componentId = 'Grid.Row', _GridRow.allowedProps = allowedProps, _GridRow.defaultProps = {
|
|
90
90
|
children: null,
|
|
91
91
|
isLastRow: false
|
|
92
92
|
}, _GridRow)) || _class);
|
package/es/GridRow/props.js
CHANGED
|
@@ -22,19 +22,5 @@
|
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
|
-
import PropTypes from 'prop-types';
|
|
26
|
-
import { Children as ChildrenPropTypes } from '@instructure/ui-prop-types';
|
|
27
|
-
import { ScreenReaderContent } from '@instructure/ui-a11y-content';
|
|
28
|
-
import { GridCol } from '../GridCol';
|
|
29
|
-
const propTypes = {
|
|
30
|
-
children: ChildrenPropTypes.oneOf([GridCol, ScreenReaderContent]),
|
|
31
|
-
rowSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
32
|
-
colSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
33
|
-
hAlign: PropTypes.oneOf(['start', 'center', 'end', 'space-around', 'space-between']),
|
|
34
|
-
vAlign: PropTypes.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
35
|
-
startAt: PropTypes.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
36
|
-
visualDebug: PropTypes.bool,
|
|
37
|
-
isLastRow: PropTypes.bool
|
|
38
|
-
};
|
|
39
25
|
const allowedProps = ['children', 'rowSpacing', 'colSpacing', 'hAlign', 'vAlign', 'startAt', 'visualDebug', 'isLastRow'];
|
|
40
|
-
export {
|
|
26
|
+
export { allowedProps };
|
package/lib/Grid/index.js
CHANGED
|
@@ -108,7 +108,7 @@ let Grid = exports.Grid = (_dec = (0, _emotion.withStyle)(_styles.default, _them
|
|
|
108
108
|
children: this.renderChildren()
|
|
109
109
|
});
|
|
110
110
|
}
|
|
111
|
-
}, _Grid.displayName = "Grid", _Grid.componentId = 'Grid', _Grid.
|
|
111
|
+
}, _Grid.displayName = "Grid", _Grid.componentId = 'Grid', _Grid.allowedProps = _props.allowedProps, _Grid.defaultProps = {
|
|
112
112
|
colSpacing: 'medium',
|
|
113
113
|
rowSpacing: 'medium',
|
|
114
114
|
hAlign: 'start',
|
package/lib/Grid/props.js
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
|
-
exports.
|
|
8
|
-
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
var _Children = require("@instructure/ui-prop-types/lib/Children.js");
|
|
10
|
-
var _ScreenReaderContent = require("@instructure/ui-a11y-content/lib/ScreenReaderContent");
|
|
11
|
-
var _GridRow = require("../GridRow");
|
|
6
|
+
exports.allowedProps = void 0;
|
|
12
7
|
/*
|
|
13
8
|
* The MIT License (MIT)
|
|
14
9
|
*
|
|
@@ -33,13 +28,4 @@ var _GridRow = require("../GridRow");
|
|
|
33
28
|
* SOFTWARE.
|
|
34
29
|
*/
|
|
35
30
|
|
|
36
|
-
const propTypes = exports.propTypes = {
|
|
37
|
-
children: _Children.Children.oneOf([_GridRow.GridRow, _ScreenReaderContent.ScreenReaderContent]),
|
|
38
|
-
colSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
39
|
-
rowSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
40
|
-
hAlign: _propTypes.default.oneOf(['start', 'center', 'end', 'space-around', 'space-between']),
|
|
41
|
-
vAlign: _propTypes.default.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
42
|
-
startAt: _propTypes.default.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
43
|
-
visualDebug: _propTypes.default.bool
|
|
44
|
-
};
|
|
45
31
|
const allowedProps = exports.allowedProps = ['children', 'colSpacing', 'rowSpacing', 'hAlign', 'vAlign', 'startAt', 'visualDebug'];
|
package/lib/GridCol/index.js
CHANGED
|
@@ -97,7 +97,7 @@ let GridCol = exports.GridCol = (_dec = (0, _emotion.withStyle)(_styles.default,
|
|
|
97
97
|
children: children
|
|
98
98
|
});
|
|
99
99
|
}
|
|
100
|
-
}, _GridCol.displayName = "GridCol", _GridCol.componentId = 'Grid.Col', _GridCol.
|
|
100
|
+
}, _GridCol.displayName = "GridCol", _GridCol.componentId = 'Grid.Col', _GridCol.allowedProps = _props.allowedProps, _GridCol.defaultProps = {
|
|
101
101
|
textAlign: 'inherit',
|
|
102
102
|
children: null,
|
|
103
103
|
isLastCol: false,
|
package/lib/GridCol/props.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
|
-
exports.
|
|
8
|
-
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
6
|
+
exports.allowedProps = void 0;
|
|
9
7
|
/*
|
|
10
8
|
* The MIT License (MIT)
|
|
11
9
|
*
|
|
@@ -30,31 +28,4 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
30
28
|
* SOFTWARE.
|
|
31
29
|
*/
|
|
32
30
|
|
|
33
|
-
// TODO: get numcols from theme config
|
|
34
|
-
const COL_WIDTHS = _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.oneOf(['auto'])]);
|
|
35
|
-
const propTypes = exports.propTypes = {
|
|
36
|
-
children: _propTypes.default.node,
|
|
37
|
-
colSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
38
|
-
rowSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
39
|
-
textAlign: _propTypes.default.oneOf(['start', 'end', 'center', 'inherit']),
|
|
40
|
-
hAlign: _propTypes.default.oneOf(['start', 'center', 'end', 'space-around', 'space-between']),
|
|
41
|
-
vAlign: _propTypes.default.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
42
|
-
startAt: _propTypes.default.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
43
|
-
visualDebug: _propTypes.default.bool,
|
|
44
|
-
width: _propTypes.default.oneOfType([COL_WIDTHS, _propTypes.default.shape({
|
|
45
|
-
small: COL_WIDTHS,
|
|
46
|
-
medium: COL_WIDTHS,
|
|
47
|
-
large: COL_WIDTHS,
|
|
48
|
-
xLarge: COL_WIDTHS
|
|
49
|
-
})]),
|
|
50
|
-
offset: _propTypes.default.oneOfType([COL_WIDTHS, _propTypes.default.shape({
|
|
51
|
-
small: COL_WIDTHS,
|
|
52
|
-
medium: COL_WIDTHS,
|
|
53
|
-
large: COL_WIDTHS,
|
|
54
|
-
xLarge: COL_WIDTHS
|
|
55
|
-
})]),
|
|
56
|
-
isLastRow: _propTypes.default.bool,
|
|
57
|
-
isLastCol: _propTypes.default.bool,
|
|
58
|
-
elementRef: _propTypes.default.func
|
|
59
|
-
};
|
|
60
31
|
const allowedProps = exports.allowedProps = ['children', 'colSpacing', 'rowSpacing', 'textAlign', 'hAlign', 'vAlign', 'startAt', 'visualDebug', 'width', 'offset', 'isLastRow', 'isLastCol', 'elementRef'];
|
package/lib/GridRow/index.js
CHANGED
|
@@ -95,7 +95,7 @@ let GridRow = exports.GridRow = (_dec = (0, _emotion.withStyle)(_styles.default,
|
|
|
95
95
|
children: this.renderChildren()
|
|
96
96
|
});
|
|
97
97
|
}
|
|
98
|
-
}, _GridRow.displayName = "GridRow", _GridRow.componentId = 'Grid.Row', _GridRow.
|
|
98
|
+
}, _GridRow.displayName = "GridRow", _GridRow.componentId = 'Grid.Row', _GridRow.allowedProps = _props.allowedProps, _GridRow.defaultProps = {
|
|
99
99
|
children: null,
|
|
100
100
|
isLastRow: false
|
|
101
101
|
}, _GridRow)) || _class);
|
package/lib/GridRow/props.js
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
|
-
exports.
|
|
8
|
-
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
var _Children = require("@instructure/ui-prop-types/lib/Children.js");
|
|
10
|
-
var _ScreenReaderContent = require("@instructure/ui-a11y-content/lib/ScreenReaderContent");
|
|
11
|
-
var _GridCol = require("../GridCol");
|
|
6
|
+
exports.allowedProps = void 0;
|
|
12
7
|
/*
|
|
13
8
|
* The MIT License (MIT)
|
|
14
9
|
*
|
|
@@ -33,14 +28,4 @@ var _GridCol = require("../GridCol");
|
|
|
33
28
|
* SOFTWARE.
|
|
34
29
|
*/
|
|
35
30
|
|
|
36
|
-
const propTypes = exports.propTypes = {
|
|
37
|
-
children: _Children.Children.oneOf([_GridCol.GridCol, _ScreenReaderContent.ScreenReaderContent]),
|
|
38
|
-
rowSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
39
|
-
colSpacing: _propTypes.default.oneOf(['none', 'small', 'medium', 'large']),
|
|
40
|
-
hAlign: _propTypes.default.oneOf(['start', 'center', 'end', 'space-around', 'space-between']),
|
|
41
|
-
vAlign: _propTypes.default.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
42
|
-
startAt: _propTypes.default.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
43
|
-
visualDebug: _propTypes.default.bool,
|
|
44
|
-
isLastRow: _propTypes.default.bool
|
|
45
|
-
};
|
|
46
31
|
const allowedProps = exports.allowedProps = ['children', 'rowSpacing', 'colSpacing', 'hAlign', 'vAlign', 'startAt', 'visualDebug', 'isLastRow'];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/ui-grid",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "11.0.0",
|
|
4
4
|
"description": "A Grid component.",
|
|
5
5
|
"author": "Instructure, Inc. Engineering and Product Design",
|
|
6
6
|
"module": "./es/index.js",
|
|
@@ -24,26 +24,23 @@
|
|
|
24
24
|
"license": "MIT",
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@babel/runtime": "^7.27.6",
|
|
27
|
-
"@instructure/console": "
|
|
28
|
-
"@instructure/emotion": "
|
|
29
|
-
"@instructure/shared-types": "
|
|
30
|
-
"@instructure/ui-a11y-content": "
|
|
31
|
-
"@instructure/ui-
|
|
32
|
-
"@instructure/ui-
|
|
33
|
-
"@instructure/ui-testable": "10.26.1",
|
|
34
|
-
"@instructure/ui-utils": "10.26.1",
|
|
35
|
-
"prop-types": "^15.8.1"
|
|
27
|
+
"@instructure/console": "11.0.0",
|
|
28
|
+
"@instructure/emotion": "11.0.0",
|
|
29
|
+
"@instructure/shared-types": "11.0.0",
|
|
30
|
+
"@instructure/ui-a11y-content": "11.0.0",
|
|
31
|
+
"@instructure/ui-react-utils": "11.0.0",
|
|
32
|
+
"@instructure/ui-utils": "11.0.0"
|
|
36
33
|
},
|
|
37
34
|
"devDependencies": {
|
|
38
|
-
"@instructure/ui-babel-preset": "
|
|
39
|
-
"@instructure/ui-color-utils": "
|
|
40
|
-
"@instructure/ui-themes": "
|
|
35
|
+
"@instructure/ui-babel-preset": "11.0.0",
|
|
36
|
+
"@instructure/ui-color-utils": "11.0.0",
|
|
37
|
+
"@instructure/ui-themes": "11.0.0",
|
|
41
38
|
"@testing-library/jest-dom": "^6.6.3",
|
|
42
|
-
"@testing-library/react": "
|
|
39
|
+
"@testing-library/react": "15.0.7",
|
|
43
40
|
"vitest": "^3.2.2"
|
|
44
41
|
},
|
|
45
42
|
"peerDependencies": {
|
|
46
|
-
"react": ">=
|
|
43
|
+
"react": ">=18 <=19"
|
|
47
44
|
},
|
|
48
45
|
"publishConfig": {
|
|
49
46
|
"access": "public"
|
package/src/Grid/index.tsx
CHANGED
|
@@ -40,7 +40,7 @@ import { withStyle } from '@instructure/emotion'
|
|
|
40
40
|
import generateStyle from './styles'
|
|
41
41
|
import generateComponentTheme from './theme'
|
|
42
42
|
|
|
43
|
-
import {
|
|
43
|
+
import { allowedProps } from './props'
|
|
44
44
|
import type { GridProps } from './props'
|
|
45
45
|
|
|
46
46
|
/**
|
|
@@ -52,7 +52,6 @@ category: components
|
|
|
52
52
|
class Grid extends Component<GridProps> {
|
|
53
53
|
static readonly componentId = 'Grid'
|
|
54
54
|
|
|
55
|
-
static propTypes = propTypes
|
|
56
55
|
static allowedProps = allowedProps
|
|
57
56
|
static defaultProps = {
|
|
58
57
|
colSpacing: 'medium',
|
package/src/Grid/props.ts
CHANGED
|
@@ -22,17 +22,7 @@
|
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
|
-
import
|
|
26
|
-
|
|
27
|
-
import { Children as ChildrenPropTypes } from '@instructure/ui-prop-types'
|
|
28
|
-
import { ScreenReaderContent } from '@instructure/ui-a11y-content'
|
|
29
|
-
import { GridRow } from '../GridRow'
|
|
30
|
-
|
|
31
|
-
import type {
|
|
32
|
-
PropValidators,
|
|
33
|
-
GridTheme,
|
|
34
|
-
OtherHTMLAttributes
|
|
35
|
-
} from '@instructure/shared-types'
|
|
25
|
+
import type { GridTheme, OtherHTMLAttributes } from '@instructure/shared-types'
|
|
36
26
|
import type { WithStyleProps, ComponentStyle } from '@instructure/emotion'
|
|
37
27
|
import type { GridBreakpoints } from '../GridTypes'
|
|
38
28
|
|
|
@@ -58,23 +48,6 @@ type GridProps = GridOwnProps &
|
|
|
58
48
|
OtherHTMLAttributes<GridOwnProps>
|
|
59
49
|
|
|
60
50
|
type GridStyle = ComponentStyle<'grid'>
|
|
61
|
-
|
|
62
|
-
const propTypes: PropValidators<PropKeys> = {
|
|
63
|
-
children: ChildrenPropTypes.oneOf([GridRow, ScreenReaderContent]),
|
|
64
|
-
colSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
65
|
-
rowSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
66
|
-
hAlign: PropTypes.oneOf([
|
|
67
|
-
'start',
|
|
68
|
-
'center',
|
|
69
|
-
'end',
|
|
70
|
-
'space-around',
|
|
71
|
-
'space-between'
|
|
72
|
-
]),
|
|
73
|
-
vAlign: PropTypes.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
74
|
-
startAt: PropTypes.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
75
|
-
visualDebug: PropTypes.bool
|
|
76
|
-
}
|
|
77
|
-
|
|
78
51
|
const allowedProps: AllowedPropKeys = [
|
|
79
52
|
'children',
|
|
80
53
|
'colSpacing',
|
|
@@ -86,4 +59,4 @@ const allowedProps: AllowedPropKeys = [
|
|
|
86
59
|
]
|
|
87
60
|
|
|
88
61
|
export type { GridProps, GridStyle }
|
|
89
|
-
export {
|
|
62
|
+
export { allowedProps }
|
package/src/GridCol/index.tsx
CHANGED
|
@@ -32,7 +32,7 @@ import { logWarn as warn } from '@instructure/console'
|
|
|
32
32
|
import generateStyle from './styles'
|
|
33
33
|
import generateComponentTheme from './theme'
|
|
34
34
|
|
|
35
|
-
import {
|
|
35
|
+
import { allowedProps } from './props'
|
|
36
36
|
import type { GridColProps } from './props'
|
|
37
37
|
|
|
38
38
|
/**
|
|
@@ -45,7 +45,6 @@ id: Grid.Col
|
|
|
45
45
|
class GridCol extends Component<GridColProps> {
|
|
46
46
|
static readonly componentId = 'Grid.Col'
|
|
47
47
|
|
|
48
|
-
static propTypes = propTypes
|
|
49
48
|
static allowedProps = allowedProps
|
|
50
49
|
static defaultProps = {
|
|
51
50
|
textAlign: 'inherit',
|
package/src/GridCol/props.ts
CHANGED
|
@@ -22,22 +22,10 @@
|
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
|
-
import PropTypes from 'prop-types'
|
|
26
|
-
|
|
27
25
|
import type { WithStyleProps, ComponentStyle } from '@instructure/emotion'
|
|
28
|
-
import type {
|
|
29
|
-
PropValidators,
|
|
30
|
-
GridTheme,
|
|
31
|
-
OtherHTMLAttributes
|
|
32
|
-
} from '@instructure/shared-types'
|
|
26
|
+
import type { GridTheme, OtherHTMLAttributes } from '@instructure/shared-types'
|
|
33
27
|
import type { GridBreakpoints } from '../GridTypes'
|
|
34
28
|
|
|
35
|
-
// TODO: get numcols from theme config
|
|
36
|
-
const COL_WIDTHS = PropTypes.oneOfType([
|
|
37
|
-
PropTypes.number,
|
|
38
|
-
PropTypes.oneOf(['auto'])
|
|
39
|
-
])
|
|
40
|
-
|
|
41
29
|
type ColWidths = 'auto' | number
|
|
42
30
|
|
|
43
31
|
type GridColOwnProps = {
|
|
@@ -82,45 +70,6 @@ type GridColProps = GridColOwnProps &
|
|
|
82
70
|
OtherHTMLAttributes<GridColOwnProps>
|
|
83
71
|
|
|
84
72
|
type GridColStyle = ComponentStyle<'gridCol'>
|
|
85
|
-
|
|
86
|
-
const propTypes: PropValidators<PropKeys> = {
|
|
87
|
-
children: PropTypes.node,
|
|
88
|
-
colSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
89
|
-
rowSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
90
|
-
textAlign: PropTypes.oneOf(['start', 'end', 'center', 'inherit']),
|
|
91
|
-
hAlign: PropTypes.oneOf([
|
|
92
|
-
'start',
|
|
93
|
-
'center',
|
|
94
|
-
'end',
|
|
95
|
-
'space-around',
|
|
96
|
-
'space-between'
|
|
97
|
-
]),
|
|
98
|
-
vAlign: PropTypes.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
99
|
-
startAt: PropTypes.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
100
|
-
visualDebug: PropTypes.bool,
|
|
101
|
-
width: PropTypes.oneOfType([
|
|
102
|
-
COL_WIDTHS,
|
|
103
|
-
PropTypes.shape({
|
|
104
|
-
small: COL_WIDTHS,
|
|
105
|
-
medium: COL_WIDTHS,
|
|
106
|
-
large: COL_WIDTHS,
|
|
107
|
-
xLarge: COL_WIDTHS
|
|
108
|
-
})
|
|
109
|
-
]),
|
|
110
|
-
offset: PropTypes.oneOfType([
|
|
111
|
-
COL_WIDTHS,
|
|
112
|
-
PropTypes.shape({
|
|
113
|
-
small: COL_WIDTHS,
|
|
114
|
-
medium: COL_WIDTHS,
|
|
115
|
-
large: COL_WIDTHS,
|
|
116
|
-
xLarge: COL_WIDTHS
|
|
117
|
-
})
|
|
118
|
-
]),
|
|
119
|
-
isLastRow: PropTypes.bool,
|
|
120
|
-
isLastCol: PropTypes.bool,
|
|
121
|
-
elementRef: PropTypes.func
|
|
122
|
-
}
|
|
123
|
-
|
|
124
73
|
const allowedProps: AllowedPropKeys = [
|
|
125
74
|
'children',
|
|
126
75
|
'colSpacing',
|
|
@@ -138,4 +87,4 @@ const allowedProps: AllowedPropKeys = [
|
|
|
138
87
|
]
|
|
139
88
|
|
|
140
89
|
export type { GridColProps, GridColStyle }
|
|
141
|
-
export {
|
|
90
|
+
export { allowedProps }
|
package/src/GridRow/index.tsx
CHANGED
|
@@ -39,7 +39,7 @@ import { withStyle } from '@instructure/emotion'
|
|
|
39
39
|
import generateStyle from './styles'
|
|
40
40
|
import generateComponentTheme from './theme'
|
|
41
41
|
|
|
42
|
-
import {
|
|
42
|
+
import { allowedProps } from './props'
|
|
43
43
|
import type { GridRowProps } from './props'
|
|
44
44
|
|
|
45
45
|
/**
|
|
@@ -52,7 +52,6 @@ id: Grid.Row
|
|
|
52
52
|
class GridRow extends Component<GridRowProps> {
|
|
53
53
|
static readonly componentId = 'Grid.Row'
|
|
54
54
|
|
|
55
|
-
static propTypes = propTypes
|
|
56
55
|
static allowedProps = allowedProps
|
|
57
56
|
static defaultProps = {
|
|
58
57
|
children: null,
|
package/src/GridRow/props.ts
CHANGED
|
@@ -23,17 +23,8 @@
|
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
25
|
import React from 'react'
|
|
26
|
-
import PropTypes from 'prop-types'
|
|
27
26
|
|
|
28
|
-
import {
|
|
29
|
-
import { ScreenReaderContent } from '@instructure/ui-a11y-content'
|
|
30
|
-
import { GridCol } from '../GridCol'
|
|
31
|
-
|
|
32
|
-
import type {
|
|
33
|
-
PropValidators,
|
|
34
|
-
GridTheme,
|
|
35
|
-
OtherHTMLAttributes
|
|
36
|
-
} from '@instructure/shared-types'
|
|
27
|
+
import type { GridTheme, OtherHTMLAttributes } from '@instructure/shared-types'
|
|
37
28
|
import type { WithStyleProps, ComponentStyle } from '@instructure/emotion'
|
|
38
29
|
import type { GridBreakpoints } from '../GridTypes'
|
|
39
30
|
|
|
@@ -60,24 +51,6 @@ type GridRowProps = GridRowOwnProps &
|
|
|
60
51
|
OtherHTMLAttributes<GridRowOwnProps>
|
|
61
52
|
|
|
62
53
|
type GridRowStyle = ComponentStyle<'gridRow'>
|
|
63
|
-
|
|
64
|
-
const propTypes: PropValidators<PropKeys> = {
|
|
65
|
-
children: ChildrenPropTypes.oneOf([GridCol, ScreenReaderContent]),
|
|
66
|
-
rowSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
67
|
-
colSpacing: PropTypes.oneOf(['none', 'small', 'medium', 'large']),
|
|
68
|
-
hAlign: PropTypes.oneOf([
|
|
69
|
-
'start',
|
|
70
|
-
'center',
|
|
71
|
-
'end',
|
|
72
|
-
'space-around',
|
|
73
|
-
'space-between'
|
|
74
|
-
]),
|
|
75
|
-
vAlign: PropTypes.oneOf(['top', 'middle', 'bottom', 'stretch']),
|
|
76
|
-
startAt: PropTypes.oneOf(['small', 'medium', 'large', 'x-large', null]),
|
|
77
|
-
visualDebug: PropTypes.bool,
|
|
78
|
-
isLastRow: PropTypes.bool
|
|
79
|
-
}
|
|
80
|
-
|
|
81
54
|
const allowedProps: AllowedPropKeys = [
|
|
82
55
|
'children',
|
|
83
56
|
'rowSpacing',
|
|
@@ -90,4 +63,4 @@ const allowedProps: AllowedPropKeys = [
|
|
|
90
63
|
]
|
|
91
64
|
|
|
92
65
|
export type { GridRowProps, GridRowStyle }
|
|
93
|
-
export {
|
|
66
|
+
export { allowedProps }
|
package/tsconfig.build.json
CHANGED
|
@@ -10,9 +10,7 @@
|
|
|
10
10
|
{ "path": "../emotion/tsconfig.build.json" },
|
|
11
11
|
{ "path": "../shared-types/tsconfig.build.json" },
|
|
12
12
|
{ "path": "../ui-a11y-content/tsconfig.build.json" },
|
|
13
|
-
{ "path": "../ui-prop-types/tsconfig.build.json" },
|
|
14
13
|
{ "path": "../ui-react-utils/tsconfig.build.json" },
|
|
15
|
-
{ "path": "../ui-testable/tsconfig.build.json" },
|
|
16
14
|
{ "path": "../ui-utils/tsconfig.build.json" },
|
|
17
15
|
{ "path": "../ui-babel-preset/tsconfig.build.json" },
|
|
18
16
|
{ "path": "../ui-color-utils/tsconfig.build.json" },
|