Skip to content

Commit 63d6254

Browse files
dej611kibanamachine
andcommitted
[Lens] Remove reference tooltip in Formula panel when the popup is open (#103283)
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
1 parent dcacd04 commit 63d6254

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { monaco } from '@kbn/monaco';
2424
import classNames from 'classnames';
2525
import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
2626
import type { CodeEditorProps } from '../../../../../../../../../src/plugins/kibana_react/public';
27-
import { useDebounceWithOptions } from '../../../../../shared_components';
27+
import { TooltipWrapper, useDebounceWithOptions } from '../../../../../shared_components';
2828
import { ParamEditorProps } from '../../index';
2929
import { getManagedColumnsFrom } from '../../../layer_helpers';
3030
import { ErrorWrapper, runASTValidation, tryToParse } from '../validation';
@@ -729,11 +729,16 @@ export function FormulaEditor({
729729
</EuiLink>
730730
</EuiToolTip>
731731
) : (
732-
<EuiToolTip
733-
content={i18n.translate('xpack.lens.formula.editorHelpOverlayToolTip', {
734-
defaultMessage: 'Function reference',
735-
})}
732+
<TooltipWrapper
733+
tooltipContent={i18n.translate(
734+
'xpack.lens.formula.editorHelpOverlayToolTip',
735+
{
736+
defaultMessage: 'Function reference',
737+
}
738+
)}
739+
condition={!isHelpOpen}
736740
position="top"
741+
delay="regular"
737742
>
738743
<EuiPopover
739744
panelClassName="lnsFormula__docs lnsFormula__docs--overlay"
@@ -764,7 +769,7 @@ export function FormulaEditor({
764769
operationDefinitionMap={visibleOperationsMap}
765770
/>
766771
</EuiPopover>
767-
</EuiToolTip>
772+
</TooltipWrapper>
768773
)}
769774
</EuiFlexItem>
770775

x-pack/plugins/lens/public/shared_components/tooltip_wrapper.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@
66
*/
77

88
import React from 'react';
9-
import { EuiToolTip } from '@elastic/eui';
9+
import { EuiToolTip, EuiToolTipProps } from '@elastic/eui';
1010

11-
export interface TooltipWrapperProps {
11+
export type TooltipWrapperProps = Partial<Omit<EuiToolTipProps, 'content'>> & {
1212
tooltipContent: string;
1313
condition: boolean;
14-
}
14+
};
1515

1616
export const TooltipWrapper: React.FunctionComponent<TooltipWrapperProps> = ({
1717
children,
1818
condition,
1919
tooltipContent,
20+
...tooltipProps
2021
}) => {
2122
return (
2223
<>
2324
{condition ? (
24-
<EuiToolTip content={tooltipContent} delay="long">
25+
<EuiToolTip content={tooltipContent} delay="long" {...tooltipProps}>
2526
<>{children}</>
2627
</EuiToolTip>
2728
) : (

0 commit comments

Comments
 (0)