release: v0.2.1

- Persist settings in Electron (IPC + userData settings.json) with browser localStorage fallback
- Fix Settings modal save wiring so changes actually apply
- Respect global shortcuts master toggle and correctly map KeyA..KeyZ accelerators
- Bump version to 0.2.1

Author: aramb-dev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "islamic-text-copier",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A cross-platform Islamic Text Copier built with React and Electron",
   "main": "src/main.js",
   "homepage": "./",

src/components/App.js

@@ -10,8 +10,8 @@ import './App.css';
 // Falls back gracefully for browser mode
 const electronAPI = window.electronAPI || null;
 
-// Load settings from localStorage or use defaults
-const loadSettings = () => {
+// Load settings from localStorage or use defaults (browser fallback)
+const loadSettingsFromLocalStorage = () => {
   try {
     const saved = localStorage.getItem('itc-settings');
     if (saved) {
@@ -23,8 +23,8 @@ const loadSettings = () => {
   return defaultSettings;
 };
 
-// Save settings to localStorage
-const saveSettings = (settings) => {
+// Save settings to localStorage (browser fallback)
+const saveSettingsToLocalStorage = (settings) => {
   try {
     localStorage.setItem('itc-settings', JSON.stringify(settings));
   } catch (err) {
@@ -35,10 +35,10 @@ const saveSettings = (settings) => {
 function App() {
   const [statusMessage, setStatusMessage] = useState('');
   const [meaningText, setMeaningText] = useState('');
-  const [appVersion, setAppVersion] = useState('0.2.0');
+  const [appVersion, setAppVersion] = useState('0.2.1');
   const [showDocs, setShowDocs] = useState(false);
   const [showSettings, setShowSettings] = useState(false);
-  const [settings, setSettings] = useState(loadSettings);
+  const [settings, setSettings] = useState(loadSettingsFromLocalStorage);
   const [globalNotification, setGlobalNotification] = useState('');
   const [updateStatus, setUpdateStatus] = useState('');
 
@@ -59,9 +59,34 @@ function App() {
     fetchVersion();
   }, []);
 
+  // Load settings from Electron main process when available
+  useEffect(() => {
+    const loadElectronSettings = async () => {
+      if (!electronAPI || !electronAPI.isElectron || !electronAPI.getSettings) return;
+
+      try {
+        const result = await electronAPI.getSettings();
+        if (result && result.success && result.settings) {
+          setSettings(result.settings);
+        }
+      } catch (err) {
+        console.error('Failed to load Electron settings:', err);
+      }
+    };
+
+    loadElectronSettings();
+  }, []);
+
   // Save settings whenever they change
   useEffect(() => {
-    saveSettings(settings);
+    if (electronAPI && electronAPI.isElectron && electronAPI.setSettings) {
+      electronAPI.setSettings(settings).catch((err) => {
+        console.error('Failed to save Electron settings:', err);
+      });
+      return;
+    }
+
+    saveSettingsToLocalStorage(settings);
   }, [settings]);
 
   // Apply theme from settings
@@ -77,6 +102,10 @@ function App() {
       // Unregister all first to clean up
       await electronAPI.unregisterAllGlobalShortcuts();
 
+      if (!settings.globalShortcutsEnabled) {
+        return;
+      }
+
       // Register each shortcut that has global enabled
       for (const shortcut of settings.shortcuts) {
         if (shortcut.global) {
@@ -99,7 +128,7 @@ function App() {
     return () => {
       electronAPI.unregisterAllGlobalShortcuts();
     };
-  }, [settings.shortcuts]);
+  }, [settings.shortcuts, settings.globalShortcutsEnabled]);
 
   // Listen for global shortcut triggered events
   useEffect(() => {
@@ -377,7 +406,7 @@ function App() {
       {showSettings && (
         <Settings
           settings={settings}
-          onSettingsChange={handleSettingsChange}
+          onSave={handleSettingsChange}
           onClose={closeSettings}
         />
       )}

src/components/__tests__/App.test.js

@@ -214,9 +214,9 @@ describe('App Component', () => {
 
       render(<App />);
 
-      // Should fallback to default version (0.2.0)
+      // Should fallback to default version (0.2.1)
       await waitFor(() => {
-        expect(screen.getByText(/Version 0\.2\.0/i)).toBeInTheDocument();
+        expect(screen.getByText(/Version 0\.2\.1/i)).toBeInTheDocument();
       });
     });
 

src/main.js

@@ -1,5 +1,6 @@
 const { app, BrowserWindow, shell, ipcMain, globalShortcut, clipboard, dialog } = require('electron');
 const path = require('path');
+const fs = require('fs');
 const { autoUpdater } = require('electron-updater');
 
 // Keep a global reference of the window object
@@ -172,6 +173,38 @@ ipcMain.handle('get-version', async () => {
   return app.getVersion(); // Returns version from package.json
 });
 
+/**
+ * Settings persistence (stored in userData)
+ */
+function getSettingsFilePath() {
+  return path.join(app.getPath('userData'), 'settings.json');
+}
+
+ipcMain.handle('get-settings', async () => {
+  const settingsPath = getSettingsFilePath();
+  try {
+    const raw = await fs.promises.readFile(settingsPath, 'utf8');
+    return { success: true, settings: JSON.parse(raw) };
+  } catch (error) {
+    if (error && (error.code === 'ENOENT' || error.code === 'ENOTDIR')) {
+      return { success: true, settings: null };
+    }
+    console.error('Failed to read settings:', error);
+    return { success: false, error: error.message, settings: null };
+  }
+});
+
+ipcMain.handle('set-settings', async (event, settings) => {
+  const settingsPath = getSettingsFilePath();
+  try {
+    await fs.promises.writeFile(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
+    return { success: true };
+  } catch (error) {
+    console.error('Failed to write settings:', error);
+    return { success: false, error: error.message };
+  }
+});
+
 /**
  * Convert a key code to an Electron accelerator string
  */
@@ -181,9 +214,14 @@ function keyCodeToAccelerator(keyCode) {
     'Digit6': '6', 'Digit7': '7', 'Digit8': '8', 'Digit9': '9', 'Digit0': '0',
     'Minus': '-', 'Equal': '=', 'BracketLeft': '[', 'BracketRight': ']',
     'Semicolon': ';', 'Quote': "'", 'Comma': ',', 'Period': '.',
-    'Slash': '/', 'Backslash': '\\'
+    'Slash': '/', 'Backslash': '\\', 'Backquote': '`'
   };
-  return keyMap[keyCode] || keyCode;
+
+  if (keyMap[keyCode]) return keyMap[keyCode];
+  if (typeof keyCode === 'string' && keyCode.startsWith('Key') && keyCode.length === 4) {
+    return keyCode.slice(3);
+  }
+  return keyCode;
 }
 
 /**

src/preload.js

@@ -31,6 +31,10 @@ contextBridge.exposeInMainWorld('electronAPI', {
    */
   getVersion: () => ipcRenderer.invoke('get-version'),
 
+  getSettings: () => ipcRenderer.invoke('get-settings'),
+
+  setSettings: (settings) => ipcRenderer.invoke('set-settings', settings),
+
   /**
    * Register a global shortcut that works outside the app
    * @param {string} id - Unique identifier for the shortcut

src/setupTests.js

@@ -12,6 +12,8 @@ global.window.electronAPI = {
   openExternal: jest.fn(),
   openPath: jest.fn(),
   getVersion: jest.fn().mockResolvedValue('1.0.0'),
+  getSettings: jest.fn().mockResolvedValue({ success: true, settings: null }),
+  setSettings: jest.fn().mockResolvedValue({ success: true }),
   isElectron: true,
 };
 

version.txt

@@ -1 +1 @@
-221
+0.2.1