Merge pull request #46 from inloop/bugfix/textfield_apply_base_style

FIX: Apply base style to text field causes crash
inloop · Feb 28, 2018 · 5e8aa68 · 5e8aa68
2 parents 18bc943 + 7c78c5d
commit 5e8aa68
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
-  - Styles (0.14.8)
-  - Styles/Tests (0.14.8)
+  - Styles (0.15.9)
+  - Styles/Tests (0.15.9)
 
 DEPENDENCIES:
   - Styles (from `../`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  Styles: af5e6b6920360e9a71b84a1776b721f5ef4c257c
+  Styles: 5922b6d6b0f130580487821bf4f6cdd1918c93c1
 
 PODFILE CHECKSUM: f5341d1bc44d76e5ca1e0d50940004053970d8dc
 

diff --git a/Example/Pods/Local Podspecs/Styles.podspec.json b/Example/Pods/Local Podspecs/Styles.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Target Support Files/Styles/Info.plist b/Example/Pods/Target Support Files/Styles/Info.plist
diff --git a/Styles.podspec b/Styles.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Styles'
-  s.version          = '0.14.8'
+  s.version          = '0.15.9'
   s.summary          = 'UI Elements rapid styling'
   s.description      = <<-DESC
 UIElements styling made easy, declarative and rapid.

diff --git a/Styles/Classes/UIElement+Extensions/UITextField+Styles.m b/Styles/Classes/UIElement+Extensions/UITextField+Styles.m
@@ -82,21 +82,21 @@ - (void)swizzle_awakeFromNib {
 
 - (void)setTextStyle:(TextStyle *)style forState:(TextInputState)state {
     self.textStyles[@(state)] = style;
-    [self applyStyle];
+    [self applyStyleForCurrentState];
 }
 
 - (void)setViewStyle:(ViewStyle *)style forState:(TextInputState)state {
     self.viewStyles[@(state)] = style;
-    [self applyStyle];
+    [self applyStyleForCurrentState];
 }
 
 - (void)setPlaceholderStyle:(TextStyle *)style forState:(TextInputState)state {
     self.placeholderStyles[@(state)] = style;
-    [self applyStyle];
+    [self applyStyleForCurrentState];
 }
 
-- (void)applyStyle {
-    [super applyStyle];
+- (void)applyStyleForCurrentState {
+    [self applyStyle];
     TextInputState state = [self isEditing] ? kEditing : kInactive;
     [self updateStylesForState:state];
 }

diff --git a/Styles/Classes/UIElement+Extensions/UITextView+Styles.m b/Styles/Classes/UIElement+Extensions/UITextView+Styles.m
@@ -84,7 +84,7 @@ - (void)setViewStyle:(ViewStyle *)style forState:(TextInputState)state {
 - (void)applyStylesForState:(TextInputState)state {
     ViewStyle *viewSyle = self.viewStyles[@(state)];
     TextStyle *textStyle = self.textStyles[@(state)];
-    
+
     [self applyTextStyle:textStyle];
     [self applyViewStyle:viewSyle];
 }
@@ -94,7 +94,7 @@ - (void)textViewEditingDidChange:(NSNotification *)notification {
         return;
     }
     TextInputState state = notification.name == UITextViewTextDidBeginEditingNotification ? kEditing : kInactive;
-    [super applyStyle];
+    [self applyStyle];
     [self applyStylesForState:state];
 }
 
@@ -114,4 +114,3 @@ - (void)applyViewStyle:(ViewStyle *)style {
 }
 
 @end
-