diff --git a/src/components/modals/share/Option.jsx b/src/components/modals/share/Option.tsx
similarity index 100%
rename from src/components/modals/share/Option.jsx
rename to src/components/modals/share/Option.tsx
diff --git a/src/components/modals/share/Share.jsx b/src/components/modals/share/Share.tsx
similarity index 90%
rename from src/components/modals/share/Share.jsx
rename to src/components/modals/share/Share.tsx
index 2421aee..2d52fd2 100644
--- a/src/components/modals/share/Share.jsx
+++ b/src/components/modals/share/Share.tsx
@@ -1,16 +1,16 @@
import { useEffect, useState } from "react";
-import ModalsManager from "../../../features/modals/modalsManager.js";
-import { WindowedModal } from "../_utils/WindowedModal.jsx";
+import ModalsManager from "../../../features/modals/modalsManager";
+import { WindowedModal } from "../_utils/WindowedModal";
import styles from "./Share.module.css";
-import { copyToClipboard, generateUrl } from "../../../features/_utils/browser.utils.js";
-import AppsManager from "../../../features/apps/appsManager.js";
+import { copyToClipboard, generateUrl } from "../../../features/_utils/browser.utils";
+import AppsManager from "../../../features/apps/appsManager";
import utilStyles from "../../../styles/utils.module.css";
-import { Button } from "../../_utils/button/Button.jsx";
-import Option from "./Option.jsx";
+import { Button } from "../../_utils/button/Button";
+import Option from "./Option";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faSquare } from "@fortawesome/free-regular-svg-icons";
import { faSquareCheck } from "@fortawesome/free-solid-svg-icons";
-import { useAlert } from "../../../hooks/modals/alert.js";
+import { useAlert } from "../../../hooks/modals/alert";
const APP_OPTIONS = {
"terminal": [
@@ -39,7 +39,7 @@ export function Share({ modal, params, ...props }) {
const [fullscreen, setFullscreen] = useState(params.fullscreen ?? false);
const [options, setOptions] = useState({});
const [url, setUrl] = useState(null);
- const { alert } = useAlert({ modalsManager: modal.modalsManager });
+ const { alert } = useAlert();
useEffect(() => {
setUrl(generateUrl({
diff --git a/src/components/taskbar/Taskbar.jsx b/src/components/taskbar/Taskbar.tsx
similarity index 79%
rename from src/components/taskbar/Taskbar.jsx
rename to src/components/taskbar/Taskbar.tsx
index fbba7f3..3525770 100644
--- a/src/components/taskbar/Taskbar.jsx
+++ b/src/components/taskbar/Taskbar.tsx
@@ -1,30 +1,29 @@
-import { memo, useEffect, useMemo, useRef, useState } from "react";
+import { CSSProperties, memo, useEffect, useMemo, useRef, useState } from "react";
import styles from "./Taskbar.module.css";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faCog, faSearch } from "@fortawesome/free-solid-svg-icons";
-import AppsManager from "../../features/apps/appsManager.js";
+import AppsManager from "../../features/apps/appsManager";
import { ReactSVG } from "react-svg";
-import { HomeMenu } from "./menus/HomeMenu.jsx";
-import OutsideClickListener from "../../hooks/_utils/outsideClick.js";
-import { Battery } from "./indicators/Battery.jsx";
-import { Network } from "./indicators/Network.jsx";
-import { Volume } from "./indicators/Volume.jsx";
-import { SearchMenu } from "./menus/SearchMenu.jsx";
-import { Calendar } from "./indicators/Calendar.jsx";
-import { useScrollWithShadow } from "../../hooks/_utils/scrollWithShadows.js";
-import { AppButton } from "./app-icon/AppIcon.jsx";
-import { useContextMenu } from "../../hooks/modals/contextMenu.js";
-import { Actions } from "../actions/Actions.jsx";
-import { ClickAction } from "../actions/actions/ClickAction.jsx";
-import { APPS, APP_NAMES } from "../../config/apps.config.js";
+import { HomeMenu } from "./menus/HomeMenu";
+import OutsideClickListener from "../../hooks/_utils/outsideClick";
+import { Battery } from "./indicators/Battery";
+import { Network } from "./indicators/Network";
+import { Volume } from "./indicators/Volume";
+import { SearchMenu } from "./menus/SearchMenu";
+import { Calendar } from "./indicators/Calendar";
+import { useScrollWithShadow } from "../../hooks/_utils/scrollWithShadows";
+import { AppButton } from "./app-icon/AppIcon";
+import { useContextMenu } from "../../hooks/modals/contextMenu";
+import { Actions } from "../actions/Actions";
+import { ClickAction } from "../actions/actions/ClickAction";
+import { APPS, APP_NAMES } from "../../config/apps.config";
import { useWindowsManager } from "../../hooks/windows/windowsManagerContext";
-import { TASKBAR_HEIGHT } from "../../config/taskbar.config.js";
+import { TASKBAR_HEIGHT } from "../../config/taskbar.config";
import { useSettingsManager } from "../../hooks/settings/settingsManagerContext";
-import { SettingsManager } from "../../features/settings/settingsManager.js";
+import { SettingsManager } from "../../features/settings/settingsManager";
import { useWindows } from "../../hooks/windows/windowsContext";
-import { ZIndexManager } from "../../features/z-index/zIndexManager.js";
-import { useZIndex } from "../../hooks/z-index/zIndex.js";
-import { useModalsManager } from "../../hooks/modals/modalsManagerContext";
+import { ZIndexManager } from "../../features/z-index/zIndexManager";
+import { useZIndex } from "../../hooks/z-index/zIndex";
export const Taskbar = memo(() => {
const ref = useRef(null);
@@ -40,10 +39,9 @@ export const Taskbar = memo(() => {
color: { a: 25 }
} });
const inputRef = useRef(null);
- const modalsManager = useModalsManager();
const windowsManager = useWindowsManager();
const windows = useWindows();
- const { onContextMenu } = useContextMenu({ modalsManager, Actions: (props) =>
+ const { onContextMenu } = useContextMenu({ Actions: (props) =>
{
windowsManager.open(APPS.SETTINGS);
@@ -70,14 +68,13 @@ export const Taskbar = memo(() => {
const shouldBeShown = (pins.includes(app.id) || isActive);
return ();
- }), [modalsManager, pins, windows, windowsManager]);
+ }), [pins, windows, windowsManager]);
useEffect(() => {
const settings = settingsManager.get(SettingsManager.VIRTUAL_PATHS.taskbar);
@@ -131,11 +128,11 @@ export const Taskbar = memo(() => {
return (<>
{
- if (event.target.getAttribute("data-allow-context-menu"))
+ if ((event.target as HTMLElement).getAttribute("data-allow-context-menu"))
onContextMenu(event);
}}
>
@@ -193,4 +190,4 @@ export const Taskbar = memo(() => {