From 7c44442bb8abaee28dabc6663ce218e17e4ce698 Mon Sep 17 00:00:00 2001
From: SrGooglo <srgooglo@ragestudio.net>
Date: Sun, 15 Sep 2024 17:46:24 +0000
Subject: [PATCH] remove sidebar auto collapse

---
 .../src/layouts/components/sidebar/index.jsx  | 27 +++----------------
 packages/app/src/settings/general/index.jsx   | 14 ----------
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/packages/app/src/layouts/components/sidebar/index.jsx b/packages/app/src/layouts/components/sidebar/index.jsx
index fdb6f5a6..5b15e49e 100755
--- a/packages/app/src/layouts/components/sidebar/index.jsx
+++ b/packages/app/src/layouts/components/sidebar/index.jsx
@@ -152,10 +152,6 @@ export default class Sidebar extends React.Component {
 
 		setTimeout(() => {
 			this.interface.toggleVisibility(true)
-
-			if (app.cores.settings.is("sidebar.collapsable", false)) {
-				this.interface.toggleExpanded(true)
-			}
 		}, 10)
 	}
 
@@ -304,24 +300,11 @@ export default class Sidebar extends React.Component {
 	}
 
 	onMouseEnter = () => {
-		if (!this.state.visible) {
+		if (!this.state.visible || app.layout.drawer.isMaskVisible()) {
 			return false
 		}
 
-		if (window.app.cores.settings.is("sidebar.collapsable", false)) {
-			if (!this.state.expanded) {
-				this.interface.toggleExpanded(true)
-			}
-
-			return false
-		}
-
-		// do nothing if is mask visible
-		if (app.layout.drawer.isMaskVisible()) {
-			return false
-		}
-
-		this.interface.toggleExpanded(true)
+		return this.interface.toggleExpanded(true)
 	}
 
 	handleMouseLeave = () => {
@@ -329,11 +312,7 @@ export default class Sidebar extends React.Component {
 			return false
 		}
 
-		if (window.app.cores.settings.is("sidebar.collapsable", false)) {
-			return false
-		}
-
-		this.interface.toggleExpanded(false)
+		return this.interface.toggleExpanded(false)
 	}
 
 	onDropdownOpenChange = (to) => {
diff --git a/packages/app/src/settings/general/index.jsx b/packages/app/src/settings/general/index.jsx
index a3e139c1..ddb15aed 100755
--- a/packages/app/src/settings/general/index.jsx
+++ b/packages/app/src/settings/general/index.jsx
@@ -117,25 +117,11 @@ export default {
             },
             mobile: false,
         },
-        {
-            id: "sidebar.collapsable",
-            group: "sidebar",
-            component: "Switch",
-            icon: "Columns",
-            title: "Auto Collapse",
-            description: "Allow to collapse the sidebar when loose focus.",
-            emitEvent: "settingChanged.sidebar_collapse",
-            storaged: true,
-            mobile: false,
-        },
         {
             id: "sidebar.collapse_delay_time",
             group: "sidebar",
             component: "Slider",
             icon: "MdTimer",
-            dependsOn: {
-                "sidebar.collapsable": true
-            },
             title: "Auto Collapse timeout",
             description: "Set the delay before the sidebar is collapsed",
             props: {