Fixed regression with autoRestoreFocus

NoriginMedia · Mar 16, 2020 · 8620d4a · 8620d4a
1 parent 01d2c06
commit 8620d4a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.12.1]
+### Fixed
+- Fixed regression with using `autoRestoreFocus` on components that are focused + getting unmounted and don't have parent
+
 ## [2.12.0]
 ### Added
 - added `autoRestoreFocus` prop to control whether parent component should restore focus on any available child when a currently focused child component is unmounted.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@noriginmedia/react-spatial-navigation",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "HOC-based Spatial Navigation (key navigation) solution for React",
   "main": "dist/index.js",
   "files": [

diff --git a/src/spatialNavigation.js b/src/spatialNavigation.js
@@ -790,7 +790,7 @@ class SpatialNavigation {
       /**
        * If the component was also focused at this time, focus another one
        */
-      if (isFocused && parentComponent.autoRestoreFocus) {
+      if (isFocused && parentComponent && parentComponent.autoRestoreFocus) {
         this.setFocus(parentFocusKey);
       }
     }