Browse Source

bugfix #48 #49 and bumping the version to 0.9.13

ibireme 9 years ago
parent
commit
3b53aa553d
4 changed files with 17 additions and 28 deletions
  1. 1 1
      Framework/Info.plist
  2. 1 1
      YYText.podspec
  3. 4 0
      YYText/Component/YYTextLayout.m
  4. 11 26
      YYText/YYTextView.m

+ 1 - 1
Framework/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.12</string>
+	<string>0.9.13</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

+ 1 - 1
YYText.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = 'YYText'
   s.summary      = 'Powerful text framework for iOS to display and edit rich text.'
-  s.version      = '0.9.12'
+  s.version      = '0.9.13'
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.authors      = { 'ibireme' => 'ibireme@gmail.com' }
   s.social_media_url = 'http://blog.ibireme.com'

+ 4 - 0
YYText/Component/YYTextLayout.m

@@ -126,6 +126,10 @@ static inline UIEdgeInsets UIEdgeInsetRotateVertical(UIEdgeInsets insets) {
     return one;
 }
 
+- (id)mutableCopyWithZone:(nullable NSZone *)zone {
+    return [self copyWithZone:zone];
+}
+
 - (void)encodeWithCoder:(NSCoder *)aCoder {
     [aCoder encodeObject:[NSValue valueWithCGSize:_size] forKey:@"size"];
     [aCoder encodeObject:[NSValue valueWithUIEdgeInsets:_insets] forKey:@"insets"];

+ 11 - 26
YYText/YYTextView.m

@@ -1916,6 +1916,9 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
     [self willChangeValueForKey:@"selectedRange"];
     _selectedRange = selectedRange;
     [self didChangeValueForKey:@"selectedRange"];
+    if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
+        [self.delegate textViewDidChangeSelection:self];
+    }
 }
 
 - (void)_setTypingAttributes:(NSDictionary *)typingAttributes {
@@ -2173,9 +2176,6 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
     if ([self.delegate respondsToSelector:@selector(textViewDidChange:)]) {
         [self.delegate textViewDidChange:self];
     }
-    if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
-        [self.delegate textViewDidChangeSelection:self];
-    }
     
     if (!_state.insideUndoBlock) {
         [self _resetUndoAndRedoStack];
@@ -2467,7 +2467,7 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
     } else {
         size.height = CGFLOAT_MAX;
     }
-    YYTextContainer *newContainer = _innerContainer.mutableCopy;
+    YYTextContainer *newContainer = _innerContainer.copy;
     newContainer.size = size;
     YYTextLayout *newLayout = [YYTextLayout layoutWithContainer:newContainer text:textLayout.text];
     CGSize newSize = newLayout.textBoundingSize;
@@ -2476,6 +2476,13 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
 
 #pragma mark - Override UIResponder
 
+- (UIView *)hitTest:(CGPoint)point withEvent:(nullable UIEvent *)event {
+    UIView *view = nil;
+    
+    view = [super hitTest:point withEvent:event];
+    return view;
+}
+
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
     [self _updateIfNeeded];
     UITouch *touch = touches.anyObject;
@@ -2698,9 +2705,6 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
                 [_inputDelegate selectionWillChange:self];
                 _selectedTextRange = _trackingRange;
                 [_inputDelegate selectionDidChange:self];
-                if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
-                    [self.delegate textViewDidChangeSelection:self];
-                }
                 [self _updateAttributesHolder];
                 [self _updateOuterProperties];
             }
@@ -2985,9 +2989,6 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
         [_inputDelegate selectionWillChange:self];
         _selectedTextRange = newRange;
         [_inputDelegate selectionDidChange:self];
-        if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
-            [self.delegate textViewDidChangeSelection:self];
-        }
     }
     
     [self _updateIfNeeded];
@@ -3002,9 +3003,6 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
     [_inputDelegate selectionWillChange:self];
     _selectedTextRange = [YYTextRange rangeWithRange:NSMakeRange(0, _innerText.length)];
     [_inputDelegate selectionDidChange:self];
-    if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
-        [self.delegate textViewDidChangeSelection:self];
-    }
     
     [self _updateIfNeeded];
     [self _updateOuterProperties];
@@ -3237,9 +3235,6 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
             
             [self _updateOuterProperties];
             [self _updateSelectionView];
-            if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
-                [self.delegate textViewDidChangeSelection:self];
-            }
             return;
         }
     }
@@ -3284,10 +3279,6 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
     if (self.isFirstResponder) {
         [self _scrollRangeToVisible:_selectedTextRange];
     }
-    
-    if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
-        [self.delegate textViewDidChangeSelection:self];
-    }
 }
 
 - (void)setMarkedTextStyle:(NSDictionary *)markedTextStyle {
@@ -3364,9 +3355,6 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
     if ([self.delegate respondsToSelector:@selector(textViewDidChange:)]) {
         [self.delegate textViewDidChange:self];
     }
-    if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
-        [self.delegate textViewDidChangeSelection:self];
-    }
     
     _lastTypeRange = _selectedTextRange.asRange;
 }
@@ -3441,9 +3429,6 @@ typedef NS_ENUM(NSUInteger, YYTextMoveDirection) {
     if ([self.delegate respondsToSelector:@selector(textViewDidChange:)]) {
         [self.delegate textViewDidChange:self];
     }
-    if ([self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
-        [self.delegate textViewDidChangeSelection:self];
-    }
     
     _lastTypeRange = _selectedTextRange.asRange;