@civet/events 0.1.8 → 1.0.0-rc2

package/lib/EventHandler.js

@@ -1,202 +1,42 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.composeHandlers = exports["default"] = void 0;
-
-var _core = require("@civet/core");
-
-var _fastDeepEqual = _interopRequireDefault(require("fast-deep-equal"));
+exports["default"] = void 0;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _context = require("./context");
+var _react = _interopRequireDefault(require("react"));
 
 var _EventReceiver = require("./EventReceiver");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+var _useEventHandler = _interopRequireDefault(require("./useEventHandler"));
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _excluded = ["children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _extends() { _extends = Object.assign || 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 _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); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-var EventHandler = /*#__PURE__*/function (_Component) {
-  _inherits(EventHandler, _Component);
-
-  var _super = _createSuper(EventHandler);
-
-  function EventHandler() {
-    _classCallCheck(this, EventHandler);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(EventHandler, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      var _this = this;
-
-      var _this$props = this.props,
-          eventReceiver = _this$props.eventReceiver,
-          resource = _this$props.resource,
-          options = _this$props.options;
-      if (eventReceiver == null) return;
-      this.unsubscribe = eventReceiver.subscribe(resource, options, function (data) {
-        return _this.handleNotify(data);
-      });
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      var _this2 = this;
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
-      var _this$props2 = this.props,
-          eventReceiver = _this$props2.eventReceiver,
-          resource = _this$props2.resource,
-          options = _this$props2.options;
-      var prevRequest = (prevProps.resource || {}).request;
-      var currentRequest = (resource || {}).request;
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-      if (eventReceiver == null || prevProps.eventReceiver !== eventReceiver || prevRequest !== currentRequest || !(0, _fastDeepEqual["default"])(prevProps.options, options)) {
-        if (this.unsubscribe) this.unsubscribe();
-        this.unsubscribe = undefined;
-        if (eventReceiver == null) return;
-        this.unsubscribe = eventReceiver.subscribe(resource, options, function (data) {
-          return _this2.handleNotify(data);
-        });
-      }
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      this.isUnmounted = true;
-      if (this.unsubscribe) this.unsubscribe();
-    }
-  }, {
-    key: "handleNotify",
-    value: function handleNotify(data) {
-      var _this$props3 = this.props,
-          eventReceiver = _this$props3.eventReceiver,
-          resource = _this$props3.resource,
-          onEvent = _this$props3.onEvent,
-          onNotify = _this$props3.onNotify;
-      if (eventReceiver == null || data == null || (data.length || 0) === 0) return;
-      var unhandledEvents;
+function EventHandler(_ref) {
+  var children = _ref.children,
+      props = _objectWithoutProperties(_ref, _excluded);
 
-      if (typeof onEvent === 'function') {
-        unhandledEvents = data.filter(function (event) {
-          return !onEvent(event);
-        });
-      } else {
-        unhandledEvents = data;
-      }
-
-      if (unhandledEvents.length === 0 || resource == null || typeof resource.notify !== 'function') {
-        return;
-      }
-
-      var promise = resource.notify();
-      if (typeof onNotify === 'function') promise.then(function (result) {
-        return onNotify(result, unhandledEvents);
-      });
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, this.props.children);
-    }
-  }]);
-
-  return EventHandler;
-}(_react.Component);
+  (0, _useEventHandler["default"])(props);
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children);
+}
 
 EventHandler.propTypes = {
   eventReceiver: _EventReceiver.eventReceiverPropType.isRequired,
   resource: _propTypes["default"].object,
+  disabled: _propTypes["default"].bool,
   options: _propTypes["default"].object,
   onEvent: _propTypes["default"].func,
   onNotify: _propTypes["default"].func,
   children: _propTypes["default"].node
 };
