From c2e4d76134a1b1d1f14c3f0b692f4d1306f609c7 Mon Sep 17 00:00:00 2001
From: Matthew Francis Brunetti <zenflow87@gmail.com>
Date: Tue, 20 Apr 2021 05:26:43 -0400
Subject: [PATCH] fix: passing react elements via .mixin (#153)

* test: Demonstrate issue #152

* pass mixinParams to _main

Co-authored-by: Limon Monte <limon.monte@gmail.com>
---
 src/index.js             |  6 ++--
 test/integration.test.js | 75 +++++++++++++++++++++++-----------------
 2 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/index.js b/src/index.js
index c9dcaea..cfe4825 100644
--- a/src/index.js
+++ b/src/index.js
@@ -21,8 +21,8 @@ export default function withReactContent (ParentSwal) {
       }
     }
 
-    _main (params) {
-      params = Object.assign({}, params)
+    _main (params, mixinParams) {
+      params = Object.assign({}, mixinParams, params)
 
       mounts.forEach(({ key, getter }) => {
         if (React.isValidElement(params[key])) {
@@ -50,7 +50,7 @@ export default function withReactContent (ParentSwal) {
         }
       })
 
-      return super._main(params)
+      return super._main(params, mixinParams)
     }
 
     update () {
diff --git a/test/integration.test.js b/test/integration.test.js
index 0e1af1f..fb9ac86 100644
--- a/test/integration.test.js
+++ b/test/integration.test.js
@@ -15,39 +15,50 @@ describe('integration', () => {
     // jest doesn't implement `window.scrollTo` so we need to mock it
     window.scrollTo = () => {} // eslint-disable-line @typescript-eslint/no-empty-function
   })
-  it('renders React elements for each supported option', async () => {
-    await cleanSwalState()
-    const MySwal = withReactContent(SwalWithoutAnimation)
-    await MySwal.fire({
-      title: <span>title</span>,
-      html: <span>html</span>,
-      icon: 'success',
-      iconHtml: <span>@</span>,
-      confirmButtonText: <span>confirmButtonText</span>,
-      denyButtonText: <span>denyButtonText</span>,
-      cancelButtonText: <span>cancelButtonText</span>,
-      closeButtonHtml: <span>closeButtonHtml</span>,
-      footer: <span>footer</span>,
-      didOpen: () => {
-        expect(MySwal.getTitle().innerHTML).toEqual('<span>title</span>')
-        expect(MySwal.getHtmlContainer().innerHTML).toEqual('<span>html</span>')
-        expect(MySwal.getConfirmButton().innerHTML).toEqual(
-          '<span>confirmButtonText</span>',
-        )
-        expect(MySwal.getDenyButton().innerHTML).toEqual(
-          '<span>denyButtonText</span>',
-        )
-        expect(MySwal.getCancelButton().innerHTML).toEqual(
-          '<span>cancelButtonText</span>',
-        )
-        expect(MySwal.getIcon().innerHTML).toEqual(
-          '<div class="swal2-icon-content"><span>@</span></div>',
-        )
-        expect(MySwal.getFooter().innerHTML).toEqual('<span>footer</span>')
-        expect(MySwal.getCloseButton().innerHTML).toEqual('<span>closeButtonHtml</span>')
-        MySwal.clickConfirm()
-      },
+  describe('rendering React elements for each supported option', () => {
+    beforeEach(async () => cleanSwalState())
+    it('works via .fire', async () => {
+      const MySwal = withReactContent(SwalWithoutAnimation)
+      await MySwal.fire({
+        ...getReactOptions(),
+        didOpen: () => {
+          checkReactOptions(MySwal)
+          MySwal.clickConfirm()
+        },
+      })
+    })
+    it('works via .mixin', async () => {
+      const MySwal = withReactContent(SwalWithoutAnimation)
+      const MyConfiguredSwal = MySwal.mixin({ ...getReactOptions() })
+      await MyConfiguredSwal.fire({
+        didOpen: () => {
+          checkReactOptions(MySwal)
+          MySwal.clickConfirm()
+        },
+      })
     })
+    function getReactOptions () {
+      return {
+        title: <span>title</span>,
+        html: <span>html</span>,
+        iconHtml: <span>@</span>,
+        confirmButtonText: <span>confirmButtonText</span>,
+        denyButtonText: <span>denyButtonText</span>,
+        cancelButtonText: <span>cancelButtonText</span>,
+        closeButtonHtml: <span>closeButtonHtml</span>,
+        footer: <span>footer</span>,
+      }
+    }
+    function checkReactOptions (MySwal) {
+      expect(MySwal.getTitle().innerHTML).toEqual('<span>title</span>')
+      expect(MySwal.getHtmlContainer().innerHTML).toEqual('<span>html</span>')
+      expect(MySwal.getConfirmButton().innerHTML).toEqual('<span>confirmButtonText</span>')
+      expect(MySwal.getDenyButton().innerHTML).toEqual('<span>denyButtonText</span>')
+      expect(MySwal.getCancelButton().innerHTML).toEqual('<span>cancelButtonText</span>')
+      expect(MySwal.getIcon().innerHTML).toEqual('<div class="swal2-icon-content"><span>@</span></div>')
+      expect(MySwal.getFooter().innerHTML).toEqual('<span>footer</span>')
+      expect(MySwal.getCloseButton().innerHTML).toEqual('<span>closeButtonHtml</span>')
+    }
   })
   it('can mix React and non-React params', async () => {
     await cleanSwalState()