Update from master to bring release v1.0 to develop

index.js

@@ -1,6 +1,6 @@
 /** @flow
  * @format */
 
-import { setupApp } from './src';
+import { registerApp } from './src';
 
-setupApp();
+registerApp();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "0.3.5",
+  "version": "1.0.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

react-native-aztec/ios/Cartfile

@@ -1,2 +1,2 @@
-github "wordpress-mobile/AztecEditor-iOS" ~> 1.4
+github "wordpress-mobile/AztecEditor-iOS" ~> 1.4.3
 

react-native-aztec/ios/Cartfile.resolved

@@ -1 +1 @@
-github "wordpress-mobile/AztecEditor-iOS" "1.4.2"
+github "wordpress-mobile/AztecEditor-iOS" "1.4.3"

react-native-aztec/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-aztec",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "license": "GPL-2.0",
   "scripts": {
     "install-aztec-ios": "cd ./ios && carthage bootstrap --platform iOS --cache-builds",

src/app/App.js

@@ -3,52 +3,16 @@
 
 import React from 'react';
 
-// Gutenberg imports
-import { setLocaleData } from '@wordpress/i18n';
-
 import AppContainer from './AppContainer';
 import initialHtml from './initial-html';
 
-import { getTranslation } from '../../i18n-cache';
-
 type PropsType = {
 	initialData: string,
 	initialHtmlModeEnabled: boolean,
 	initialTitle: string,
-	locale: string,
-	translations: mixed,
 };
 
 export default class AppProvider extends React.Component<PropsType> {
-	constructor( props: PropsType ) {
-		super( props );
-
-		this.setLocale( props.locale );
-	}
-
-	componentDidUpdate( prevProps: PropsType ) {
-		if ( prevProps.locale !== this.props.locale ) {
-			this.setLocale( this.props.locale );
-		}
-	}
-
-	setLocale( locale: ?string ) {
-		const translationsFromParentApp = this.props.translations;
-		let gutenbergTranslations = getTranslation( locale );
-		if ( locale && ! gutenbergTranslations ) {
-			// Try stripping out the regional
-			locale = locale.replace( /[-_][A-Za-z]+$/, '' );
-			gutenbergTranslations = getTranslation( locale );
-		}
-		const translations = Object.assign( {}, gutenbergTranslations, translationsFromParentApp );
-		// eslint-disable-next-line no-console
-		console.log( 'locale', locale, translations );
-		// Only change the locale if it's supported by gutenberg
-		if ( gutenbergTranslations || translationsFromParentApp ) {
-			setLocaleData( translations );
-		}
-	}
-
 	render() {
 		const { initialHtmlModeEnabled } = this.props;
 		let initialData = this.props.initialData;

src/app/App.test.js

@@ -2,13 +2,13 @@
 
 import renderer from 'react-test-renderer';
 
-import { setupApp } from '..';
+import { bootstrapEditor } from '..';
 import App from './App';
 import BlockHolder from '../block-management/block-holder';
 import { dispatch, select } from '@wordpress/data';
 
 describe( 'App', () => {
-	beforeAll( setupApp );
+	beforeAll( bootstrapEditor );
 
 	it( 'renders without crashing', () => {
 		const app = renderer.create( <App /> );

src/index.js

@@ -1,15 +1,16 @@
 // External dependencies
-import { AppRegistry, I18nManager } from 'react-native';
+import { AppRegistry, I18nManager, YellowBox } from 'react-native';
+import React from 'react';
 
 // Setting up environment
 import './globals';
+import { getTranslation } from '../i18n-cache';
+import { setLocaleData } from '@wordpress/i18n';
 
 const gutenbergSetup = () => {
 	const apiFetch = require( '@wordpress/api-fetch' ).default;
 	const wpData = require( '@wordpress/data' );
 
-	I18nManager.forceRTL( false ); // Change to `true` to debug RTL layout easily.
-
 	// wp-api-fetch
 	apiFetch.use( apiFetch.createRootURLMiddleware( 'https://public-api.wordpress.com/' ) );
 
@@ -42,10 +43,50 @@ const editorSetup = () => {
 	}
 };
 
-export function setupApp() {
+const setupLocale = ( locale, extraTranslations ) => {
+	I18nManager.forceRTL( false ); // Change to `true` to debug RTL layout easily.
+
+	let gutenbergTranslations = getTranslation( locale );
+	if ( locale && ! gutenbergTranslations ) {
+		// Try stripping out the regional
+		locale = locale.replace( /[-_][A-Za-z]+$/, '' );
+		gutenbergTranslations = getTranslation( locale );
+	}
+	const translations = Object.assign( {}, gutenbergTranslations, extraTranslations );
+	// eslint-disable-next-line no-console
+	console.log( 'locale', locale, translations );
+	// Only change the locale if it's supported by gutenberg
+	if ( gutenbergTranslations || extraTranslations ) {
+		setLocaleData( translations );
+	}
+};
+
+export class RootComponent extends React.Component {
+	constructor( props ) {
+		super( props );
+		setupLocale( props.locale, props.translations );
+		bootstrapEditor();
+	}
+
+	render() {
+		// eslint-disable-next-line no-unused-vars
+		const { locale, translations, ...otherProps } = this.props;
+		// Need to wait for everything to be setup before requiring our App
+		const App = require( './app/App' ).default;
+		return (
+			<App { ...otherProps } />
+		);
+	}
+}
+
+export function registerApp() {
+	// Disable require circle warnings showing up in the app (they will still be visible in the console)
+	YellowBox.ignoreWarnings( [ 'Require cycle:' ] );
+
+	AppRegistry.registerComponent( 'gutenberg', () => RootComponent );
+}
+
+export function bootstrapEditor() {
 	gutenbergSetup();
 	editorSetup();
-
-	// Making sure the environment is set up before loading any Component
-	AppRegistry.registerComponent( 'gutenberg', () => require( './app/App' ).default );
 }

src/variables.android.scss

@@ -3,3 +3,5 @@
 // Fonts
 $default-monospace-font: monospace;
 $default-regular-font: serif;
+$title-block-padding-top: 0;
+$title-block-padding-bottom: 0;

src/variables.ios.scss

@@ -3,3 +3,5 @@
 // Fonts
 $default-monospace-font: courier;
 $default-regular-font: 'Noto Serif';
+$title-block-padding-top: 12;
+$title-block-padding-bottom: 12;