Merge pull request #873 from mohpor/development

Fixes PlaceholderLabel position when right-aligned - iOS 11.0

Sources/iOS/Base.swift

@@ -33,8 +33,9 @@ class Base: UIControl {
         beforeSecondAnimation()
         beforeSecondAnimation()
         secondAnimation()
         secondAnimation()
     }
     }
-    
-    @objc func didTap() {
+
+    @objc
+    func didTap() {
         self.isSelected = !self.isSelected
         self.isSelected = !self.isSelected
         self.animate()
         self.animate()
     }
     }

Sources/iOS/TextField.swift

@@ -566,7 +566,7 @@ fileprivate extension TextField {
         case .left, .natural:
         case .left, .natural:
             placeholderLabel.frame.origin.x = w + placeholderHorizontalOffset
             placeholderLabel.frame.origin.x = w + placeholderHorizontalOffset
         case .right:
         case .right:
-            placeholderLabel.frame.origin.x = bounds.width - placeholderLabel.bounds.width - textInset + placeholderHorizontalOffset
+            placeholderLabel.frame.origin.x = (bounds.width * (1.0 - placeholderActiveScale)) - textInset + placeholderHorizontalOffset
         default:break
         default:break
         }
         }
         
         
@@ -707,7 +707,7 @@ extension TextField {
             case .left, .natural:
             case .left, .natural:
                 s.placeholderLabel.frame.origin.x = s.leftViewWidth + s.textInset + s.placeholderHorizontalOffset
                 s.placeholderLabel.frame.origin.x = s.leftViewWidth + s.textInset + s.placeholderHorizontalOffset
             case .right:
             case .right:
-                s.placeholderLabel.frame.origin.x = s.bounds.width - s.placeholderLabel.bounds.width - s.textInset + s.placeholderHorizontalOffset
+                s.placeholderLabel.frame.origin.x = (s.bounds.width * (1.0 - s.placeholderActiveScale)) - s.textInset + s.placeholderHorizontalOffset
             default:break
             default:break
             }
             }