Skip to content

Commit 7516aae

Browse files
committed
fix: Fix issue with toggling notes panel back on when it has been turned off
(fixes standardnotes/forum#3754)
1 parent 63db4c5 commit 7516aae

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { WebApplication } from '@/Application/WebApplication'
1111
import { PANEL_NAME_NOTES } from '@/Constants/Constants'
1212
import { FileItem, Platform, PrefKey, WebAppEvent } from '@standardnotes/snjs'
1313
import { observer } from 'mobx-react-lite'
14-
import { forwardRef, useCallback, useEffect, useMemo } from 'react'
14+
import { forwardRef, useCallback, useEffect, useMemo, useRef } from 'react'
1515
import ContentList from '@/Components/ContentListView/ContentList'
1616
import NoAccountWarning from '@/Components/NoAccountWarning/NoAccountWarning'
1717
import { ElementIds } from '@/Constants/ElementIDs'
@@ -25,7 +25,6 @@ import DailyContentList from './Daily/DailyContentList'
2525
import { ListableContentItem } from './Types/ListableContentItem'
2626
import { FeatureName } from '@/Controllers/FeatureName'
2727
import { PanelResizedData } from '@/Types/PanelResizedData'
28-
import { useForwardedRef } from '@/Hooks/useForwardedRef'
2928
import FloatingAddButton from './FloatingAddButton'
3029
import ContentTableView from '../ContentTableView/ContentTableView'
3130
import { 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'} />

packages/web/src/javascripts/Components/Panes/usePaneGesture.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,5 +269,5 @@ export const usePaneSwipeGesture = (
269269
}
270270
}, [direction, element, isMobileScreen, onSwipeEndRef, isEnabled, adjustedGesture, requiresStartFromEdge])
271271

272-
return [setElement]
272+
return [setElement] as const
273273
}

0 commit comments

Comments
 (0)