@zohodesk/dot 1.8.1 → 1.8.2

package/README.md

@@ -2,6 +2,11 @@
 
 In this Library, we Provide Some Basic Components to Build Your Application
 
+# 1.8.2
+
+- **GlobalNotification**
+ - `onStatusChange` prop added.
+
 # 1.8.1
 
 - Font Family Migrated to Font-weight across all css  (Impacted)

package/es/version2/GlobalNotification/GlobalNotification.js

@@ -7,6 +7,8 @@ import AlertClose from "../AlertClose/AlertClose";
 import style from "./GlobalNotification.module.css";
 import { Container, Box } from '@zohodesk/components/es/Layout';
 import { cancelBubblingEffect } from '@zohodesk/components/es/utils/Common';
+import getCurrentTime from '@zohodesk/utils/es/getCurrentTime';
+import { STATUS } from "./utils/constants";
 export default class GlobalNotification extends React.Component {
   constructor(props) {
     super(props);
@@ -15,6 +17,8 @@ export default class GlobalNotification extends React.Component {
       shadowClose: true
     };
     this.onClose = this.onClose.bind(this);
+    this.getNotificationData = this.getNotificationData.bind(this);
+    this.handleStatusChange = this.handleStatusChange.bind(this);
   }
 
   componentDidMount() {
@@ -24,18 +28,44 @@ export default class GlobalNotification extends React.Component {
       id,
       needAutoClose
     } = this.props;
+    this.handleStatusChange(STATUS.MOUNTED);
 
     if (needAutoClose) {
       this.hideMessageTimer = setTimeout(() => {
         hideMessage(id);
+        this.handleStatusChange(STATUS.DISMISSING);
       }, hideTime);
     }
   }
 
+  componentDidUpdate(prevProps) {
+    if (prevProps.id === this.props.id && (prevProps.message !== this.props.message || prevProps.type !== this.props.type)) {
+      this.handleStatusChange(STATUS.UPDATED);
+    }
+  }
+
   componentWillUnmount() {
     if (this.hideMessageTimer) {
       clearTimeout(this.hideMessageTimer);
     }
+
+    this.handleStatusChange(STATUS.UNMOUNTED);
+  }
+
+  handleStatusChange(status) {
+    const {
+      onStatusChange
+    } = this.props;
+
+    if (typeof onStatusChange == 'function') {
+      const notificationData = this.getNotificationData();
+      const currentTime = getCurrentTime();
+      onStatusChange({
+        status,
+        ...notificationData,
+        time: currentTime
+      });
+    }
   }
 
   onClose(e) {
@@ -47,20 +77,31 @@ export default class GlobalNotification extends React.Component {
     this.setState({
       shadowClose: false
     });
+    this.handleStatusChange(STATUS.DISMISSING);
     hideMessage && hideMessage(id);
     onClose && onClose(e);
   }
 
+  getNotificationData() {
+    const {
+      id,
+      type,
+      message
+    } = this.props;
+    return {
+      id,
+      type,
+      message
+    };
+  }
+
   render() {
     let {
-      type,
-      message,
       hideMessage,
       onClick,
       i18nKeys = {},
       customProps,
       dataSelectorId,
-      id,
       needShadow,
       shadowCount,
       eleRef
@@ -71,15 +112,13 @@ export default class GlobalNotification extends React.Component {
     let {
       closeTitle = 'Close'
     } = i18nKeys;
-    return /*#__PURE__*/React.createElement(GlobalNotificationUI, {
-      type: type,
-      message: message,
+    const notificationData = this.getNotificationData();
+    return /*#__PURE__*/React.createElement(GlobalNotificationUI, { ...notificationData,
       hideMessage: hideMessage,
       onClick: onClick,
       closeTitle: closeTitle,
       customProps: customProps,
       dataSelectorId: dataSelectorId,
-      id: id,
       shadowCount: shadowCount,
       onClose: this.onClose,
       needShadow: shadowClose && needShadow,

package/es/version2/GlobalNotification/__tests__/GlobalNotification.spec.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import GlobalNotification from "../GlobalNotification";
+import { STATUS } from "../utils/constants";
 describe('GlobalNotification', () => {
   test('rendering the defult props', () => {
     const {
@@ -8,4 +9,12 @@ describe('GlobalNotification', () => {
     } = render( /*#__PURE__*/React.createElement(GlobalNotification, null));
     expect(asFragment()).toMatchSnapshot();
   });
+});
+describe('GlobalNotification Constants', () => {
+  test('should have correct constant values', () => {
+    expect(STATUS.MOUNTED).toBe('mounted');
+    expect(STATUS.UPDATED).toBe('updated');
+    expect(STATUS.DISMISSING).toBe('dismissing');
+    expect(STATUS.UNMOUNTED).toBe('unmounted');
+  });
 });

package/es/version2/GlobalNotification/props/propTypes.js

@@ -10,12 +10,13 @@ export const propTypes = {
   customProps: PropTypes.shape({
     ExtraProps: PropTypes.object
   }),
-  id: PropTypes.number,
+  id: PropTypes.string,
   hideTime: PropTypes.number,
   needAutoClose: PropTypes.bool,
   isCollapseView: PropTypes.bool,
   shadowCount: PropTypes.number,
-  needShadow: PropTypes.bool
+  needShadow: PropTypes.bool,
+  onStatusChange: PropTypes.func
 };
 export const UI_propTypes = {
   dataSelectorId: PropTypes.string,
@@ -28,7 +29,7 @@ export const UI_propTypes = {
   }),
   needShadow: PropTypes.bool,
   shadowCount: PropTypes.number,
-  id: PropTypes.number,
+  id: PropTypes.string,
   onClose: PropTypes.func
 };
 export const new_propTypes = {

package/es/version2/GlobalNotification/utils/constants.js

@@ -0,0 +1,6 @@
+export const STATUS = {
+  MOUNTED: 'mounted',
+  UNMOUNTED: 'unmounted',
+  UPDATED: 'updated',
+  DISMISSING: 'dismissing'
+};

package/lib/version2/GlobalNotification/GlobalNotification.js

@@ -27,10 +27,20 @@ var _Layout = require("@zohodesk/components/es/Layout");
 
 var _Common = require("@zohodesk/components/es/utils/Common");
 
+var _getCurrentTime = _interopRequireDefault(require("@zohodesk/utils/es/getCurrentTime"));
+
+var _constants = require("./utils/constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -67,30 +77,61 @@ var GlobalNotification = /*#__PURE__*/function (_React$Component) {
       shadowClose: true
     };
     _this.onClose = _this.onClose.bind(_assertThisInitialized(_this));
+    _this.getNotificationData = _this.getNotificationData.bind(_assertThisInitialized(_this));
+    _this.handleStatusChange = _this.handleStatusChange.bind(_assertThisInitialized(_this));
     return _this;
   }
 
   _createClass(GlobalNotification, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      var _this2 = this;
+
       var _this$props = this.props,
           hideMessage = _this$props.hideMessage,
           hideTime = _this$props.hideTime,
           id = _this$props.id,
           needAutoClose = _this$props.needAutoClose;
+      this.handleStatusChange(_constants.STATUS.MOUNTED);
 
       if (needAutoClose) {
         this.hideMessageTimer = setTimeout(function () {
           hideMessage(id);
+
+          _this2.handleStatusChange(_constants.STATUS.DISMISSING);
         }, hideTime);
       }
     }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps.id === this.props.id && (prevProps.message !== this.props.message || prevProps.type !== this.props.type)) {
+        this.handleStatusChange(_constants.STATUS.UPDATED);
+      }
+    }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       if (this.hideMessageTimer) {
         clearTimeout(this.hideMessageTimer);
       }
+
+      this.handleStatusChange(_constants.STATUS.UNMOUNTED);
+    }
+  }, {
+    key: "handleStatusChange",
+    value: function handleStatusChange(status) {
+      var onStatusChange = this.props.onStatusChange;
+
+      if (typeof onStatusChange == 'function') {
+        var notificationData = this.getNotificationData();
+        var currentTime = (0, _getCurrentTime["default"])();
+        onStatusChange(_objectSpread(_objectSpread({
+          status: status
+        }, notificationData), {}, {
+          time: currentTime
+        }));
+      }
     }
   }, {
     key: "onClose",
@@ -102,42 +143,51 @@ var GlobalNotification = /*#__PURE__*/function (_React$Component) {
       this.setState({
         shadowClose: false
       });
+      this.handleStatusChange(_constants.STATUS.DISMISSING);
       hideMessage && hideMessage(id);
       onClose && onClose(e);
     }
   }, {
-    key: "render",
-    value: function render() {
+    key: "getNotificationData",
+    value: function getNotificationData() {
       var _this$props3 = this.props,
-          type = _this$props3.type,
-          message = _this$props3.message,
-          hideMessage = _this$props3.hideMessage,
-          onClick = _this$props3.onClick,
-          _this$props3$i18nKeys = _this$props3.i18nKeys,
-          i18nKeys = _this$props3$i18nKeys === void 0 ? {} : _this$props3$i18nKeys,
-          customProps = _this$props3.customProps,
-          dataSelectorId = _this$props3.dataSelectorId,
           id = _this$props3.id,
-          needShadow = _this$props3.needShadow,
-          shadowCount = _this$props3.shadowCount,
-          eleRef = _this$props3.eleRef;
+          type = _this$props3.type,
+          message = _this$props3.message;
+      return {
+        id: id,
+        type: type,
+        message: message
+      };
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props4 = this.props,
+          hideMessage = _this$props4.hideMessage,
+          onClick = _this$props4.onClick,
+          _this$props4$i18nKeys = _this$props4.i18nKeys,
+          i18nKeys = _this$props4$i18nKeys === void 0 ? {} : _this$props4$i18nKeys,
+          customProps = _this$props4.customProps,
+          dataSelectorId = _this$props4.dataSelectorId,
+          needShadow = _this$props4.needShadow,
+          shadowCount = _this$props4.shadowCount,
+          eleRef = _this$props4.eleRef;
       var shadowClose = this.state.shadowClose;
       var _i18nKeys$closeTitle = i18nKeys.closeTitle,
           closeTitle = _i18nKeys$closeTitle === void 0 ? 'Close' : _i18nKeys$closeTitle;
-      return /*#__PURE__*/_react["default"].createElement(GlobalNotificationUI, {
-        type: type,
-        message: message,
+      var notificationData = this.getNotificationData();
+      return /*#__PURE__*/_react["default"].createElement(GlobalNotificationUI, _extends({}, notificationData, {
         hideMessage: hideMessage,
         onClick: onClick,
         closeTitle: closeTitle,
         customProps: customProps,
         dataSelectorId: dataSelectorId,
-        id: id,
         shadowCount: shadowCount,
         onClose: this.onClose,
         needShadow: shadowClose && needShadow,
         eleRef: eleRef
-      });
+      }));
     }
   }]);
 

package/lib/version2/GlobalNotification/__tests__/GlobalNotification.spec.js

@@ -6,6 +6,8 @@ var _react2 = require("@testing-library/react");
 
 var _GlobalNotification = _interopRequireDefault(require("../GlobalNotification"));
 
+var _constants = require("../utils/constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 describe('GlobalNotification', function () {
@@ -15,4 +17,12 @@ describe('GlobalNotification', function () {
 
     expect(asFragment()).toMatchSnapshot();
   });
+});
+describe('GlobalNotification Constants', function () {
+  test('should have correct constant values', function () {
+    expect(_constants.STATUS.MOUNTED).toBe('mounted');
+    expect(_constants.STATUS.UPDATED).toBe('updated');
+    expect(_constants.STATUS.DISMISSING).toBe('dismissing');
+    expect(_constants.STATUS.UNMOUNTED).toBe('unmounted');
+  });
 });

package/lib/version2/GlobalNotification/props/propTypes.js

@@ -20,12 +20,13 @@ var propTypes = {
   customProps: _propTypes["default"].shape({
     ExtraProps: _propTypes["default"].object
   }),
-  id: _propTypes["default"].number,
+  id: _propTypes["default"].string,
   hideTime: _propTypes["default"].number,
   needAutoClose: _propTypes["default"].bool,
   isCollapseView: _propTypes["default"].bool,
   shadowCount: _propTypes["default"].number,
-  needShadow: _propTypes["default"].bool
+  needShadow: _propTypes["default"].bool,
+  onStatusChange: _propTypes["default"].func
 };
 exports.propTypes = propTypes;
 var UI_propTypes = {
@@ -39,7 +40,7 @@ var UI_propTypes = {
   }),
   needShadow: _propTypes["default"].bool,
   shadowCount: _propTypes["default"].number,
-  id: _propTypes["default"].number,
+  id: _propTypes["default"].string,
   onClose: _propTypes["default"].func
 };
 exports.UI_propTypes = UI_propTypes;

package/lib/version2/GlobalNotification/utils/constants.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.STATUS = void 0;
+var STATUS = {
+  MOUNTED: 'mounted',
+  UNMOUNTED: 'unmounted',
+  UPDATED: 'updated',
+  DISMISSING: 'dismissing'
+};
+exports.STATUS = STATUS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/dot",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "main": "lib/index",
   "module": "es/index.js",
   "private": false,
@@ -73,29 +73,29 @@
     "@zohodesk-private/node-plugins": "1.1.13",
     "@zohodesk-private/react-prop-validator": "1.2.3",
     "@zohodesk/a11y": "2.3.8",
-    "@zohodesk/components": "1.5.1",
+    "@zohodesk/components": "1.5.2",
     "@zohodesk/hooks": "2.0.6",
-    "@zohodesk/icons": "1.1.3",
+    "@zohodesk/icons": "1.1.4",
     "@zohodesk/layout": "^3.1.0",
-    "@zohodesk/svg": "1.2.3",
-    "@zohodesk/utils": "1.3.15",
+    "@zohodesk/svg": "1.2.5",
+    "@zohodesk/utils": "1.3.16",
     "@zohodesk/variables": "1.2.0",
     "@zohodesk/virtualizer": "1.0.13",
     "react-sortable-hoc": "^0.8.3",
     "velocity-react": "1.4.3",
-    "@zohodesk/dotkit": "1.0.3",
+    "@zohodesk/dotkit": "1.0.4",
     "@zohodesk/react-cli": "1.1.27"
   },
   "peerDependencies": {
     "velocity-react": "1.4.3",
     "@zohodesk/variables": "1.2.0",
-    "@zohodesk/components": "1.5.1",
-    "@zohodesk/icons": "1.1.3",
-    "@zohodesk/svg": "1.2.3",
+    "@zohodesk/components": "1.5.2",
+    "@zohodesk/icons": "1.1.4",
+    "@zohodesk/svg": "1.2.5",
     "@zohodesk/virtualizer": "1.0.13",
     "react-sortable-hoc": "^0.8.3",
     "@zohodesk/hooks": "2.0.6",
-    "@zohodesk/utils": "1.3.15",
+    "@zohodesk/utils": "1.3.16",
     "@zohodesk/a11y": "2.3.8",
     "@zohodesk/layout": "3.1.0"
   }