Fix issue #222

- Replace for of by forEach to support ie11. For of output Symbol on babel compilation result.
fkhadra · Aug 22, 2018 · 2c06db6 · 2c06db6
1 parent 85caa85
commit 2c06db6
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 20 deletions.
diff --git a/dist/ReactToastify.js b/dist/ReactToastify.js
diff --git a/dist/ReactToastify.js.map b/dist/ReactToastify.js.map
diff --git a/src/__tests__/components/__snapshots__/ProgressBar.js.snap b/src/__tests__/components/__snapshots__/ProgressBar.js.snap
@@ -2,10 +2,21 @@
 
 exports[`ProgressBar Should be able to hide the progress bar 1`] = `
 ShallowWrapper {
-  "length": 1,
   Symbol(enzyme.__root__): [Circular],
   Symbol(enzyme.__unrendered__): <ProgressBar
-    closeToast={[Function]}
+    closeToast={
+      [MockFunction] {
+        "calls": Array [
+          Array [],
+        ],
+        "results": Array [
+          Object {
+            "isThrow": false,
+            "value": undefined,
+          },
+        ],
+      }
+    }
     delay={5000}
     hide={true}
     isRunning={true}
@@ -25,7 +36,17 @@ ShallowWrapper {
     "nodeType": "host",
     "props": Object {
       "className": "Toastify__progress-bar Toastify__progress-bar--default",
-      "onAnimationEnd": [Function],
+      "onAnimationEnd": [MockFunction] {
+        "calls": Array [
+          Array [],
+        ],
+        "results": Array [
+          Object {
+            "isThrow": false,
+            "value": undefined,
+          },
+        ],
+      },
       "style": Object {
         "animationDuration": "5000ms",
         "animationPlayState": "running",
@@ -43,7 +64,17 @@ ShallowWrapper {
       "nodeType": "host",
       "props": Object {
         "className": "Toastify__progress-bar Toastify__progress-bar--default",
-        "onAnimationEnd": [Function],
+        "onAnimationEnd": [MockFunction] {
+          "calls": Array [
+            Array [],
+          ],
+          "results": Array [
+            Object {
+              "isThrow": false,
+              "value": undefined,
+            },
+          ],
+        },
         "style": Object {
           "animationDuration": "5000ms",
           "animationPlayState": "running",
@@ -59,18 +90,37 @@ ShallowWrapper {
     "adapter": ReactSixteenAdapter {
       "options": Object {
         "enableComponentDidUpdateOnSetState": true,
+        "lifecycles": Object {
+          "componentDidUpdate": Object {
+            "onSetState": true,
+          },
+          "getSnapshotBeforeUpdate": true,
+        },
       },
     },
+    "attachTo": undefined,
+    "hydrateIn": undefined,
   },
 }
 `;
 
 exports[`ProgressBar Should be able to pause animation 1`] = `
 ShallowWrapper {
-  "length": 1,
   Symbol(enzyme.__root__): [Circular],
   Symbol(enzyme.__unrendered__): <ProgressBar
-    closeToast={[Function]}
+    closeToast={
+      [MockFunction] {
+        "calls": Array [
+          Array [],
+        ],
+        "results": Array [
+          Object {
+            "isThrow": false,
+            "value": undefined,
+          },
+        ],
+      }
+    }
     delay={5000}
     hide={false}
     isRunning={false}
@@ -90,7 +140,17 @@ ShallowWrapper {
     "nodeType": "host",
     "props": Object {
       "className": "Toastify__progress-bar Toastify__progress-bar--default",
-      "onAnimationEnd": [Function],
+      "onAnimationEnd": [MockFunction] {
+        "calls": Array [
+          Array [],
+        ],
+        "results": Array [
+          Object {
+            "isThrow": false,
+            "value": undefined,
+          },
+        ],
+      },
       "style": Object {
         "animationDuration": "5000ms",
         "animationPlayState": "paused",
@@ -108,7 +168,17 @@ ShallowWrapper {
       "nodeType": "host",
       "props": Object {
         "className": "Toastify__progress-bar Toastify__progress-bar--default",
-        "onAnimationEnd": [Function],
+        "onAnimationEnd": [MockFunction] {
+          "calls": Array [
+            Array [],
+          ],
+          "results": Array [
+            Object {
+              "isThrow": false,
+              "value": undefined,
+            },
+          ],
+        },
         "style": Object {
           "animationDuration": "5000ms",
           "animationPlayState": "paused",
@@ -124,8 +194,16 @@ ShallowWrapper {
     "adapter": ReactSixteenAdapter {
       "options": Object {
         "enableComponentDidUpdateOnSetState": true,
+        "lifecycles": Object {
+          "componentDidUpdate": Object {
+            "onSetState": true,
+          },
+          "getSnapshotBeforeUpdate": true,
+        },
       },
     },
+    "attachTo": undefined,
+    "hydrateIn": undefined,
   },
 }
 `;
diff --git a/src/__tests__/components/__snapshots__/Toast.js.snap b/src/__tests__/components/__snapshots__/Toast.js.snap
@@ -2,7 +2,6 @@
 
 exports[`Toast Should support Rtl display 1`] = `
 ShallowWrapper {
-  "length": 1,
   Symbol(enzyme.__root__): [Circular],
   Symbol(enzyme.__unrendered__): <Toast
     autoClose={false}
@@ -219,8 +218,16 @@ ShallowWrapper {
     "adapter": ReactSixteenAdapter {
       "options": Object {
         "enableComponentDidUpdateOnSetState": true,
+        "lifecycles": Object {
+          "componentDidUpdate": Object {
+            "onSetState": true,
+          },
+          "getSnapshotBeforeUpdate": true,
+        },
       },
     },
+    "attachTo": undefined,
+    "hydrateIn": undefined,
   },
 }
 `;
diff --git a/src/components/ToastContainer.js b/src/components/ToastContainer.js
@@ -338,7 +338,7 @@ class ToastContainer extends Component {
       : Object.keys(this.collection);
 
     // group toast by position
-    for (const toastId of collection) {
+    collection.forEach(toastId => {
       const toast = this.collection[toastId];
       toastToRender[toast.position] || (toastToRender[toast.position] = []);
 
@@ -350,7 +350,7 @@ class ToastContainer extends Component {
         toastToRender[toast.position].push(null);
         delete this.collection[toastId];
       }
-    }
+    })  
 
     return Object.keys(toastToRender).map(position => {
       const disablePointer =

diff --git a/src/toast.js b/src/toast.js
@@ -89,9 +89,9 @@ eventManager
     container = containerInstance;
     toast.isActive = id => container.isToastActive(id);
 
-    for (const item of queue) {
+    queue.forEach(item => {
       eventManager.emit(item.action, item.content, item.options);
-    }
+    });
 
     queue = [];
   })

diff --git a/src/utils/eventManager.js b/src/utils/eventManager.js
@@ -18,10 +18,9 @@ const eventManager = {
     if (!this.list.has(event)) {
       return false;
     }
-
-    for (const callback of this.list.get(event)) {
-      setTimeout(() => callback.call(this, ...args), 0);
-    }
+    this.list
+      .get(event)
+      .forEach(callback => setTimeout(() => callback.call(null, ...args), 0));
 
     return true;
   }