fix: Fix issue with toggling notes panel back on when it has been turned off
(fixes standardnotes/forum#3754)
This commit is contained in:
@@ -11,7 +11,7 @@ import { WebApplication } from '@/Application/WebApplication'
|
||||
import { PANEL_NAME_NOTES } from '@/Constants/Constants'
|
||||
import { FileItem, Platform, PrefKey, WebAppEvent } from '@standardnotes/snjs'
|
||||
import { observer } from 'mobx-react-lite'
|
||||
import { forwardRef, useCallback, useEffect, useMemo } from 'react'
|
||||
import { forwardRef, useCallback, useEffect, useMemo, useRef } from 'react'
|
||||
import ContentList from '@/Components/ContentListView/ContentList'
|
||||
import NoAccountWarning from '@/Components/NoAccountWarning/NoAccountWarning'
|
||||
import { ElementIds } from '@/Constants/ElementIDs'
|
||||
@@ -25,7 +25,6 @@ import DailyContentList from './Daily/DailyContentList'
|
||||
import { ListableContentItem } from './Types/ListableContentItem'
|
||||
import { FeatureName } from '@/Controllers/FeatureName'
|
||||
import { PanelResizedData } from '@/Types/PanelResizedData'
|
||||
import { useForwardedRef } from '@/Hooks/useForwardedRef'
|
||||
import FloatingAddButton from './FloatingAddButton'
|
||||
import ContentTableView from '../ContentTableView/ContentTableView'
|
||||
import { MutuallyExclusiveMediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
|
||||
@@ -77,7 +76,7 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
|
||||
selectPreviousItem,
|
||||
} = itemListController
|
||||
|
||||
const innerRef = useForwardedRef(ref)
|
||||
const innerRef = useRef<HTMLDivElement | null>(null)
|
||||
|
||||
const { addDragTarget, removeDragTarget } = useFileDragNDrop()
|
||||
|
||||
@@ -297,7 +296,7 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
|
||||
id={id}
|
||||
className={classNames(className, 'sn-component section h-full overflow-hidden pt-safe-top')}
|
||||
aria-label={'Notes & Files'}
|
||||
ref={mergeRefs([innerRef, setElement])}
|
||||
ref={mergeRefs([ref, innerRef, setElement])}
|
||||
>
|
||||
{isMobileScreen && !itemListController.isMultipleSelectionMode && (
|
||||
<FloatingAddButton onClick={addNewItem} label={addButtonLabel} style={dailyMode ? 'danger' : 'info'} />
|
||||
|
||||
@@ -269,5 +269,5 @@ export const usePaneSwipeGesture = (
|
||||
}
|
||||
}, [direction, element, isMobileScreen, onSwipeEndRef, isEnabled, adjustedGesture, requiresStartFromEdge])
|
||||
|
||||
return [setElement]
|
||||
return [setElement] as const
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user