Add actualNumberOfLines

zekunyan · Nov 27, 2017 · 3e66a89 · 3e66a89
1 parent 2a5815f
commit 3e66a89
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/TTGTagCollectionView/Classes/TTGTagCollectionView.h b/TTGTagCollectionView/Classes/TTGTagCollectionView.h
@@ -70,6 +70,8 @@ typedef NS_ENUM(NSInteger, TTGTagCollectionAlignment) {
 
 // Number of lines. 0 means no limit, default is 0 for vertical and 1 for horizontal.
 @property (nonatomic, assign) NSUInteger numberOfLines;
+// The real number of lines ignoring the numberOfLines value
+@property (nonatomic, assign, readonly) NSUInteger actualNumberOfLines;
 
 // Horizontal and vertical space between tags, default is 4.
 @property (nonatomic, assign) CGFloat horizontalSpacing;

diff --git a/TTGTagCollectionView/Classes/TTGTagCollectionView.m b/TTGTagCollectionView/Classes/TTGTagCollectionView.m
@@ -12,6 +12,7 @@ @interface TTGTagCollectionView ()
 @property (nonatomic, strong) UIScrollView *scrollView;
 @property (nonatomic, strong) UIView *containerView;
 @property (nonatomic, assign) BOOL needsLayoutTagViews;
+@property (nonatomic, assign) NSUInteger actualNumberOfLines;
 @end
 
 @implementation TTGTagCollectionView
@@ -186,7 +187,7 @@ - (void)layoutTagViewsForVerticalDirection {
             currentLineX = 0;
         }
 
-        // Line number limit
+        // Line limit
         if (_numberOfLines != 0) {
             UIView *tagView = [_dataSource tagCollectionView:self tagViewForIndex:i];
             tagView.hidden = eachLineWidthNumbers.count >= _numberOfLines;
@@ -204,11 +205,15 @@ - (void)layoutTagViewsForVerticalDirection {
     [eachLineTagCountNumbers addObject:@(currentLineTagsCount)];
     [eachLineTagIndexs addObject:tmpTagIndexNumbers];
 
+    // Actual number of lines
+    _actualNumberOfLines = eachLineTagCountNumbers.count;
+
     // Line limit
     if (_numberOfLines != 0) {
-        eachLineWidthNumbers = [[eachLineWidthNumbers subarrayWithRange:NSMakeRange(0, MIN(eachLineWidthNumbers.count, _numberOfLines))] mutableCopy];
         eachLineMaxHeightNumbers = [[eachLineMaxHeightNumbers subarrayWithRange:NSMakeRange(0, MIN(eachLineMaxHeightNumbers.count, _numberOfLines))] mutableCopy];
+        eachLineWidthNumbers = [[eachLineWidthNumbers subarrayWithRange:NSMakeRange(0, MIN(eachLineWidthNumbers.count, _numberOfLines))] mutableCopy];
         eachLineTagCountNumbers = [[eachLineTagCountNumbers subarrayWithRange:NSMakeRange(0, MIN(eachLineTagCountNumbers.count, _numberOfLines))] mutableCopy];
+        eachLineTagIndexs = [[eachLineTagIndexs subarrayWithRange:NSMakeRange(0, MIN(eachLineTagIndexs.count, _numberOfLines))] mutableCopy];
     }
 
     // Prepare
@@ -405,6 +410,14 @@ - (void)setNumberOfLines:(NSUInteger)numberOfLines {
     [self setNeedsLayoutTagViews];
 }
 
+- (NSUInteger)actualNumberOfLines {
+    if (_scrollDirection == TTGTagCollectionScrollDirectionHorizontal) {
+        return _numberOfLines;
+    } else {
+        return _actualNumberOfLines;
+    }
+}
+
 - (void)setHorizontalSpacing:(CGFloat)horizontalSpacing {
     _horizontalSpacing = horizontalSpacing;
     [self setNeedsLayoutTagViews];

diff --git a/TTGTagCollectionView/Classes/TTGTextTagCollectionView.h b/TTGTagCollectionView/Classes/TTGTextTagCollectionView.h
@@ -85,6 +85,8 @@
 
 // Number of lines. 0 means no limit, default is 0 for vertical and 1 for horizontal.
 @property (nonatomic, assign) NSUInteger numberOfLines;
+// The real number of lines ignoring the numberOfLines value
+@property (nonatomic, assign, readonly) NSUInteger actualNumberOfLines;
 
 // Tag selection limit, default is 0, means no limit
 @property (nonatomic, assign) NSUInteger selectionLimit;

diff --git a/TTGTagCollectionView/Classes/TTGTextTagCollectionView.m b/TTGTagCollectionView/Classes/TTGTextTagCollectionView.m
@@ -533,6 +533,10 @@ - (void)setNumberOfLines:(NSUInteger)numberOfLines {
     _tagCollectionView.numberOfLines = numberOfLines;
 }
 
+- (NSUInteger)actualNumberOfLines {
+    return _tagCollectionView.actualNumberOfLines;
+}
+
 - (UIEdgeInsets)contentInset {
     return _tagCollectionView.contentInset;
 }