Merge pull request #23 from xrr2016/dev

fix: fix onBack callback info index
BrunoJurkovic · Feb 23, 2021 · b4ff47e · b4ff47e
2 parents 403c543 + 3454962
commit b4ff47e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
           java-version: "12.x"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.3.1] - 2021.02.23
+
+1. Fix onBack callback info index 🐛
+
 ## [1.3.0] - 2021.02.23
 
 1. Add lockYAxis property ✨

diff --git a/lib/src/cards.dart b/lib/src/cards.dart
@@ -292,10 +292,12 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
     _resetFrontCard();
     _swipInfoList.removeLast();
     if (widget.onBack != null && widget.onBack is Function) {
-      widget.onBack(
-        _frontCardIndex,
-        _swipInfoList[_frontCardIndex],
-      );
+      int index = _frontCardIndex > 0 ? _frontCardIndex - 1 : 0;
+      SwipInfo info = _swipInfoList.isNotEmpty
+          ? _swipInfoList[index]
+          : SwipInfo(-1, SwipDirection.None);
+
+      widget.onBack(_frontCardIndex, info);
     }
   }
 

diff --git a/lib/src/swip_info.dart b/lib/src/swip_info.dart
@@ -1,6 +1,7 @@
 enum SwipDirection {
   Left,
   Right,
+  None,
 }
 
 class SwipInfo {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: tcard
 description: A tinder like cards flutter plugin, can slide it's children left or right. You can use it to show some images, videos and so on.
-version: 1.3.0
+version: 1.3.1
 homepage: https://github.com/xrr2016/tcard
 
 environment: