packages/core: move sidebar things closer to the sidebar

packages/core/src/hooks/useSidebarPinState.ts

@@ -1,28 +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 { useContext } from 'react';
-import { SidebarPinStateContext } from '../layout/Sidebar';
-
-export function useSidebarPinState() {
-  const { isPinned, toggleSidebarPinState } = useContext(
-    SidebarPinStateContext,
-  );
-
-  return {
-    isPinned,
-    toggleSidebarPinState,
-  };
-}

packages/core/src/layout/Sidebar/Bar.tsx

@@ -16,10 +16,10 @@
 
 import { makeStyles } from '@material-ui/core';
 import clsx from 'clsx';
-import React, { FC, useRef, useState } from 'react';
+import React, { FC, useRef, useState, useContext } from 'react';
 import { sidebarConfig, SidebarContext } from './config';
 import { BackstageTheme } from '@backstage/theme';
-import { useSidebarPinState } from '../../hooks/useSidebarPinState';
+import { SidebarPinStateContext } from './Page';
 
 const useStyles = makeStyles<BackstageTheme>(theme => ({
   root: {
@@ -76,7 +76,7 @@ export const Sidebar: FC<Props> = ({
   const classes = useStyles();
   const [state, setState] = useState(State.Closed);
   const hoverTimerRef = useRef<number>();
-  const { isPinned } = useSidebarPinState();
+  const { isPinned } = useContext(SidebarPinStateContext);
 
   const handleOpen = () => {
     if (isPinned) {

packages/core/src/layout/Sidebar/Page.tsx

@@ -18,7 +18,7 @@ import { makeStyles } from '@material-ui/core';
 import React, { createContext, FC, useEffect, useState } from 'react';
 import { sidebarConfig } from './config';
 import { BackstageTheme } from '@backstage/theme';
-import { LocalStorage } from '../../data/localStorage';
+import { LocalStorage } from './localStorage';
 
 const useStyles = makeStyles<BackstageTheme, { isPinned: boolean }>({
   root: {