-
-var composeHandlers = function composeHandlers() {
-  for (var _len = arguments.length, handlers = new Array(_len), _key = 0; _key < _len; _key++) {
-    handlers[_key] = arguments[_key];
-  }
-
-  return function () {
-    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      args[_key2] = arguments[_key2];
-    }
-
-    return handlers.reduce(function (sum, handler) {
-      return sum || (typeof handler === 'function' ? handler.apply(void 0, args) : false);
-    }, false);
-  };
-};
-/* eslint-disable react/jsx-props-no-spreading */
-
-
-exports.composeHandlers = composeHandlers;
-
-var withResource = function withResource(ChildComponent) {
-  var WithResource = function WithResource(props) {
-    return /*#__PURE__*/_react["default"].createElement(_core.ResourceConsumer, null, function (resource) {
-      return /*#__PURE__*/_react["default"].createElement(ChildComponent, _extends({
-        resource: resource
-      }, props));
-    });
-  };
-
-  return WithResource;
-};
-/* eslint-enable react/jsx-props-no-spreading */
-
-/* eslint-disable react/jsx-props-no-spreading */
-
-
-var withContext = function withContext(ChildComponent) {
-  var WithContext = function WithContext(props) {
-    return /*#__PURE__*/_react["default"].createElement(_context.ConfigContext.Consumer, null, function (_ref) {
-      var eventReceiver = _ref.eventReceiver;
-      return /*#__PURE__*/_react["default"].createElement(ChildComponent, _extends({
-        eventReceiver: eventReceiver
-      }, props));
-    });
-  };
-
-  return WithContext;
-};
-/* eslint-enable react/jsx-props-no-spreading */
-
-
-var _default = withContext(withResource(EventHandler));
-
+var _default = EventHandler;
 exports["default"] = _default;

package/lib/composeHandlers.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var composeHandlers = function composeHandlers() {
+  for (var _len = arguments.length, handlers = new Array(_len), _key = 0; _key < _len; _key++) {
+    handlers[_key] = arguments[_key];
+  }
+
+  return function () {
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+
+    return handlers.reduce(function (sum, handler) {
+      return sum || (typeof handler === 'function' ? handler.apply(void 0, args) : false);
+    }, false);
+  };
+};
+
+var _default = composeHandlers;
+exports["default"] = _default;

package/lib/context.js

@@ -1,17 +1,13 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useConfigContext = exports.ConfigContext = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+var _react = _interopRequireDefault(require("react"));
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var ConfigContext = /*#__PURE__*/_react["default"].createContext({});
 
@@ -19,7 +15,7 @@ exports.ConfigContext = ConfigContext;
 ConfigContext.displayName = 'Events.ConfigContext';
 
 var useConfigContext = function useConfigContext() {
-  return (0, _react.useContext)(ConfigContext);
+  return _react["default"].useContext(ConfigContext);
 };
 
 exports.useConfigContext = useConfigContext;

package/lib/index.js

@@ -11,16 +11,16 @@ Object.defineProperty(exports, "useConfigContext", {
     return _context.useConfigContext;
   }
 });
