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

Update the way we determine how a post has been edited #252

Closed
wants to merge 2 commits into from
Closed

Update the way we determine how a post has been edited #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
714f814
Initialize lastHtmlSent to the html sent by the parent app
Tug Nov 16, 2018
674ff00
Use isEditedPostDirty selector to determine if a post needs to be upd…
Tug Nov 16, 2018
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
2 changes: 1 addition & 1 deletion gutenberg
Open in desktop
Submodule gutenberg updated 379 files
2 changes: 1 addition & 1 deletion react-native-aztec
Open in desktop
Submodule react-native-aztec updated 9 files
+1 −15 android/build.gradle
+14 −63 android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
+0 −50 android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecSelectionChangeEvent.java
+24 −81 android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java
+0 −3 example/editor.js
+3 −27 ios/RNTAztecView/RCTAztecView.swift
+0 −3 ios/RNTAztecView/RCTAztecViewManager.m
+1 −18 ios/RNTAztecView/RCTAztecViewManager.swift
+8 −55 src/AztecView.js
9 changes: 7 additions & 2 deletions src/app/AppContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import { compose } from '@wordpress/compose';
import RNReactNativeGutenbergBridge from 'react-native-gutenberg-bridge';

import MainApp from './MainApp';
import type { BlockType } from '../store/types';
import type { PostType, BlockType } from '../store/types';

type PropsType = {
rootClientId: ?string,
post: PostType,
isBlockSelected: string => boolean,
showHtml: boolean,
editedPostContent: string,
Expand All @@ -29,7 +30,6 @@ type PropsType = {
onAttributesUpdate: ( string, mixed ) => mixed,
initialHtml: string,
setupEditor: ( mixed, ?mixed ) => mixed,
clientId: string,
};

class AppContainer extends React.Component<PropsType> {
Expand Down Expand Up @@ -92,6 +92,9 @@ class AppContainer extends React.Component<PropsType> {

toggleHtmlModeAction = () => {
this.props.onToggleBlockMode( this.props.rootClientId );
// eslint-disable-next-line no-console
console.log( 'isEditedPostDirty', this.props.isEditedPostDirty );
RNReactNativeGutenbergBridge.provideToNative_Html( html, this.props.isEditedPostDirty );
};

mergeBlocksAction = ( blockOneClientId, blockTwoClientId ) => {
Expand Down Expand Up @@ -128,6 +131,7 @@ export default compose( [
isBlockSelected,
getBlockMode,
getEditedPostContent,
isEditedPostDirty,
} = select( 'core/editor' );
const selectedBlockClientId = getSelectedBlockClientId();

Expand All @@ -137,6 +141,7 @@ export default compose( [
blocks: getBlocks( rootClientId ),
showHtml: getBlockMode( rootClientId ) === 'html',
editedPostContent: getEditedPostContent(),
isEditedPostDirty: isEditedPostDirty(),
};
} ),
withDispatch( ( dispatch ) => {
Expand Down
8 changes: 8 additions & 0 deletions src/store/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,11 @@ export type StateType = {
refresh: boolean,
fullparse: boolean,
};

export type PostType = {
id: number,
content: {
raw: string,
},
type: string,
};