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.

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

Elevation: reduced motion styles, updated docs and README #33551

Merged
merged 5 commits into from
Jul 19, 2021
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
32 changes: 28 additions & 4 deletions packages/components/src/card/test/__snapshots__/index.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,12 @@ Object {
border-radius: 2px;
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-18 {
transition-duration: 0ms;
}
}

<body>
<div>
<div
Expand Down Expand Up @@ -616,6 +622,12 @@ Object {
border-radius: 2px;
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-18 {
transition-duration: 0ms;
}
}

<div>
<div
class="components-surface components-card components-card emotion-0 emotion-1"
Expand Down Expand Up @@ -757,15 +769,15 @@ Snapshot Diff:
</div>
<div
aria-hidden="true"
- class="components-elevation css-180mfx7-View-Elevation-sx-Base-elevationClassName em57xhy0"
+ class="components-elevation css-19ozpqv-View-Elevation-sx-Base-elevationClassName em57xhy0"
- class="components-elevation css-1b4rkmt-View-Elevation-sx-Base-elevationClassName em57xhy0"
+ class="components-elevation css-91yjwm-View-Elevation-sx-Base-elevationClassName em57xhy0"
data-wp-c16t="true"
data-wp-component="Elevation"
/>
<div
aria-hidden="true"
- class="components-elevation css-179ju9e-View-Elevation-sx-Base-elevationClassName em57xhy0"
+ class="components-elevation css-19ozpqv-View-Elevation-sx-Base-elevationClassName em57xhy0"
- class="components-elevation css-o8otup-View-Elevation-sx-Base-elevationClassName em57xhy0"
+ class="components-elevation css-91yjwm-View-Elevation-sx-Base-elevationClassName em57xhy0"
data-wp-c16t="true"
data-wp-component="Elevation"
/>
Expand Down Expand Up @@ -805,6 +817,12 @@ exports[`Card Card component should warn when the isElevated prop is passed 1`]
border-radius: 2px;
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-4 {
transition-duration: 0ms;
}
}

.emotion-6 {
background: transparent;
display: block;
Expand All @@ -824,6 +842,12 @@ exports[`Card Card component should warn when the isElevated prop is passed 1`]
border-radius: 2px;
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-6 {
transition-duration: 0ms;
}
}

