Don't allow bullets and numbers to be selected at the same time

codemagic-ci-cd · Dec 13, 2023 · 6260caa · 6260caa
1 parent d114a8a
commit 6260caa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...s/Editors/Common Views/Input Accessory Views/Expanding/WKEditorToolbarExpandingView.swift b/...s/Editors/Common Views/Input Accessory Views/Expanding/WKEditorToolbarExpandingView.swift
@@ -158,8 +158,10 @@ class WKEditorToolbarExpandingView: WKEditorToolbarView {
         templateButton.isSelected = selectionState.isHorizontalTemplate
 
         unorderedListButton.isSelected = selectionState.isBulletSingleList || selectionState.isBulletMultipleList
+        unorderedListButton.isEnabled = !selectionState.isNumberSingleList && !selectionState.isNumberMultipleList
 
         orderedListButton.isSelected = selectionState.isNumberSingleList || selectionState.isNumberMultipleList
+        orderedListButton.isEnabled = !selectionState.isBulletSingleList && !selectionState.isBulletMultipleList
 
         decreaseIndentionButton.isEnabled = false
         if selectionState.isBulletMultipleList || selectionState.isNumberMultipleList {

diff --git a/...Common Views/Input Views/Main/Grouped Toolbar Table Item/WKEditorToolbarGroupedView.swift b/...Common Views/Input Views/Main/Grouped Toolbar Table Item/WKEditorToolbarGroupedView.swift
@@ -65,8 +65,10 @@ class WKEditorToolbarGroupedView: WKEditorToolbarView {
         }
 
         unorderedListButton.isSelected = selectionState.isBulletSingleList || selectionState.isBulletMultipleList
+        unorderedListButton.isEnabled = !selectionState.isNumberSingleList && !selectionState.isNumberMultipleList
 
         orderedListButton.isSelected = selectionState.isNumberSingleList || selectionState.isNumberMultipleList
+        orderedListButton.isEnabled = !selectionState.isBulletSingleList && !selectionState.isBulletMultipleList
 
         decreaseIndentButton.isEnabled = false
         if selectionState.isBulletMultipleList || selectionState.isNumberMultipleList {