FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-18 23:46:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(nui): Don't display metadata popover if there is no metadata

Browse Source
This commit is contained in:
Luke
2022-03-27 19:10:44 +02:00
parent ac832d4840
commit edce4b4a82
2 changed files with 80 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/TextUI.tsx
View File

@@ -59,9 +59,7 @@ const TextUI: React.FC = () => {
borderRadius="md" borderRadius="md"
maxW="xs" maxW="xs"
> >
<Text>
<ReactMarkdown>{data.text}</ReactMarkdown> <ReactMarkdown>{data.text}</ReactMarkdown>
</Text>
</Box> </Box>
</ScaleFade> </ScaleFade>
</Flex> </Flex>

16
web/src/components/features/menu/Item.tsx
View File

@@ -16,6 +16,7 @@ const Item: React.FC<{
option: [string, Option]; option: [string, Option];
}> = ({ option }) => { }> = ({ option }) => {
return ( return (
<>
<Popover <Popover
placement="right-start" placement="right-start"
trigger="hover" trigger="hover"
@@ -63,6 +64,7 @@ const Item: React.FC<{
)} )}
</Flex> </Flex>
<Portal> <Portal>
{option[1].metadata && (
<PopoverContent <PopoverContent
fontFamily="Poppins" fontFamily="Poppins"
bg="gray.800" bg="gray.800"
@@ -72,10 +74,14 @@ const Item: React.FC<{
maxW="2xs" maxW="2xs"
> >
<PopoverBody> <PopoverBody>
{option[1]?.metadata && Array.isArray(option[1].metadata) ? ( {Array.isArray(option[1].metadata) ? (
option[1].metadata.map((metadata: string, index: number) => ( option[1].metadata.map(
<Text key={`context-metadata-${index}`}>{metadata}</Text> (metadata: string, index: number) => (
)) <Text key={`context-metadata-${index}`}>
{metadata}
</Text>
)
)
) : ( ) : (
<> <>
{typeof option[1].metadata === "object" && {typeof option[1].metadata === "object" &&
@@ -90,10 +96,12 @@ const Item: React.FC<{
)} )}
</PopoverBody> </PopoverBody>
</PopoverContent> </PopoverContent>
)}
</Portal> </Portal>
</Box> </Box>
</PopoverTrigger> </PopoverTrigger>
</Popover> </Popover>
</>
); );
}; };