From 257c9dcd7f853d371d382e8f41fdebc1c24b743f Mon Sep 17 00:00:00 2001 From: Leangseu Kim <83240113+leangseu-edx@users.noreply.github.com> Date: Tue, 14 May 2024 11:22:55 -0400 Subject: [PATCH] chore: make sidebar less intrusive for mobile (#1377) * chore: fix incorrect fetch result * chore: make sidebar less intrusive for mobile * chore: linting --- src/courseware/course/sidebar/SidebarContextProvider.jsx | 8 +++++--- src/courseware/data/thunks.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/courseware/course/sidebar/SidebarContextProvider.jsx b/src/courseware/course/sidebar/SidebarContextProvider.jsx index 84dfa1df..05472c01 100644 --- a/src/courseware/course/sidebar/SidebarContextProvider.jsx +++ b/src/courseware/course/sidebar/SidebarContextProvider.jsx @@ -28,8 +28,8 @@ const SidebarProvider = ({ const { alwaysOpenAuxiliarySidebar } = useSelector(getCoursewareOutlineSidebarSettings); const isInitiallySidebarOpen = shouldDisplaySidebarOpen || query.get('sidebar') === 'true'; - let initialSidebar = null; - if (isInitiallySidebarOpen && alwaysOpenAuxiliarySidebar) { + let initialSidebar = shouldDisplayFullScreen ? getLocalStorage(`sidebar.${courseId}`) : null; + if (!shouldDisplayFullScreen && isInitiallySidebarOpen && alwaysOpenAuxiliarySidebar) { initialSidebar = isUnitHasDiscussionTopics ? SIDEBARS[discussionsSidebar.ID].ID : verifiedMode && SIDEBARS[notificationsSidebar.ID].ID; @@ -57,7 +57,9 @@ const SidebarProvider = ({ const toggleSidebar = useCallback((sidebarId) => { // Switch to new sidebar or hide the current sidebar - setCurrentSidebar(sidebarId === currentSidebar ? null : sidebarId); + const newSidebar = sidebarId === currentSidebar ? null : sidebarId; + setCurrentSidebar(newSidebar); + setLocalStorage(`sidebar.${courseId}`, newSidebar); }, [currentSidebar]); const contextValue = useMemo(() => ({ diff --git a/src/courseware/data/thunks.js b/src/courseware/data/thunks.js index 54eb5d16..7222d357 100644 --- a/src/courseware/data/thunks.js +++ b/src/courseware/data/thunks.js @@ -113,7 +113,7 @@ export function fetchCourse(courseId) { logError(courseHomeMetadataResult.reason); } if (!fetchedCoursewareOutlineSidebarTogglesResult) { - logError(fetchedCoursewareOutlineSidebarTogglesResult.reason); + logError(coursewareOutlineSidebarTogglesResult.reason); } if (fetchedMetadata && fetchedCourseHomeMetadata) { if (courseHomeMetadataResult.value.courseAccess.hasAccess && fetchedOutline) {