Skip to content

Allow for dynamically updated fontSizes in CodePane #875

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

Merged
merged 2 commits into from
Apr 9, 2020
Merged

Allow for dynamically updated fontSizes in CodePane #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e955a8f
Look for props first, then use theme
Apr 9, 2020
8cf716e
Changelog++
Apr 9, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- Allow for `props.fontSize` to override the theme's monospace font size in `CodePane`. [#875](https://github.com/FormidableLabs/spectacle/pull/875)
- Surface `textDecoration` prop from styled-system for `Link`s. [#869](https://github.com/FormidableLabs/spectacle/pull/869)

## 6.0.1
Expand Down
9 changes: 7 additions & 2 deletions src/components/code-pane.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,20 @@ export default function CodePane(props) {
}, [themeContext]);

const fontSize = React.useMemo(() => {
if (props && props.fontSize) {
return props.fontSize;
}

if (
themeContext &&
themeContext.fontSizes &&
themeContext.fontSizes.monospace
) {
return themeContext.fontSizes.monospace;
}
return props.fontSize;

// Default to 15px
return 15;
}, [themeContext, props.fontSize]);

const preStyles = React.useMemo(
Expand Down Expand Up @@ -159,7 +165,6 @@ CodePane.propTypes = {
CodePane.defaultProps = {
language: 'javascript',
theme: theme,
fontSize: 15,
highlightStart: -Infinity,
highlightEnd: Infinity
};