Fixed bug with deleting backward in rx

matghazaryan · Feb 29, 2020 · bf88bd1 · bf88bd1
1 parent 3d01b05
commit bf88bd1
Show file tree

Hide file tree

Showing 14 changed files with 921 additions and 913 deletions.
diff --git a/SwiftyCodeView.podspec b/SwiftyCodeView.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
  s.swift_version     = '5.0'
   s.name             = 'SwiftyCodeView'
-  s.version          = '0.3.5'
+  s.version          = '0.3.6'
   s.summary          = 'An UI Component for verification codes written in swift'
 
   s.description      = <<-DESC

diff --git a/SwiftyCodeView/Classes/SwiftyCodeView/SwiftyCodeTextField.swift b/SwiftyCodeView/Classes/SwiftyCodeView/SwiftyCodeTextField.swift
@@ -7,15 +7,16 @@
 import UIKit
 
 public protocol SwiftyCodeTextFieldDelegate: class {
-    func deleteBackward(sender: SwiftyCodeTextField)
+	func deleteBackward(sender: SwiftyCodeTextField, prevValue: String?)
 }
 
 open class SwiftyCodeTextField: UITextField {
 
     weak open var deleteDelegate: SwiftyCodeTextFieldDelegate?
-    
+
     override open func deleteBackward() {
-        deleteDelegate?.deleteBackward(sender: self)
-		super.deleteBackward()        
+		let prevValue = text
+		super.deleteBackward()
+        deleteDelegate?.deleteBackward(sender: self, prevValue: prevValue)
     }
 }
diff --git a/SwiftyCodeView/Classes/SwiftyCodeView/SwiftyCodeView.swift b/SwiftyCodeView/Classes/SwiftyCodeView/SwiftyCodeView.swift
@@ -129,11 +129,11 @@ extension SwiftyCodeView: UITextFieldDelegate, SwiftyCodeTextFieldDelegate {
 		return false
 	}
 
-	public func deleteBackward(sender: SwiftyCodeTextField) {
-		for i in 1..<length{
+	public func deleteBackward(sender: SwiftyCodeTextField, prevValue: String?) {
+		for i in 1..<length {
 			let itemView = stackView.arrangedSubviews[i] as! SwiftyCodeItemView
 
-			if !itemView.textField.isFirstResponder {
+			guard itemView.textField.isFirstResponder, (prevValue?.isEmpty ?? true) else {
 				continue
 			}
 

diff --git a/SwiftyCodeViewDemoRX/Podfile.lock b/SwiftyCodeViewDemoRX/Podfile.lock
@@ -5,8 +5,8 @@ PODS:
   - RxRelay (5.0.0):
     - RxSwift (~> 5)
   - RxSwift (5.0.0)
-  - SwiftyCodeView/Core (0.3.3)
-  - SwiftyCodeView/RxSwift (0.3.3):
+  - SwiftyCodeView/Core (0.3.5)
+  - SwiftyCodeView/RxSwift (0.3.5):
     - RxCocoa
     - RxSwift
     - SwiftyCodeView/Core
@@ -15,7 +15,7 @@ DEPENDENCIES:
   - SwiftyCodeView/RxSwift (from `../`)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - RxCocoa
     - RxRelay
     - RxSwift
@@ -28,8 +28,8 @@ SPEC CHECKSUMS:
   RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
   RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
   RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
-  SwiftyCodeView: 6c2b6353bba059eaa78959b8fbdc1be282b83655
+  SwiftyCodeView: 40aca2a0a07203113358de5cd8c24756a39bb885
 
 PODFILE CHECKSUM: 24942d50cecea0fe9f4340842636149451c40039
 
-COCOAPODS: 1.7.1
+COCOAPODS: 1.8.4
diff --git a/SwiftyCodeViewDemoRX/Pods/Local Podspecs/SwiftyCodeView.podspec.json b/SwiftyCodeViewDemoRX/Pods/Local Podspecs/SwiftyCodeView.podspec.json
diff --git a/SwiftyCodeViewDemoRX/Pods/Manifest.lock b/SwiftyCodeViewDemoRX/Pods/Manifest.lock
diff --git a/SwiftyCodeViewDemoRX/Pods/Pods.xcodeproj/project.pbxproj b/SwiftyCodeViewDemoRX/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...s/Target Support Files/Pods-SwiftyCodeViewDemoRX/Pods-SwiftyCodeViewDemoRX.debug.xcconfig b/...s/Target Support Files/Pods-SwiftyCodeViewDemoRX/Pods-SwiftyCodeViewDemoRX.debug.xcconfig
diff --git a/...Target Support Files/Pods-SwiftyCodeViewDemoRX/Pods-SwiftyCodeViewDemoRX.release.xcconfig b/...Target Support Files/Pods-SwiftyCodeViewDemoRX/Pods-SwiftyCodeViewDemoRX.release.xcconfig
diff --git a/SwiftyCodeViewDemoRX/Pods/Target Support Files/RxCocoa/RxCocoa.xcconfig b/SwiftyCodeViewDemoRX/Pods/Target Support Files/RxCocoa/RxCocoa.xcconfig
diff --git a/SwiftyCodeViewDemoRX/Pods/Target Support Files/RxRelay/RxRelay.xcconfig b/SwiftyCodeViewDemoRX/Pods/Target Support Files/RxRelay/RxRelay.xcconfig
diff --git a/SwiftyCodeViewDemoRX/Pods/Target Support Files/RxSwift/RxSwift.xcconfig b/SwiftyCodeViewDemoRX/Pods/Target Support Files/RxSwift/RxSwift.xcconfig
diff --git a/SwiftyCodeViewDemoRX/Pods/Target Support Files/SwiftyCodeView/SwiftyCodeView-Info.plist b/SwiftyCodeViewDemoRX/Pods/Target Support Files/SwiftyCodeView/SwiftyCodeView-Info.plist
diff --git a/SwiftyCodeViewDemoRX/Pods/Target Support Files/SwiftyCodeView/SwiftyCodeView.xcconfig b/SwiftyCodeViewDemoRX/Pods/Target Support Files/SwiftyCodeView/SwiftyCodeView.xcconfig