From adddc7f2a4a2b3276adb4a8d3da1eaeb1b995106 Mon Sep 17 00:00:00 2001
From: Morten Olsen <morten@olsen.pro>
Date: Fri, 5 Jul 2019 13:55:13 +0200
Subject: [PATCH] Better seperation

---
 demo/App.js                                  |  2 --
 lib/src/components/DevTool/Console/Input.js  |  9 +++++---
 lib/src/components/DevTool/Console/index.js  |  8 +++----
 lib/src/components/DevTool/Requests/index.js |  6 +++--
 lib/src/components/DevTool/index.js          | 23 ++++++++++++--------
 lib/src/components/data/Log.js               |  7 +++---
 lib/src/components/data/requests.js          |  7 +++---
 lib/src/console.js                           | 12 +++++-----
 lib/src/index.js                             |  2 --
 lib/src/log.js                               | 10 +++++++++
 10 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/demo/App.js b/demo/App.js
index 50ce944..890fe0f 100644
--- a/demo/App.js
+++ b/demo/App.js
@@ -14,12 +14,10 @@ import {
   log,
   network,
   show,
-  context,
 } from 'react-native-debug-console';
 
 network.attach();
 log.attach();
-context.hello = () => 'earth';
 
 console.log('fooo');
 let xhr = new XMLHttpRequest();
diff --git a/lib/src/components/DevTool/Console/Input.js b/lib/src/components/DevTool/Console/Input.js
index 5ecd9a2..ecb9862 100644
--- a/lib/src/components/DevTool/Console/Input.js
+++ b/lib/src/components/DevTool/Console/Input.js
@@ -5,8 +5,7 @@ import {
   TextInput,
 } from 'react-native';
 import styled from 'styled-components/native';
