Skip to content

Commit 2e7d2f4

Browse files
chore(release): 1.3.6 [skip ci]
## [1.3.6](v1.3.5...v1.3.6) (2023-04-06) ### Bug Fixes * multiple flex classes for grid ([8754b44](8754b44))
1 parent 8754b44 commit 2e7d2f4

File tree

7 files changed

+81
-32
lines changed

7 files changed

+81
-32
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [1.3.6](https://github.com/ocadotechnology/codeforlife-package-javascript/compare/v1.3.5...v1.3.6) (2023-04-06)
2+
3+
4+
### Bug Fixes
5+
6+
* multiple flex classes for grid ([8754b44](https://github.com/ocadotechnology/codeforlife-package-javascript/commit/8754b44cdbd6d24f4404b6a4f4bacff49adf581a))
7+
18
## [1.3.5](https://github.com/ocadotechnology/codeforlife-package-javascript/compare/v1.3.4...v1.3.5) (2023-04-05)
29

310

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import React from 'react';
22
import { AppBarProps } from '@mui/material';
3-
export interface ElevatedAppBarProps {
4-
props: AppBarProps;
5-
children: React.ReactNode;
3+
export interface ElevatedAppBarProps extends AppBarProps {
64
}
75
declare const ElevatedAppBar: React.FC<ElevatedAppBarProps>;
86
export default ElevatedAppBar;

lib/cjs/components/ElevatedAppBar.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,30 @@ var __assign = (this && this.__assign) || function () {
1010
};
1111
return __assign.apply(this, arguments);
1212
};
13+
var __rest = (this && this.__rest) || function (s, e) {
14+
var t = {};
15+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
16+
t[p] = s[p];
17+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
18+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
19+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
20+
t[p[i]] = s[p[i]];
21+
}
22+
return t;
23+
};
1324
var __importDefault = (this && this.__importDefault) || function (mod) {
1425
return (mod && mod.__esModule) ? mod : { "default": mod };
1526
};
1627
Object.defineProperty(exports, "__esModule", { value: true });
1728
var react_1 = __importDefault(require("react"));
1829
var material_1 = require("@mui/material");
1930
var ElevatedAppBar = function (_a) {
20-
var props = _a.props, children = _a.children;
31+
var children = _a.children, otherProps = __rest(_a, ["children"]);
2132
var trigger = (0, material_1.useScrollTrigger)({
2233
disableHysteresis: true,
2334
threshold: 0
2435
});
25-
return react_1.default.cloneElement(react_1.default.createElement(material_1.AppBar, __assign({}, props),
36+
return react_1.default.cloneElement(react_1.default.createElement(material_1.AppBar, __assign({}, otherProps),
2637
react_1.default.createElement(material_1.Toolbar, null, children)), {
2738
elevation: trigger ? 4 : 0,
2839
position: trigger ? 'fixed' : 'sticky'

lib/cjs/theme.js

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,30 @@ var theme = (0, styles_1.responsiveFontSizes)((0, styles_1.createTheme)({
5353
},
5454
styleOverrides: {
5555
root: function (_a) {
56+
var _b;
5657
var ownerState = _a.ownerState;
57-
return (__assign(__assign(__assign({}, (ownerState.className === 'flex-center' && {
58-
display: 'flex',
59-
justifyContent: 'center',
60-
alignItems: 'center'
61-
})), (ownerState.className === 'flex-center-x' && {
62-
display: 'flex',
63-
justifyContent: 'center'
64-
})), (ownerState.className === 'flex-center-y' && {
65-
display: 'flex',
66-
alignItems: 'center'
67-
})));
58+
return (__assign({}, (((_b = ownerState.className) === null || _b === void 0 ? void 0 : _b.startsWith('flex')) && __assign({ display: 'flex' }, {
59+
'flex-center': {
60+
justifyContent: 'center',
61+
alignItems: 'center'
62+
},
63+
'flex-center-x': {
64+
justifyContent: 'center'
65+
},
66+
'flex-center-y': {
67+
alignItems: 'center'
68+
},
69+
'flex-end': {
70+
justifyContent: 'end',
71+
alignItems: 'end'
72+
},
73+
'flex-end-x': {
74+
justifyContent: 'end'
75+
},
76+
'flex-end-y': {
77+
alignItems: 'end'
78+
}
79+
}[ownerState.className]))));
6880
}
6981
}
7082
},
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import React from 'react';
22
import { AppBarProps } from '@mui/material';
3-
export interface ElevatedAppBarProps {
4-
props: AppBarProps;
5-
children: React.ReactNode;
3+
export interface ElevatedAppBarProps extends AppBarProps {
64
}
75
declare const ElevatedAppBar: React.FC<ElevatedAppBarProps>;
86
export default ElevatedAppBar;

lib/esm/components/ElevatedAppBar.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,26 @@ var __assign = (this && this.__assign) || function () {
99
};
1010
return __assign.apply(this, arguments);
1111
};
12+
var __rest = (this && this.__rest) || function (s, e) {
13+
var t = {};
14+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
15+
t[p] = s[p];
16+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
17+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
18+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
19+
t[p[i]] = s[p[i]];
20+
}
21+
return t;
22+
};
1223
import React from 'react';
1324
import { AppBar, Toolbar, useScrollTrigger } from '@mui/material';
1425
var ElevatedAppBar = function (_a) {
15-
var props = _a.props, children = _a.children;
26+
var children = _a.children, otherProps = __rest(_a, ["children"]);
1627
var trigger = useScrollTrigger({
1728
disableHysteresis: true,
1829
threshold: 0
1930
});
20-
return React.cloneElement(React.createElement(AppBar, __assign({}, props),
31+
return React.cloneElement(React.createElement(AppBar, __assign({}, otherProps),
2132
React.createElement(Toolbar, null, children)), {
2233
elevation: trigger ? 4 : 0,
2334
position: trigger ? 'fixed' : 'sticky'

lib/esm/theme.js

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,30 @@ var theme = responsiveFontSizes(createTheme({
5151
},
5252
styleOverrides: {
5353
root: function (_a) {
54+
var _b;
5455
var ownerState = _a.ownerState;
55-
return (__assign(__assign(__assign({}, (ownerState.className === 'flex-center' && {
56-
display: 'flex',
57-
justifyContent: 'center',
58-
alignItems: 'center'
59-
})), (ownerState.className === 'flex-center-x' && {
60-
display: 'flex',
61-
justifyContent: 'center'
62-
})), (ownerState.className === 'flex-center-y' && {
63-
display: 'flex',
64-
alignItems: 'center'
65-
})));
56+
return (__assign({}, (((_b = ownerState.className) === null || _b === void 0 ? void 0 : _b.startsWith('flex')) && __assign({ display: 'flex' }, {
57+
'flex-center': {
58+
justifyContent: 'center',
59+
alignItems: 'center'
60+
},
61+
'flex-center-x': {
62+
justifyContent: 'center'
63+
},
64+
'flex-center-y': {
65+
alignItems: 'center'
66+
},
67+
'flex-end': {
68+
justifyContent: 'end',
69+
alignItems: 'end'
70+
},
71+
'flex-end-x': {
72+
justifyContent: 'end'
73+
},
74+
'flex-end-y': {
75+
alignItems: 'end'
76+
}
77+
}[ownerState.className]))));
6678
}
6779
}
6880
},

0 commit comments

Comments
 (0)