From 567860b2db39205424f16f5a34f7b4802c48ce95 Mon Sep 17 00:00:00 2001 From: Tom Owers Date: Wed, 12 Jun 2024 11:37:28 +0100 Subject: [PATCH] Fixed react hook ordering --- .../DefinitionPopoverContents.tsx | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/frontend/src/lib/components/DefinitionPopover/DefinitionPopoverContents.tsx b/frontend/src/lib/components/DefinitionPopover/DefinitionPopoverContents.tsx index d3353fa63c245..6613083dbbd87 100644 --- a/frontend/src/lib/components/DefinitionPopover/DefinitionPopoverContents.tsx +++ b/frontend/src/lib/components/DefinitionPopover/DefinitionPopoverContents.tsx @@ -174,19 +174,23 @@ function DefinitionView({ group }: { group: TaxonomicFilterGroup }): JSX.Element ) } - if (isProperty) { + + const hasSentAsLabel = useMemo(() => { const _definition = definition as PropertyDefinition - const hasSentAsLabel = useMemo(() => { - if (isDataWarehousePersonProperty) { - return _definition.id - } - if (_definition.name !== '') { - return _definition.name - } + if (isDataWarehousePersonProperty) { + return _definition.id + } - return (empty string) - }, [isDataWarehousePersonProperty, _definition]) + if (_definition.name !== '') { + return _definition.name + } + + return (empty string) + }, [isDataWarehousePersonProperty, definition, isProperty]) + + if (isProperty) { + const _definition = definition as PropertyDefinition return ( <>