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

Send contentInfo information when updating HTML. #23115

Merged
merged 12 commits into from
Jun 16, 2020
Merged

Send contentInfo information when updating HTML. #23115

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
736f40b
Send contentInfo information when updating HTML.
SergioEstevao Jun 12, 2020
74c3e7a
Rename content info names.
SergioEstevao Jun 12, 2020
ab379a2
Fix lint issues.
SergioEstevao Jun 12, 2020
c5547bd
Change to getGlobalCount to count blocks.
SergioEstevao Jun 16, 2020
13c86b0
Merge branch 'master' into rnmobile/content_info
SergioEstevao Jun 16, 2020
d97c6ca
Remove unused method.
SergioEstevao Jun 16, 2020
e35a35e
Remove unused variable.
SergioEstevao Jun 16, 2020
74ef040
Merge branch 'master' into rnmobile/content_info
SergioEstevao Jun 16, 2020
bd8840e
Merge branch 'master' into rnmobile/content_info
SergioEstevao Jun 16, 2020
43dd970
Merge branch 'master' into rnmobile/content_info
SergioEstevao Jun 16, 2020
f645d58
Add comment to method.
SergioEstevao Jun 16, 2020
c937e3e
Merge branch 'master' into rnmobile/content_info
SergioEstevao Jun 16, 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
20 changes: 16 additions & 4 deletions packages/editor/src/components/provider/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import RNReactNativeGutenbergBridge, {
* WordPress dependencies
*/
import { Component } from '@wordpress/element';
import { count as wordCount } from '@wordpress/wordcount';
import {
parse,
serialize,
Expand Down Expand Up @@ -181,10 +182,20 @@ class NativeEditorProvider extends Component {
const hasChanges =
title !== this.post.title.raw || html !== this.post.content.raw;

// Variable to store the content structure metrics.
const contentInfo = {};
contentInfo.characterCount = wordCount(
html,
'characters_including_spaces'
);
contentInfo.wordCount = wordCount( html, 'words' );
contentInfo.paragraphCount = this.props.paragraphCount;
contentInfo.blockCount = this.props.blockCount;
RNReactNativeGutenbergBridge.provideToNative_Html(
html,
title,
hasChanges
hasChanges,
contentInfo
);

if ( hasChanges ) {
Expand Down Expand Up @@ -228,7 +239,7 @@ class NativeEditorProvider extends Component {
}

export default compose( [
withSelect( ( select, { rootClientId } ) => {
withSelect( ( select ) => {
const {
__unstableIsEditorReady: isEditorReady,
getEditorBlocks,
Expand All @@ -238,9 +249,9 @@ export default compose( [
const { getEditorMode } = select( 'core/edit-post' );

const {
getBlockCount,
getBlockIndex,
getSelectedBlockClientId,
getGlobalBlockCount,
} = select( 'core/block-editor' );

const selectedBlockClientId = getSelectedBlockClientId();
Expand All @@ -251,7 +262,8 @@ export default compose( [
title: getEditedPostAttribute( 'title' ),
getEditedPostContent,
selectedBlockIndex: getBlockIndex( selectedBlockClientId ),
blockCount: getBlockCount( rootClientId ),
blockCount: getGlobalBlockCount(),
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like getBlockCount is not needed anymore and we can remove it from the extraction list above, right?

paragraphCount: getGlobalBlockCount( 'core/paragraph' ),
};
} ),
withDispatch( ( dispatch ) => {
Expand Down