focus-trap-react 7.0.0 → 7.0.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 7.0.1
+
+- Fix: PropTypes definition now supports server-side rendering. #83
+
 ## 7.0.0
 
 - Add: Prop types for `<FocusTrap>`.

package/dist/focus-trap-react.js

@@ -151,25 +151,27 @@ var FocusTrap = /*#__PURE__*/function (_React$Component) {
   }]);
 
   return FocusTrap;
-}(React.Component);
+}(React.Component); // support server-side rendering where `Element` will not be defined
 
+
+var ElementType = typeof Element === 'undefined' ? Function : Element;
 FocusTrap.propTypes = {
   active: PropTypes.bool,
   paused: PropTypes.bool,
   focusTrapOptions: PropTypes.shape({
     onActivate: PropTypes.func,
     onDeactivate: PropTypes.func,
-    initialFocus: PropTypes.oneOfType([PropTypes.instanceOf(Element), PropTypes.string, PropTypes.func]),
-    fallbackFocus: PropTypes.oneOfType([PropTypes.instanceOf(Element), PropTypes.string, PropTypes.func]),
+    initialFocus: PropTypes.oneOfType([PropTypes.instanceOf(ElementType), PropTypes.string, PropTypes.func]),
+    fallbackFocus: PropTypes.oneOfType([PropTypes.instanceOf(ElementType), PropTypes.string, PropTypes.func]),
     escapeDeactivates: PropTypes.bool,
     clickOutsideDeactivates: PropTypes.bool,
     returnFocusOnDeactivate: PropTypes.bool,
-    setReturnFocus: PropTypes.oneOfType([PropTypes.instanceOf(Element), PropTypes.string, PropTypes.func]),
+    setReturnFocus: PropTypes.oneOfType([PropTypes.instanceOf(ElementType), PropTypes.string, PropTypes.func]),
     allowOutsideClick: PropTypes.func,
     preventScroll: PropTypes.bool
   }),
   children: PropTypes.oneOfType([PropTypes.element, // React element
-  PropTypes.instanceOf(Element) // DOM element
+  PropTypes.instanceOf(ElementType) // DOM element
   ]) // NOTE: _createFocusTrap is internal, for testing purposes only, so we don't
   //  specify it here. It's expected to be set to the function returned from
   //  require('focus-trap'), or one with a compatible interface.

package/package.json

@@ -1,23 +1,20 @@
 {
   "name": "focus-trap-react",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "A React component that traps focus.",
   "main": "dist/focus-trap-react.js",
-  "engines": {
-    "npm": ">=6.14.5"
-  },
   "types": "index.d.ts",
   "scripts": {
     "demo-bundle": "browserify demo/js -t babelify --extension=.jsx -o demo/demo-bundle.js",
-    "prestart": "npm run build",
+    "prestart": "yarn build",
     "start": "budo demo/js/index.js:demo-bundle.js --dir demo --live -- -t babelify --extension=.jsx",
     "lint": "eslint \"src/**/*.js\" \"test/**/*.js\" \"demo/**/*.js\"",
     "format": "prettier --write \"src/**/*.js\" \"test/**/*.js\" \"demo/js/**/*.js\"",
     "format-check": "prettier --check \"src/**/*.js\" \"test/**/*.js\" \"demo/js/**/*.js\"",
     "build": "babel src -d dist",
     "test-unit": "jest",
-    "test": "npm run format-check && npm run lint && jest",
-    "prepublishOnly": "npm test && npm run build"
+    "test": "yarn format-check && yarn lint && jest",
+    "prepublishOnly": "yarn test && yarn build"
   },
   "repository": {
     "type": "git",

package/src/focus-trap-react.js

@@ -113,6 +113,9 @@ class FocusTrap extends React.Component {
   }
 }
 
+// support server-side rendering where `Element` will not be defined
+const ElementType = typeof Element === 'undefined' ? Function : Element;
+
 FocusTrap.propTypes = {
   active: PropTypes.bool,
   paused: PropTypes.bool,
@@ -120,12 +123,12 @@ FocusTrap.propTypes = {
     onActivate: PropTypes.func,
     onDeactivate: PropTypes.func,
     initialFocus: PropTypes.oneOfType([
-      PropTypes.instanceOf(Element),
+      PropTypes.instanceOf(ElementType),
       PropTypes.string,
       PropTypes.func
     ]),
     fallbackFocus: PropTypes.oneOfType([
-      PropTypes.instanceOf(Element),
+      PropTypes.instanceOf(ElementType),
       PropTypes.string,
       PropTypes.func
     ]),
@@ -133,7 +136,7 @@ FocusTrap.propTypes = {
     clickOutsideDeactivates: PropTypes.bool,
     returnFocusOnDeactivate: PropTypes.bool,
     setReturnFocus: PropTypes.oneOfType([
-      PropTypes.instanceOf(Element),
+      PropTypes.instanceOf(ElementType),
       PropTypes.string,
       PropTypes.func
     ]),
@@ -142,7 +145,7 @@ FocusTrap.propTypes = {
   }),
   children: PropTypes.oneOfType([
     PropTypes.element, // React element
-    PropTypes.instanceOf(Element) // DOM element
+    PropTypes.instanceOf(ElementType) // DOM element
   ])
 
   // NOTE: _createFocusTrap is internal, for testing purposes only, so we don't