From 831e328a5c7e1e81225ad37dff1d9fb5aeae95c8 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 6 Aug 2018 13:19:06 +1000
Subject: [PATCH 1/2] Fix iframe JavaScript indendation

---
 packages/components/src/sandbox/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/sandbox/index.js b/packages/components/src/sandbox/index.js
index 31c36f162f132..bbc5097aa4624 100644
--- a/packages/components/src/sandbox/index.js
+++ b/packages/components/src/sandbox/index.js
@@ -143,8 +143,8 @@ class Sandbox extends Component {
 				// keeping the correct aspect ratio.
 				var potentialIframe = document.body.children[0];
 				if ( 'DIV' === potentialIframe.tagName || 'SPAN' === potentialIframe.tagName ) {
-						potentialIframe = potentialIframe.children[0];
-					}
+					potentialIframe = potentialIframe.children[0];
+				}
 				if ( potentialIframe && 'IFRAME' === potentialIframe.tagName ) {
 					if ( potentialIframe.width ) {
 						iframe = potentialIframe;

From 13dcbda12f03d17c6adad90f6ba638108b3a7c61 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 6 Aug 2018 13:20:29 +1000
Subject: [PATCH 2/2] Fix unrecognised `forwardedRef` prop error

Have `withGlobalEvents` omit the `forwardedRef` prop. This prevents the
prop being added to HTML in some cases, e.g. when used in
`FocusableIframe`.
---
 packages/compose/src/with-global-events/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/compose/src/with-global-events/index.js b/packages/compose/src/with-global-events/index.js
index f9d2c8b194756..f00f222a2d2be 100644
--- a/packages/compose/src/with-global-events/index.js
+++ b/packages/compose/src/with-global-events/index.js
@@ -61,12 +61,12 @@ function withGlobalEvents( eventTypesToHandlers ) {
 			}
 
 			render() {
-				return <WrappedComponent { ...this.props } ref={ this.handleRef } />;
+				return <WrappedComponent { ...this.props.ownProps } ref={ this.handleRef } />;
 			}
 		}
 
 		return forwardRef( ( props, ref ) => {
-			return <Wrapper { ...props } forwardedRef={ ref } />;
+			return <Wrapper ownProps={ props } forwardedRef={ ref } />;
 		} );
 	}, 'withGlobalEvents' );
 }