From 12a26125b2a3d76fba77b1e2fbc77b8d3d50b0f7 Mon Sep 17 00:00:00 2001
From: Chris <chris@chris-Ubuntu.(none)>
Date: Wed, 12 Jun 2019 12:24:12 -0400
Subject: [PATCH 1/8] Added optional support for React Icons

---
 docs/intro.md      |  2 +-
 package.json       |  5 ++++-
 src/alert/icon.jsx | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/docs/intro.md b/docs/intro.md
index fd139b8..aea3587 100644
--- a/docs/intro.md
+++ b/docs/intro.md
@@ -10,4 +10,4 @@ import { AlertList, Alert, AlertContainer } from "react-bs-notifier";
 
 This package exports three components, `AlertList`, `Alert`, & `AlertContainer`. Depending on your use-case, one or a combination of these components might work better for you.
 
-These components makes use of [Bootstrap](https://getbootstrap.com/) & [Font Awesome](http://fontawesome.io/), but do not take direct dependencies on either. It assumes the CSS classes are available (e.g. just include the stylesheets). If bootstrap isn't available, the component won't look like much. If font awesome isn't available, it just won't add the icons to the alerts.
\ No newline at end of file
+These components makes use of [Bootstrap](https://getbootstrap.com/) & either [Font Awesome](http://fontawesome.io/) or [React Icons](https://www.npmjs.com/package/react-icons), but do not take direct dependencies on either. It assumes the CSS classes are available for Font Awesome (e.g. just include the stylesheets), or that the React Icons module has been added to your project. If bootstrap isn't available, the component won't look like much. If Font Awesome or React Icons isn't available, it just won't add the icons to the alerts.
diff --git a/package.json b/package.json
index 6f3718a..5ac6e22 100644
--- a/package.json
+++ b/package.json
@@ -61,5 +61,8 @@
     "style-loader": "0.13.x",
     "webpack": "2.x",
     "webpack-dev-server": "2.x"
+  },
+  "optionalDependencies": {
+    "react-icons": "3.x"
   }
-}
\ No newline at end of file
+}
diff --git a/src/alert/icon.jsx b/src/alert/icon.jsx
index f1e5b64..d519fbf 100644
--- a/src/alert/icon.jsx
+++ b/src/alert/icon.jsx
@@ -1,15 +1,46 @@
 import React from "react";
 
+
+// Import optional react-icons library
+import("react-icons/fa").then(fa => {
+  const { FaCheck, FaExclamationCircle, FaExclamationTriangle, FaInfo } = fa;
+}).catch(err => {
+  const FaCheck = null;
+});
+
 const Icon = ({ type, className = "" }) => {
 	const faType = iconType(type);
 
 	if (faType) {
-		return <i className={`${faType} ${className}`} aria-hidden="true" />;
+	  if (FaCheck) {
+	    return <ReactIcon type={type} className={className} />
+	  } else {
+  		return <i className={`${faType} ${className}`} aria-hidden="true" />;
+  }
 	}
 
 	return null;
 };
 
