Skip to content

Commit

Permalink
Components: Restore Non-Themed Text Colors for `optimizeReadabilityFo…
Browse files Browse the repository at this point in the history
…r` (#68472)

* fix: Reverted to use non theme based CSS values

* revert: Dark contrast tests for optimizeReadabilityFor, and updated CHANGELOG

Co-authored-by: im3dabasia <[email protected]>
Co-authored-by: mirka <[email protected]>
  • Loading branch information
3 people authored Jan 6, 2025
1 parent 72a9996 commit b80c80c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
- `Navigation`: Upsize back buttons ([#68157](https://github.com/WordPress/gutenberg/pull/68157)).
- `Heading`: Fix text contrast for dark mode ([#68349](https://github.com/WordPress/gutenberg/pull/68349)).
- `Text`: Fix text contrast for dark mode ([#68349](https://github.com/WordPress/gutenberg/pull/68349)).
- `Heading`: Revert text contrast fix for dark mode with optimizeReadabilityFor ([#68472](https://github.com/WordPress/gutenberg/pull/68472)).
- `Text`: Revert text contrast fix for dark mode with optimizeReadabilityFor ([#68472](https://github.com/WordPress/gutenberg/pull/68472)).

### Deprecations

Expand Down
5 changes: 3 additions & 2 deletions packages/components/src/text/hook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,10 @@ export default function useText(
const isOptimalTextColorDark =
getOptimalTextShade( optimizeReadabilityFor ) === 'dark';

// Should not use theme colors
sx.optimalTextColor = isOptimalTextColorDark
? css( { color: COLORS.theme.foreground } )
: css( { color: COLORS.theme.foregroundInverted } );
? css( { color: COLORS.gray[ 900 ] } )
: css( { color: COLORS.white } );
}

return cx(
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/text/test/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe( 'Text', () => {
</Text>
);
expect( screen.getByRole( 'heading' ) ).toHaveStyle( {
color: 'rgb( 255, 255, 255 )',
color: COLORS.white,
} );
} );

Expand Down

1 comment on commit b80c80c

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in b80c80c.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/12633792884
📝 Reported issues:

Please sign in to comment.