From dad3f112edf4a365485b1241e8ba8eb74c5ad744 Mon Sep 17 00:00:00 2001
From: NejcZdovc <nejc.zdovc@3zsistemi.si>
Date: Thu, 3 Aug 2017 16:34:12 -0500
Subject: [PATCH] Moves hrePreview from Frame

Resolves #10194

Auditors: @bsclifton

Test Plan:
---
 app/renderer/components/frame/frame.js       | 14 +-----
 app/renderer/components/frame/hrefPreview.js | 45 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 app/renderer/components/frame/hrefPreview.js

diff --git a/app/renderer/components/frame/frame.js b/app/renderer/components/frame/frame.js
index fe2b74bda14..ea0d4d366b7 100644
--- a/app/renderer/components/frame/frame.js
+++ b/app/renderer/components/frame/frame.js
@@ -16,6 +16,7 @@ const getSetting = require('../../../../js/settings').getSetting
 // Components
 const ReduxComponent = require('../reduxComponent')
 const FullScreenWarning = require('./fullScreenWarning')
+const HrefPreview = require('./hrefPreview')
 const MessageBox = require('../common/messageBox')
 
 // Store
@@ -884,8 +885,6 @@ class Frame extends React.Component {
     props.isActive = frameStateUtil.isFrameKeyActive(currentWindow, frame.get('key'))
     props.showFullScreenWarning = frame.get('showFullScreenWarning')
     props.location = location
-    props.hrefPreview = frame.get('hrefPreview')
-    props.showOnRight = frame.get('showOnRight')
     props.tabId = tabId
     props.showMessageBox = tabMessageBoxState.hasMessageBoxDetail(state, tabId)
 
@@ -944,16 +943,7 @@ class Frame extends React.Component {
           webviewContainer: true,
           isPreview: this.props.isPreview
         })} />
-      {
-        this.props.hrefPreview
-        ? <div className={cx({
-          hrefPreview: true,
-          right: this.props.showOnRight
-        })}>
-          {this.props.hrefPreview}
-        </div>
-        : null
-      }
+      <HrefPreview frameKey={this.props.frameKey} />
       {
         this.props.showMessageBox
         ? <MessageBox
diff --git a/app/renderer/components/frame/hrefPreview.js b/app/renderer/components/frame/hrefPreview.js
new file mode 100644
index 00000000000..aad911c3b0d
--- /dev/null
+++ b/app/renderer/components/frame/hrefPreview.js
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const React = require('react')
+const Immutable = require('immutable')
+
+// Components
+const ReduxComponent = require('../reduxComponent')
+
+// Utils
+const frameStateUtil = require('../../../../js/state/frameStateUtil')
+const cx = require('../../../../js/lib/classSet')
+
+class HrefPreview extends React.Component {
+  mergeProps (state, ownProps) {
+    const currentWindow = state.get('currentWindow')
+    const frame = frameStateUtil.getFrameByKey(currentWindow, ownProps.frameKey) || Immutable.Map()
+
+    const props = {}
+    // used in renderer
+    props.frameKey = ownProps.frameKey
+    props.hrefPreview = frame.get('hrefPreview')
+    props.showOnRight = frame.get('showOnRight')
+
+    return props
+  }
+
+  render () {
+    if (!this.props.hrefPreview) {
+      return null
+    }
+
+    return <div
+      className={cx({
+        hrefPreview: true,
+        right: this.props.showOnRight
+      })}
+    >
+      {this.props.hrefPreview}
+    </div>
+  }
+}
+
+module.exports = ReduxComponent.connect(HrefPreview)