Merge pull request #18 from zitudu/fix/index

fix: step index where step selectors not sibling
oguzhanoya · Apr 4, 2021 · 103324d · 103324d
2 parents 4d0cd9f + 44b1f73
commit 103324d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/dist/jquery-steps.js b/dist/jquery-steps.js
diff --git a/dist/jquery-steps.js.map b/dist/jquery-steps.js.map
diff --git a/dist/jquery-steps.min.js b/dist/jquery-steps.min.js
diff --git a/src/Steps.js b/src/Steps.js
@@ -19,7 +19,10 @@ class Steps {
 
   stepClick(e) {
     e.preventDefault();
-    const nextStep = $(this).closest('[data-step-target]').index();
+    const { self } = e.data;
+    const all = self.el.find(self.stepSelector);
+    const next = $(this).closest('[data-step-target]');
+    const nextStep = all.index(next);
     const stepIndex = e.data.self.getStepIndex();
     e.data.self.setActiveStep(stepIndex, nextStep);
   }
@@ -67,9 +70,8 @@ class Steps {
   }
 
   getStepIndex() {
-    const stepIndex = this.el.find(this.stepSelector)
-      .filter(`.${this.options.activeClass.split(' ').join('.')}`)
-      .index();
+    const all = this.el.find(this.stepSelector);
+    const stepIndex = all.index(all.filter(`.${this.options.activeClass.split(' ').join('.')}`));
     return stepIndex || 0;
   }