Fixed issue where focus was not on first non close element

Author: ghosh

CHANGELOG.md

@@ -1,4 +1,7 @@
 ## Release History
+* **0.4.5**
+    * 🐞 `BUGFIX` Modal focus correctly focuses on non close trigger when possible
+    * 🐞 `BUGFIX` Custom open class is now properly removed on modal close
 * **0.4.4**
     * 💡 `FEATURE` Added ability to customize open class name
 * **0.4.3**

lib/src/index.js

@@ -150,13 +150,13 @@ const MicroModal = (() => {
     setFocusToFirstNode () {
       if (this.config.disableFocus) return
 
-      const focusableNodes = this.getFocusableNodes()
+      let focusableNodes = this.getFocusableNodes()
 
-      // could not think of a better name :(
-      const nodesWhichAreNotCloseTargets = focusableNodes.filter(node => !node.hasAttribute('data-micromodal-close'))
+      // Filters nodes which are close targets
+      focusableNodes = focusableNodes.filter(node => !node.hasAttribute(this.config.closeTrigger))
 
-      if (nodesWhichAreNotCloseTargets.length > 0) nodesWhichAreNotCloseTargets[0].focus()
-      if (nodesWhichAreNotCloseTargets.length === 0) focusableNodes[0].focus()
+      if (focusableNodes.length > 0) focusableNodes[0].focus()
+      if (focusableNodes.length === 0) focusableNodes[0].focus()
     }
 
     retainFocus (event) {

package.json

@@ -17,10 +17,10 @@
     "build": "yarn lib:build && yarn docs:build",
     "deploy:npm": "yarn workspace micromodal publish",
     "deploy:docs": "yarn workspace @micromodal/docs deploy",
-    "lib:dev": "yarn workspace micromodal dev",
-    "lib:build": "yarn workspace micromodal build",
     "docs:dev": "yarn workspace @micromodal/docs dev",
     "docs:build": "yarn workspace @micromodal/docs build",
+    "lib:dev": "yarn workspace micromodal dev",
+    "lib:build": "yarn workspace micromodal build",
     "test": "yarn workspace @micromodal/tests cypress:cli",
     "test:serve": "yarn workspace @micromodal/tests serve",
     "test:gui": "yarn workspace @micromodal/tests cypress:open"