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] Add media inserter blocks to toolbar #51827

Merged
merged 18 commits into from
Jul 6, 2023
Merged

[RNMobile] Add media inserter blocks to toolbar #51827

Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
db4d75c
Add media button to native header toolbar
derekblank Jun 21, 2023
6b23489
Add other media button types
derekblank Jun 22, 2023
9f963f9
Display media inserter buttons when no block is selected
derekblank Jun 23, 2023
47f2410
Add insertBlocks function to Header Toolbar
derekblank Jun 23, 2023
1fc5605
Use const instead of function for renderMediaButtons
derekblank Jun 28, 2023
8a111d0
Remove inline function for onInsertBlock
derekblank Jun 28, 2023
7cf0e1d
Update header toolbar media block insertion method
derekblank Jun 28, 2023
07f418d
Update media toolbar insertion tests
derekblank Jun 29, 2023
5eefcd7
Update media toolbar insertion tests
derekblank Jun 29, 2023
dc49b65
Update visual-editor test with Media Toolbar insertion tests
derekblank Jun 30, 2023
d1d5978
Fix typo in Gallery block test
derekblank Jun 30, 2023
3d1587c
Update visual editor tests to use toBeVisible when selecting Media To…
derekblank Jul 4, 2023
88211d8
Update Visual Editor gallery block selector
derekblank Jul 5, 2023
2d26192
Wrap Media Inserter toolbar buttons in ToolbarGroup
derekblank Jul 5, 2023
34daefc
Remove iOS ActionSheet conditional from Visual Editor test
derekblank Jul 5, 2023
4fa8834
Update CHANGELOG
derekblank Jul 5, 2023
7f5a35f
Merge branch 'trunk' into rnmobile/add-media-inserter-to-toolbar
derekblank Jul 6, 2023
28fbc2f
Merge branch 'trunk' into rnmobile/add-media-inserter-to-toolbar
Jul 6, 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
59 changes: 58 additions & 1 deletion packages/edit-post/src/components/header/header-toolbar/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,15 @@ import {
import { ToolbarGroup, ToolbarButton } from '@wordpress/components';
import {
keyboardClose,
audio as audioIcon,
media as imageIcon,
video as videoIcon,
gallery as galleryIcon,
undo as undoIcon,
redo as redoIcon,
} from '@wordpress/icons';
import { store as editorStore } from '@wordpress/editor';
import { createBlock } from '@wordpress/blocks';

/**
* Internal dependencies
Expand All @@ -38,6 +43,7 @@ function HeaderToolbar( {
showInserter,
showKeyboardHideButton,
getStylesFromColorScheme,
insertBlocks,
onHideKeyboard,
isRTL,
noContentSelected,
Expand All @@ -55,6 +61,7 @@ function HeaderToolbar( {
scrollViewRef.current.scrollTo( { x: 0 } );
}
};

const renderHistoryButtons = () => {
const buttons = [
/* TODO: replace with EditorHistoryRedo and EditorHistoryUndo. */
Expand Down Expand Up @@ -83,6 +90,53 @@ function HeaderToolbar( {
return isRTL ? buttons.reverse() : buttons;
};

function onInsertBlock( blockType ) {
derekblank marked this conversation as resolved.
Show resolved Hide resolved
insertBlocks( [ createBlock( blockType ) ] );
}

const renderMediaButtons = () => {
derekblank marked this conversation as resolved.
Show resolved Hide resolved
const buttons = [
<ToolbarButton
key="imageButton"
title={ __( 'Image' ) }
icon={ imageIcon }
onClick={ () => onInsertBlock( 'core/image' ) }
derekblank marked this conversation as resolved.
Show resolved Hide resolved
extraProps={ {
hint: __( 'Insert Image Block' ),
} }
/>,
<ToolbarButton
key="videoButton"
title={ __( 'Video' ) }
icon={ videoIcon }
onClick={ () => onInsertBlock( 'core/video' ) }
extraProps={ {
hint: __( 'Insert Video Block' ),
} }
/>,
<ToolbarButton
key="galleryButton"
title={ __( 'Gallery' ) }
icon={ galleryIcon }
onClick={ () => onInsertBlock( 'core/gallery' ) }
extraProps={ {
hint: __( 'Insert Gallery Block' ),
} }
/>,
<ToolbarButton
key="audioButton"
title={ __( 'Audio' ) }
icon={ audioIcon }
onClick={ () => onInsertBlock( 'core/audio' ) }
extraProps={ {
hint: __( 'Insert Audio Block' ),
} }
/>,
];

return buttons;
};

const onToggleInserter = useCallback(
( isOpen ) => {
if ( isOpen ) {
Expand Down Expand Up @@ -131,6 +185,7 @@ function HeaderToolbar( {
useExpandedMode={ useExpandedMode }
onToggle={ onToggleInserter }
/>
{ noContentSelected && renderMediaButtons() }
{ renderHistoryButtons() }
<BlockToolbar />
</ScrollView>
Expand Down Expand Up @@ -181,7 +236,8 @@ export default compose( [
};
} ),
withDispatch( ( dispatch ) => {
const { clearSelectedBlock } = dispatch( blockEditorStore );
const { clearSelectedBlock, insertBlocks } =
dispatch( blockEditorStore );
const { togglePostTitleSelection } = dispatch( editorStore );

return {
Expand All @@ -191,6 +247,7 @@ export default compose( [
clearSelectedBlock();
togglePostTitleSelection( false );
},
insertBlocks,
};
} ),
withViewportMatch( { isLargeViewport: 'medium' } ),
Expand Down