chore: fix vault selection menu not auto-updating on vault changes
This commit is contained in:
@@ -1,14 +1,20 @@
|
|||||||
import { FunctionComponent, useCallback } from 'react'
|
import { FunctionComponent, useCallback, useEffect, useState } from 'react'
|
||||||
import Menu from '../Menu/Menu'
|
import Menu from '../Menu/Menu'
|
||||||
import { useApplication } from '../ApplicationProvider'
|
import { useApplication } from '../ApplicationProvider'
|
||||||
import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem'
|
import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem'
|
||||||
import Icon from '../Icon/Icon'
|
import Icon from '../Icon/Icon'
|
||||||
import { VaultListingInterface } from '@standardnotes/snjs'
|
import { ContentType, VaultListingInterface } from '@standardnotes/snjs'
|
||||||
import { observer } from 'mobx-react-lite'
|
import { observer } from 'mobx-react-lite'
|
||||||
|
|
||||||
const ManyVaultSelectionMenu: FunctionComponent = () => {
|
const ManyVaultSelectionMenu: FunctionComponent = () => {
|
||||||
const application = useApplication()
|
const application = useApplication()
|
||||||
const vaults = application.vaults.getVaults()
|
|
||||||
|
const [vaults, setVaults] = useState(() => application.vaults.getVaults())
|
||||||
|
useEffect(() => {
|
||||||
|
return application.items.streamItems(ContentType.TYPES.VaultListing, () => {
|
||||||
|
setVaults(application.vaults.getVaults())
|
||||||
|
})
|
||||||
|
}, [application.items, application.vaults])
|
||||||
|
|
||||||
const isVaultVisible = useCallback(
|
const isVaultVisible = useCallback(
|
||||||
(vault: VaultListingInterface) => {
|
(vault: VaultListingInterface) => {
|
||||||
@@ -30,7 +36,7 @@ const ManyVaultSelectionMenu: FunctionComponent = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu a11yLabel="Vault selection menu" isOpen>
|
<Menu a11yLabel="Vault selection menu" isOpen>
|
||||||
{!vaults.length && <div className="text-center py-1">No vaults found</div>}
|
{!vaults.length && <div className="py-1 text-center">No vaults found</div>}
|
||||||
{vaults.map((vault) => (
|
{vaults.map((vault) => (
|
||||||
<MenuSwitchButtonItem
|
<MenuSwitchButtonItem
|
||||||
onChange={() => {
|
onChange={() => {
|
||||||
|
|||||||
@@ -1,14 +1,20 @@
|
|||||||
import { FunctionComponent, useCallback } from 'react'
|
import { FunctionComponent, useCallback, useEffect, useState } from 'react'
|
||||||
import Menu from '../Menu/Menu'
|
import Menu from '../Menu/Menu'
|
||||||
import { useApplication } from '../ApplicationProvider'
|
import { useApplication } from '../ApplicationProvider'
|
||||||
import { VaultListingInterface } from '@standardnotes/snjs'
|
import { ContentType, VaultListingInterface } from '@standardnotes/snjs'
|
||||||
import MenuRadioButtonItem from '../Menu/MenuRadioButtonItem'
|
import MenuRadioButtonItem from '../Menu/MenuRadioButtonItem'
|
||||||
import { observer } from 'mobx-react-lite'
|
import { observer } from 'mobx-react-lite'
|
||||||
import Icon from '../Icon/Icon'
|
import Icon from '../Icon/Icon'
|
||||||
|
|
||||||
const SingleVaultSelectionMenu: FunctionComponent = () => {
|
const SingleVaultSelectionMenu: FunctionComponent = () => {
|
||||||
const application = useApplication()
|
const application = useApplication()
|
||||||
const vaults = application.vaults.getVaults()
|
|
||||||
|
const [vaults, setVaults] = useState(() => application.vaults.getVaults())
|
||||||
|
useEffect(() => {
|
||||||
|
return application.items.streamItems(ContentType.TYPES.VaultListing, () => {
|
||||||
|
setVaults(application.vaults.getVaults())
|
||||||
|
})
|
||||||
|
}, [application.items, application.vaults])
|
||||||
|
|
||||||
const isVaultVisible = useCallback(
|
const isVaultVisible = useCallback(
|
||||||
(vault: VaultListingInterface) => {
|
(vault: VaultListingInterface) => {
|
||||||
@@ -26,7 +32,7 @@ const SingleVaultSelectionMenu: FunctionComponent = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu a11yLabel="Vault selection menu" isOpen>
|
<Menu a11yLabel="Vault selection menu" isOpen>
|
||||||
{!vaults.length && <div className="text-center py-1">No vaults found</div>}
|
{!vaults.length && <div className="py-1 text-center">No vaults found</div>}
|
||||||
{vaults.map((vault) => (
|
{vaults.map((vault) => (
|
||||||
<MenuRadioButtonItem key={vault.uuid} checked={isVaultVisible(vault)} onClick={() => selectVault(vault)}>
|
<MenuRadioButtonItem key={vault.uuid} checked={isVaultVisible(vault)} onClick={() => selectVault(vault)}>
|
||||||
<div className="flex w-full items-center gap-1">
|
<div className="flex w-full items-center gap-1">
|
||||||
|
|||||||
Reference in New Issue
Block a user