Software-Mac/spacedrive
Software-Mac/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive synced 2024-07-02 10:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix topbar hmr (#2231)

Browse source
This commit is contained in:
Brendan Allan 2024-03-22 14:29:14 +08:00 committed by GitHub
parent f2477d47d9
commit 697dc50ea2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/app/$libraryId/Explorer/View/DragScrollable.tsx
View file

@ -1,7 +1,7 @@
import { useExplorerLayoutStore } from '@sd/client';
import { tw } from '@sd/ui';
import { useTopBarContext } from '../../TopBar/Layout';
import { useTopBarContext } from '../../TopBar/Context';
import { useExplorerContext } from '../Context';
import { PATH_BAR_HEIGHT } from '../ExplorerPath';
import { useDragScrollable } from './useDragScrollable';

2
interface/app/$libraryId/Explorer/index.tsx
View file

@ -8,7 +8,7 @@ import {
} from '@sd/client';
import { useShortcut } from '~/hooks';
import { useTopBarContext } from '../TopBar/Layout';
import { useTopBarContext } from '../TopBar/Context';
import { useExplorerContext } from './Context';
import ContextMenu from './ContextMenu';
import DismissibleNotice from './DismissibleNotice';

2
interface/app/$libraryId/PageLayout/index.tsx
View file

@ -3,7 +3,7 @@ import { useRef } from 'react';
import { Outlet } from 'react-router';
import { useShowControls } from '../../../hooks';
import { useTopBarContext } from '../TopBar/Layout';
import { useTopBarContext } from '../TopBar/Context';
import { PageLayoutContext } from './Context';
export const Component = () => {

36
interface/app/$libraryId/TopBar/Context.tsx Normal file
View file

@ -0,0 +1,36 @@
import { createContext, useContext, useState } from 'react';
import { SearchFilterArgs } from '@sd/client';
export const TopBarContext = createContext<ReturnType<typeof useContextValue> | null>(null);
export function useContextValue() {
const [left, setLeft] = useState<HTMLDivElement | null>(null);
const [center, setCenter] = useState<HTMLDivElement | null>(null);
const [right, setRight] = useState<HTMLDivElement | null>(null);
const [children, setChildren] = useState<HTMLDivElement | null>(null);
const [fixedArgs, setFixedArgs] = useState<SearchFilterArgs[] | null>(null);
const [topBarHeight, setTopBarHeight] = useState(0);
return {
left,
setLeft,
center,
setCenter,
right,
setRight,
children,
setChildren,
fixedArgs,
setFixedArgs,
topBarHeight,
setTopBarHeight
};
}
export function useTopBarContext() {
const ctx = useContext(TopBarContext);
if (!ctx) throw new Error('TopBarContext not found!');
return ctx;
}

38
interface/app/$libraryId/TopBar/Layout.tsx
View file

@ -1,35 +1,9 @@
import { createContext, useContext, useEffect, useState } from 'react';
import { useEffect } from 'react';
import { Outlet } from 'react-router';
import { SearchFilterArgs } from '@sd/client';
import TopBar from '.';
import { explorerStore } from '../Explorer/store';
const TopBarContext = createContext<ReturnType<typeof useContextValue> | null>(null);
function useContextValue() {
const [left, setLeft] = useState<HTMLDivElement | null>(null);
const [center, setCenter] = useState<HTMLDivElement | null>(null);
const [right, setRight] = useState<HTMLDivElement | null>(null);
const [children, setChildren] = useState<HTMLDivElement | null>(null);
const [fixedArgs, setFixedArgs] = useState<SearchFilterArgs[] | null>(null);
const [topBarHeight, setTopBarHeight] = useState(0);
return {
left,
setLeft,
center,
setCenter,
right,
setRight,
children,
setChildren,
fixedArgs,
setFixedArgs,
topBarHeight,
setTopBarHeight
};
}
import { TopBarContext, useContextValue } from './Context';
export const Component = () => {
const value = useContextValue();
@ -48,11 +22,3 @@ export const Component = () => {
</TopBarContext.Provider>
);
};
export function useTopBarContext() {
const ctx = useContext(TopBarContext);
if (!ctx) throw new Error('TopBarContext not found!');
return ctx;
}

2
interface/app/$libraryId/TopBar/Portal.tsx
View file

@ -1,7 +1,7 @@
import { PropsWithChildren, type ReactNode } from 'react';
import { createPortal } from 'react-dom';
import { useTopBarContext } from './Layout';
import { useTopBarContext } from './Context';
interface Props extends PropsWithChildren {
left?: ReactNode;

2
interface/app/$libraryId/TopBar/index.tsx
View file

@ -15,7 +15,7 @@ import { useRoutingContext } from '~/RoutingContext';
import { useTabsContext } from '~/TabsContext';
import { explorerStore } from '../Explorer/store';
import { useTopBarContext } from './Layout';
import { useTopBarContext } from './Context';
import { NavigationButtons } from './NavigationButtons';
// million-ignore

2
interface/app/$libraryId/ephemeral.tsx
View file

@ -37,7 +37,7 @@ import { DefaultTopBarOptions } from './Explorer/TopBarOptions';
import { useExplorer, useExplorerSettings } from './Explorer/useExplorer';
import { EmptyNotice } from './Explorer/View/EmptyNotice';
import { AddLocationButton } from './settings/library/locations/AddLocationButton';
import { useTopBarContext } from './TopBar/Layout';
import { useTopBarContext } from './TopBar/Context';
import { TopBarPortal } from './TopBar/Portal';
import TopBarButton from './TopBar/TopBarButton';