From 0b03f317350e3ff1db50af05dde16307d05e0c36 Mon Sep 17 00:00:00 2001 From: Philipp Hugenroth Date: Fri, 5 May 2023 16:03:09 +0200 Subject: [PATCH] Remove non-intended changes Signed-off-by: Philipp Hugenroth --- .../src/layout/Sidebar/Page.tsx | 12 +- yarn.lock | 137 +++--------------- 2 files changed, 24 insertions(+), 125 deletions(-) diff --git a/packages/core-components/src/layout/Sidebar/Page.tsx b/packages/core-components/src/layout/Sidebar/Page.tsx index a1564c0409..5f660547d1 100644 --- a/packages/core-components/src/layout/Sidebar/Page.tsx +++ b/packages/core-components/src/layout/Sidebar/Page.tsx @@ -33,23 +33,23 @@ import { SidebarPinStateProvider } from './SidebarPinStateContext'; export type SidebarPageClassKey = 'root'; -type PageStyleProps = { sidebarConfig: SidebarConfig; isPinned: boolean }; - -const useStyles = makeStyles( +const useStyles = makeStyles< + BackstageTheme, + { sidebarConfig: SidebarConfig; isPinned: boolean } +>( theme => ({ root: { width: '100%', transition: 'padding-left 0.1s ease-out', isolation: 'isolate', [theme.breakpoints.up('sm')]: { - paddingLeft: (props: PageStyleProps) => + paddingLeft: props => props.isPinned ? props.sidebarConfig.drawerWidthOpen : props.sidebarConfig.drawerWidthClosed, }, [theme.breakpoints.down('xs')]: { - paddingBottom: (props: PageStyleProps) => - props.sidebarConfig.mobileSidebarHeight, + paddingBottom: props => props.sidebarConfig.mobileSidebarHeight, }, }, content: { diff --git a/yarn.lock b/yarn.lock index bdc04393da..cc32ce9a0e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3472,7 +3472,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.0, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.0, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.21.0 resolution: "@babel/runtime@npm:7.21.0" dependencies: @@ -6960,10 +6960,9 @@ __metadata: "@backstage/dev-utils": "workspace:^" "@backstage/test-utils": "workspace:^" "@backstage/theme": "workspace:^" - "@mui/icons-material": ^5.11.0 - "@mui/lab": 5.0.0-alpha.114 - "@mui/material": ^5.12.2 - "@mui/styles": ^5.11.2 + "@material-ui/core": ^4.12.2 + "@material-ui/icons": ^4.9.1 + "@material-ui/lab": 4.0.0-alpha.61 "@testing-library/dom": ^8.0.0 "@testing-library/jest-dom": ^5.10.1 "@testing-library/react": ^12.1.3 @@ -12881,29 +12880,6 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-alpha.112": - version: 5.0.0-alpha.112 - resolution: "@mui/base@npm:5.0.0-alpha.112" - dependencies: - "@babel/runtime": ^7.20.7 - "@emotion/is-prop-valid": ^1.2.0 - "@mui/types": ^7.2.3 - "@mui/utils": ^5.11.2 - "@popperjs/core": ^2.11.6 - clsx: ^1.2.1 - prop-types: ^15.8.1 - react-is: ^18.2.0 - peerDependencies: - "@types/react": ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: fd19240ac16859d62f057fd80261fc4e0dbc960a648b601bd7beaeb44b88c059f654b0989f33cea655ad61106832bffa0cd8446730c1be7671b6cde383dbce80 - languageName: node - linkType: hard - "@mui/base@npm:5.0.0-alpha.127": version: 5.0.0-alpha.127 resolution: "@mui/base@npm:5.0.0-alpha.127" @@ -12934,52 +12910,6 @@ __metadata: languageName: node linkType: hard -"@mui/icons-material@npm:^5.11.0": - version: 5.11.0 - resolution: "@mui/icons-material@npm:5.11.0" - dependencies: - "@babel/runtime": ^7.20.6 - peerDependencies: - "@mui/material": ^5.0.0 - "@types/react": ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: 764c1185b3432f0228f3c5217b0e218b10f106fa96d305dfc62c0ef5afd2a7a087b0d664fd0a8171282e195c18d3ee073d5f037901a2bed1a1519a70fbb0501c - languageName: node - linkType: hard - -"@mui/lab@npm:5.0.0-alpha.114": - version: 5.0.0-alpha.114 - resolution: "@mui/lab@npm:5.0.0-alpha.114" - dependencies: - "@babel/runtime": ^7.20.7 - "@mui/base": 5.0.0-alpha.112 - "@mui/system": ^5.11.2 - "@mui/types": ^7.2.3 - "@mui/utils": ^5.11.2 - clsx: ^1.2.1 - prop-types: ^15.8.1 - react-is: ^18.2.0 - peerDependencies: - "@emotion/react": ^11.5.0 - "@emotion/styled": ^11.3.0 - "@mui/material": ^5.0.0 - "@types/react": ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - "@emotion/react": - optional: true - "@emotion/styled": - optional: true - "@types/react": - optional: true - checksum: 0b6441e7f7a69e2a6910f044ef2a222462a219f61e3a05c023484508e7f14a5fe6baeddf08b37bceab357c7cb0eed90324ac42ecd8e59a6eb6e1c801ea01504a - languageName: node - linkType: hard - "@mui/material@npm:^5.12.2": version: 5.12.2 resolution: "@mui/material@npm:5.12.2" @@ -13013,7 +12943,7 @@ __metadata: languageName: node linkType: hard -"@mui/private-theming@npm:^5.11.2, @mui/private-theming@npm:^5.12.0": +"@mui/private-theming@npm:^5.12.0": version: 5.12.0 resolution: "@mui/private-theming@npm:5.12.0" dependencies: @@ -13051,38 +12981,7 @@ __metadata: languageName: node linkType: hard -"@mui/styles@npm:^5.11.2": - version: 5.11.2 - resolution: "@mui/styles@npm:5.11.2" - dependencies: - "@babel/runtime": ^7.20.7 - "@emotion/hash": ^0.9.0 - "@mui/private-theming": ^5.11.2 - "@mui/types": ^7.2.3 - "@mui/utils": ^5.11.2 - clsx: ^1.2.1 - csstype: ^3.1.1 - hoist-non-react-statics: ^3.3.2 - jss: ^10.9.2 - jss-plugin-camel-case: ^10.9.2 - jss-plugin-default-unit: ^10.9.2 - jss-plugin-global: ^10.9.2 - jss-plugin-nested: ^10.9.2 - jss-plugin-props-sort: ^10.9.2 - jss-plugin-rule-value-function: ^10.9.2 - jss-plugin-vendor-prefixer: ^10.9.2 - prop-types: ^15.8.1 - peerDependencies: - "@types/react": ^17.0.0 - react: ^17.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: d565e53acd6f49679446dbb9d85ab055d6c16225afd429ac9a738fba3cddfc394f88530cebfe1b3640ca89f58e7db73bb47d09e9bb05c80e47a5018418802378 - languageName: node - linkType: hard - -"@mui/system@npm:^5.11.2, @mui/system@npm:^5.12.1": +"@mui/system@npm:^5.12.1": version: 5.12.1 resolution: "@mui/system@npm:5.12.1" dependencies: @@ -13110,7 +13009,7 @@ __metadata: languageName: node linkType: hard -"@mui/types@npm:^7.2.3, @mui/types@npm:^7.2.4": +"@mui/types@npm:^7.2.4": version: 7.2.4 resolution: "@mui/types@npm:7.2.4" peerDependencies: @@ -13122,7 +13021,7 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^5.11.2, @mui/utils@npm:^5.12.0": +"@mui/utils@npm:^5.12.0": version: 5.12.0 resolution: "@mui/utils@npm:5.12.0" dependencies: @@ -14048,7 +13947,7 @@ __metadata: languageName: node linkType: hard -"@popperjs/core@npm:^2.11.6, @popperjs/core@npm:^2.11.7": +"@popperjs/core@npm:^2.11.7": version: 2.11.7 resolution: "@popperjs/core@npm:2.11.7" checksum: 5b6553747899683452a1d28898c1b39173a4efd780e74360bfcda8eb42f1c5e819602769c81a10920fc68c881d07fb40429604517d499567eac079cfa6470f19 @@ -21756,7 +21655,7 @@ __metadata: languageName: node linkType: hard -"csstype@npm:^3.0.2, csstype@npm:^3.0.6, csstype@npm:^3.1.1, csstype@npm:^3.1.2": +"csstype@npm:^3.0.2, csstype@npm:^3.0.6, csstype@npm:^3.1.2": version: 3.0.9 resolution: "csstype@npm:3.0.9" checksum: 199f9af7e673f9f188525c3102a329d637ff46c52f6385a4427ff5cb17adcb736189150170a7af7c5701d18d7704bdad130273f4aa7e44c6c4f9967e6115dc93 @@ -29262,7 +29161,7 @@ __metadata: languageName: node linkType: hard -"jss-plugin-camel-case@npm:^10.5.1, jss-plugin-camel-case@npm:^10.9.2": +"jss-plugin-camel-case@npm:^10.5.1": version: 10.9.2 resolution: "jss-plugin-camel-case@npm:10.9.2" dependencies: @@ -29273,7 +29172,7 @@ __metadata: languageName: node linkType: hard -"jss-plugin-default-unit@npm:^10.5.1, jss-plugin-default-unit@npm:^10.9.2": +"jss-plugin-default-unit@npm:^10.5.1": version: 10.9.2 resolution: "jss-plugin-default-unit@npm:10.9.2" dependencies: @@ -29283,7 +29182,7 @@ __metadata: languageName: node linkType: hard -"jss-plugin-global@npm:^10.5.1, jss-plugin-global@npm:^10.9.2": +"jss-plugin-global@npm:^10.5.1": version: 10.9.2 resolution: "jss-plugin-global@npm:10.9.2" dependencies: @@ -29293,7 +29192,7 @@ __metadata: languageName: node linkType: hard -"jss-plugin-nested@npm:^10.5.1, jss-plugin-nested@npm:^10.9.2": +"jss-plugin-nested@npm:^10.5.1": version: 10.9.2 resolution: "jss-plugin-nested@npm:10.9.2" dependencies: @@ -29304,7 +29203,7 @@ __metadata: languageName: node linkType: hard -"jss-plugin-props-sort@npm:^10.5.1, jss-plugin-props-sort@npm:^10.9.2": +"jss-plugin-props-sort@npm:^10.5.1": version: 10.9.2 resolution: "jss-plugin-props-sort@npm:10.9.2" dependencies: @@ -29314,7 +29213,7 @@ __metadata: languageName: node linkType: hard -"jss-plugin-rule-value-function@npm:^10.5.1, jss-plugin-rule-value-function@npm:^10.9.2": +"jss-plugin-rule-value-function@npm:^10.5.1": version: 10.9.2 resolution: "jss-plugin-rule-value-function@npm:10.9.2" dependencies: @@ -29325,7 +29224,7 @@ __metadata: languageName: node linkType: hard -"jss-plugin-vendor-prefixer@npm:^10.5.1, jss-plugin-vendor-prefixer@npm:^10.9.2": +"jss-plugin-vendor-prefixer@npm:^10.5.1": version: 10.9.2 resolution: "jss-plugin-vendor-prefixer@npm:10.9.2" dependencies: @@ -29368,7 +29267,7 @@ __metadata: languageName: node linkType: hard -"jss@npm:^10.5.1, jss@npm:^10.9.2, jss@npm:~10.10.0": +"jss@npm:^10.5.1, jss@npm:~10.10.0": version: 10.10.0 resolution: "jss@npm:10.10.0" dependencies: