Skip to content

Get font sizes from theme to account for overrides #97

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
barry-observation merged 3 commits into from
May 28, 2026
Merged

Get font sizes from theme to account for overrides #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37b82e1
Get font sizes from theme to account for overrides
barry-observation May 13, 2026
e9ecd94
Bump version
barry-observation May 26, 2026
42511d9
Lower font size of input text
barry-observation May 28, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@observation.org/react-native-components",
"version": "1.77.0",
"version": "1.78.0",
"main": "src/index.ts",
"exports": {
".": "./src/index.ts",
Expand Down
6 changes: 3 additions & 3 deletions src/components/InputField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Platform, StyleProp, StyleSheet, Text, TextInput, TextInputProps, View,

import { Icon } from './Icon'
import IconText from './IconText'
import { font, layout, rounded } from '../styles'
import { layout, rounded } from '../styles'
import { Theme, createInputStyles, useStyles, useTheme } from '../theme'

type Props = {
Expand Down Expand Up @@ -128,11 +128,11 @@ const createStyles = (theme: Theme) => {
justifyContent: 'center',
},
errorStyle: {
...font.small,
...theme.font.small,
color: theme.color.text.system.error,
},
descriptionStyle: {
...font.small,
...theme.font.small,
color: theme.color.text.system.subtle,
},
})
Expand Down
3 changes: 1 addition & 2 deletions src/components/Notification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'
import { StyleProp, Text, View, ViewStyle } from 'react-native'

import { font } from '../styles'
import { useTheme } from '../theme/ThemeProvider'

type Props = {
Expand All @@ -27,7 +26,7 @@ const Notification = ({ count, style }: Props) => {
>
<Text
allowFontScaling={false}
style={{ ...font.extraSmall, color: theme.color.text.system.staticWhite, textAlign: 'center' }}
style={{ ...theme.font.extraSmall, color: theme.color.text.system.staticWhite, textAlign: 'center' }}
>
{count}
</Text>
Expand Down
7 changes: 3 additions & 4 deletions src/components/ProgressBarList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { StyleSheet, Text, View } from 'react-native'

import { Icon } from './Icon'
import ProgressBar from '../data/ProgressBar'
import { font } from '../styles'
import { Theme, useStyles, useTheme } from '../theme'

type Props = {
Expand Down Expand Up @@ -127,7 +126,7 @@ const createStyles = (theme: Theme) =>
paddingLeft: borderRadius,
},
label: {
...font.small,
...theme.font.small,
color: theme.overlay.white70,
justifyContent: 'center',
lineHeight: barHeight,
Expand All @@ -150,12 +149,12 @@ const createStyles = (theme: Theme) =>
paddingRight: borderRadius,
},
denominator: {
...font.small,
...theme.font.small,
color: theme.overlay.white70,
lineHeight: barHeight,
},
numerator: {
...font.smallBold,
...theme.font.smallBold,
color: theme.color.text.system.staticWhite,
lineHeight: barHeight,
},
Expand Down
40 changes: 20 additions & 20 deletions src/components/__tests__/__snapshots__/InputField.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ exports[`InputField Rendering Disabled 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -107,10 +107,10 @@ exports[`InputField Rendering Normal 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -162,10 +162,10 @@ exports[`InputField Rendering With a description 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -254,10 +254,10 @@ exports[`InputField Rendering With a label 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -309,10 +309,10 @@ exports[`InputField Rendering With a right icon 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -382,10 +382,10 @@ exports[`InputField Rendering With an alternative TextInput component 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -457,10 +457,10 @@ exports[`InputField Rendering With an error message 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -565,10 +565,10 @@ exports[`InputField Rendering With focus 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -621,10 +621,10 @@ exports[`InputField Rendering With focus and an error message 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down Expand Up @@ -677,10 +677,10 @@ exports[`InputField Rendering Without focus 1`] = `
"color": "#212121",
"flex": 1,
"fontFamily": "Ubuntu",
"fontSize": 16,
"fontSize": 14,
"fontStyle": "normal",
"fontWeight": "normal",
"lineHeight": 24,
"lineHeight": 20,
"minHeight": 40,
"overflow": "hidden",
"paddingLeft": 8,
Expand Down
2 changes: 1 addition & 1 deletion src/theme/tokens/text.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const createTextStyles = (theme: Theme) =>
color: theme.color.text.system.link,
},
input: {
...theme.font.large,
...theme.font.medium,
color: theme.color.text.system.strong,
},
subtitle: {
Expand Down