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

chore(react-accordion): update styles to not use CSS shorthands #20800

Merged
merged 4 commits into from
Nov 26, 2021
Merged

chore(react-accordion): update styles to not use CSS shorthands #20800

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58eaa81
chore(react-accordion): update styles to not use CSS shorthands
layershifter Nov 8, 2021
f42410d
fix stories
layershifter Nov 26, 2021
c3fbf81
Apply suggestions from code review
layershifter Nov 26, 2021
c18ca92
fix spread
layershifter Nov 26, 2021
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-accordion-191cfc27-d162-4222-9399-0afb7e4660c2.json
View file
Open in desktop
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-accordion",
"email": "[email protected]",
"dependentChangeType": "patch"
}
25 changes: 15 additions & 10 deletions packages/react-accordion/src/components/AccordionHeader/useAccordionHeaderStyles.ts
View file
Open in desktop
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 { createFocusOutlineStyle } from '@fluentui/react-tabster';
import type { AccordionHeaderState } from './AccordionHeader.types';

Expand All @@ -8,12 +8,14 @@ const useStyles = makeStyles({
// TODO: this should be extracted to another package
resetButton: {
boxSizing: 'content-box',
background: 'none',
backgroundColor: 'inherit',
color: 'inherit',
font: 'inherit',
fontFamily: 'inherit',
fontSize: 'inherit',
lineHeight: 'normal',
overflow: 'visible',
padding: '0',
overflowX: 'visible',
overflowY: 'visible',
layershifter marked this conversation as resolved.
Show resolved Hide resolved
...shorthands.padding(0),
WebkitAppearance: 'button',
userSelect: 'none',
textAlign: 'unset',
Expand All @@ -22,10 +24,10 @@ const useStyles = makeStyles({
root: theme => ({
color: theme.colorNeutralForeground1,
backgroundColor: theme.colorNeutralBackground1,
borderRadius: '2px',
...shorthands.borderRadius('2px'),
}),
rootDisabled: theme => ({
backgroundColor: 'none',
backgroundImage: 'none',
Copy link
Member

Choose a reason for hiding this comment

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

was this necessary ?

Suggested change
backgroundImage: 'none',
backgroundColor: 'none',

Copy link
Member Author

Choose a reason for hiding this comment

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

Not really 😉

⬇️⬇️⬇️

"none" is not a valid value for background-color:
https://developer.mozilla.org/en-US/docs/Web/CSS/background-color

image
https://developer.mozilla.org/en-US/docs/Web/CSS/background#formal_syntax

Or it's either backgroundImage: 'none' or backgroundColor: 'initial'

Copy link
Member Author

Choose a reason for hiding this comment

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

As VR tests are passing, I am leaving it as it is. We can fix it if it will cause any problems.

color: theme.colorNeutralForegroundDisabled,
}),
rootInline: {
Expand All @@ -34,7 +36,7 @@ const useStyles = makeStyles({
button: {
position: 'relative',
width: 'calc(100% - 22px)',
border: '1px solid transparent',
...shorthands.border('1px', 'solid', 'transparent'),
paddingRight: '10px',
paddingLeft: '10px',
height: '44px',
Expand All @@ -55,7 +57,9 @@ const useStyles = makeStyles({
paddingRight: '8px',
},
expandIconEnd: {
flex: '1',
flexGrow: '1',
flexShrink: '1',
flexBasis: '0%',
display: 'flex',
justifyContent: 'flex-end',
paddingLeft: '8px',
Expand All @@ -72,7 +76,8 @@ const useStyles = makeStyles({
fontFamily: theme.fontFamilyBase,
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
overflow: 'hidden',
overflowX: 'hidden',
overflowY: 'hidden',
layershifter marked this conversation as resolved.
Show resolved Hide resolved
}),
childrenSmall: theme => ({
fontSize: theme.fontSizeBase200,
Expand Down
3 changes: 1 addition & 2 deletions packages/react-accordion/src/stories/AccordionCollapsible.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionProps } from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionProps } from '../index';

export const Collapsible = (args: AccordionProps) => (
<Accordion {...args}>
Expand Down
3 changes: 1 addition & 2 deletions packages/react-accordion/src/stories/AccordionDefault.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion } from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion } from '../index';

export const Default = () => (
<Accordion>
Expand Down
8 changes: 1 addition & 7 deletions packages/react-accordion/src/stories/AccordionDisabled.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import * as React from 'react';
import {
AccordionItem,
AccordionHeader,
AccordionPanel,
Accordion,
AccordionItemProps,
} from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionItemProps } from '../index';

export const Disabled = (args: AccordionItemProps) => (
<Accordion>
Expand Down
9 changes: 2 additions & 7 deletions packages/react-accordion/src/stories/AccordionExpandIcon.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import * as React from 'react';
import { Rocket20Regular as RocketIcon } from '@fluentui/react-icons';
import {
AccordionItem,
AccordionHeader,
AccordionPanel,
Accordion,
AccordionHeaderProps,
} from '@fluentui/react-accordion';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionHeaderProps } from '../index';

export const ExpandIcon = (args: AccordionHeaderProps) => (
<Accordion>
Expand Down
3 changes: 1 addition & 2 deletions packages/react-accordion/src/stories/AccordionExpandIconPosition.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion } from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion } from '../index';

export const ExpandIconPosition = () => (
<Accordion>
Expand Down
8 changes: 1 addition & 7 deletions packages/react-accordion/src/stories/AccordionInline.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import * as React from 'react';
import {
AccordionItem,
AccordionHeader,
AccordionPanel,
Accordion,
AccordionHeaderProps,
} from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionHeaderProps } from '../index';

export const Inline = (args: AccordionHeaderProps) => (
<Accordion>
Expand Down
3 changes: 1 addition & 2 deletions packages/react-accordion/src/stories/AccordionMultiple.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionProps } from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionProps } from '../index';

export const Multiple = (args: AccordionProps) => (
<Accordion {...args}>
Expand Down
3 changes: 1 addition & 2 deletions packages/react-accordion/src/stories/AccordionNavigable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionProps } from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionProps } from '../index';

export const Navigable = (args: AccordionProps) => (
<Accordion {...args}>
Expand Down
3 changes: 1 addition & 2 deletions packages/react-accordion/src/stories/AccordionOpenItems.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionProps } from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionProps } from '../index';

export const OpenItems = (args: AccordionProps) => (
<Accordion {...args}>
Expand Down
3 changes: 1 addition & 2 deletions packages/react-accordion/src/stories/AccordionSizes.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion } from '@fluentui/react-accordion';
import { AccordionItem, AccordionHeader, AccordionPanel, Accordion } from '../index';

export const Sizes = () => (
<>
Expand Down
9 changes: 2 additions & 7 deletions packages/react-accordion/src/stories/AccordionWithIcon.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import * as React from 'react';
import { Rocket20Regular as RocketIcon } from '@fluentui/react-icons';
import {
AccordionItem,
AccordionHeader,
AccordionPanel,
Accordion,
AccordionHeaderProps,
} from '@fluentui/react-accordion';

import { AccordionItem, AccordionHeader, AccordionPanel, Accordion, AccordionHeaderProps } from '../index';

export const WithIcon = (args: AccordionHeaderProps) => (
<Accordion>
Expand Down