evo/EvoCalculator
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove toolip from renderSections

Browse Source
This commit is contained in:
Chika 2021-09-01 14:55:34 +03:00
parent be8e354bdb
commit fb1cfe137e
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/Containers/Calculation/lib/elements/elementsProps.ts
View File

@ -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<ElementProps> = {
max: 9999999,
precision: 2,
tooltip: {
title: 'Без учета налога на роскошь',
placement: 'topLeft',
Component: buildTooltip({
title: 'Без учета налога на роскошь',
placement: 'topLeft',
}),
},
},
tbxVehicleTaxInLeasingPeriod: {

19
src/client/Containers/Calculation/lib/renderSections.js
View File

@ -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 (
<Tooltip {...tooltip}>
<Flex flexDirection="column" key={ie}>
<Head sub={sub} elementTitle={elementTitle} />
<Component />
</Flex>
</Tooltip>
const Tooltip = tooltip?.Component;
const element = (
<Flex flexDirection="column" key={ie}>
<Head sub={sub} elementTitle={elementTitle} />
<Component />
</Flex>
);
if (tooltip) {
return <Tooltip>{element}</Tooltip>;
}
return element;
});
};

4
src/client/Elements/Tooltip.jsx
View File

@ -1,3 +1,5 @@
import { Tooltip as AntTooltip } from 'antd';
export default AntTooltip;
export default params => props => (
<AntTooltip {...params}>{props.children}</AntTooltip>
);