From e533b7c01743c479bda67aa8dd490621689f285e Mon Sep 17 00:00:00 2001 From: Sayam Samal Date: Wed, 14 May 2025 13:17:35 +0530 Subject: [PATCH] ui_util: Improve enable_element_and_remove_tooltip method logic. This commit improves the enable_element_and_remove_tooltip method to only unwrap the disabled element from the tooltip wrapper, once we confirm the wrappers existence. (cherry picked from commit 30bfabb2eb6181ed220bfde4ba4744125263b9d8) --- web/src/ui_util.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/src/ui_util.ts b/web/src/ui_util.ts index fae05076e4..6c52e6d231 100644 --- a/web/src/ui_util.ts +++ b/web/src/ui_util.ts @@ -299,9 +299,12 @@ export function enable_element_and_remove_tooltip($element: JQuery): void { // and explicitly removes any attached tooltips on the wrapper to prevent // ghost tooltips. $element.prop("disabled", false); - const tooltip_wrapper: tippy.ReferenceElement = $element.parent(".disabled-tooltip")[0]!; - if (tooltip_wrapper?._tippy) { - tooltip_wrapper._tippy.destroy(); + const tooltip_wrapper: tippy.ReferenceElement | undefined = + $element.parent(".disabled-tooltip")[0]; + if (tooltip_wrapper) { + if (tooltip_wrapper._tippy) { + tooltip_wrapper._tippy.destroy(); + } + $element.unwrap(".disabled-tooltip"); } - $element.unwrap(".disabled-tooltip"); }