feat(tauri): add tray icon updating and a number of other commands

zidoro · Oct 1, 2023 · b9cf906 · b9cf906
1 parent 1a4365e
commit b9cf906
Show file tree

Hide file tree

Showing 13 changed files with 1,645 additions and 282 deletions.
diff --git a/app/renderer/package.json b/app/renderer/package.json
@@ -57,6 +57,7 @@
     "redux-devtools-extension": "^2.13.8",
     "redux-undo": "^1.0.1",
     "styled-components": "^5.3.11",
+    "tauri-plugin-autostart-api": "https://github.com/tauri-apps/tauri-plugin-autostart#v1",
     "use-stay-awake": "^0.1.5"
   },
   "devDependencies": {

diff --git a/app/renderer/src/App.tsx b/app/renderer/src/App.tsx
@@ -1,4 +1,4 @@
-import React, { Suspense } from "react";
+import React, { Suspense, useEffect } from "react";
 import { HashRouter as Router, Switch, Route } from "react-router-dom";
 import {
   ThemeProvider,
@@ -14,6 +14,23 @@ export default function App() {
   const settings = useSelector(
     (state: AppStateTypes) => state.settings
   );
+
+  useEffect(() => {
+    const contextEvent = (event: MouseEvent) => {
+      if (event.target) {
+        let target = event.target as HTMLElement;
+        if (target.tagName === "TEXTAREA") {
+          return true;
+        }
+      }
+      event.preventDefault();
+      return false;
+    };
+    document.addEventListener("contextmenu", contextEvent);
+    return () =>
+      document.removeEventListener("contextmenu", contextEvent);
+  }, []);
+
   return (
     <ThemeProvider>
       <CounterProvider>

diff --git a/app/renderer/src/components/Layout.tsx b/app/renderer/src/components/Layout.tsx
@@ -76,7 +76,7 @@ const Layout: React.FC<Props> = ({ history, location, children }) => {
 
   return (
     <StyledLayout noTransition={noTransition}>
-      {!useNativeTitlebar.current && (
+      {!settings.useNativeTitlebar && (
         <Titlebar
           darkMode={settings.enableDarkTheme}
           timerType={timer.timerType}

diff --git a/app/renderer/src/contexts/connectors/TauriConnector.tsx b/app/renderer/src/contexts/connectors/TauriConnector.tsx
@@ -10,16 +10,22 @@ import {
   SET_FULLSCREEN_BREAK,
   SET_MINIMIZE,
   SET_NATIVE_TITLEBAR,
+  SET_OPEN_AT_LOGIN,
   SET_SHOW,
   SET_UI_THEME,
   TRAY_ICON_UPDATE,
 } from "@pomatez/shareables";
 import { encodeSvg } from "../../utils";
 import { TraySVG } from "../../components";
+import { enable, disable } from "tauri-plugin-autostart-api";
 
 export const TauriConnectorProvider: React.FC = ({ children }) => {
   const { invoke } = window.__TAURI__;
 
+  const settings: SettingTypes = useSelector(
+    (state: AppStateTypes) => state.settings
+  );
+
   /**
    * Rust uses lowercase snake_case for function names so we need to convert to lower case for the calls.
    * @param event
@@ -32,14 +38,18 @@ export const TauriConnectorProvider: React.FC = ({ children }) => {
     [invoke]
   );
 
+  useEffect(() => {
+    if (settings.openAtLogin) {
+      enable().catch((err) => console.error(err));
+    } else {
+      disable().catch((err) => console.error(err));
+    }
+  }, [settings.openAtLogin]);
+
   // TODO do logic to switch out the connectors based on the platform
 
   const timer = useSelector((state: AppStateTypes) => state.timer);
 
-  const settings: SettingTypes = useSelector(
-    (state: AppStateTypes) => state.settings
-  );
-
   const { count, duration, timerType, shouldFullscreen } =
     useContext(CounterContext);
   const dashOffset = (duration - count) * (24 / duration);

diff --git a/app/renderer/src/styles/components/titlebar.ts b/app/renderer/src/styles/components/titlebar.ts
@@ -38,6 +38,7 @@ export const StyledMarkWrapper = styled.div`
   column-gap: 0.8rem;
 
   padding-left: 1rem;
+  pointer-events: none;
 `;
 
 export const StyledMarkLogo = styled.img`