Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #455 from omnivore-app/fix/focus-after-set-labels

Browse Source 
Return focus to item after setting its labels
This commit is contained in:
Jackson Harper
2022-04-20 09:45:52 -07:00
committed by GitHub
parent c99466c21e 92423eaa0d
commit cdd2463fed
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/web/components/templates/homeFeed/HomeFeedContainer.tsx
View File

@ -236,14 +236,8 @@ export function HomeFeedContainer(props: HomeFeedContainerProps): JSX.Element {
return
}
// If any of the modals are open we disable handling keyboard shortcuts
if (labelsTarget || snoozeTarget || shareTarget) {
return
}
switch (action) {
case 'showDetail':
const username = viewerData?.me?.profile.username
if (username) {
setActiveCardId(item.node.id)
@ -293,6 +287,11 @@ export function HomeFeedContainer(props: HomeFeedContainerProps): JSX.Element {
return gridColumnCount
}
// If any of the modals are open we disable handling keyboard shortcuts
if (labelsTarget || snoozeTarget || shareTarget) {
return
}
switch (action) {
case 'openArticle':
handleCardAction('showDetail', activeItem)
@ -430,6 +429,9 @@ export function HomeFeedContainer(props: HomeFeedContainerProps): JSX.Element {
setLabelsTarget={setLabelsTarget}
showAddLinkModal={showAddLinkModal}
setShowAddLinkModal={setShowAddLinkModal}
setActiveItem={(item: LibraryItem) => {
activateCard(item.node.id)
}}
/>
)
}
@ -452,6 +454,7 @@ type HomeFeedContentProps = {
setLabelsTarget: (target: LibraryItem | undefined) => void
showAddLinkModal: boolean
setShowAddLinkModal: (show: boolean) => void
setActiveItem: (item: LibraryItem) => void
actionHandler: (
action: LinkedItemCardAction,
item: LibraryItem | undefined
@ -745,7 +748,11 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element {
}
}}
onOpenChange={() => {
props.setLabelsTarget(undefined)
if (props.labelsTarget) {
const activate = props.labelsTarget
props.setActiveItem(activate)
props.setLabelsTarget(undefined)
}
}}
/>
)}