Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "update styles to not use CSS shorthands",
"packageName": "@fluentui/react-tooltip",
"email": "olfedias@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles, mergeClasses } from '@fluentui/react-make-styles';
import { shorthands, makeStyles, mergeClasses } from '@fluentui/react-make-styles';
import { createArrowStyles } from '@fluentui/react-positioning';
import type { TooltipState } from './Tooltip.types';

Expand All @@ -10,15 +10,17 @@ export const tooltipClassName = 'fui-Tooltip';
const useStyles = makeStyles({
root: theme => ({
display: 'none',
padding: '5px 12px 7px 12px',
...shorthands.padding('5px', '12px', '7px', '12px'),
maxWidth: '240px',
cursor: 'default',
fontFamily: theme.fontFamilyBase,
fontSize: theme.fontSizeBase200,
lineHeight: theme.lineHeightBase200,
borderRadius: theme.borderRadiusMedium, // Update tooltipBorderRadius in useTooltip.tsx if this changes

background: theme.colorNeutralBackground1,
// Update tooltipBorderRadius in useTooltip.tsx if this changes
...shorthands.borderRadius(theme.borderRadiusMedium),

backgroundColor: theme.colorNeutralBackground1,
color: theme.colorNeutralForeground1,

// TODO need to add versions of theme.alias.shadow.shadow8, etc. that work with filter
Expand All @@ -32,7 +34,7 @@ const useStyles = makeStyles({
},

inverted: theme => ({
background: theme.colorNeutralForeground2, // TODO should be neutralBackgroundInverted
backgroundColor: theme.colorNeutralBackgroundInverted,

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Solved TODO ¯_(ツ)_/¯

color: theme.colorNeutralForegroundInverted,
}),

Expand Down
9 changes: 5 additions & 4 deletions packages/react-tooltip/src/stories/TooltipAria.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import * as React from 'react';
import { Tooltip } from '../Tooltip'; // codesandbox-dependency: @fluentui/react-tooltip ^9.0.0-beta
import { makeStyles } from '@fluentui/react-make-styles';
import { shorthands, makeStyles } from '@fluentui/react-make-styles';

import { Tooltip } from '../Tooltip';

const useStyles = makeStyles({
exampleList: {
display: 'flex',
flexDirection: 'row',
alignItems: 'flex-start',
margin: '16px 0',
gap: '16px',
...shorthands.margin('16px', '0'),
...shorthands.gap('16px'),
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Tooltip } from '../Tooltip'; // codesandbox-dependency: @fluentui/react-tooltip ^9.0.0-beta
import { Tooltip } from '../Tooltip';

export const Controlled = () => {
const [tooltipVisible, setTooltipVisible] = React.useState(false);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import * as React from 'react';
import { Tooltip } from '../Tooltip'; // codesandbox-dependency: @fluentui/react-tooltip ^9.0.0-beta
import { makeStyles } from '@fluentui/react-make-styles'; // codesandbox-dependency: @fluentui/react-make-styles ^9.0.0-beta
import { shorthands, makeStyles } from '@fluentui/react-make-styles';

import { Tooltip } from '../Tooltip';

const useStyles = makeStyles({
exampleList: {
display: 'flex',
flexDirection: 'row',
alignItems: 'flex-start',
margin: '16px 0',
gap: '16px',
...shorthands.margin('16px', '0'),
...shorthands.gap('16px'),
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Tooltip } from '../Tooltip'; // codesandbox-dependency: @fluentui/react-tooltip ^9.0.0-beta
import { Tooltip } from '../Tooltip';

export const OnlyIfTruncated = () => {
const textContainerRef = React.useRef<HTMLDivElement>(null);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import * as React from 'react';
import { Tooltip } from '../Tooltip'; // codesandbox-dependency: @fluentui/react-tooltip ^9.0.0-beta
import { makeStyles } from '@fluentui/react-make-styles'; // codesandbox-dependency: @fluentui/react-make-styles ^9.0.0-beta
import { shorthands, makeStyles } from '@fluentui/react-make-styles';

import { Tooltip } from '../Tooltip';

const useStyles = makeStyles({
targetContainer: {
display: 'inline-grid',
gridTemplateColumns: 'repeat(5, 1fr)',
gridTemplateRows: 'repeat(5, 64px)',
gap: '4px',
margin: '16px 128px',
...shorthands.gap('4px'),
...shorthands.margin('16px 128px'),
},
});

Expand Down