issue-1245: Fixed issue where completion block was not executed when …

…calling Switch.toggle
CosmicMind · Jun 27, 2019 · 4051056 · 4051056
1 parent 815097b
commit 4051056
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 3.1.6
+- [issue-1245](https://github.com/CosmicMind/Material/issues/1245): Fixed issue where completion block was not executed when calling Switch.toggle.
+
 ## 3.1.5
 
 - [pr-1248](https://github.com/CosmicMind/Material/pull/1248): Exposed Obj-C methods for NavigationDrawerController.

diff --git a/Material.podspec b/Material.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name = 'Material'
-	s.version = '3.1.5'
+	s.version = '3.1.6'
 	s.swift_version = '5.0'
 	s.license = 'BSD-3-Clause'
 	s.summary = 'A UI/UX framework for creating beautiful applications.'

diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.5</string>
+	<string>3.1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Sources/iOS/Switch/Switch.swift b/Sources/iOS/Switch/Switch.swift
@@ -414,11 +414,12 @@ fileprivate extension Switch {
 
     if animated {
       animateToState(state: state) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction] _ in
-        guard isTriggeredByUserInteraction else {
+        guard let s = self else {
           return
         }
 
-        guard let s = self else {
+        guard isTriggeredByUserInteraction else {
+          completion?(s)
           return
         }
 
@@ -431,6 +432,7 @@ fileprivate extension Switch {
       styleForState(state: state)
 
       guard isTriggeredByUserInteraction else {
+        completion?(self)
         return
       }