Preserve emojis order when adding

Classes/Issues/Comments/Reactions/IssueCommentReactionViewModel.swift

@@ -17,16 +17,32 @@ extension ReactionContent: Hashable {
 
 final class IssueCommentReactionViewModel: ListDiffable {
 
+ static let allReactions: [ReactionContent] = [
+ .thumbsUp,
+ .thumbsDown,
+ .laugh,
+ .hooray,
+ .confused,
+ .heart,
+ .rocket,
+ .eyes
+ ]
+
  let models: [ReactionViewModel]
  private let map: [ReactionContent: ReactionViewModel]
  private let flatState: String
 
  init(models: [ReactionViewModel]) {
- self.models = models
+ let reactions = IssueCommentReactionViewModel.allReactions
+ let indexOfModel: (ReactionViewModel) -> Int = {
+ reactions.firstIndex(of: $0.content) ?? 0
+ }
+ let sortedModels = models.sorted { indexOfModel($0) < indexOfModel($1) }
+ self.models = sortedModels
 
  var map = [ReactionContent: ReactionViewModel]()
  var flatState = ""
- for model in models {
+ for model in sortedModels {
  map[model.content] = model
  flatState += "\(model.content.rawValue)\(model.count)"
  }

Classes/Issues/Comments/Reactions/IssueReactionCell.swift

@@ -89,6 +89,7 @@ final class IssueReactionCell: UICollectionViewCell {
  accessibilityHint = isViewer
  ? NSLocalizedString("Tap to remove your reaction", comment: "")
  : NSLocalizedString("Tap to react with this emoji", comment: "")
+ restoreDisplay()
  }
 
  func popIn() {
@@ -109,9 +110,7 @@ final class IssueReactionCell: UICollectionViewCell {
  // hack to prevent changing to "0"
  countLabel.text = "1"
 
- countLabel.alpha = 1
- emojiLabel.transform = .identity
- emojiLabel.alpha = 1
+ restoreDisplay()
  UIView.animate(withDuration: 0.2, delay: 0, animations: {
  self.countLabel.alpha = 0
  self.emojiLabel.transform = CGAffineTransform(scaleX: 0.3, y: 0.3)
@@ -130,6 +129,12 @@ final class IssueReactionCell: UICollectionViewCell {
 
  // MARK: Private API
 
+ func restoreDisplay() {
+ countLabel.alpha = 1
+ emojiLabel.transform = .identity
+ emojiLabel.alpha = 1
+ }
+
  @objc func showMenu(recognizer: UITapGestureRecognizer) {
  guard recognizer.state == .began,
  !detailText.isEmpty else { return }

Classes/Issues/Comments/Reactions/ReactionsMenuViewController.swift

@@ -33,26 +33,25 @@ final class EmojiCell: UICollectionViewCell {
 
 }
 
+private extension Array {
+ func split(toNumberOfChunks number: Int) -> [[Element]] {
+ let size = count / number
+ return (0 ..< number).map {
+ let from = $0 * size
+ let to = from + size
+ let isLast = ($0 == number - 1)
+ return Array(self[from ..< (isLast ? count : to)])
+ }
+ }
+}
+
 final class ReactionsMenuViewController: UICollectionViewController,
  UICollectionViewDelegateFlowLayout {
 
  private let reuseIdentifier = "cell"
  private let size: CGFloat = 50
 
- private let sectionedReactions: [[ReactionContent]] = [
- [
- .thumbsUp,
- .thumbsDown,
- .laugh,
- .hooray
- ],
- [
- .confused,
- .heart,
- .rocket,
- .eyes
- ]
- ]
+ private let sectionedReactions = IssueCommentReactionViewModel.allReactions.split(toNumberOfChunks: 2)
 
  var selectedReaction: ReactionContent? {
  guard let item = collectionView?.indexPathsForSelectedItems?.first else { return nil }