@kaspernj/api-maker 1.0.336 → 1.0.338

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.336",
+  "version": "1.0.338",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/event-listener.jsx

@@ -1,36 +1,25 @@
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
-import React from "react"
+import {memo} from "react"
+import useEventListener from "./use-event-listener.mjs"
 
-export default class ApiMakerEventListener extends React.PureComponent {
-  static callEvent (target, eventName, args = []) {
-    let event = document.createEvent("Event")
-    event.initEvent(eventName, false, true)
-    target.dispatchEvent(event, args)
-  }
-
-  static propTypes = propTypesExact({
-    event: PropTypes.string.isRequired,
-    onCalled: PropTypes.func.isRequired,
-    target: PropTypes.object.isRequired
-  })
-
-  constructor (props) {
-    super(props)
-    this.onCalled = this.onCalled.bind(this)
-  }
+const callEvent = (target, eventName, args = []) => {
+  let event = document.createEvent("Event")
+  event.initEvent(eventName, false, true)
+  target.dispatchEvent(event, args)
+}
 
-  componentDidMount () {
-    this.props.target.addEventListener(this.props.event, this.onCalled)
-  }
+const ApiMakerEventListener = ({event, onCalled, target}) => {
+  useEventListener(target, event, onCalled)
 
-  componentWillUnmount () {
-    this.props.target.removeEventListener(this.props.event, this.onCalled)
-  }
+  return null
+}
 
-  onCalled (...args) {
-    this.props.onCalled.apply(null, args)
-  }
+ApiMakerEventListener.propTypes = propTypesExact({
+  event: PropTypes.string.isRequired,
+  onCalled: PropTypes.func.isRequired,
+  target: PropTypes.object.isRequired
+})
 
-  render = () => null
-}
+export {callEvent}
+export default memo(ApiMakerEventListener)

package/src/use-current-user.mjs

@@ -32,8 +32,8 @@ const useCurrentUser = (args) => {
     const current = digg(result, "current")
 
     if (!(scopeName in s.setStates)) throw new Error(`'${scopeName}' not found in setStates`)
+    if (current) Devise.updateSession(current)
 
-    Devise.updateSession(current)
     s.setStates[scopeName](current)
 
     if (s.props.onCurrentUserLoaded) setTimeout(() => s.props.onCurrentUserLoaded(current), 0)

package/src/use-event-emitter.mjs

@@ -1,5 +1,3 @@
-import EventEmitter from "events"
-import PropTypes from "prop-types"
 import {useCallback, useEffect} from "react"
 
 const ApiMakerUseEventEmitter = (events, event, onCalled) => {
@@ -16,10 +14,4 @@ const ApiMakerUseEventEmitter = (events, event, onCalled) => {
   }, [events, event, onCalled])
 }
 
-ApiMakerUseEventEmitter.propTypes = {
-  event: PropTypes.string.isRequired,
-  events: PropTypes.instanceOf(EventEmitter).isRequired,
-  onCalled: PropTypes.func.isRequired
-}
-
 export default ApiMakerUseEventEmitter

package/src/use-event-listener.mjs

@@ -0,0 +1,17 @@
+import {useCallback, useEffect} from "react"
+
+const ApiMakerUseEventListener = (target, event, onCalled) => {
+  const onCalledCallback = useCallback((...args) => {
+    onCalled.apply(null, args)
+  }, [target, event, onCalled])
+
+  useEffect(() => {
+    target.addEventListener(event, onCalledCallback)
+
+    return () => {
+      target.removeEventListener(event, onCalledCallback)
+    }
+  }, [target, event, onCalled])
+}
+
+export default ApiMakerUseEventListener