CategoryごとにList表示分けする

Kyome22 · Sep 12, 2023 · b0e8248 · b0e8248
1 parent e9b3940
commit b0e8248
Showing 1 changed file with 25 additions and 30 deletions.
diff --git a/Sources/EmojiPalette/EmojiPaletteView.swift b/Sources/EmojiPalette/EmojiPaletteView.swift
@@ -21,45 +21,40 @@ public struct EmojiPaletteView: View {
 
     public var body: some View {
         VStack(spacing: 0) {
-            ScrollViewReader { proxy in
+            if let emojiSet = emojiSets.first(where: { $0.category == selection }) {
                 List {
-                    ForEach(emojiSets) { emojiSet in
-                        Section {
-                            LazyVGrid(columns: columns, spacing: 8) {
-                                ForEach(emojiSet.emojis) { emoji in
-                                    Button {
-                                        selectedEmoji = emoji.character
-                                    } label: {
-                                        Text(emoji.character)
-                                            .font(.title)
-                                    }
-                                    .buttonStyle(.borderless)
+                    Section {
+                        LazyVGrid(columns: columns, spacing: 8) {
+                            ForEach(emojiSet.emojis) { emoji in
+                                Button {
+                                    selectedEmoji = emoji.character
+                                } label: {
+                                    Text(emoji.character)
+                                        .font(.title)
                                 }
+                                .buttonStyle(.borderless)
                             }
-                        } header: {
-                            Text(emojiSet.category.label, bundle: .module)
-                                .id(emojiSet.category)
                         }
-                        .textCase(.none)
+                    } header: {
+                        Text(emojiSet.category.label, bundle: .module)
                     }
+                    .textCase(.none)
                 }
                 .listStyle(.plain)
-                Divider()
-                HStack {
-                    ForEach(EmojiCategory.allCases) { emojiCategory in
-                        Image(systemName: emojiCategory.imageName)
-                            .foregroundColor(selection == emojiCategory ? Color.accentColor : .secondary)
-                            .frame(maxWidth: .infinity)
-                            .onTapGesture {
-                                selection = emojiCategory
-                                withAnimation {
-                                    proxy.scrollTo(emojiCategory, anchor: UnitPoint.top)
-                                }
-                            }
-                    }
+                .id(selection)
+            }
+            Divider()
+            HStack {
+                ForEach(EmojiCategory.allCases) { emojiCategory in
+                    Image(systemName: emojiCategory.imageName)
+                        .foregroundColor(selection == emojiCategory ? Color.accentColor : .secondary)
+                        .frame(maxWidth: .infinity)
+                        .onTapGesture {
+                            selection = emojiCategory
+                        }
                 }
-                .padding(8)
             }
+            .padding(8)
         }
         .frame(width: 240, height: 320)
     }