Skip to content

Commit 35e5996

Browse files
committed
Fix build errors
1 parent 0ba622c commit 35e5996

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

src/components/BorderedApp/BorderedApp.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
import React, {
2-
KeyboardEvent,
3-
RefObject,
4-
useCallback,
5-
useEffect,
6-
useRef,
7-
} from "react";
1+
import React, { KeyboardEvent, RefObject, useCallback, useRef } from "react";
82
import useWindowManagerStore, {
93
BaseProps,
104
} from "../../stores/windowManagerStore";

src/components/BottomBar/Launcher/Launcher.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import { MenuItemProps } from "../../MenuItems";
1010
import { StyledIcon, StyledLauncher } from "./styles";
1111
import ContextMenu from "../../ContextMenu";
1212
import { BorderedAppContentHandles } from "../../BorderedApp/BorderedApp";
13-
interface LauncherProps<T extends BorderedAppContentHandles> {
13+
interface LauncherProps<
14+
T extends BorderedAppContentHandles<E>,
15+
E extends HTMLElement = HTMLElement,
16+
> {
1417
windowType: string;
1518
WindowTitle: string;
1619
windowId?: string;
@@ -23,7 +26,10 @@ interface LauncherProps<T extends BorderedAppContentHandles> {
2326
contentRef: RefObject<T>;
2427
}
2528

26-
function Launcher<T extends BorderedAppContentHandles>({
29+
function Launcher<
30+
T extends BorderedAppContentHandles<E>,
31+
E extends HTMLElement = HTMLElement,
32+
>({
2733
windowType,
2834
windowId,
2935
WindowTitle,

src/programs/Calculator/Calculator.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ interface CalculatorProps {}
2323
const isDigit = (key: string) => /^[0-9]$/.test(key);
2424
const operators = new Set(["+", "-", "*", "/", "%"]);
2525

26-
export const Calculator = forwardRef<CalculatorHandles, CalculatorProps>(
26+
const Calculator = forwardRef<CalculatorHandles, CalculatorProps>(
2727
(_props, ref) => {
2828
const elementRef = useRef<HTMLDivElement>(null);
2929
const [input, setInput] = useState<string>("");
@@ -156,3 +156,4 @@ export const Calculator = forwardRef<CalculatorHandles, CalculatorProps>(
156156
);
157157
},
158158
);
159+
export default Calculator;

src/programs/Calculator/CalculatorLauncher/CalculatorLauncher.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useRef } from "react";
22
import Launcher from "../../../components/BottomBar/Launcher";
3-
import { Calculator, CalculatorHandles } from "../Calculator";
3+
import Calculator, { CalculatorHandles } from "../Calculator";
44

55
interface CalculatorLauncherProps {}
66

src/programs/FileBrowser/FileBrowserLauncher/FileBrowserLauncher.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import { useRef } from "react";
12
import FileBrowser from "..";
23
import Launcher from "../../../components/BottomBar/Launcher";
4+
import { FileBrowserHandles } from "../FileBrowser";
35

46
interface FileBrowserLauncherProps {}
57

68
// eslint-disable-next-line no-empty-pattern
79
function FileBrowserLauncher({}: FileBrowserLauncherProps) {
10+
const ref = useRef<FileBrowserHandles>(null);
811
return (
912
<Launcher
1013
windowType={"file-browser"}
@@ -13,7 +16,8 @@ function FileBrowserLauncher({}: FileBrowserLauncherProps) {
1316
menus={[]}
1417
appContent={<FileBrowser />}
1518
icon=""
16-
></Launcher>
19+
contentRef={ref}
20+
/>
1721
);
1822
}
1923

0 commit comments

Comments
 (0)