@@ -11,7 +11,7 @@ import { WebApplication } from '@/Application/WebApplication'
1111import { PANEL_NAME_NOTES } from '@/Constants/Constants'
1212import { FileItem , Platform , PrefKey , WebAppEvent } from '@standardnotes/snjs'
1313import { observer } from 'mobx-react-lite'
14- import { forwardRef , useCallback , useEffect , useMemo } from 'react'
14+ import { forwardRef , useCallback , useEffect , useMemo , useRef } from 'react'
1515import ContentList from '@/Components/ContentListView/ContentList'
1616import NoAccountWarning from '@/Components/NoAccountWarning/NoAccountWarning'
1717import { ElementIds } from '@/Constants/ElementIDs'
@@ -25,7 +25,6 @@ import DailyContentList from './Daily/DailyContentList'
2525import { ListableContentItem } from './Types/ListableContentItem'
2626import { FeatureName } from '@/Controllers/FeatureName'
2727import { PanelResizedData } from '@/Types/PanelResizedData'
28- import { useForwardedRef } from '@/Hooks/useForwardedRef'
2928import FloatingAddButton from './FloatingAddButton'
3029import ContentTableView from '../ContentTableView/ContentTableView'
3130import { MutuallyExclusiveMediaQueryBreakpoints , useMediaQuery } from '@/Hooks/useMediaQuery'
@@ -77,7 +76,7 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
7776 selectPreviousItem,
7877 } = itemListController
7978
80- const innerRef = useForwardedRef ( ref )
79+ const innerRef = useRef < HTMLDivElement | null > ( null )
8180
8281 const { addDragTarget, removeDragTarget } = useFileDragNDrop ( )
8382
@@ -297,7 +296,7 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
297296 id = { id }
298297 className = { classNames ( className , 'sn-component section h-full overflow-hidden pt-safe-top' ) }
299298 aria-label = { 'Notes & Files' }
300- ref = { mergeRefs ( [ innerRef , setElement ] ) }
299+ ref = { mergeRefs ( [ ref , innerRef , setElement ] ) }
301300 >
302301 { isMobileScreen && ! itemListController . isMultipleSelectionMode && (
303302 < FloatingAddButton onClick = { addNewItem } label = { addButtonLabel } style = { dailyMode ? 'danger' : 'info' } />
0 commit comments