+const ReactIcon = ({ type, className = ""}) => {
+  switch (type) {
+    case "warning":
+      return <FaExclamationTriangle className={className} aria-hidden="true" />;
+    
+    case "info":
+      return <FaInfo className={className} aria-hidden="true" />;
+    
+    case "success":
+      return <FaCheck className={className} aria-hidden="true" />;
+    
+    case "danger":
+      return <FaExclamationCircle className={className} aria-hidden="true" />;
+    
+    default:
+      return null;    
+  }
+}
+
 function iconType(type) {
 	switch (type) {
 		case "warning":

From c54d6caf21abf0a57188a5c4e4b63619464e3c12 Mon Sep 17 00:00:00 2001
From: NFNChris <chris@newfanglednetworks.com>
Date: Wed, 12 Jun 2019 12:38:26 -0400
Subject: [PATCH 2/8] Update .npmignore

---
 .npmignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.npmignore b/.npmignore
index 3f92706..8b13789 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,2 +1 @@
-/src
-/docs
\ No newline at end of file
+

From 0e55c9459f3687c7c667a09da37e5b252b582a53 Mon Sep 17 00:00:00 2001
From: Chris Bricker <chris@newfanglednetworks.com>
Date: Thu, 13 Jun 2019 15:11:17 -0400
Subject: [PATCH 3/8] Resolved conditional loading issue for React-Icons module

---
 src/alert/icon.jsx  | 28 ++++++++++++++++++++++------
 src/alert/styles.js |  2 +-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/alert/icon.jsx b/src/alert/icon.jsx
index d519fbf..f7c7d6c 100644
--- a/src/alert/icon.jsx
+++ b/src/alert/icon.jsx
@@ -1,18 +1,28 @@
 import React from "react";
+//import { FaCheck, FaExclamationCircle, FaExclamationTriangle, FaInfo } from "react-icons/fa";
 
+// Import optional react-icons library
+let FontAwesome;
+
+try {
+  FontAwesome = require("react-icons/fa");
+} catch (err) {
+  FontAwesome = false;
+};
 
 // Import optional react-icons library
-import("react-icons/fa").then(fa => {
-  const { FaCheck, FaExclamationCircle, FaExclamationTriangle, FaInfo } = fa;
-}).catch(err => {
-  const FaCheck = null;
-});
+//import("react-icons/fa").then(fa => {
+//  const { FaCheck, FaExclamationCircle, FaExclamationTriangle, FaInfo } = fa;
+//  console.log(FaCheck);
+//}).catch(err => {
+//  const FaCheck = null;
+//});
 
 const Icon = ({ type, className = "" }) => {
 	const faType = iconType(type);
 
 	if (faType) {
-	  if (FaCheck) {
+	  if (FontAwesome) {
 	    return <ReactIcon type={type} className={className} />
 	  } else {
   		return <i className={`${faType} ${className}`} aria-hidden="true" />;
@@ -23,6 +33,12 @@ const Icon = ({ type, className = "" }) => {
 };
 
 const ReactIcon = ({ type, className = ""}) => {
+  const {
+    FaCheck, 
+    FaExclamationCircle, 
+    FaExclamationTriangle, 
+    FaInfo } = FontAwesome;
+
   switch (type) {
     case "warning":
       return <FaExclamationTriangle className={className} aria-hidden="true" />;
diff --git a/src/alert/styles.js b/src/alert/styles.js
index 3926533..79dc669 100644
--- a/src/alert/styles.js
+++ b/src/alert/styles.js
@@ -34,7 +34,7 @@ export default useSheet({
 	icon: {
 		verticalAlign: "top",
 		fontSize: bootstrap.fontSizeH4,
-		paddingRight: bootstrap.paddingLargeHorizontal,
+		marginRight: bootstrap.paddingLargeHorizontal,
 		opacity: 0.2
 	},
 	headline: {

From f98a9581b5a98f6873a95b7d354b2a2ee01c79e8 Mon Sep 17 00:00:00 2001
From: Chris Bricker <chris@newfanglednetworks.com>
Date: Thu, 13 Jun 2019 15:18:54 -0400
Subject: [PATCH 4/8] Revert "Update .npmignore"

This reverts commit c54d6caf21abf0a57188a5c4e4b63619464e3c12.
---
 .npmignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.npmignore b/.npmignore
index 8b13789..3f92706 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1 +1,2 @@
-
+/src
+/docs
\ No newline at end of file

From 898b6e05d2ed09d6226244e55d77655d0a90f7c5 Mon Sep 17 00:00:00 2001
From: Chris Bricker <chris@newfanglednetworks.com>
Date: Thu, 13 Jun 2019 15:22:40 -0400
Subject: [PATCH 5/8] Comment clean-up

---
 src/alert/icon.jsx | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/alert/icon.jsx b/src/alert/icon.jsx
index f7c7d6c..c9c07ae 100644
--- a/src/alert/icon.jsx
+++ b/src/alert/icon.jsx
@@ -1,5 +1,4 @@
 import React from "react";
-//import { FaCheck, FaExclamationCircle, FaExclamationTriangle, FaInfo } from "react-icons/fa";
 
 // Import optional react-icons library
 let FontAwesome;
@@ -10,14 +9,6 @@ try {
   FontAwesome = false;
 };
 
-// Import optional react-icons library
-//import("react-icons/fa").then(fa => {
-//  const { FaCheck, FaExclamationCircle, FaExclamationTriangle, FaInfo } = fa;
-//  console.log(FaCheck);
-//}).catch(err => {
-//  const FaCheck = null;
-//});
-
 const Icon = ({ type, className = "" }) => {
 	const faType = iconType(type);
 

From 52402bb34c163db55c57c71d475f01d82047a9a8 Mon Sep 17 00:00:00 2001
From: Chris Bricker <chris@newfanglednetworks.com>
Date: Thu, 13 Jun 2019 16:12:10 -0400
Subject: [PATCH 6/8] Formatting fix

---
 src/alert/icon.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/alert/icon.jsx b/src/alert/icon.jsx
index c9c07ae..b9cba61 100644
--- a/src/alert/icon.jsx
+++ b/src/alert/icon.jsx
@@ -17,7 +17,7 @@ const Icon = ({ type, className = "" }) => {
 	    return <ReactIcon type={type} className={className} />
 	  } else {
   		return <i className={`${faType} ${className}`} aria-hidden="true" />;
-  }
+    }
 	}
 
 	return null;

From b23d631b55ad673dd03bc8f03a86fa89b31a266d Mon Sep 17 00:00:00 2001
From: Chris Bricker <chris@newfanglednetworks.com>
Date: Thu, 13 Jun 2019 16:22:08 -0400
Subject: [PATCH 7/8] Lint fixes

---
 src/alert/icon.jsx | 65 +++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/alert/icon.jsx b/src/alert/icon.jsx
index b9cba61..eb446b6 100644
--- a/src/alert/icon.jsx
+++ b/src/alert/icon.jsx
@@ -4,49 +4,50 @@ import React from "react";
 let FontAwesome;
 
 try {
-  FontAwesome = require("react-icons/fa");
+	FontAwesome = require("react-icons/fa");
 } catch (err) {
-  FontAwesome = false;
-};
+	FontAwesome = false;
+}
 
 const Icon = ({ type, className = "" }) => {
 	const faType = iconType(type);
 
 	if (faType) {
-	  if (FontAwesome) {
-	    return <ReactIcon type={type} className={className} />
-	  } else {
-  		return <i className={`${faType} ${className}`} aria-hidden="true" />;
-    }
+		if (FontAwesome) {
+			return <ReactIcon type={type} className={className} />;
+		} else {
+			return <i className={`${faType} ${className}`} aria-hidden="true" />;
+		}
 	}
 
 	return null;
 };
 
-const ReactIcon = ({ type, className = ""}) => {
-  const {
-    FaCheck, 
-    FaExclamationCircle, 
-    FaExclamationTriangle, 
-    FaInfo } = FontAwesome;
-
-  switch (type) {
-    case "warning":
-      return <FaExclamationTriangle className={className} aria-hidden="true" />;
-    
-    case "info":
-      return <FaInfo className={className} aria-hidden="true" />;
-    
-    case "success":
-      return <FaCheck className={className} aria-hidden="true" />;
-    
-    case "danger":
-      return <FaExclamationCircle className={className} aria-hidden="true" />;
-    
-    default:
-      return null;    
-  }
-}
+const ReactIcon = ({ type, className = "" }) => {
+	const {
+		FaCheck,
+		FaExclamationCircle,
+		FaExclamationTriangle,
+		FaInfo
+	} = FontAwesome;
+
+	switch (type) {
+		case "warning":
+			return <FaExclamationTriangle className={className} aria-hidden="true" />;
+
+		case "info":
+			return <FaInfo className={className} aria-hidden="true" />;
+
+		case "success":
+			return <FaCheck className={className} aria-hidden="true" />;
+
+		case "danger":
+			return <FaExclamationCircle className={className} aria-hidden="true" />;
+
+		default:
+			return null;
+	}
+};
 
 function iconType(type) {
 	switch (type) {

From 79d68ff2d8a2124afd9f12694e15a0f3237ed6c1 Mon Sep 17 00:00:00 2001
From: Chad Lee <chad.lee@civicsource.com>
Date: Wed, 19 Jun 2019 14:01:37 -0500
Subject: [PATCH 8/8] Use prettier to delint

---
 src/container/index.jsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/container/index.jsx b/src/container/index.jsx
index 39c77ed..5004b13 100644
--- a/src/container/index.jsx
+++ b/src/container/index.jsx
@@ -11,14 +11,12 @@ const AlertContainer = ({ position = "top-right", children, classes }) => {
 	return (
 		<div className={`${classes.container} ${classes[position]}`}>
 			<TransitionGroup>
-				{Children.map(
-					children,
-					child =>
-						child ? (
-							<AlertTransition key={child.props.id}>
-								{cloneElement(child)}
-							</AlertTransition>
-						) : null
+				{Children.map(children, child =>
+					child ? (
+						<AlertTransition key={child.props.id}>
+							{cloneElement(child)}
+						</AlertTransition>
+					) : null
 				)}
 			</TransitionGroup>
 		</div>