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

[RNMobile] - Starter Page Templates - Picker and Preview design updates #20959

Merged
merged 4 commits into from
Mar 27, 2020
Merged

[RNMobile] - Starter Page Templates - Picker and Preview design updates #20959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abdeae5
RNMobile - Starter Page Templates - Picker and preview design updates
Mar 17, 2020
bbed05c
RNMobile - Layout picker - Improve animation and HOC to pass down nee…
Mar 23, 2020
85f1404
Merge branch 'master' into rnmobile/spt-design-improvements
Mar 26, 2020
fab02d3
Merge branch 'master' into rnmobile/spt-design-improvements
Mar 27, 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
24 changes: 15 additions & 9 deletions packages/block-editor/src/components/page-template-picker/button.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
/**
* External dependencies
*/
import { TouchableOpacity, Text } from 'react-native';
import { TouchableOpacity, Text, View } from 'react-native';

/**
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { withPreferredColorScheme } from '@wordpress/compose';
import { usePreferredColorSchemeStyle } from '@wordpress/compose';

/**
* Internal dependencies
*/
import styles from './styles.scss';

const PickerButton = ( { icon, label, onPress, getStylesFromColorScheme } ) => {
const butonStyles = getStylesFromColorScheme(
const PickerButton = ( { icon, label, onPress } ) => {
const butonWrapperStyles = usePreferredColorSchemeStyle(
styles.buttonWrapper,
styles.buttonWrapperDark
);
const buttonStyles = usePreferredColorSchemeStyle(
styles.button,
styles.buttonDark
);
const butonTextStyles = getStylesFromColorScheme(
const buttonTextStyles = usePreferredColorSchemeStyle(
styles.buttonText,
styles.buttonTextDark
);
Expand All @@ -30,12 +34,14 @@ const PickerButton = ( { icon, label, onPress, getStylesFromColorScheme } ) => {
accessibilityHint={ __( 'Double tap to select layout' ) }
activeOpacity={ 0.7 }
onPress={ onPress }
style={ butonStyles }
style={ butonWrapperStyles }
>
<Text style={ styles.buttonIcon }>{ icon }</Text>
<Text style={ butonTextStyles }>{ label }</Text>
<View style={ buttonStyles }>
<Text style={ styles.buttonIcon }>{ icon }</Text>
<Text style={ buttonTextStyles }>{ label }</Text>
</View>
</TouchableOpacity>
);
};

export default withPreferredColorScheme( PickerButton );
export default PickerButton;
34 changes: 31 additions & 3 deletions ...components/page-template-picker/picker.js → ...nts/page-template-picker/picker.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
/**
* WordPress dependencies
*/
import { useState } from '@wordpress/element';
import { useState, useEffect } from '@wordpress/element';
import { useDispatch, useSelect } from '@wordpress/data';

/**
* External dependencies
*/
import { logUserEvent, userEvents } from 'react-native-gutenberg-bridge';
import { Animated } from 'react-native';

/**
* Internal dependencies
Expand All @@ -17,8 +18,11 @@ import Container from './container';
import getDefaultTemplates from './default-templates';
import Preview from './preview';

const PICKER_ANIMATION_DELAY = 500;

const __experimentalPageTemplatePicker = ( {
templates = getDefaultTemplates(),
visible,
} ) => {
const { editPost } = useDispatch( 'core/editor' );
const { title } = useSelect( ( select ) => {
Expand All @@ -30,6 +34,16 @@ const __experimentalPageTemplatePicker = ( {
} );

const [ templatePreview, setTemplatePreview ] = useState();
const [ pickerVisible, setPickerVisible ] = useState( visible );
const contentOpacity = new Animated.Value( 1 );

useEffect( () => {
if ( ! visible ) {
onHidePicker();
} else {
setPickerVisible( true );
}
}, [ visible ] );

const onApply = () => {
editPost( {
Expand All @@ -42,8 +56,22 @@ const __experimentalPageTemplatePicker = ( {
setTemplatePreview( undefined );
};

const onHidePicker = () => {
Animated.timing( contentOpacity, {
toValue: 0,
duration: 300,
delay: PICKER_ANIMATION_DELAY,
} ).start( () => {
setPickerVisible( false );
} );
};

if ( ! pickerVisible ) {
return null;
}

return (
<>
<Animated.View style={ [ { opacity: contentOpacity } ] }>
<Container>
{ templates.map( ( template ) => (
<Button
Expand All @@ -67,7 +95,7 @@ const __experimentalPageTemplatePicker = ( {
onDismiss={ () => setTemplatePreview( undefined ) }
onApply={ onApply }
/>
</>
</Animated.View>
);
};

Expand Down
8 changes: 7 additions & 1 deletion packages/block-editor/src/components/page-template-picker/preview.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ const Preview = ( props ) => {
styles.previewContainer,
styles.previewContainerDark
);
const previewContentStyle = usePreferredColorSchemeStyle(
styles.previewContent,
styles.previewContentDark
);

if ( template === undefined ) {
return null;
Expand Down Expand Up @@ -79,7 +83,9 @@ const Preview = ( props ) => {
title={ template.name }
subtitle={ __( 'Template Preview' ) }
/>
<BlockPreview blocks={ template.blocks } />
<View style={ previewContentStyle }>
<BlockPreview blocks={ template.blocks } />
</View>
</SafeAreaView>
</Modal>
);
Expand Down
24 changes: 21 additions & 3 deletions packages/block-editor/src/components/page-template-picker/styles.native.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,21 @@
padding: 0 12px;
}

.button {
background-color: rgba($black, 0.04);
.buttonWrapper {
Copy link
Member Author

Choose a reason for hiding this comment

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

This wrapper will solve the issue with the transparency of the buttons

background-color: $white;
border-radius: 20px;
flex-direction: row;
margin-right: 8px;
overflow: hidden;
}

.buttonWrapperDark {
background-color: $black;
}

.button {
background-color: rgba($black, 0.04);
padding: 9px 18px 9px 14px;
flex-direction: row;
align-items: center;
}

Expand Down Expand Up @@ -41,6 +50,15 @@
}

.previewContainerDark {
background-color: #0f1518;
}

.previewContent {
flex: 1;
background-color: $white;
}

.previewContentDark {
background-color: $black;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/mobile/modal-header-bar/styles.native.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@
}

.separatorDark {
background-color: $gray-70;
background-color: #2d2d2d;
}
17 changes: 11 additions & 6 deletions packages/edit-post/src/components/layout/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ class Layout extends Component {

render() {
const {
mode,
getStylesFromColorScheme,
isPage,
mode,
showPageTemplatePicker,
} = this.props;

Expand Down Expand Up @@ -143,8 +144,10 @@ class Layout extends Component {
parentHeight={ this.state.rootViewHeight }
style={ toolbarKeyboardAvoidingViewStyle }
>
{ showPageTemplatePicker && (
<__experimentalPageTemplatePicker />
{ isPage && (
Copy link
Member Author

Choose a reason for hiding this comment

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

Before, the component was being unmounted after the user has at least one block. To be able to have a fade-out animation, the component can't be unmounted. So now the picker will be rendered if its a page only (since we don't want to import everything for a standard post)

Within the component, it will handle if it should be rendered or not by passing showPageTemplatePicker as a prop.

<__experimentalPageTemplatePicker
visible={ showPageTemplatePicker }
/>
) }
<Header />
<BottomSheetSettings />
Expand All @@ -157,12 +160,14 @@ class Layout extends Component {

export default compose( [
withSelect( ( select ) => {
const { __unstableIsEditorReady: isEditorReady } = select(
'core/editor'
);
const {
__unstableIsEditorReady: isEditorReady,
getCurrentPostType,
} = select( 'core/editor' );
const { getEditorMode } = select( 'core/edit-post' );

return {
isPage: getCurrentPostType(),
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should be getCurrentPostType() === 'page'.

I think I'd still encapsulate that logic in the HOC, maybe splitting the PageTemplatePickerVisible HOC/hook into two: "available" (is a page) and "visible" (has no content).

isReady: isEditorReady(),
mode: getEditorMode(),
};
Expand Down