react-focus-trap - npm Package Compare versions

Comparing version 2.5.0 to 2.6.0-beta.0

index.js

@@ -12,13 +12,5 @@ 'use strict';
 
-var stack = [];
 var timer = null;
+var isDOM = typeof document !== 'undefined';
 
-/**
- * To support server-side rendering, do not push the active element
- * when not in the browser environment
- */
-if (typeof document !== 'undefined' && document.activeElement) {
-  stack.push(document.activeElement);
-}
-
 var defaultProps$1 = {
@@ -32,2 +24,5 @@ element: 'div'
 
+    this.anchor = null;
+
+    this.focus = this.focus.bind(this);
     this._onBlur = this._onBlur.bind(this);
@@ -53,9 +48,6 @@ this._setRoot = this._setRoot.bind(this);
     clearTimeout(timer);
-    timer = setTimeout(function (_) { return stack[stack.length - 1].focus(); }, 10);
+    timer = setTimeout(this.focus, 10);
   };
 
   FocalPoint.prototype.returnFocus = function returnFocus () {
-    var ref = this.state;
-    var anchor = ref.anchor;
-
     // When transitioning between pages using hash route state,
@@ -65,7 +57,7 @@ // this anchor is some times lost. Do not attempt to focus
     if (
-      anchor &&
-      typeof anchor === 'object' &&
-      typeof anchor.focus === 'function'
+      this.anchor &&
+      typeof this.anchor === 'object' &&
+      typeof this.anchor.focus === 'function'
     ) {
-      anchor.focus();
+      this.anchor.focus();
     }
@@ -75,4 +67,4 @@ };
   FocalPoint.prototype.componentWillMount = function componentWillMount () {
-    if (typeof document !== 'undefined') {
-      this.setState({ anchor: document.activeElement });
+    if (isDOM) {
+      this.anchor = document.activeElement;
     }
@@ -82,4 +74,2 @@ };
   FocalPoint.prototype.componentDidMount = function componentDidMount () {
-    stack.push(this);
-
     this.trapFocus();
@@ -91,6 +81,2 @@
   FocalPoint.prototype.componentWillUnmount = function componentWillUnmount () {
-    var this$1 = this;
-
-    stack = stack.filter(function (i) { return i !== this$1; });
-
     document.removeEventListener('focus', this._onBlur, true);
@@ -101,2 +87,4 @@
     this.returnFocus();
+
+    this.anchor = null;
   };
@@ -107,10 +95,11 @@
     var children = ref.children;
-    var Element = ref.element;
+    var element = ref.element;
     var className = ref.className;
 
-    return (
-      React.createElement( Element, { ref: this._setRoot, tabIndex: "0", className: className },
-        children
-      )
-    )
+    return React.createElement(element, {
+      ref: this._setRoot,
+      tabIndex: 0,
+      className: className,
+      children: children
+    })
   };
@@ -125,3 +114,3 @@
   FocalPoint.prototype._onBlur = function _onBlur (event) {
-    var current = stack[stack.length - 1];
+    var current = this.anchor;
 
@@ -141,3 +130,4 @@ if (current && current.contains(event.target) === false) {
   active: true,
-  className: 'focus-trap'
+  className: 'focus-trap',
+  onExit: function () {}
 };
@@ -148,5 +138,3 @@
     superclass.call(this, props, context);
-
     this._onKeyUp = this._onKeyUp.bind(this);
-    this._setFocus = this._setFocus.bind(this);
   }
@@ -172,3 +160,3 @@
           'aria-hidden': "true", className: (className + "-backdrop"), onClick: onExit }),
-        React.createElement( FocalPoint, { ref: this._setFocus, className: className, element: element },
+        React.createElement( FocalPoint, { className: className, element: element },
           children
@@ -182,8 +170,4 @@ )
 
-  FocusTrap.prototype._setFocus = function _setFocus (el) {
-    this.focus = el;
-  };
-
   FocusTrap.prototype._onKeyUp = function _onKeyUp (event) {
-    if (event.key === 'Escape' && 'onExit' in this.props) {
+    if (event.key === 'Escape') {
       this.props.onExit();
@@ -190,0 +174,0 @@ }

package.json

 {
   "name": "react-focus-trap",
-  "version": "2.5.0",
+  "version": "2.6.0-beta.0",
   "description": "Traps focus for accessible dropdowns and modal content.",
@@ -5,0 +5,0 @@ "main": "src/focus-trap.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Total package byte prevSize

13992

decreased by-8.32%

Lines of code

130

decreased by-7.8%

Number of low quality alerts

2

increased by100%

No dependency changes