-
Notifications
You must be signed in to change notification settings - Fork 837
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Emotion][Theming] Add new consumer-configurable
font.defaultUnits …
…token (#7133)
- Loading branch information
Showing
10 changed files
with
230 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
src/global_styling/functions/__snapshots__/typography.test.tsx.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`euiFontSizeFromScale scale l 1`] = `"1.5714rem"`; | ||
|
|
||
| exports[`euiFontSizeFromScale scale m 1`] = `"1.1429rem"`; | ||
|
|
||
| exports[`euiFontSizeFromScale scale s 1`] = `"1.0000rem"`; | ||
|
|
||
| exports[`euiFontSizeFromScale scale xl 1`] = `"1.9286rem"`; | ||
|
|
||
| exports[`euiFontSizeFromScale scale xs 1`] = `"0.8571rem"`; | ||
|
|
||
| exports[`euiFontSizeFromScale scale xxl 1`] = `"2.4286rem"`; | ||
|
|
||
| exports[`euiFontSizeFromScale scale xxs 1`] = `"0.7857rem"`; | ||
|
|
||
| exports[`euiFontSizeFromScale scale xxxs 1`] = `"0.6429rem"`; | ||
|
|
||
| exports[`euiFontSizeFromScale unit em 1`] = `"1em"`; | ||
|
|
||
| exports[`euiFontSizeFromScale unit px 1`] = `"16px"`; | ||
|
|
||
| exports[`euiFontSizeFromScale unit rem 1`] = `"1.1429rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline scale l 1`] = `"1.7143rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline scale m 1`] = `"1.7143rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline scale s 1`] = `"1.4286rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline scale xl 1`] = `"2.2857rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline scale xs 1`] = `"1.1429rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline scale xxl 1`] = `"2.8571rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline scale xxs 1`] = `"1.1429rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline scale xxxs 1`] = `"0.8571rem"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline unit em 1`] = `"1.5000"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline unit px 1`] = `"24px"`; | ||
|
|
||
| exports[`euiLineHeightFromBaseline unit rem 1`] = `"1.7143rem"`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * 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, PropsWithChildren } from 'react'; | ||
| import { renderHook } from '@testing-library/react'; | ||
|
|
||
| import { EuiProvider } from '../../components'; | ||
| import { useEuiTheme } from '../../services'; | ||
| import { EuiThemeFontScales, EuiThemeFontUnits } from '../variables/typography'; | ||
|
|
||
| import { euiFontSizeFromScale, euiLineHeightFromBaseline } from './typography'; | ||
|
|
||
| // Default euiTheme to use for most tests | ||
| const { euiTheme } = renderHook(useEuiTheme).result.current; | ||
|
|
||
| describe('euiFontSizeFromScale', () => { | ||
| describe('scale', () => { | ||
| EuiThemeFontScales.forEach((scale) => { | ||
| test(scale, () => { | ||
| expect(euiFontSizeFromScale(scale, euiTheme)).toMatchSnapshot(); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('custom scale', () => { | ||
| it('allows passing a custom modifier to the existing scale', () => { | ||
| expect( | ||
| euiFontSizeFromScale('xxxs', euiTheme, { customScale: 's' }) | ||
| ).toEqual('0.5625rem'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('unit', () => { | ||
| EuiThemeFontUnits.forEach((unit) => { | ||
| test(unit, () => { | ||
| const output = euiFontSizeFromScale('m', euiTheme, { unit }); | ||
| expect(output.endsWith(unit)).toBe(true); | ||
| expect(output).toMatchSnapshot(); | ||
| }); | ||
| }); | ||
|
|
||
| it('falls back to the `defaultUnits` theme token if a unit is not passed', () => { | ||
| const wrapper: FunctionComponent<PropsWithChildren> = ({ children }) => ( | ||
| <EuiProvider modify={{ font: { defaultUnits: 'px' } }}> | ||
| {children} | ||
| </EuiProvider> | ||
| ); | ||
| const { euiTheme: modifiedEuiTheme } = renderHook(useEuiTheme, { | ||
| wrapper, | ||
| }).result.current; | ||
|
|
||
| expect(euiFontSizeFromScale('m', modifiedEuiTheme)).toEqual('16px'); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('euiLineHeightFromBaseline', () => { | ||
| describe('scale', () => { | ||
| EuiThemeFontScales.forEach((scale) => { | ||
| test(scale, () => { | ||
| expect(euiLineHeightFromBaseline(scale, euiTheme)).toMatchSnapshot(); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('custom scale', () => { | ||
| it('allows passing a custom modifier to the existing scale', () => { | ||
| expect( | ||
| euiLineHeightFromBaseline('xxxs', euiTheme, { customScale: 's' }) | ||
| ).toEqual('0.8571rem'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('unit', () => { | ||
| EuiThemeFontUnits.forEach((unit) => { | ||
| test(unit, () => { | ||
| const output = euiLineHeightFromBaseline('m', euiTheme, { unit }); | ||
|
|
||
| if (unit !== 'em') { | ||
| expect(output.endsWith(unit)).toBe(true); | ||
| } else { | ||
| expect(Number(output)).not.toBeNaN(); | ||
| } | ||
|
|
||
| expect(output).toMatchSnapshot(); | ||
| }); | ||
| }); | ||
|
|
||
| it('falls back to the `defaultUnits` theme token if a unit is not passed', () => { | ||
| const wrapper: FunctionComponent<PropsWithChildren> = ({ children }) => ( | ||
| <EuiProvider modify={{ font: { defaultUnits: 'px' } }}> | ||
| {children} | ||
| </EuiProvider> | ||
| ); | ||
| const { euiTheme: modifiedEuiTheme } = renderHook(useEuiTheme, { | ||
| wrapper, | ||
| }).result.current; | ||
|
|
||
| expect(euiLineHeightFromBaseline('m', modifiedEuiTheme)).toEqual('24px'); | ||
| }); | ||
| }); | ||
| }); |
Oops, something went wrong.