merged element-ios 1.10.5 into 4409_basis_update_1_10_5

RiotSwiftUI/Modules/Room/Composer/View/Composer.swift

@@ -71,12 +71,15 @@ struct Composer: View {
     }
     
     private var formatItems: [FormatItem] {
-        FormatType.allCases.map { type in
-            FormatItem(
-                type: type,
-                state: wysiwygViewModel.actionStates[type.composerAction] ?? .disabled
-            )
-        }
+        return FormatType.allCases
+            // Exclude indent type outside of lists.
+            .filter { wysiwygViewModel.isInList || !$0.isIndentType }
+            .map { type in
+                FormatItem(
+                    type: type,
+                    state: wysiwygViewModel.actionStates[type.composerAction] ?? .disabled
+                )
+            }
     }
     
     private var composerContainer: some View {
@@ -257,6 +260,13 @@ struct Composer: View {
     }
 }
 
+private extension WysiwygComposerViewModel {
+    /// Return true if the selection of the composer is currently located in a list.
+    var isInList: Bool {
+        actionStates[.orderedList] == .reversed || actionStates[.unorderedList] == .reversed
+    }
+}
+
 // MARK: Previews
 
 struct Composer_Previews: PreviewProvider {