-import { context } from '../../../console';
-import log from '../../../log';
+import { createContext } from '../../../console';
 import Icon from '../../base/Icon';
 
 const Button = styled.TouchableOpacity`
@@ -33,6 +32,7 @@ const styles = StyleSheet.create({
 });
 
 const Input = ({
+  provider,
   logs,
 }) => {
   const [text, setText] = useState('');
@@ -79,6 +79,9 @@ const Input = ({
       <Button
         onPress={() => {
           const newHistory = [...history, text];
+          const context = createContext({
+            logProvider: provider,
+          });
           const contextKeys = Object.keys(context);
           const contextValues = Object.values(context);
           const fn = new Function(...contextKeys, text);
@@ -88,7 +91,7 @@ const Input = ({
             setHistoryOffset(undefined);
             setHistory(newHistory);
           } catch (err) {
-            log.error([err]);
+            provider.error([err]);
           }
         }}
       >
diff --git a/lib/src/components/DevTool/Console/index.js b/lib/src/components/DevTool/Console/index.js
index ea1c5bb..551e1ca 100644
--- a/lib/src/components/DevTool/Console/index.js
+++ b/lib/src/components/DevTool/Console/index.js
@@ -3,7 +3,6 @@ import {
   StyleSheet,
   View,
 } from 'react-native';
-import log from '../../../log';
 import useLog from '../../data/log';
 import Toolbar, {
   Button,
@@ -32,8 +31,9 @@ const initFilters = [
 
 const Console = ({
   includeStackTrace,
+  provider,
 }) => {
-  const logs = useLog();
+  const logs = useLog(provider);
   const [filters, setFilters] = useState(initFilters);
   return (
     <View style={styles.container}>
@@ -51,11 +51,11 @@ const Console = ({
         <Button
           name="Clear"
           icon="trash"
-          onPress={() => log.clear()}
+          onPress={() => provider.clear()}
         />
       </Toolbar>
       <Output filter={filters.filter(f => f.selected).map(f => f.name)} logs={logs} includeStackTrace={includeStackTrace} />
-      <Input />
+      <Input provider={provider} />
     </View>
   );
 };
diff --git a/lib/src/components/DevTool/Requests/index.js b/lib/src/components/DevTool/Requests/index.js
index 00505fb..64c0718 100644
--- a/lib/src/components/DevTool/Requests/index.js
+++ b/lib/src/components/DevTool/Requests/index.js
@@ -26,8 +26,10 @@ const styles = StyleSheet.create({
   },
 });
 let i = 0;
-const Console = () => {
-  const requests = useRequests();
+const Console = ({
+  provider,
+}) => {
+  const requests = useRequests(provider);
   const [active, setActive] = useState();
   const selected = active >= 0 ? requests[active] : undefined;
   return (
diff --git a/lib/src/components/DevTool/index.js b/lib/src/components/DevTool/index.js
index 7bbfe05..6b66c1f 100644
--- a/lib/src/components/DevTool/index.js
+++ b/lib/src/components/DevTool/index.js
@@ -22,33 +22,38 @@ const DevTool = ({
   style,
   includeStackTrace,
   onClose,
-  showNetwork = true,
-  showConsole = true,
+  logProvider = log,
+  storageProvider,
+  requestProvider = network,
   additionalTools = [],
-  storage,
 }) => {
   const views = [];
 
-  if (showConsole) {
+  if (logProvider) {
     views.push({
       name: 'Console',
-      view: <Console includeStackTrace={includeStackTrace} />,
+      view: (
+        <Console
+          includeStackTrace={includeStackTrace}
+          provider={logProvider}
+        />
+      ),
       getData: log.get,
     });
   }
 
-  if (showNetwork) {
+  if (requestProvider) {
     views.push({
       name: 'Network',
-      view: <Requests />,
+      view: <Requests provider={requestProvider} />,
       getData: network.get,
     });
   }
 
-  if (storage) {
+  if (storageProvider) {
     views.push({
       name: 'Storage',
-      view: <Storage provider={storage} />,
+      view: <Storage provider={storageProvider} />,
     });
   }
 
diff --git a/lib/src/components/data/Log.js b/lib/src/components/data/Log.js
index 7777ab1..4d35034 100644
--- a/lib/src/components/data/Log.js
+++ b/lib/src/components/data/Log.js
@@ -1,16 +1,15 @@
 import { useEffect, useState } from 'react';
-import log from '../../log';
 
-const useLog = () => {
+const useLog = (provider) => {
   const [logs, setLogs] = useState([]);
   useEffect(() => {
     const update = (newLogs) => {
       setLogs([...newLogs]);
     }
-    log.listen(update);
+    provider.listen(update);
 
     return () => {
-      log.unlisten(update);
+      provider.unlisten(update);
     }
   }, []);
   return logs;
diff --git a/lib/src/components/data/requests.js b/lib/src/components/data/requests.js
index 7fd7eab..3100f21 100644
--- a/lib/src/components/data/requests.js
+++ b/lib/src/components/data/requests.js
@@ -1,16 +1,15 @@
 import { useState, useEffect } from 'react';
-import network from '../../network';
 
-const useRequests = () => {
+const useRequests = (provider) => {
   const [requests, setRequests] = useState([]);
   useEffect(() => {
     const update = (newRequests) => {
       setRequests(newRequests);
     };
 
-    network.listen(update);
+    provider.listen(update);
     return () => {
-      network.unlisten(update);
+      provider.unlisten(update);
     };
   }, []);
   return requests;
diff --git a/lib/src/console.js b/lib/src/console.js
index 8166489..d40565b 100644
--- a/lib/src/console.js
+++ b/lib/src/console.js
@@ -1,6 +1,6 @@
-import log from './log';
-
-export const context = {
-  log: (...args) => console.log(...args),
-  clear: log.clear,
-};
\ No newline at end of file
+export const createContext = ({
+  logProvider,
+}) => ({
+  log: (...args) => logProvider.log(...args),
+  clear: logProvider.clear,
+});
\ No newline at end of file
diff --git a/lib/src/index.js b/lib/src/index.js
index d24a4a1..f4eefa0 100644
--- a/lib/src/index.js
+++ b/lib/src/index.js
@@ -3,7 +3,6 @@ import DevToolModal from './components/DevTool/Modal';
 import log from './log';
 import network from './network';
 import events from './events';
-import { context } from './console';
 
 const show = () => events.publish('SHOW_DEVTOOLS');
 const hide = () => events.publish('HIDE_DEVTOOLS');
@@ -13,7 +12,6 @@ export {
   DevToolModal,
   log,
   network,
-  context,
   show,
   hide,
 };
\ No newline at end of file
diff --git a/lib/src/log.js b/lib/src/log.js
index cf4c9dc..545e5a0 100644
--- a/lib/src/log.js
+++ b/lib/src/log.js
@@ -6,6 +6,7 @@ class Log {
     this.listeners = [];
     this.clear = this.clear.bind(this);
     this.get = this.get.bind(this);
+    this.handleError = this.handleError.bind(this);
   }
 
   listen(fn) {
@@ -57,6 +58,12 @@ class Log {
     this.log('debug', data, keep);
   }
 
+  handleError(err) {
+    if (err && err.error) {
+      this.error([err.error], true);
+    }
+  }
+
   attach(keep) {
     const redirected = Object.keys(proxyConsole).reduce((output, key) => ({
       ...output,
@@ -76,12 +83,15 @@ class Log {
         this.error([err], keep);
       });
     }
+    window.addEventListener('error', this.handleError);
   }
 
   detach() {
     overrides.forEach((key) => {
       window.console[key] = proxies[key];
     });
+
+    window.removeEventListener('error', this.handleError);
   }
 }