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] - 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 all commits
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
3 changes: 1 addition & 2 deletions packages/block-editor/src/components/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ export { default as VideoPlayer, VIDEO_ASPECT_RATIO } from './video-player';
// Content Related Components
export {
__experimentalPageTemplatePicker,
__experimentalUsePageTemplatePickerVisible,
__experimentalWithPageTemplatePickerVisible,
__experimentalWithPageTemplatePicker,
} from './page-template-picker';
export { default as BlockList } from './block-list';
export { default as BlockMover } from './block-mover';
Expand Down
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;
6 changes: 2 additions & 4 deletions packages/block-editor/src/components/page-template-picker/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
* Internal dependencies
*/
import __experimentalPageTemplatePicker from './picker';
import __experimentalWithPageTemplatePickerVisible from './with-page-template-picker-visible';
import __experimentalUsePageTemplatePickerVisible from './use-page-template-picker-visible';
import __experimentalWithPageTemplatePicker from './with-page-template-picker';

export { __experimentalPageTemplatePicker };
export { __experimentalWithPageTemplatePickerVisible };
export { __experimentalUsePageTemplatePickerVisible };
export { __experimentalWithPageTemplatePicker };
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, useRef } 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 @@ -19,6 +20,7 @@ import Preview from './preview';

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

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

useEffect( () => {
onPickerAnimation();
}, [ visible ] );

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

const onPickerAnimation = () => {
if ( visible && ! pickerVisible ) {
setPickerVisible( true );
}

Animated.timing( contentOpacity.current, {
toValue: visible ? 1 : 0,
duration: 300,
useNativeDriver: true,
} ).start( () => {
if ( ! visible ) {
setPickerVisible( false );
}
} );
};

if ( ! pickerVisible ) {
return null;
}

return (
<>
<Animated.View style={ [ { opacity: contentOpacity.current } ] }>
<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
14 changes: 9 additions & 5 deletions ...icker/use-page-template-picker-visible.js → ...mplate-picker/use-page-template-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@
import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
import { useSelect } from '@wordpress/data';

const __experimentalUsePageTemplatePickerVisible = () => {
export const __experimentalUsePageTemplatePickerAvailable = () => {
return useSelect( ( select ) => {
const { getCurrentPostType } = select( 'core/editor' );
return getCurrentPostType() === 'page';
}, [] );
};

export const __experimentalUsePageTemplatePickerVisible = () => {
const isTemplatePickerAvailable = __experimentalUsePageTemplatePickerAvailable();

return useSelect( ( select ) => {
const { getBlockOrder, getBlock } = select( 'core/block-editor' );

const blocks = getBlockOrder();
Expand All @@ -16,10 +23,7 @@ const __experimentalUsePageTemplatePickerVisible = () => {
const isOnlyUnmodifiedDefault =
blocks.length === 1 && isUnmodifiedDefaultBlock( firstBlock );
const isEmptyContent = isEmptyBlockList || isOnlyUnmodifiedDefault;
const isPage = getCurrentPostType() === 'page';

return isEmptyContent && isPage;
return isEmptyContent && isTemplatePickerAvailable;
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure if I'm overthinking this, but I imagine the majority of times this runs it will return false. I'd suggest refactoring a bit to return early and avoid any extra calculations:

if ( ! isTemplatePickerAvailable ) {
    return false;
}
//...
if ( isEmptyBlockList ) {
   return false;
}
// ...

It'd be interesting to check if this impacts performance at all, or I'm just worried about nothing 😅

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm always down for performance improvements 🙌, I'll definitely check it out, thanks for the review koke!

}, [] );
};

export default __experimentalUsePageTemplatePickerVisible;
24 changes: 0 additions & 24 deletions ...ges/block-editor/src/components/page-template-picker/with-page-template-picker-visible.js
View file
Open in desktop

This file was deleted.

30 changes: 30 additions & 0 deletions packages/block-editor/src/components/page-template-picker/with-page-template-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* WordPress dependencies
*/
import { createHigherOrderComponent } from '@wordpress/compose';

/**
* Internal dependencies
*/
import {
__experimentalUsePageTemplatePickerVisible,
__experimentalUsePageTemplatePickerAvailable,
} from './use-page-template-picker';

const __experimentalWithPageTemplatePicker = createHigherOrderComponent(
( WrappedComponent ) => ( props ) => {
const isTemplatePickerVisible = __experimentalUsePageTemplatePickerVisible();
const isTemplatePickerAvailable = __experimentalUsePageTemplatePickerAvailable();

return (
<WrappedComponent
{ ...props }
isTemplatePickerVisible={ isTemplatePickerVisible }
isTemplatePickerAvailable={ isTemplatePickerAvailable }
/>
);
},
'__experimentalWithPageTemplatePicker'
);

export default __experimentalWithPageTemplatePicker;
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;
}
15 changes: 9 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 @@ -13,7 +13,7 @@ import { withSelect } from '@wordpress/data';
import {
BottomSheetSettings,
__experimentalPageTemplatePicker,
__experimentalWithPageTemplatePickerVisible,
__experimentalWithPageTemplatePicker,
} from '@wordpress/block-editor';
import { compose, withPreferredColorScheme } from '@wordpress/compose';
import { HTMLTextInput, KeyboardAvoidingView } from '@wordpress/components';
Expand Down Expand Up @@ -94,9 +94,10 @@ class Layout extends Component {

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

const isHtmlView = mode === 'text';
Expand Down Expand Up @@ -143,8 +144,10 @@ class Layout extends Component {
parentHeight={ this.state.rootViewHeight }
style={ toolbarKeyboardAvoidingViewStyle }
>
{ showPageTemplatePicker && (
<__experimentalPageTemplatePicker />
{ isTemplatePickerAvailable && (
<__experimentalPageTemplatePicker
visible={ isTemplatePickerVisible }
/>
) }
<Header />
<BottomSheetSettings />
Expand All @@ -168,5 +171,5 @@ export default compose( [
};
} ),
withPreferredColorScheme,
__experimentalWithPageTemplatePickerVisible,
__experimentalWithPageTemplatePicker,
] )( Layout );