Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match tooltip styles to VS Code #2353

Merged
merged 7 commits into from
Sep 8, 2022
Merged

Match tooltip styles to VS Code #2353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
554cb0d
add border to experiments table tooltips
mattseddon Sep 8, 2022
e33f819
push border into global style
mattseddon Sep 8, 2022
5d57f8b
remove arrow from tooltips
mattseddon Sep 8, 2022
4bdb869
remove extra padding and global style
mattseddon Sep 8, 2022
4050bf2
reduce padding by 5px in info tooltip
mattseddon Sep 8, 2022
1150d96
Merge branch 'main' into add-border-to-tooltips
mattseddon Sep 8, 2022
74e3b43
remove unused styles file
mattseddon Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions webview/src/experiments/components/table/Indicators.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
} from '../../../shared/components/icons'
import { sendMessage } from '../../../shared/vscode'
import Tooltip from '../../../shared/components/tooltip/Tooltip'
import tooltipStyles from '../../../shared/components/tooltip/styles.module.scss'
import { pluralize } from '../../../util/strings'
import { ExperimentsState } from '../../store'

Expand All @@ -31,7 +30,6 @@ export const IndicatorTooltip: React.FC<IndicatorTooltipProps> = ({
placement="bottom-start"
disabled={!tooltipContent}
content={tooltipContent}
className={tooltipStyles.padded}
ref={wrapperRef}
>
{children}
Expand Down
1 change: 0 additions & 1 deletion webview/src/experiments/components/table/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,6 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
white-space: pre-wrap;
display: flex;
gap: 4px;
font-size: 0.8125rem;

svg {
min-width: 16px;
Expand Down
1 change: 0 additions & 1 deletion webview/src/experiments/util/buildDynamicColumns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ const Cell: React.FC<Cell<Experiment, CellValue>> = cell => {
<Tooltip
content={<CellTooltip stringValue={stringValue} />}
placement="bottom-end"
arrow={true}
delay={[CELL_TOOLTIP_DELAY, 0]}
interactive={true}
>
Expand Down
2 changes: 1 addition & 1 deletion webview/src/plots/components/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ $gap: 20px;

.infoTooltip {
max-width: 220px;
padding: 12px 8px;
padding: 7px 3px;
white-space: normal;
display: flex;
gap: 4px;
Expand Down
2 changes: 1 addition & 1 deletion webview/src/shared/components/contextMenu/ContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ export const ContextMenu: React.FC<ContextMenuProps> = ({
trigger = 'contextmenu'
}) => (
<Tooltip
arrow
trigger={trigger}
delay={[100, 200]}
placement={'bottom'}
interactive
isContextMenu={true}
onTrigger={positionContextMenuAndDisableEvents}
content={content}
onShow={onShow}
Expand Down
2 changes: 0 additions & 2 deletions webview/src/shared/components/iconMenu/IconMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useSingleton } from '@tippyjs/react'
import { IconMenuItem, IconMenuItemProps } from './IconMenuItem'
import styles from './styles.module.scss'
import Tooltip from '../tooltip/Tooltip'
import tooltipStyles from '../tooltip/styles.module.scss'

interface IconMenuProps {
items: IconMenuItemProps[]
Expand All @@ -29,7 +28,6 @@ export const IconMenu: React.FC<IconMenuProps> = ({ items }) => {

return (
<Tooltip
className={tooltipStyles.padded}
singleton={tooltipSource}
placement="bottom-end"
popperOptions={popperOptions}
Expand Down
18 changes: 11 additions & 7 deletions webview/src/shared/components/tooltip/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const CELL_TOOLTIP_DELAY = 1000

const TooltipRenderFunction: React.ForwardRefRenderFunction<
unknown,
TippyProps
TippyProps & { isContextMenu?: boolean }
> = (
{
children,
Expand All @@ -27,19 +27,23 @@ const TooltipRenderFunction: React.ForwardRefRenderFunction<
hideOnClick,
onTrigger,
appendTo,
animation = false,
className = typeof content === 'string' ? styles.padded : undefined,
arrow = false
isContextMenu = false,
animation = false
},
ref
) => (
<Tippy
arrow={false}
animation={animation}
appendTo={appendTo}
content={content}
className={className}
content={
isContextMenu ? (
content
) : (
<div className={styles.tooltipContent}>{content}</div>
)
}
placement={placement}
arrow={arrow}
delay={delay}
disabled={disabled}
popperOptions={popperOptions}
Expand Down
20 changes: 15 additions & 5 deletions webview/src/shared/components/tooltip/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
$tooltip-border: var(--vscode-editorHoverWidget-border);
$vscode-drop-shadow: drop-shadow(0 0 4px var(--vscode-widget-shadow));
$foreground: var(--vscode-quickInput-foreground);
$background: var(--vscode-quickInput-background);
$font: var(--vscode-font-family);

:global(.tippy-box).padded {
& > :global(.tippy-content) {
padding: 2px 6px;
}
}
:global(.tippy-box) {
filter: $vscode-drop-shadow;
font-family: $font;
Expand All @@ -30,3 +26,17 @@ $font: var(--vscode-font-family);
z-index: 2;
}
}

.tooltipContent {
border: 1px solid $tooltip-border;
white-space: pre-wrap;
padding: 5px;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we decrease the plots info tooltips padding now that they already get some padding from .tooltipContent:

image

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed the padding here.

display: flex;
gap: 4px;
font-size: 0.8125rem;

svg {
min-width: 16px;
min-height: 16px;
}
}
1 change: 1 addition & 0 deletions webview/src/shared/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ $header-bg-color: $bg-color;
$header-border-color: $border-color;
$meta-cell-color: var(--vscode-descriptionForeground);
$header-resizer-color: var(--vscode-sash-hoverBorder);
$tooltip-border: var(--vscode-editorHoverWidget-border);

$hover-background-color: var(--vscode-list-hoverBackground);
$row-hover-background-color: var(--vscode-list-hoverBackground);
Expand Down