Merge pull request #106 from brainstormforce/sidebar-collapse

Sidebar collapse
brainstormforce · Oct 3, 2024 · 1f0ca41 · 1f0ca41
2 parents 9545d1a + 6021cf3
commit 1f0ca41
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/dist/force-ui.asset.php b/dist/force-ui.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom'), 'version' => '078fc74692ede3c0d6af');
+<?php return array('dependencies' => array('react', 'react-dom'), 'version' => 'cb8b68fc4b596e83b76c');
diff --git a/dist/force-ui.js b/dist/force-ui.js
diff --git a/src/components/sidebar/sidebar.jsx b/src/components/sidebar/sidebar.jsx
@@ -38,13 +38,21 @@ const Sidebar = ( {
 	useEffect( () => {
 		const handleScreenResize = () => {
 			const isSmallScreen = window.innerWidth < 1280;
-			if ( isSmallScreen ) {
+			if ( ! collapsible ) {
+				setIsCollapsed( false );
+				localStorage.removeItem( 'sidebar-collapsed' );
+			} else if ( isSmallScreen ) {
 				setIsCollapsed( true );
-
-				localStorage.setItem( 'sidebar-collapsed', JSON.stringify( true ) );
+				localStorage.setItem(
+					'sidebar-collapsed',
+					JSON.stringify( true )
+				);
 			} else {
-				const storedState = localStorage.getItem( 'sidebar-collapsed' );
-				setIsCollapsed( storedState ? JSON.parse( storedState ) : false );
+				const storedState =
+						localStorage.getItem( 'sidebar-collapsed' );
+				setIsCollapsed(
+					storedState ? JSON.parse( storedState ) : false
+				);
 			}
 
 			if ( sideBarRef.current ) {
@@ -62,7 +70,7 @@ const Sidebar = ( {
 		return () => {
 			window.removeEventListener( 'resize', handleScreenResize );
 		};
-	}, [ screenHeight ] );
+	}, [ screenHeight, collapsible ] );
 
 	return (
 		<SidebarContext.Provider
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react', 'react-dom'), 'version' => '078fc74692ede3c0d6af');
		<?php return array('dependencies' => array('react', 'react-dom'), 'version' => 'cb8b68fc4b596e83b76c');