Merge pull request #1102 from jstastny/js/mac-back-navigation

Navigation on Mac with Command instead of Option

app/browser/tools/shortcuts.js

@@ -25,14 +25,22 @@ class Shortcuts {
 	}
 }
 
+const isMac = os.platform() === 'darwin';
+
 const KEY_MAPS = {
 	'CTRL_+': () => zoom.increaseZoomLevel(),
 	'CTRL_=': () => zoom.increaseZoomLevel(),
 	'CTRL_-': () => zoom.decreaseZoomLevel(),
 	'CTRL__': () => zoom.decreaseZoomLevel(),
 	'CTRL_0': () => zoom.resetZoomLevel(),
-	'ALT_ArrowLeft': () => window.history.back(),
-	'ALT_ArrowRight': () => window.history.forward()
+	// Alt (Option) Left / Right is used to jump words in Mac, so diabling the history navigation for Mac here
+	...(!isMac ? 
+		{ 
+			'ALT_ArrowLeft': () => window.history.back(),
+		    'ALT_ArrowRight': () => window.history.forward()
+		} 
+		: {}
+		)
 };
 
 function initInternal() {

com.github.IsmaelMartinez.teams_for_linux.appdata.xml

@@ -14,6 +14,13 @@
 	<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
 	<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
 	<releases>
+		<release version="1.4.11" date="2024-02-14">
+			<description>
+				<ul>
+					<li>Fix: MacOS - Disable Option + Left / Right keyboard shortcuts for history navigation (it is used for word jumping on MacOS)</li>
+				</ul>
+			</description>
+		</release>
 		<release version="1.4.10" date="2024-02-04">
 			<description>
 				<ul>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "1.4.10",
+  "version": "1.4.11",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",