Skip to content
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

Jump to bottom

[RNMobile] Synced Patterns: Ensure title is always visible #55399

Merged
merged 8 commits into from
Oct 20, 2023
Merged

[RNMobile] Synced Patterns: Ensure title is always visible #55399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7a16978
Ensure title is visible for block-based themes
Oct 16, 2023
f350e96
Merge branch 'trunk' into rnmobile/reusable-block-title-dark-mode
Oct 19, 2023
7ff71dc
Update CHANGELOG
Oct 19, 2023
c605917
Merge branch 'trunk' into rnmobile/reusable-block-title-dark-mode
fluiddot Oct 20, 2023
cd0c45f
Fix incorrect CHANGELOG entry
Oct 20, 2023
7b1e40b
Use function vs. context to fetch global styles
Oct 20, 2023
a08c27c
Merge branch 'trunk' into rnmobile/reusable-block-title-dark-mode
Oct 20, 2023
6ac47e1
Tweak CHANGELOG entry to match other format
Oct 20, 2023
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
29 changes: 16 additions & 13 deletions packages/block-library/src/block/edit-title.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Text, View } from 'react-native';
/**
* WordPress dependencies
*/
import { Icon } from '@wordpress/components';
import { Icon, useGlobalStyles } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { withPreferredColorScheme } from '@wordpress/compose';
import { help, lock } from '@wordpress/icons';
Expand All @@ -17,18 +17,21 @@ import { help, lock } from '@wordpress/icons';
import styles from './editor.scss';

function EditTitle( { getStylesFromColorScheme, title } ) {
const lockIconStyle = getStylesFromColorScheme(
styles.lockIcon,
styles.lockIconDark
);
const titleStyle = getStylesFromColorScheme(
styles.title,
styles.titleDark
);
const infoIconStyle = getStylesFromColorScheme(
styles.infoIcon,
styles.infoIconDark
);
const globalStyles = useGlobalStyles();
const baseColors = globalStyles?.baseColors?.color;

const lockIconStyle = [
getStylesFromColorScheme( styles.lockIcon, styles.lockIconDark ),
baseColors && { color: baseColors.text },
];
const titleStyle = [
getStylesFromColorScheme( styles.title, styles.titleDark ),
baseColors && { color: baseColors.text },
];
const infoIconStyle = [
getStylesFromColorScheme( styles.infoIcon, styles.infoIconDark ),
baseColors && { color: baseColors.text },
];
const separatorStyle = getStylesFromColorScheme(
styles.separator,
styles.separatorDark
Expand Down
1 change: 1 addition & 0 deletions packages/react-native-editor/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ For each user feature we should also add a importance categorization label to i
-->

## Unreleased
- [*] Synced Patterns: Fix visibility of heading section when used with block based themes in dark mode [#55399]
- [*] Classic block: Add option to convert to blocks [#55461]

## 1.106.0
Expand Down
Loading