<div>
<div
class="components-surface components-card components-card emotion-0 emotion-1"
Expand Down
39 changes: 21 additions & 18 deletions packages/components/src/elevation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,43 +29,46 @@ function Example() {

## Props

##### active
### `active`: `number`

**Type**: `boolean`
Size of the shadow value when active (see the `value` and `isInteractive` props).

Renders the active (interaction) shadow value.
- Required: No

##### borderRadius

**Type**: `string`,`number`
### `borderRadius`: `CSSProperties[ 'borderRadius' ]`

Renders the border-radius of the shadow.

##### focus
- Required: No
- Default: `inherit`

**Type**: `boolean`
### `focus`: `number`

Renders the focus (interaction) shadow value.
Size of the shadow value when focused (see the `value` and `isInteractive` props).

##### hover
- Required: No

**Type**: `boolean`
### `hover`: `number`

Renders the hover (interaction) shadow value.
Size of the shadow value when hovered (see the `value` and `isInteractive` props).

##### isInteractive
- Required: No

**Type**: `boolean`
### `isInteractive`: `boolean`

Determines if hover, active, and focus shadow values should be automatically calculated and rendered.
Determines if `hover`, `active`, and `focus` shadow values should be automatically calculated and rendered.

##### offset
- Required: No
- Default: `false`

**Type**: `number`
### `offset`: `number`

Dimensional offsets (margin) for the shadow.

##### value
- Required: No
- Default: `0`

### `value`

**Type**: `number`

Expand Down
25 changes: 14 additions & 11 deletions packages/components/src/elevation/hook.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { useMemo } from '@wordpress/element';
*/
import { useContextSystem } from '../ui/context';
import * as styles from './styles';
import CONFIG from '../utils/config-values';
import { CONFIG, reduceMotion } from '../utils';
import { useCx } from '../utils/hooks/use-cx';

/**
Expand Down Expand Up @@ -62,16 +62,19 @@ export function useElevation( props ) {

const sx = {};

sx.Base = css( {
borderRadius,
bottom: offset,
boxShadow: getBoxShadow( value ),
opacity: CONFIG.elevationIntensity,
left: offset,
right: offset,
top: offset,
transition,
} );
sx.Base = css(
{
borderRadius,
bottom: offset,
boxShadow: getBoxShadow( value ),
opacity: CONFIG.elevationIntensity,
left: offset,
right: offset,
top: offset,
transition,
},
reduceMotion( 'transition' )
);

if ( ! isNil( hoverValue ) ) {
sx.hover = css`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ exports[`props should render active 1`] = `
transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-0 {
transition-duration: 0ms;
}
}

*:hover>.emotion-0 {
box-shadow: 0 14px 28px 0 rgba(0 ,0, 0, 0.7);
}
Expand Down Expand Up @@ -54,6 +60,12 @@ exports[`props should render correctly 1`] = `
transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-0 {
transition-duration: 0ms;
}
}

<div
aria-hidden="true"
class="components-elevation emotion-0 emotion-1"
Expand Down Expand Up @@ -81,6 +93,12 @@ exports[`props should render hover 1`] = `
transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-0 {
transition-duration: 0ms;
}
}

*:hover>.emotion-0 {
box-shadow: 0 14px 28px 0 rgba(0 ,0, 0, 0.7);
}
Expand Down Expand Up @@ -112,6 +130,12 @@ exports[`props should render isInteractive 1`] = `
transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-0 {
transition-duration: 0ms;
}
}

*:hover>.emotion-0 {
box-shadow: 0 0px 0px 0 rgba(0 ,0, 0, 0);
}
Expand Down Expand Up @@ -147,6 +171,12 @@ exports[`props should render offset 1`] = `
transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-0 {
transition-duration: 0ms;
}
}

*:hover>.emotion-0 {
box-shadow: 0 14px 28px 0 rgba(0 ,0, 0, 0.7);
}
Expand Down Expand Up @@ -182,6 +212,12 @@ exports[`props should render value 1`] = `
transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-0 {
transition-duration: 0ms;
}
}

<div
aria-hidden="true"
class="components-elevation emotion-0 emotion-1"
Expand Down
26 changes: 23 additions & 3 deletions packages/components/src/elevation/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,52 @@ import type { CSSProperties } from 'react';

export type Props = {
/**
* Renders the active (interaction) shadow value.
* Size of the shadow value when active (see the `value` and `isInteractive` props).
*/
active?: number;
/**
* Renders the border-radius of the shadow.
*
* @default 'inherit'
*/
borderRadius?: CSSProperties[ 'borderRadius' ];
/**
* Renders the focus (interaction) shadow value.
* Size of the shadow value when focused (see the `value` and `isInteractive` props).
*/
focus?: number;
/**
* Renders the hover (interaction) shadow value.
* Size of the shadow value when hovered (see the `value` and `isInteractive` props).
*/
hover?: number;
/**
* Determines if hover, active, and focus shadow values should be automatically calculated and rendered.
*
* @default false
*/
isInteractive?: boolean;
/**
* Dimensional offsets (margin) for the shadow.
*
* @default 0
*/
offset?: number;
/**
* Size of the shadow, based on the Style system's elevation system. The `value` determines the strength of the shadow, which sense of depth.
* In the example below, `isInteractive` is activated to give a better sense of depth.
*
* @example
* ```jsx
* import { __experimentalElevation as Elevation } from '@wordpress/components';
* * function Example() {
* return (
* <div>
* <Elevation isInteractive value={ 200 } />
* </div>
* );
* }
* ```
*
* @default 0
*/
value?: number;
};
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ exports[`props should render correctly 1`] = `
border-radius: 2px;
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-7 {
transition-duration: 0ms;
}
}

.emotion-9 {
background: transparent;
display: block;
Expand All @@ -73,6 +79,12 @@ exports[`props should render correctly 1`] = `
border-radius: 2px;
}

@media ( prefers-reduced-motion: reduce ) {
.emotion-9 {
transition-duration: 0ms;
}
}

<div
class="components-surface components-card components-card emotion-0 emotion-1 emotion-2"
data-wp-c16t="true"
Expand Down Expand Up @@ -169,6 +181,6 @@ Snapshot Diff:
</div>
<div
aria-hidden="true"
class="components-elevation css-180mfx7-View-Elevation-sx-Base-elevationClassName em57xhy0"
class="components-elevation css-1b4rkmt-View-Elevation-sx-Base-elevationClassName em57xhy0"
data-wp-c16t="true"
`;