Use NSHashTable instead of NSOrderedSet to store checkBoxes weakly

Boris-Em · May 16, 2017 · a33d37f · a33d37f
1 parent d778782
commit a33d37f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/Classes/BEMCheckBox.m b/Classes/BEMCheckBox.m
@@ -35,7 +35,7 @@ @interface BEMCheckBox ()
 
 /** The group this box is associated with.
  */
-@property (weak, nonatomic, nullable) BEMCheckBoxGroup *group;
+@property (strong, nonatomic, nullable) BEMCheckBoxGroup *group;
 
 @end
 

diff --git a/Classes/BEMCheckBoxGroup.h b/Classes/BEMCheckBoxGroup.h
@@ -14,7 +14,7 @@
 
 /** An array of check boxes in this group.
  */
-@property (nonatomic, strong, nonnull, readonly) NSOrderedSet<BEMCheckBox *> *checkBoxes;
+@property (nonatomic, strong, nonnull, readonly) NSHashTable *checkBoxes;
 
 /** The currently selected check box. Only can be nil if mustHaveSelection is NO. Setting this value will cause the other check boxes to deselect automatically.
  */

diff --git a/Classes/BEMCheckBoxGroup.m b/Classes/BEMCheckBoxGroup.m
@@ -11,15 +11,15 @@
 
 @interface BEMCheckBoxGroup ()
 
-@property (nonatomic, strong, nonnull) NSOrderedSet<BEMCheckBox *> *checkBoxes;
+@property (nonatomic, strong, nonnull) NSHashTable *checkBoxes;
 
 @end
 
 /** Defines private methods that we can call on the check box.
  */
 @interface BEMCheckBox ()
 
-@property (weak, nonatomic, nullable) BEMCheckBoxGroup *group;
+@property (strong, nonatomic, nullable) BEMCheckBoxGroup *group;
 
 - (void)_setOn:(BOOL)on animated:(BOOL)animated notifyGroup:(BOOL)notifyGroup;
 
@@ -31,7 +31,7 @@ - (instancetype)init {
     self = [super init];
     if (self) {
         _mustHaveSelection = NO;
-        _checkBoxes = [NSOrderedSet orderedSet];
+        _checkBoxes = [NSHashTable hashTableWithOptions:NSPointerFunctionsWeakMemory];
     }
     return self;
 }
@@ -52,9 +52,8 @@ - (void)addCheckBoxToGroup:(nonnull BEMCheckBox *)checkBox {
 
     [checkBox _setOn:NO animated:NO notifyGroup:NO];
     checkBox.group = self;
-    NSMutableOrderedSet *mutableBoxes = [self.checkBoxes mutableCopy];
-    [mutableBoxes addObject:checkBox];
-    self.checkBoxes = [NSOrderedSet orderedSetWithOrderedSet:mutableBoxes];
+
+    [self.checkBoxes addObject:checkBox];
 }
 
 - (void)removeCheckBoxFromGroup:(nonnull BEMCheckBox *)checkBox {
@@ -64,9 +63,7 @@ - (void)removeCheckBoxFromGroup:(nonnull BEMCheckBox *)checkBox {
     }
 
     checkBox.group = nil;
-    NSMutableOrderedSet *mutableBoxes = [self.checkBoxes mutableCopy];
-    [mutableBoxes removeObject:checkBox];
-    self.checkBoxes = [NSOrderedSet orderedSetWithOrderedSet:mutableBoxes];
+    [self.checkBoxes removeObject:checkBox];
 }
 
 #pragma mark Getters
@@ -97,7 +94,7 @@ - (void)setSelectedCheckBox:(BEMCheckBox *)selectedCheckBox {
         // Selection is nil
         if(self.mustHaveSelection && [self.checkBoxes count] > 0){
             // We must have a selected checkbox, so re-call this method with the first checkbox
-            self.selectedCheckBox = [self.checkBoxes firstObject];
+            self.selectedCheckBox = [self.checkBoxes anyObject];
         } else {
             for (BEMCheckBox *checkBox in self.checkBoxes) {
                 BOOL shouldBeOn = NO;
@@ -114,7 +111,7 @@ - (void)setMustHaveSelection:(BOOL)mustHaveSelection {
 
     // If it must have a selection and we currently don't, select the first box
     if (mustHaveSelection && !self.selectedCheckBox) {
-        self.selectedCheckBox = [self.checkBoxes firstObject];
+        self.selectedCheckBox = [self.checkBoxes anyObject];
     }
 }
 

diff --git a/Sample Project/CheckBoxTests/GroupTests.m b/Sample Project/CheckBoxTests/GroupTests.m
@@ -67,10 +67,10 @@ - (void)testAutoSelectFirstCheckBox {
     XCTAssertNil(group.selectedCheckBox);
 
     group.mustHaveSelection = YES;
-    XCTAssertEqual(group.selectedCheckBox, [self.checkBoxes firstObject]);
+    XCTAssertNotNil(group.selectedCheckBox);
 
     group.selectedCheckBox = nil;
-    XCTAssertEqual(group.selectedCheckBox, [self.checkBoxes firstObject]);
+    XCTAssertNotNil(group.selectedCheckBox);
 }
 
 - (void)testAddCheckBox {