#29 Added onRemoval to notification

Author: teodosii

src/react-notification-component.js

@@ -1,11 +1,11 @@
 import React from 'react';
-import ReactNotification from 'src/react-notification';
+import ReactNotification from './react-notification';
 import PropTypes from 'prop-types';
 import store from './store';
 import {
   getNotificationsForEachContainer,
   getNotificationsForMobileView
-} from 'src/helpers';
+} from './utils/helpers';
 
 import 'src/scss/notification.scss';
 
@@ -28,8 +28,7 @@ export default class ReactNotificationComponent extends React.Component {
   static propTypes = {
     isMobile: PropTypes.bool,
     breakpoint: PropTypes.number,
-    types: PropTypes.array,
-    onNotificationRemoval: PropTypes.func
+    types: PropTypes.array
   }
 
   static defaultProps = {
@@ -77,14 +76,7 @@ export default class ReactNotificationComponent extends React.Component {
     }));
   }
 
-  toggleRemoval(id, removalFlag) {
-    const { onNotificationRemoval } = this.props;
-    const callback = () => {
-      if (onNotificationRemoval) {
-        onNotificationRemoval(id, removalFlag);
-      }
-    };
-
+  toggleRemoval(id, callback) {
     this.setState(({ notifications }) => ({
       notifications: notifications.filter(({ id: nId }) => nId !== id)
     }), callback);

src/react-notification.js

@@ -1,13 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Timer from './timer';
-import { REMOVAL } from './constants';
+import Timer from './utils/timer';
 import {
   getTransition,
   hasFullySwiped,
   getHtmlClassesForType,
   shouldNotificationHaveSliding
-} from 'src/helpers';
+} from './utils/helpers';
+import { REMOVAL } from './utils/constants';
 
 export default class ReactNotification extends React.Component {
   constructor(props) {
@@ -89,13 +89,13 @@ export default class ReactNotification extends React.Component {
 
   removeNotification(removalFlag) {
     const { notification, toggleRemoval } = this.props;
-    const { dismiss: { waitForAnimation } } = notification;
+    const { id, onRemoval, dismiss: { waitForAnimation } } = notification;
     const htmlClassList = [
       ...notification.animationOut,
       ...getHtmlClassesForType(notification)
     ];
 
-    const onTransitionEnd = () => toggleRemoval(notification.id, removalFlag);
+    const onTransitionEnd = () => toggleRemoval(id, () => onRemoval(id, removalFlag));
     const parentStyle = {
       height: 0,
       transition: getTransition(notification.slidingExit, 'height')
@@ -147,6 +147,7 @@ export default class ReactNotification extends React.Component {
       toggleRemoval,
       notification: {
         id,
+        onRemoval,
         slidingExit,
         touchSlidingExit: { swipe, fade }
       }
@@ -160,7 +161,9 @@ export default class ReactNotification extends React.Component {
     if (hasFullySwiped(distance)) {
       const t1 = getTransition(swipe, 'left');
       const t2 = getTransition(fade, 'opacity');
-      const onTransitionEnd = () => toggleRemoval(id, REMOVAL.TOUCH);
+      const onTransitionEnd = () => {
+        toggleRemoval(id, () => onRemoval(id, REMOVAL.TOUCH));
+      }
 
       return this.setState(({ parentStyle }) => ({
         touchEnabled: false,

src/store.js

@@ -1,5 +1,5 @@
-import { parseNotification } from './helpers';
-import { validateTransition, validators } from './validators';
+import { parseNotification } from './utils/helpers';
+import { validateTransition, validators } from './utils/validators';
 
 function Store() {
   this.types = null;

src/utils.js

@@ -55,5 +55,6 @@ export const ERROR = {
   TRANSITION_DURATION_NUMBER: 'Validation error. `duration` property of `transition` option must be a Number',
   TRANSITION_TIMING_FUNCTION: 'Validation error. `timingFunction` property of `transition` option must be a String',
   TRANSITION_DELAY_NUMBER: 'Validation error. `delay` property of `transition` option must be a Number',
-  TYPE_NOT_FOUND: 'Validation error. Custom type not found'
+  TYPE_NOT_FOUND: 'Validation error. Custom type not found',
+  REMOVAL_FUNC: 'Validation error. `onRemoval` must be a function'
 };

src/constants.js renamed to src/utils/constants.js

@@ -3,8 +3,10 @@ import {
   INSERTION,
   NOTIFICATION_BASE_CLASS,
   NOTIFICATION_TYPE as NT,
-} from 'src/constants';
-import { isNull, getRandomId } from 'src/utils';
+} from './constants';
+
+const getRandomId = () => Math.random().toString(36).substr(2, 9);
+const isNull = (object) => object === null || object === undefined;
 
 export function isBottomContainer(container) {
   return container === CONTAINER.BOTTOM_LEFT
@@ -190,7 +192,8 @@ export function parseNotification(options, userDefinedTypes) {
     touchRevert,
     touchSlidingExit,
     dismiss,
-    width
+    width,
+    onRemoval
   } = notification;
 
   notification.id = id || getRandomId();
@@ -209,6 +212,7 @@ export function parseNotification(options, userDefinedTypes) {
   notification.dismiss = defaultDismiss(dismiss);
   notification.animationIn = animationIn || [];
   notification.animationOut = animationOut || [];
+  notification.onRemoval = onRemoval || (() => {});
 
   const t = (duration, timingFunction, delay) => ({
     duration,

src/helpers.js renamed to src/utils/helpers.js

@@ -1,12 +1,12 @@
 import React from 'react';
 import { ERROR, NOTIFICATION_TYPE as NT } from './constants';
-import {
-  isNull,
-  isString,
-  isNumber,
-  isBoolean,
-  isArray
-} from 'src/utils';
+
+const isNull = (object) => object === null || object === undefined;
+const isString = (object) => typeof object === 'string';
+const isNumber = (object) => typeof object === 'number';
+const isBoolean = (object) => typeof object === 'boolean';
+const isFunction = (object) => !!(object && object.constructor && object.call && object.apply);
+const isArray = (object) => !isNull(object) && object.constructor === Array;
 
 function isClassComponent(component) {
   return typeof component === 'function' 
@@ -148,6 +148,13 @@ export const validators = [
     }
   },
 
+  function onRemoval({ onRemoval }) {
+    if (!onRemoval) return;
+    if (!isFunction(onRemoval)) {
+      throw new Error(ERROR.REMOVAL_FUNC);
+    }
+  },
+
   function dismiss({ dismiss }) {
     if (!dismiss) return;