From 65f311920432416f547e83831cfcdfef2dc570af Mon Sep 17 00:00:00 2001 From: Georg Bremer Date: Thu, 11 Apr 2024 15:40:33 +0200 Subject: [PATCH] chore: Add absolute date tooltip in history (#9629) --- packages/client/components/SimpleTooltip.tsx | 31 +++++++++++++++++++ .../client/components/TimelineEventDate.tsx | 8 ++++- .../TeamDashInsights/MostUsedEmojisCard.tsx | 6 ++-- .../TeamDashInsights/TeamInsightsCard.tsx | 6 ++-- .../TopRetroTemplatesCard.tsx | 6 ++-- 5 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 packages/client/components/SimpleTooltip.tsx diff --git a/packages/client/components/SimpleTooltip.tsx b/packages/client/components/SimpleTooltip.tsx new file mode 100644 index 00000000000..a38ebd8bacb --- /dev/null +++ b/packages/client/components/SimpleTooltip.tsx @@ -0,0 +1,31 @@ +import clsx from 'clsx' +import React, {ReactNode} from 'react' +import {MenuPosition} from '../hooks/useCoords' +import useTooltip from '../hooks/useTooltip' + +interface Props { + text: ReactNode + children: ReactNode + className?: string +} + +const SimpleTooltip = (props: Props) => { + const {text, children, className} = props + const {openTooltip, closeTooltip, tooltipPortal, originRef} = useTooltip( + MenuPosition.UPPER_CENTER + ) + + return ( +
+ {children} + {tooltipPortal(text)} +
+ ) +} + +export default SimpleTooltip diff --git a/packages/client/components/TimelineEventDate.tsx b/packages/client/components/TimelineEventDate.tsx index eae6dc65acd..fa309d87165 100644 --- a/packages/client/components/TimelineEventDate.tsx +++ b/packages/client/components/TimelineEventDate.tsx @@ -2,7 +2,9 @@ import styled from '@emotion/styled' import ms from 'ms' import React, {Component} from 'react' import {PALETTE} from '../styles/paletteV3' +import absoluteDate from '../utils/date/absoluteDate' import relativeDate from '../utils/date/relativeDate' +import SimpleTooltip from './SimpleTooltip' const StyledSpan = styled('span')({ color: PALETTE.SLATE_600, @@ -41,7 +43,11 @@ class TimelineEventDate extends Component { render() { const {fromNow} = this.state - return {fromNow} + return ( + + {fromNow} + + ) } } diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/MostUsedEmojisCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/MostUsedEmojisCard.tsx index 4fe97897bc2..aabb832be1b 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashInsights/MostUsedEmojisCard.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/MostUsedEmojisCard.tsx @@ -2,7 +2,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {MostUsedEmojisCard_insights$key} from '~/__generated__/MostUsedEmojisCard_insights.graphql' -import Tooltip from '../../../../components/Tooltip' +import SimpleTooltip from '../../../../components/SimpleTooltip' import getReactji from '../../../../utils/getReactji' import TeamInsightsCard from './TeamInsightsCard' @@ -41,9 +41,9 @@ const MostUsedEmojisCard = (props: Props) => { const {unicode, shortName} = getReactji(emoji.id) return (
- +
{unicode}
-
+
{emoji.count}
) diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx index c4ffa985305..6e9922db025 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx @@ -1,7 +1,7 @@ import graphql from 'babel-plugin-relay/macro' import React, {ReactNode, useState} from 'react' import {useFragment} from 'react-relay' -import Tooltip from '../../../../components/Tooltip' +import SimpleTooltip from '../../../../components/SimpleTooltip' import {Info as InfoIcon} from '@mui/icons-material' import {ThumbUp, ThumbDown} from '@mui/icons-material' import FlatButton from '../../../../components/FlatButton' @@ -51,9 +51,9 @@ const TeamInsightsCard = (props: Props) => {
{title}
- + - +
{children}
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx index aaf9bbd3e64..d62c822e707 100644 --- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx +++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx @@ -2,7 +2,7 @@ import graphql from 'babel-plugin-relay/macro' import React from 'react' import {useFragment} from 'react-relay' import {TopRetroTemplatesCard_insights$key} from '~/__generated__/TopRetroTemplatesCard_insights.graphql' -import Tooltip from '../../../../components/Tooltip' +import SimpleTooltip from '../../../../components/SimpleTooltip' import TeamInsightsCard from './TeamInsightsCard' import plural from '../../../../utils/plural' @@ -46,14 +46,14 @@ const TopRetroTemplatesCard = (props: Props) => { const {reflectTemplate, count} = template const {name, illustrationUrl} = reflectTemplate return ( - {name} - + ) })} {topRetroTemplates.length === 1 && (