[Bug] SettingPicker icon not rendered in combination with ChoicesConfiguration.pickerDisplayMode(.menu)

[duraki]

While experimenting with PR #19 by @Saik0s, I've found a bug which results in SettingPicker component not rendering the icon, as it should. This happens when used in combination with ChoicesConfiguration.pickerDisplayMode(.menu) instead of revolving around default .navigation display mode, which works.

Bug Reproduction

To reproduce this bug and make icon not showing use the following code (notably choiceConfiguration: (...) constructor param:

// ...
struct SomeView: View {
  @AppStorage("pickerIndex") var pickerIndex = 0

  var body: some View {
    // ...
    SettingGroup(header: "Text Appearance", footer: "Use this settings to customize text rendering styles.") {
      SettingPicker(
        icon: .system(icon: "textformat.subscript", backgroundColor: .pink),
        title: "Example Picker",
        choices: ["Default", "Gradient", "Image based"],
        selectedIndex: $pickerIndex,
        choicesConfiguration: .init(pickerDisplayMode: .menu)  /** bug produced by this line */
      )
    }
  }
}

Example of working code when the icon is shown, using .navigation display mode instead:

// ...
SettingGroup(header: "...", footer: "...") {
    SettingPicker(
        // ...
        choicesConfiguration: .init(pickerDisplayMode: .navigation)
    )
}

Rendered Results

Left side is working example when using .navigation display mode, while the right side is showing bugged version. The important item is the "Vehicle Model" settings (last item).

       

[duraki]

Code used while debugging in Example/SettingExample XCode previews:

struct SettingPicker_Previews: PreviewProvider {
    static var previews: some View {
        PreviewWrapper()
    }

    struct PreviewWrapper: View {
        @State private var selectedIndex = 0

        var body: some View {
            VStack {
                SettingPicker(
                    icon: .system(icon: "chevron.compact.down", backgroundColor: .black),
                    title: "SettingPicker ~ Navigation",
                    choices: ["Option 1", "Option 2"],
                    selectedIndex: $selectedIndex,
                    choicesConfiguration: SettingPicker
                        .ChoicesConfiguration(
                            pickerDisplayMode: .navigation
                        )
                )

                SettingPicker(
                    icon: .system(icon: "chevron.compact.up", backgroundColor: .black),
                    title: "SettingPicker ~ Menu",
                    choices: ["Option 1", "Option 2"],
                    selectedIndex: $selectedIndex,
                    choicesConfiguration: SettingPicker
                        .ChoicesConfiguration(
                            pickerDisplayMode: .menu
                        )
                )
            }
        }
    }
}

[duraki]

Here is the patch diff that fixes this When-original-devs-wont-merge-good-PRs@fac1bd9:

index f255d41..fd90f83 100644
--- a/Sources/Views/SettingPicker.swift
+++ b/Sources/Views/SettingPicker.swift
@@ -182,6 +182,10 @@ struct SettingPickerView: View {
 
         case .menu:
             HStack(spacing: horizontalSpacing) {
+                if let icon {
+                    SettingIconView(icon: icon)
+                }
+
                 Text(title)
                     .fixedSize(horizontal: false, vertical: true)
                     .frame(maxWidth: .infinity, alignment: .leading)

Usage: git apply SettingPicker_Icon_MenuDispMode.patch

PR not yet created due to merge requirements of #43. Otherwise, cherry-picking and commit by @aheze is also appreciated. The implementation of .inline display mode doesn't make much sense since it's not showing picker's descriptive text/label, therefore the icons would render on all available choices.

Patch above fixes