@cloudflare/component-notifications 10.0.18 → 10.1.0

package/lib/Notification.js

@@ -9,15 +9,13 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _styleConst = require("@cloudflare/style-const");
-
 var _raf = _interopRequireDefault(require("raf"));
 
 var _styleContainer = require("@cloudflare/style-container");
 
-var _componentIcon = require("@cloudflare/component-icon");
+var _NotificationItem = _interopRequireDefault(require("./NotificationItem"));
+
+var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -41,75 +39,11 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-var getBorderColor = function getBorderColor(type, theme) {
-  switch (type) {
-    case 'success':
-      return theme.colors.green[5];
-
-    case 'warning':
-      return theme.colors.orange[5];
-
-    case 'error':
-      return theme.colors.red[2];
-
-    case 'info':
-    default:
-      return theme.colors.blue[3];
-  }
-};
-
-var getBackgroundColor = function getBackgroundColor(type, theme) {
-  switch (type) {
-    case 'success':
-      return theme.colors.green[(0, _styleConst.isDarkMode)() ? 3 : 6];
-
-    case 'warning':
-      return theme.colors.orange[(0, _styleConst.isDarkMode)() ? 3 : 6];
-
-    case 'error':
-      return theme.colors.red[3];
+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; }
 
-    case 'info':
-    default:
-      return theme.colors.blue[(0, _styleConst.isDarkMode)() ? 3 : 6];
-  }
-};
-
-var NotificationMessage = (0, _styleContainer.createComponent)(function (_ref) {
-  var theme = _ref.theme;
-  return {
-    position: 'relative',
-    zIndex: 2,
-    color: theme.colors.white,
-    display: 'flex',
-    alignItems: 'center'
-  };
-}, 'span');
-var NotificationClose = (0, _styleContainer.createComponent)(function (_ref2) {
-  var theme = _ref2.theme,
-      type = _ref2.type;
-  return {
-    position: 'absolute',
-    zIndex: 3,
-    top: 0,
-    right: 0,
-    bottom: 0,
-    width: '2.5em',
-    cursor: 'pointer',
-    '&:hover': {
-      backgroundColor: getBorderColor(type, theme)
-    },
-    '&::before': {
-      position: 'absolute',
-      top: '50%',
-      left: '50%',
-      transform: 'translate(-50%, -50%)'
-    }
-  };
-}, 'span');
-var NotificationContainer = (0, _styleContainer.createComponent)(function (_ref3) {
-  var theme = _ref3.theme,
-      type = _ref3.type;
+var NotificationContainer = (0, _styleContainer.createStyledComponent)(function (_ref) {
+  var theme = _ref.theme,
+      type = _ref.type;
   return {
     position: 'relative',
     padding: theme.space[2],
@@ -118,16 +52,16 @@ var NotificationContainer = (0, _styleContainer.createComponent)(function (_ref3
     '-webkit-font-smoothing': 'antialiased',
     cursor: 'pointer',
     transformOrigin: 'bottom left',
-    borderTopColor: getBorderColor(type, theme),
-    borderBottomColor: getBorderColor(type, theme),
-    borderLeftColor: getBorderColor(type, theme),
-    borderRightColor: getBorderColor(type, theme),
+    borderTopColor: (0, _utils.getBorderColor)(theme, type),
+    borderBottomColor: (0, _utils.getBorderColor)(theme, type),
+    borderLeftColor: (0, _utils.getBorderColor)(theme, type),
+    borderRightColor: (0, _utils.getBorderColor)(theme, type),
     borderTopWidth: 1,
     borderRightWidth: 1,
     borderBottomWidth: 0,
     borderLeftWidth: 1,
     borderStyle: 'solid',
-    backgroundColor: getBackgroundColor(type, theme),
+    backgroundColor: (0, _utils.getBackgroundColor)(theme, type),
     animationName: {
       '0%': {
         transform: 'scaleY(0)'
@@ -151,78 +85,6 @@ var NotificationContainer = (0, _styleContainer.createComponent)(function (_ref3
     }
   };
 }, 'div');
-var IconWrapper = (0, _styleContainer.createComponent)(function () {
-  return {
-    paddingRight: 6,
-    display: 'flex'
-  };
-});
-var NotificationWrapper = (0, _styleContainer.createComponent)(function () {
-  return {
-    display: 'flex'
-  };
-});
-var CloseWrapper = (0, _styleContainer.createComponent)(function () {
-  return {
-    position: 'absolute',
-    top: '50%',
-    left: '50%',
-    transform: 'translate(-50%,-50%)'
-  };
-});
-var NotificationItem = (0, _styleContainer.createComponent)(function () {
-  return {};
-}, function (_ref4) {
-  var children = _ref4.children,
-      closable = _ref4.closable,
-      handleClickClose = _ref4.handleClickClose,
-      type = _ref4.type;
-  var iconType;
-
-  switch (type) {
-    case 'success':
-      iconType = 'ok-sign';
-      break;
-
-    case 'info':
-      iconType = 'info-sign';
-      break;
-
-    case 'warning':
-      iconType = 'exclamation-sign';
-      break;
-
-    case 'error':
-      iconType = 'exclamation-sign';
-      break;
-
-    default:
-      iconType = 'info-sign';
-      break;
-  }
-
-  return /*#__PURE__*/_react.default.createElement(NotificationWrapper, null, /*#__PURE__*/_react.default.createElement(NotificationMessage, null, /*#__PURE__*/_react.default.createElement(IconWrapper, null, /*#__PURE__*/_react.default.createElement(_componentIcon.Icon, {
-    type: iconType,
-    label: type ? type : 'info-sign',
-    color: "white",
-    size: 24
-  })), children), closable && /*#__PURE__*/_react.default.createElement(NotificationClose, {
-    onClick: handleClickClose,
-    type: type
-  }, /*#__PURE__*/_react.default.createElement(CloseWrapper, null, /*#__PURE__*/_react.default.createElement(_componentIcon.Icon, {
-    type: "remove",
-    label: "close",
-    color: "white"
-  }))));
-});
-NotificationItem.propTypes = {
-  children: _propTypes.default.string,
-  closable: _propTypes.default.bool,
-  persist: _propTypes.default.bool,
-  duration: _propTypes.default.number,
-  active: _propTypes.default.bool,
-  handleClickClose: _propTypes.default.func
-};
 
 var Notification = /*#__PURE__*/function (_React$Component) {
   _inherits(Notification, _React$Component);
@@ -235,6 +97,9 @@ var Notification = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, Notification);
 
     _this = _super.call(this, props);
+
+    _defineProperty(_assertThisInitialized(_this), "_raf", null);
+
     _this.state = {
       persist: _this.props.persist,
       timeoutId: null
@@ -328,12 +193,9 @@ var Notification = /*#__PURE__*/function (_React$Component) {
         onMouseEnter: this.handleMouseEnter.bind(this),
         onMouseLeave: this.handleMouseLeave.bind(this),
         type: this.props.type
-      }, /*#__PURE__*/_react.default.createElement(NotificationItem, {
+      }, /*#__PURE__*/_react.default.createElement(_NotificationItem.default, {
         closable: this.props.closable,
         handleClickClose: this.handleClickClose.bind(this),
-        duration: this.props.delay,
-        persist: this.state.persist,
-        active: !!this.state.timeoutId,
         type: this.props.type
       }, this.props.message));
     }
@@ -342,19 +204,12 @@ var Notification = /*#__PURE__*/function (_React$Component) {
   return Notification;
 }(_react.default.Component);
 
-Notification.propTypes = {
-  type: _propTypes.default.oneOf(['success', 'error', 'info', 'warning']),
-  message: _propTypes.default.string.isRequired,
-  closable: _propTypes.default.bool,
-  delay: _propTypes.default.number,
-  persist: _propTypes.default.bool,
-  onClose: _propTypes.default.func.isRequired
-};
-Notification.defaultProps = {
+_defineProperty(Notification, "defaultProps", {
   closable: true,
   delay: 4000,
   persist: false,
   type: 'info'
-};
+});
+
 var _default = Notification;
 exports.default = _default;

package/lib/NotificationGlobalContainer.js

@@ -7,13 +7,11 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _styleContainer = require("@cloudflare/style-container");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var styles = function styles(_ref) {
+var StyledContainer = (0, _styleContainer.createStyledComponent)(function (_ref) {
   var theme = _ref.theme;
   return {
     position: 'fixed',
@@ -25,22 +23,15 @@ var styles = function styles(_ref) {
     zIndex: 1600,
     fontSize: theme.fontSizes[3]
   };
-};
+}, 'div');
 
 var NotificationGlobalContainer = function NotificationGlobalContainer(_ref2) {
   var className = _ref2.className,
       children = _ref2.children;
-  return /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(StyledContainer, {
     className: className
   }, children);
 };
 
-NotificationGlobalContainer.propTypes = {
-  children: _propTypes.default.node,
-  className: _propTypes.default.string
-};
-NotificationGlobalContainer.displayName = 'NotificationGlobalContainer';
-
-var _default = (0, _styleContainer.createComponent)(styles, NotificationGlobalContainer);
-
+var _default = NotificationGlobalContainer;
 exports.default = _default;

package/lib/NotificationItem.js

@@ -0,0 +1,115 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _componentIcon = require("@cloudflare/component-icon");
+
+var _styleContainer = require("@cloudflare/style-container");
+
+var _utils = require("./utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var IconWrapper = (0, _styleContainer.createStyledComponent)(function () {
+  return {
+    paddingRight: '6px',
+    display: 'flex'
+  };
+});
+var NotificationWrapper = (0, _styleContainer.createStyledComponent)(function () {
+  return {
+    display: 'flex'
+  };
+});
+var CloseWrapper = (0, _styleContainer.createStyledComponent)(function () {
+  return {
+    position: 'absolute',
+    top: '50%',
+    left: '50%',
+    transform: 'translate(-50%,-50%)'
+  };
+});
+var NotificationMessage = (0, _styleContainer.createStyledComponent)(function (_ref) {
+  var theme = _ref.theme;
+  return {
+    position: 'relative',
+    zIndex: 2,
+    color: theme.colors.white,
+    display: 'flex',
+    alignItems: 'center'
+  };
+}, 'span');
+var NotificationClose = (0, _styleContainer.createStyledComponent)(function (_ref2) {
+  var theme = _ref2.theme,
+      type = _ref2.type;
+  return {
+    position: 'absolute',
+    zIndex: 3,
+    top: 0,
+    right: 0,
+    bottom: 0,
+    width: '2.5em',
+    cursor: 'pointer',
+    '&:hover': {
+      backgroundColor: (0, _utils.getBorderColor)(theme, type)
+    },
+    '&::before': {
+      position: 'absolute',
+      top: '50%',
+      left: '50%',
+      transform: 'translate(-50%, -50%)'
+    }
+  };
+}, 'span');
+
+var NotificationItem = function NotificationItem(_ref3) {
+  var children = _ref3.children,
+      closable = _ref3.closable,
+      handleClickClose = _ref3.handleClickClose,
+      type = _ref3.type;
+  var iconType;
+
+  switch (type) {
+    case 'success':
+      iconType = 'ok-sign';
+      break;
+
+    case 'info':
+      iconType = 'info-sign';
+      break;
+
+    case 'warning':
+      iconType = 'exclamation-sign';
+      break;
+
+    case 'error':
+      iconType = 'exclamation-sign';
+      break;
+
+    default:
+      iconType = 'info-sign';
+      break;
+  }
+
+  return /*#__PURE__*/_react.default.createElement(NotificationWrapper, null, /*#__PURE__*/_react.default.createElement(NotificationMessage, null, /*#__PURE__*/_react.default.createElement(IconWrapper, null, /*#__PURE__*/_react.default.createElement(_componentIcon.Icon, {
+    type: iconType,
+    label: type ? type : 'info-sign',
+    color: "white",
+    size: 24
+  })), children), closable && /*#__PURE__*/_react.default.createElement(NotificationClose, {
+    onClick: handleClickClose,
+    type: type
+  }, /*#__PURE__*/_react.default.createElement(CloseWrapper, null, /*#__PURE__*/_react.default.createElement(_componentIcon.Icon, {
+    type: "remove",
+    label: "close",
+    color: "white"
+  }))));
+};
+
+var _default = NotificationItem;
+exports.default = _default;

package/lib/NotificationList.js

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _styleContainer = require("@cloudflare/style-container");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -28,12 +26,6 @@ var NotificationList = function NotificationList(_ref) {
   }, children);
 };
 
-NotificationList.propTypes = {
-  children: _propTypes.default.node,
-  className: _propTypes.default.string
-};
-NotificationList.displayName = 'NotificationList';
-
-var _default = (0, _styleContainer.createComponent)(styles, NotificationList);
+var _default = (0, _styleContainer.createStyledComponent)(styles, NotificationList);
 
 exports.default = _default;

package/lib/utils.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getBorderColor = exports.getBackgroundColor = void 0;
+
+var _styleConst = require("@cloudflare/style-const");
+
+var getBorderColor = function getBorderColor(theme, type) {
+  switch (type) {
+    case 'success':
+      return theme.colors.green[5];
+
+    case 'warning':
+      return theme.colors.orange[5];
+
+    case 'error':
+      return theme.colors.red[2];
+
+    case 'info':
+    default:
+      return theme.colors.blue[3];
+  }
+};
+
+exports.getBorderColor = getBorderColor;
+
+var getBackgroundColor = function getBackgroundColor(theme, type) {
+  switch (type) {
+    case 'success':
+      return theme.colors.green[(0, _styleConst.isDarkMode)() ? 3 : 6];
+
+    case 'warning':
+      return theme.colors.orange[(0, _styleConst.isDarkMode)() ? 3 : 6];
+
+    case 'error':
+      return theme.colors.red[3];
+
+    case 'info':
+    default:
+      return theme.colors.blue[(0, _styleConst.isDarkMode)() ? 3 : 6];
+  }
+};
+
+exports.getBackgroundColor = getBackgroundColor;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudflare/component-notifications",
   "description": "Cloudflare Notifications Component",
-  "version": "10.0.18",
+  "version": "10.1.0",
   "main": "lib/index.js",
   "module": "es/index.js",
   "author": "James Kyle <jkyle@cloudflare.com>",
@@ -9,7 +9,8 @@
   "publishConfig": {
     "access": "public",
     "main": "lib/index.js",
-    "module": "es/index.js"
+    "module": "es/index.js",
+    "types": "./dist/index.d.ts"
   },
   "dependencies": {
     "raf": "^3.3.2"
@@ -31,5 +32,6 @@
     "test": "stratus test",
     "test-coverage": "stratus test --coverage --muteErrorsFixWeNeedToSolveThis",
     "test-watch": "stratus test --watch"
-  }
+  },
+  "types": "./dist/index.d.ts"
 }

package/src/Notification.tsx

@@ -0,0 +1,171 @@
+import React from 'react';
+import raf from 'raf';
+import {
+  createStyledComponent,
+  type ThemeProp
+} from '@cloudflare/style-container';
+import NotificationItem from './NotificationItem';
+import { getBackgroundColor, getBorderColor } from './utils';
+
+type TNotificationContainerProps = ThemeProp & {
+  type?: TNotificationType;
+};
+
+const NotificationContainer = createStyledComponent(
+  ({ theme, type }: TNotificationContainerProps) => ({
+    position: 'relative',
+    padding: theme.space[2],
+    verticalAlign: 'middle',
+    '-webkit-text-stroke': '0',
+    '-webkit-font-smoothing': 'antialiased',
+    cursor: 'pointer',
+    transformOrigin: 'bottom left',
+    borderTopColor: getBorderColor(theme, type),
+    borderBottomColor: getBorderColor(theme, type),
+    borderLeftColor: getBorderColor(theme, type),
+    borderRightColor: getBorderColor(theme, type),
+    borderTopWidth: 1,
+    borderRightWidth: 1,
+    borderBottomWidth: 0,
+    borderLeftWidth: 1,
+    borderStyle: 'solid',
+    backgroundColor: getBackgroundColor(theme, type),
+    animationName: {
+      '0%': {
+        transform: 'scaleY(0)'
+      },
+      '100%': {
+        transform: 'scaleY(1)'
+      }
+    },
+    animationDuration: '200ms',
+    animationTimingFunction: 'ease-in-out',
+    '&::before': {
+      position: 'absolute',
+      top: '50%',
+      left: '0.75rem',
+      transform: 'translate(0, -50%)',
+      lineHeight: '1',
+      verticalAlign: 'middle'
+    },
+    '&:first-child': {
+      borderTopWidth: 1
+    }
+  }),
+  'div'
+);
+
+type TNotificationProps = {
+  type?: TNotificationType;
+  message: string;
+  closable?: boolean;
+  delay?: number;
+  persist?: boolean;
+  onClose: () => void;
+};
+
+type TNotificationState = {
+  persist?: boolean;
+  timeoutId: NodeJS.Timeout | null;
+};
+
+export type TNotificationType = 'success' | 'error' | 'info' | 'warning';
+
+class Notification extends React.Component<
+  TNotificationProps,
+  TNotificationState
+> {
+  private _raf: number | null = null;
+
+  static defaultProps: Partial<TNotificationProps> = {
+    closable: true,
+    delay: 4000,
+    persist: false,
+    type: 'info'
+  };
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      persist: this.props.persist,
+      timeoutId: null
+    };
+  }
+
+  componentDidMount() {
+    // Read this https://stanko.github.io/react-rerender-in-component-did-mount/
+    this._raf = raf(() => {
+      this._raf = raf(() => {
+        this._raf = null;
+        this.startTimeout();
+      });
+    });
+  }
+
+  componentWillUnmount() {
+    this.stopTimeout();
+  }
+
+  startTimeout() {
+    // Don't dismiss errors if they're configured to be persisted,
+    // or if we're in a testing environment
+    if (this.state.persist || process.env.TESTING) {
+      return;
+    }
+    this.stopTimeout();
+    const timeoutId = setTimeout(() => this.props.onClose(), this.props.delay);
+    this.setState({ timeoutId });
+  }
+
+  stopTimeout() {
+    if (this._raf) {
+      raf.cancel(this._raf);
+      this._raf = null;
+    }
+    if (this.state.timeoutId) {
+      clearTimeout(this.state.timeoutId);
+      this.setState({ timeoutId: null });
+    }
+  }
+
+  handleMouseEnter() {
+    this.stopTimeout();
+  }
+
+  handleMouseLeave() {
+    this.startTimeout();
+  }
+
+  handleClickClose() {
+    this.props.onClose();
+  }
+
+  handleClick() {
+    this.stopTimeout();
+    this.setState({
+      persist: true
+    });
+  }
+
+  render() {
+    return (
+      <NotificationContainer
+        role="alert"
+        onClick={this.handleClick.bind(this)}
+        onMouseEnter={this.handleMouseEnter.bind(this)}
+        onMouseLeave={this.handleMouseLeave.bind(this)}
+        type={this.props.type}
+      >
+        <NotificationItem
+          closable={this.props.closable}
+          handleClickClose={this.handleClickClose.bind(this)}
+          type={this.props.type}
+        >
+          {this.props.message}
+        </NotificationItem>
+      </NotificationContainer>
+    );
+  }
+}
+
+export default Notification;

package/src/NotificationGlobalContainer.tsx

@@ -0,0 +1,33 @@
+import React, { type ReactNode } from 'react';
+import {
+  createStyledComponent,
+  type ThemeProp
+} from '@cloudflare/style-container';
+
+const StyledContainer = createStyledComponent(
+  ({ theme }: ThemeProp) => ({
+    position: 'fixed',
+    bottom: 0,
+    left: 0,
+    right: 0,
+    maxHeight: '25%',
+    overflow: 'auto',
+    zIndex: 1600,
+    fontSize: theme.fontSizes[3]
+  }),
+  'div'
+);
+
+type TNotificationGlobalContainerProps = {
+  className?: string;
+  children?: ReactNode;
+};
+
+const NotificationGlobalContainer = ({
+  className,
+  children
+}: TNotificationGlobalContainerProps) => {
+  return <StyledContainer className={className}>{children}</StyledContainer>;
+};
+
+export default NotificationGlobalContainer;