diff --git a/packages/core/src/icons/icons.tsx b/packages/core/src/icons/icons.tsx deleted file mode 100644 index e8834a6162..0000000000 --- a/packages/core/src/icons/icons.tsx +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2020 Spotify AB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { SvgIconProps } from '@material-ui/core'; -import PeopleIcon from '@material-ui/icons/People'; -import PersonIcon from '@material-ui/icons/Person'; -import React, { FC } from 'react'; -import { useApp } from '@backstage/core-api'; -import { IconComponent, SystemIconKey, SystemIcons } from './types'; - -export const defaultSystemIcons: SystemIcons = { - user: PersonIcon, - group: PeopleIcon, -}; - -const overridableSystemIcon = (key: SystemIconKey): IconComponent => { - const Component: FC = props => { - const app = useApp(); - const Icon = app.getSystemIcon(key); - return ; - }; - return Component; -}; - -export const UserIcon = overridableSystemIcon('user'); -export const GroupIcon = overridableSystemIcon('group'); diff --git a/packages/core/src/icons/index.ts b/packages/core/src/icons/index.ts deleted file mode 100644 index 4c97d27176..0000000000 --- a/packages/core/src/icons/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2020 Spotify AB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './icons'; -export * from './types'; diff --git a/packages/core/src/icons/types.ts b/packages/core/src/icons/types.ts deleted file mode 100644 index 599cb969df..0000000000 --- a/packages/core/src/icons/types.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2020 Spotify AB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ComponentType } from 'react'; -import { SvgIconProps } from '@material-ui/core'; -export type IconComponent = ComponentType; -export type SystemIconKey = 'user' | 'group'; -export type SystemIcons = { [key in SystemIconKey]: IconComponent }; diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 37f01eb3f4..fc4d5e82c4 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -39,4 +39,3 @@ export { default as TrendLine } from './components/TrendLine'; export { FeatureCalloutCircular } from './components/FeatureDiscovery/FeatureCalloutCircular'; export * from './components/Status'; export { default as WarningPanel } from './components/WarningPanel'; -export type { IconComponent } from './icons'; diff --git a/packages/core/src/layout/Sidebar/Items.tsx b/packages/core/src/layout/Sidebar/Items.tsx index 4696f53a37..ddd71cc189 100644 --- a/packages/core/src/layout/Sidebar/Items.tsx +++ b/packages/core/src/layout/Sidebar/Items.tsx @@ -22,12 +22,12 @@ import { Typography, Badge, } from '@material-ui/core'; +import { IconComponent } from '@backstage/core-api'; import SearchIcon from '@material-ui/icons/Search'; import clsx from 'clsx'; import React, { FC, useContext, useState, KeyboardEventHandler } from 'react'; import { NavLink } from 'react-router-dom'; import { sidebarConfig, SidebarContext } from './config'; -import { IconComponent } from '../../icons'; const useStyles = makeStyles(theme => { const {