From fb1cfe137ea2d53b55c6764232a8110a81d779fe Mon Sep 17 00:00:00 2001 From: Chika Date: Wed, 1 Sep 2021 14:55:34 +0300 Subject: [PATCH] remove toolip from renderSections --- .../Calculation/lib/elements/elementsProps.ts | 7 +++++-- .../Calculation/lib/renderSections.js | 19 +++++++++++-------- src/client/Elements/Tooltip.jsx | 4 +++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/client/Containers/Calculation/lib/elements/elementsProps.ts b/src/client/Containers/Calculation/lib/elements/elementsProps.ts index 5c84ab0..0d28076 100644 --- a/src/client/Containers/Calculation/lib/elements/elementsProps.ts +++ b/src/client/Containers/Calculation/lib/elements/elementsProps.ts @@ -1,6 +1,7 @@ import DownloadOutlined from '@ant-design/icons/lib/icons/DownloadOutlined'; import InsuranceTag from 'client/Components/Calculation/InsuranceTag'; import Link from 'client/Elements/Link'; +import buildTooltip from 'client/Elements/Tooltip'; import { withLink } from 'client/hocs/Calculation'; import { MAX_FRANCHISE } from 'core/constants/stores/Calculation/limits'; import { currentYear } from 'core/tools/date'; @@ -407,8 +408,10 @@ const elementsProps: TElements = { max: 9999999, precision: 2, tooltip: { - title: 'Без учета налога на роскошь', - placement: 'topLeft', + Component: buildTooltip({ + title: 'Без учета налога на роскошь', + placement: 'topLeft', + }), }, }, tbxVehicleTaxInLeasingPeriod: { diff --git a/src/client/Containers/Calculation/lib/renderSections.js b/src/client/Containers/Calculation/lib/renderSections.js index 80fe4f3..655f6fd 100644 --- a/src/client/Containers/Calculation/lib/renderSections.js +++ b/src/client/Containers/Calculation/lib/renderSections.js @@ -1,7 +1,6 @@ import { Tabs } from 'antd'; import Divider from 'client/Elements/Divider'; import { SecondaryColoredText } from 'client/Elements/Text'; -import Tooltip from 'client/Elements/Tooltip'; import colors from 'client/UIKit/colors'; import { Box, Flex } from 'client/UIKit/grid'; import mq from 'client/UIKit/mq'; @@ -44,14 +43,18 @@ const renderElements = ({ elements }) => { const { tooltip, sub, ...elementProps } = elementsProps[elementName] || {}; const Component = buildElement(elementName, elementProps); - return ( - - - - - - + const Tooltip = tooltip?.Component; + + const element = ( + + + + ); + if (tooltip) { + return {element}; + } + return element; }); }; diff --git a/src/client/Elements/Tooltip.jsx b/src/client/Elements/Tooltip.jsx index 724d116..1e48026 100644 --- a/src/client/Elements/Tooltip.jsx +++ b/src/client/Elements/Tooltip.jsx @@ -1,3 +1,5 @@ import { Tooltip as AntTooltip } from 'antd'; -export default AntTooltip; +export default params => props => ( + {props.children} +);