-Object.defineProperty(exports, "ConfigProvider", {
+Object.defineProperty(exports, "composeHandlers", {
   enumerable: true,
   get: function get() {
-    return _ConfigProvider["default"];
+    return _composeHandlers["default"];
   }
 });
-Object.defineProperty(exports, "composeHandlers", {
+Object.defineProperty(exports, "ConfigProvider", {
   enumerable: true,
   get: function get() {
-    return _EventHandler.composeHandlers;
+    return _ConfigProvider["default"];
   }
 });
 Object.defineProperty(exports, "EventHandler", {
@@ -47,16 +47,26 @@ Object.defineProperty(exports, "isEventReceiver", {
     return _EventReceiver.isEventReceiver;
   }
 });
+Object.defineProperty(exports, "useEventHandler", {
+  enumerable: true,
+  get: function get() {
+    return _useEventHandler["default"];
+  }
+});
 exports.ConfigConsumer = void 0;
 
 var _context = require("./context");
 
+var _composeHandlers = _interopRequireDefault(require("./composeHandlers"));
+
 var _ConfigProvider = _interopRequireDefault(require("./ConfigProvider"));
 
-var _EventHandler = _interopRequireWildcard(require("./EventHandler"));
+var _EventHandler = _interopRequireDefault(require("./EventHandler"));
 
 var _EventReceiver = _interopRequireWildcard(require("./EventReceiver"));
 
+var _useEventHandler = _interopRequireDefault(require("./useEventHandler"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/useEventHandler.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _core = require("@civet/core");
+
+var _fastDeepEqual = _interopRequireDefault(require("fast-deep-equal"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _context = require("./context");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function useEventHandler(_ref) {
+  var eventReceiverProp = _ref.eventReceiver,
+      resourceProp = _ref.resource,
+      disabled = _ref.disabled,
+      optionsProp = _ref.options,
+      onEvent = _ref.onEvent,
+      onNotify = _ref.onNotify;
+  var configContext = (0, _context.useConfigContext)();
+  var eventReceiver = eventReceiverProp || configContext.eventReceiver;
+  var resourceContext = (0, _core.useResourceContext)();
+  var resource = resourceProp || resourceContext;
+
+  var _React$useState = _react["default"].useState(optionsProp),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      options = _React$useState2[0],
+      setOptions = _React$useState2[1];
+
+  if (!(0, _fastDeepEqual["default"])(options, optionsProp)) {
+    setOptions(optionsProp);
+  }
+
+  _react["default"].useEffect(function () {
+    if (eventReceiver == null || disabled) return undefined;
+    var unsubscribe = eventReceiver.subscribe(resource, options, function (data) {
+      if (((data === null || data === void 0 ? void 0 : data.length) || 0) === 0) return;
+      var unhandledEvents;
+
+      if (typeof onEvent === 'function') {
+        unhandledEvents = data.filter(function (event) {
+          return !onEvent(event);
+        });
+      } else {
+        unhandledEvents = data;
+      }
+
+      if (unhandledEvents.length === 0 || typeof (resource === null || resource === void 0 ? void 0 : resource.notify) !== 'function') return;
+      var promise = resource.notify();
+
+      if (typeof onNotify === 'function') {
+        promise.then(function (result) {
+          return onNotify(result, unhandledEvents);
+        });
+      }
+    });
+    return unsubscribe;
+  }, [eventReceiver, !disabled, resource === null || resource === void 0 ? void 0 : resource.request, options, onEvent, onNotify]);
+}
+
+var _default = useEventHandler;
+exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/events",
-  "version": "0.1.8",
+  "version": "1.0.0-rc2",
   "description": "Civet",
   "main": "./lib/index.js",
   "scripts": {
@@ -39,7 +39,7 @@
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@civet/core": "^0.6.8",
+    "@civet/core": "^1.0.0-rc4",
     "babel-eslint": "^10.1.0",
     "cross-env": "^7.0.3",
     "cross-var": "^1.1.0",
@@ -52,18 +52,18 @@
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "prettier": "^2.3.2",
-    "react": "*",
-    "react-dom": "*",
+    "prettier": "^2.6.2",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "rimraf": "^3.0.2"
   },
   "peerDependencies": {
-    "@civet/core": ">= 0.6.8",
+    "@civet/core": ">= 1.0.0",
     "react": ">= 16.8",
     "react-dom": ">= 16.8"
   },
   "dependencies": {
     "fast-deep-equal": "^3.1.3",
-    "prop-types": "^15.7.2"
+    "prop-types": "^15.8.1"
   }
 }

package/src/EventHandler.js

@@ -1,105 +1,23 @@
-import { ResourceConsumer } from '@civet/core';
-import deepEquals from 'fast-deep-equal';
 import PropTypes from 'prop-types';
-import React, { Component } from 'react';
+import React from 'react';
 
-import { ConfigContext } from './context';
 import { eventReceiverPropType } from './EventReceiver';
+import useEventHandler from './useEventHandler';
 
-class EventHandler extends Component {
-  componentDidMount() {
-    const { eventReceiver, resource, options } = this.props;
-    if (eventReceiver == null) return;
-    this.unsubscribe = eventReceiver.subscribe(resource, options, (data) =>
-      this.handleNotify(data),
-    );
-  }
+function EventHandler({ children, ...props }) {
+  useEventHandler(props);
 
-  componentDidUpdate(prevProps) {
-    const { eventReceiver, resource, options } = this.props;
-
-    const prevRequest = (prevProps.resource || {}).request;
-    const currentRequest = (resource || {}).request;
-
-    if (
-      eventReceiver == null ||
-      prevProps.eventReceiver !== eventReceiver ||
-      prevRequest !== currentRequest ||
-      !deepEquals(prevProps.options, options)
-    ) {
-      if (this.unsubscribe) this.unsubscribe();
-      this.unsubscribe = undefined;
-      if (eventReceiver == null) return;
-      this.unsubscribe = eventReceiver.subscribe(resource, options, (data) =>
-        this.handleNotify(data),
-      );
-    }
-  }
-
-  componentWillUnmount() {
-    this.isUnmounted = true;
-    if (this.unsubscribe) this.unsubscribe();
-  }
-
-  handleNotify(data) {
-    const { eventReceiver, resource, onEvent, onNotify } = this.props;
-    if (eventReceiver == null || data == null || (data.length || 0) === 0) return;
-    let unhandledEvents;
-    if (typeof onEvent === 'function') {
-      unhandledEvents = data.filter((event) => !onEvent(event));
-    } else {
-      unhandledEvents = data;
-    }
-    if (unhandledEvents.length === 0 || resource == null || typeof resource.notify !== 'function') {
-      return;
-    }
-    const promise = resource.notify();
-    if (typeof onNotify === 'function') promise.then((result) => onNotify(result, unhandledEvents));
-  }
-
-  render() {
-    return <>{this.props.children}</>;
-  }
+  return <>{children}</>;
 }
 
 EventHandler.propTypes = {
   eventReceiver: eventReceiverPropType.isRequired,
   resource: PropTypes.object,
+  disabled: PropTypes.bool,
   options: PropTypes.object,
   onEvent: PropTypes.func,
   onNotify: PropTypes.func,
   children: PropTypes.node,
 };
 
-const composeHandlers =
-  (...handlers) =>
-  (...args) =>
-    handlers.reduce(
-      (sum, handler) => sum || (typeof handler === 'function' ? handler(...args) : false),
-      false,
-    );
-
-/* eslint-disable react/jsx-props-no-spreading */
-const withResource = (ChildComponent) => {
-  const WithResource = (props) => (
-    <ResourceConsumer>
-      {(resource) => <ChildComponent resource={resource} {...props} />}
-    </ResourceConsumer>
-  );
-  return WithResource;
-};
-/* eslint-enable react/jsx-props-no-spreading */
-
-/* eslint-disable react/jsx-props-no-spreading */
-const withContext = (ChildComponent) => {
-  const WithContext = (props) => (
-    <ConfigContext.Consumer>
-      {({ eventReceiver }) => <ChildComponent eventReceiver={eventReceiver} {...props} />}
-    </ConfigContext.Consumer>
-  );
-  return WithContext;
-};
-/* eslint-enable react/jsx-props-no-spreading */
-
-export default withContext(withResource(EventHandler));
-export { composeHandlers };
+export default EventHandler;

package/src/composeHandlers.js

@@ -0,0 +1,9 @@
+const composeHandlers =
+  (...handlers) =>
+  (...args) =>
+    handlers.reduce(
+      (sum, handler) => sum || (typeof handler === 'function' ? handler(...args) : false),
+      false,
+    );
+
+export default composeHandlers;

package/src/context.js

@@ -1,5 +1,5 @@
-import React, { useContext } from 'react';
+import React from 'react';
 
 export const ConfigContext = React.createContext({});
 ConfigContext.displayName = 'Events.ConfigContext';
-export const useConfigContext = () => useContext(ConfigContext);
+export const useConfigContext = () => React.useContext(ConfigContext);

package/src/index.js

@@ -1,7 +1,9 @@
 import { ConfigContext, useConfigContext } from './context';
 
 export const { Consumer: ConfigConsumer } = ConfigContext;
+export { default as composeHandlers } from './composeHandlers';
 export { default as ConfigProvider } from './ConfigProvider';
-export { composeHandlers, default as EventHandler } from './EventHandler';
+export { default as EventHandler } from './EventHandler';
 export { default as EventReceiver, eventReceiverPropType, isEventReceiver } from './EventReceiver';
+export { default as useEventHandler } from './useEventHandler';
 export { useConfigContext };

package/src/useEventHandler.js

@@ -0,0 +1,46 @@
+import { useResourceContext } from '@civet/core';
+import deepEquals from 'fast-deep-equal';
+import React from 'react';
+
+import { useConfigContext } from './context';
+
+function useEventHandler({
+  eventReceiver: eventReceiverProp,
+  resource: resourceProp,
+  disabled,
+  options: optionsProp,
+  onEvent,
+  onNotify,
+}) {
+  const configContext = useConfigContext();
+  const eventReceiver = eventReceiverProp || configContext.eventReceiver;
+
+  const resourceContext = useResourceContext();
+  const resource = resourceProp || resourceContext;
+
+  const [options, setOptions] = React.useState(optionsProp);
+  if (!deepEquals(options, optionsProp)) {
+    setOptions(optionsProp);
+  }
+
+  React.useEffect(() => {
+    if (eventReceiver == null || disabled) return undefined;
+    const unsubscribe = eventReceiver.subscribe(resource, options, (data) => {
+      if ((data?.length || 0) === 0) return;
+      let unhandledEvents;
+      if (typeof onEvent === 'function') {
+        unhandledEvents = data.filter((event) => !onEvent(event));
+      } else {
+        unhandledEvents = data;
+      }
+      if (unhandledEvents.length === 0 || typeof resource?.notify !== 'function') return;
+      const promise = resource.notify();
+      if (typeof onNotify === 'function') {
+        promise.then((result) => onNotify(result, unhandledEvents));
+      }
+    });
+    return unsubscribe;
+  }, [eventReceiver, !disabled, resource?.request, options, onEvent, onNotify]);
+}
+
+export default useEventHandler;