-
Notifications
You must be signed in to change notification settings - Fork 883
[EuiThemeProvider] Add context & state required for theme CSS variables architecture #7132
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| import React, { FunctionComponent, useContext, useEffect } from 'react'; | ||
| import type { Meta, StoryObj } from '@storybook/react'; | ||
|
|
||
| import { EuiNestedThemeContext } from './context'; | ||
| import { EuiThemeProvider, EuiThemeProviderProps } from './provider'; | ||
|
|
||
| const meta: Meta<EuiThemeProviderProps<{}>> = { | ||
| title: 'EuiThemeProvider', | ||
| component: EuiThemeProvider, | ||
| }; | ||
|
|
||
| export default meta; | ||
| type Story = StoryObj<EuiThemeProviderProps<{}>>; | ||
|
|
||
| export const WrapperCloneElement: Story = { | ||
| render: () => ( | ||
| <> | ||
| <EuiThemeProvider wrapperProps={{ cloneElement: true }}> | ||
| <main className="clonedExample"> | ||
| This example should only have 1 main wrapper rendered. | ||
| </main> | ||
| </EuiThemeProvider> | ||
| </> | ||
| ), | ||
| }; | ||
|
Comment on lines
+23
to
+33
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This story isn't related to this PR, I just thought I'd add it as a tech debt item while here (and also as a comparison to the existing stories) |
||
|
|
||
| export const CSSVariablesNearest: Story = { | ||
| render: () => ( | ||
| <> | ||
| <MockComponent color="red"> | ||
| This component sets the nearest theme provider (the global theme) with a | ||
| red CSS variable color. Inspect the `:root` styles to see the variable | ||
| set. | ||
| </MockComponent> | ||
| <EuiThemeProvider> | ||
| <MockComponent color="blue"> | ||
| This component sets the nearest local theme provider with a blue CSS | ||
| variable color. Inspect the parent theme wrapper to see the variable | ||
| set. | ||
| </MockComponent> | ||
| </EuiThemeProvider> | ||
| </> | ||
| ), | ||
| }; | ||
|
|
||
| export const CSSVariablesGlobal: Story = { | ||
| render: () => ( | ||
| <> | ||
| <MockComponent color="red"> | ||
| This component sets the nearest theme provider (the global theme) with a | ||
| red CSS variable color. However, it should be overridden by the next | ||
| component. | ||
| </MockComponent> | ||
| <EuiThemeProvider> | ||
| <MockComponent color="blue" global={true}> | ||
| This component sets the global theme with a blue CSS variable color. | ||
| It should override the previous component. Inspect the `:root` styles | ||
| to see this behavior | ||
| </MockComponent> | ||
| </EuiThemeProvider> | ||
| </> | ||
| ), | ||
| }; | ||
|
|
||
| /** | ||
| * Component for QA/testing purposes that mocks an EUI component | ||
| * that sets global or theme-level CSS variables | ||
| */ | ||
| const MockComponent: FunctionComponent<{ | ||
| global?: boolean; | ||
| color: string; | ||
| children: any; | ||
| }> = ({ global, color, children }) => { | ||
| const { setGlobalCSSVariables, setNearestThemeCSSVariables } = useContext( | ||
| EuiNestedThemeContext | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| if (global) { | ||
| setGlobalCSSVariables({ '--testColor': color }); | ||
| } else { | ||
| setNearestThemeCSSVariables({ '--testColor': color }); | ||
| } | ||
| }, [global, color, setGlobalCSSVariables, setNearestThemeCSSVariables]); | ||
|
|
||
| return ( | ||
| <p style={{ color: 'var(--testColor)', marginBlockEnd: '1em' }}> | ||
| {children} | ||
| </p> | ||
| ); | ||
| }; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,11 +6,12 @@ | |
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import React, { FunctionComponent, useContext, useEffect } from 'react'; | ||
| import { render } from '@testing-library/react'; // Note - don't use the EUI custom RTL `render`, as it auto-wraps an `EuiProvider` | ||
| import { css } from '@emotion/react'; | ||
|
|
||
| import { EuiProvider } from '../../components/provider'; | ||
| import { EuiNestedThemeContext } from './context'; | ||
| import { EuiThemeProvider } from './provider'; | ||
|
|
||
| describe('EuiThemeProvider', () => { | ||
|
|
@@ -136,4 +137,82 @@ describe('EuiThemeProvider', () => { | |
| expect(container.querySelector('.hello.world')).toBeTruthy(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('CSS variables', () => { | ||
| const MockEuiComponent: FunctionComponent<{ global?: boolean }> = ({ | ||
| global, | ||
| }) => { | ||
| const { | ||
| globalCSSVariables, | ||
| setGlobalCSSVariables, | ||
| setNearestThemeCSSVariables, | ||
| } = useContext(EuiNestedThemeContext); | ||
|
|
||
| useEffect(() => { | ||
| if (global) { | ||
| setGlobalCSSVariables({ '--hello': 'global-world' }); | ||
| } else { | ||
| setNearestThemeCSSVariables({ '--hello': 'world' }); | ||
| } | ||
| }, [global, setGlobalCSSVariables, setNearestThemeCSSVariables]); | ||
|
|
||
| // Our current version of jsdom doesn't yet support :root (currently on v11, | ||
| // need to be on at least v20), so we'll mock something to assert on in the interim | ||
|
Comment on lines
+159
to
+160
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Reference: https://github.com/jsdom/jsdom/releases/tag/20.0.0 We'll need to update Jest to latest to get a more recent version of jsdom (#6813) |
||
| return <>{JSON.stringify(globalCSSVariables)}</>; | ||
| }; | ||
|
|
||
| const getThemeProvider = (container: HTMLElement) => | ||
| container.querySelector('.euiThemeProvider')!; | ||
| const getThemeClassName = (container: HTMLElement) => | ||
| getThemeProvider(container).className; | ||
|
|
||
| it('allows child components to set non-global theme CSS variables', () => { | ||
| const { container } = render( | ||
| <EuiProvider> | ||
| <EuiThemeProvider> | ||
| <MockEuiComponent /> | ||
| </EuiThemeProvider> | ||
| </EuiProvider> | ||
| ); | ||
| expect(getThemeClassName(container)).toContain('euiCSSVariables'); | ||
| expect(container.firstChild).toHaveStyleRule('--hello', 'world'); | ||
| expect(container.firstChild).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it('sets global CSS variables when the nearest theme provider is the top-level one', () => { | ||
| const { container } = render( | ||
| <EuiProvider> | ||
| <MockEuiComponent /> | ||
| </EuiProvider> | ||
| ); | ||
| expect(container.textContent).toContain('{"--hello":"world"}'); | ||
| }); | ||
|
|
||
| it('allows child components to set global CSS variables from any nested theme provider', () => { | ||
| const { container } = render( | ||
| <EuiProvider> | ||
| <EuiThemeProvider> | ||
| <MockEuiComponent global={true} /> | ||
| </EuiThemeProvider> | ||
| </EuiProvider> | ||
| ); | ||
| expect(getThemeClassName(container)).not.toContain('euiCSSVariables'); | ||
| expect(container.textContent).toContain('{"--hello":"global-world"}'); | ||
| }); | ||
|
|
||
| it('can set both global and nearest theme variables without conflicting', () => { | ||
| const { container } = render( | ||
| <EuiProvider> | ||
| <MockEuiComponent /> | ||
| <EuiThemeProvider> | ||
| <MockEuiComponent /> | ||
| <MockEuiComponent global={true} /> | ||
| </EuiThemeProvider> | ||
| </EuiProvider> | ||
| ); | ||
| expect(getThemeClassName(container)).toContain('euiCSSVariables'); | ||
| expect(getThemeProvider(container)).toHaveStyleRule('--hello', 'world'); | ||
| expect(container.textContent).toContain('{"--hello":"global-world"}'); | ||
| }); | ||
| }); | ||
| }); | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[attaching to a semi-random file for threading]
I'm debating making this a hook, e.g.
useEuiCSSVariables(). Right now an EUI component will have to do this:which feels like it could be cleaner/more elegant 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm also debating adding a section about this in our Emotion wiki. I'm not totally sure what to write just yet and that may become clearer once I actually have the EuiHeader work in front of me, so I may hold off on that wiki doc until the last PR that actually merges in the feature branch into main.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a hook after all in 6f4f6b2, but will continue to hold off on a wiki document for a bit