Merge branch 'develop' into feature/rich-text-formats

index.js

@@ -1,6 +1,6 @@
 /** @flow
  * @format */
 
-import { AppRegistry } from 'react-native';
-import App from './src/app/App';
-AppRegistry.registerComponent( 'gutenberg', () => App );
+import { setupApp } from './src';
+
+setupApp();

ios/gutenberg/MediaUploadCoordinator.swift

@@ -62,7 +62,7 @@ class MediaUploadCoordinator: NSObject {
     } else if progress.fractionCompleted >= 1 {
       timer.invalidate()
       if successfull {
-        gutenberg.mediaUploadUpdate(id: mediaID, state: .failed, progress: 1, url: mediaURL, serverID: 123)
+        gutenberg.mediaUploadUpdate(id: mediaID, state: .succeeded, progress: 1, url: mediaURL, serverID: 123)
         activeUploads[mediaID] = nil
       } else {
         progress.setUserInfoObject("Network upload failed", forKey: .mediaError)

react-native-gutenberg-bridge/ios/Gutenberg.swift

@@ -79,7 +79,7 @@ public class Gutenberg: NSObject {
         if let serverID = serverID {
             data["mediaServerId"] = serverID
         }
-        bridgeModule.sendEvent(withName: EventName.mediaUpload, body: data)
+        bridgeModule.sendEventIfNeeded(name: EventName.mediaUpload, body: data)
     }
 }
 

react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.swift

@@ -2,7 +2,7 @@
 public class RNReactNativeGutenbergBridge: RCTEventEmitter {
     weak var delegate: GutenbergBridgeDelegate?
     private var isJSLoading = true
-
+    private var hasObservers = false
     // MARK: - Messaging methods
 
     @objc
@@ -54,6 +54,28 @@ public class RNReactNativeGutenbergBridge: RCTEventEmitter {
             self.delegate?.gutenbergDidLayout()
         }
     }
+
+    override public func startObserving() {
+        super.startObserving()
+        hasObservers = true
+    }
+
+    override public func stopObserving() {
+        super.stopObserving()
+        hasObservers = false
+    }
+
+
+    /// Sends events to the JS side only if there is observers listening
+    ///
+    /// - Parameters:
+    ///   - name: name of the event
+    ///   - body: data for the event
+    public func sendEventIfNeeded(name: String, body: Any!) {
+        if ( hasObservers ) {
+            self.sendEvent(withName: name, body: body)
+        }
+    }
 }
 
 // MARK: - RCTBridgeModule delegate

src/app/App.js

@@ -1,30 +1,10 @@
 /** @flow
  * @format */
-
-import '../globals';
-
 import React from 'react';
 
-// Gutenberg imports
-import { registerCoreBlocks } from '@wordpress/block-library';
-import { registerBlockType, setUnregisteredTypeHandlerName, unregisterBlockType } from '@wordpress/blocks';
-
 import AppContainer from './AppContainer';
 import initialHtml from './initial-html';
 
-import * as UnsupportedBlock from '../block-types/unsupported-block/';
-import '@wordpress/format-library';
-
-registerCoreBlocks();
-registerBlockType( UnsupportedBlock.name, UnsupportedBlock.settings );
-setUnregisteredTypeHandlerName( UnsupportedBlock.name );
-
-// disable Code and More blocks for release
-if ( ! __DEV__ ) {
-	unregisterBlockType( 'core/code' );
-	unregisterBlockType( 'core/more' );
-}
-
 type PropsType = {
 	initialData: string,
 	initialHtmlModeEnabled: boolean,

src/app/App.test.js

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

src/index.js

@@ -0,0 +1,48 @@
+// External dependencies
+import { AppRegistry } from 'react-native';
+
+// Setting up environment
+import './globals';
+
+const gutenbergSetup = () => {
+	const apiFetch = require( '@wordpress/api-fetch' ).default;
+	const wpData = require( '@wordpress/data' );
+
+	// wp-api-fetch
+	apiFetch.use( apiFetch.createRootURLMiddleware( 'https://public-api.wordpress.com/' ) );
+
+	// wp-data
+	const userId = 1;
+	const storageKey = 'WP_DATA_USER_' + userId;
+	wpData.use( wpData.plugins.persistence, { storageKey: storageKey } );
+	wpData.use( wpData.plugins.controls );
+};
+
+const editorSetup = () => {
+	const wpBlockLibrary = require( '@wordpress/block-library' );
+	const wpBlocks = require( '@wordpress/blocks' );
+	const registerCoreBlocks = wpBlockLibrary.registerCoreBlocks;
+	const registerBlockType = wpBlocks.registerBlockType;
+	const setUnregisteredTypeHandlerName = wpBlocks.setUnregisteredTypeHandlerName;
+	const unregisterBlockType = wpBlocks.unregisterBlockType;
+	const UnsupportedBlock = require( './block-types/unsupported-block' );
+
+	// register and setup blocks
+	registerCoreBlocks();
+	registerBlockType( UnsupportedBlock.name, UnsupportedBlock.settings );
+	setUnregisteredTypeHandlerName( UnsupportedBlock.name );
+
+	// disable Code and More blocks for release
+	if ( ! __DEV__ ) {
+		unregisterBlockType( 'core/code' );
+		unregisterBlockType( 'core/more' );
+	}
+};
+
+export function setupApp() {
+	gutenbergSetup();
+	editorSetup();
+
+	// Making sure the environment is set up before loading any Component
+	AppRegistry.registerComponent( 'gutenberg', () => require( './app/App' ).default );
+}