Add improvements

There is an issue related to the new code finding single options

commonUI/src/main/kotlin/ch/dissem/yaep/ui/common/App.kt

@@ -1,21 +1,45 @@
 package ch.dissem.yaep.ui.common
 
 import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.PointerMatcher
+import androidx.compose.foundation.PointerMatcher.Companion.mouse
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.onClick
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.input.pointer.PointerButton.Companion.Secondary
 import androidx.compose.ui.unit.dp
-import ch.dissem.yaep.domain.*
+import ch.dissem.yaep.domain.Clue
+import ch.dissem.yaep.domain.Game
+import ch.dissem.yaep.domain.Grid
+import ch.dissem.yaep.domain.HorizontalClue
+import ch.dissem.yaep.domain.ItemClass
+import ch.dissem.yaep.domain.NeighbourClue
+import ch.dissem.yaep.domain.OrderClue
+import ch.dissem.yaep.domain.SameColumnClue
+import ch.dissem.yaep.domain.TripletClue
+import ch.dissem.yaep.domain.generateGame
 import org.jetbrains.compose.resources.painterResource
 import yaep.commonui.generated.resources.Res
 import yaep.commonui.generated.resources.neighbour
@@ -93,10 +117,15 @@ fun PuzzleGrid(
                             item.options.remove(it)
                             row.cleanupOptions()
                         },
+                        onOptionAdded = {
+                            item.options.add(it)
+                        },
                         selectedItem = selection,
                         onSelectItem = {
                             item.selection = it
-                            row.cleanupOptions()
+                            if (it != null) {
+                                row.cleanupOptions()
+                            }
                         }
                     )
                 }
@@ -147,10 +176,11 @@ fun PuzzleClues(
     }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 private fun Modifier.forClue(clue: DisplayClue<out Clue>) = this
     .alpha(if (clue.isActive) 1f else 0.2f)
     .padding(8.dp)
-    .clickable { clue.isActive = false }
+    .onClick(matcher = PointerMatcher.Primary + mouse(Secondary)) { clue.isActive = !clue.isActive }
 
 @Composable
 fun HorizontalClue(modifier: Modifier = Modifier, clue: HorizontalClue, isClueViolated: Boolean) {
@@ -191,7 +221,11 @@ fun HorizontalClue(modifier: Modifier = Modifier, clue: HorizontalClue, isClueVi
 }
 
 @Composable
-fun VerticalClue(modifier: Modifier = Modifier, clue: SameColumnClue<*, *>, isClueViolated: Boolean = false) {
+fun VerticalClue(
+    modifier: Modifier = Modifier,
+    clue: SameColumnClue<*, *>,
+    isClueViolated: Boolean = false
+) {
     ClueCard(
         modifier = modifier.aspectRatio(0.5f),
         isClueViolated = isClueViolated
@@ -204,11 +238,20 @@ fun VerticalClue(modifier: Modifier = Modifier, clue: SameColumnClue<*, *>, isCl
 }
 
 @Composable
-fun ClueCard(modifier: Modifier = Modifier, isClueViolated: Boolean, content: @Composable () -> Unit) {
+fun ClueCard(
+    modifier: Modifier = Modifier,
+    isClueViolated: Boolean,
+    content: @Composable () -> Unit
+) {
     val colors = MaterialTheme.colorScheme
     OutlinedCard(
         modifier = if (isClueViolated) {
-            modifier.shadow(8.dp, shape = CardDefaults.outlinedShape, ambientColor = colors.error, spotColor = colors.error)
+            modifier.shadow(
+                8.dp,
+                shape = CardDefaults.outlinedShape,
+                ambientColor = colors.error,
+                spotColor = colors.error
+            )
         } else {
             modifier
         },

commonUI/src/main/kotlin/ch/dissem/yaep/ui/common/selector.kt

@@ -28,7 +28,8 @@ import kotlin.math.min
 fun <C : ItemClass<C>> Selector(
     modifier: Modifier = Modifier,
     options: List<Toggleable<Item<C>>>,
-    onOptionRemoved: (Item<C>?) -> Unit,
+    onOptionRemoved: (Item<C>) -> Unit,
+    onOptionAdded: (Item<C>) -> Unit,
     selectedItem: Item<C>?,
     onSelectItem: (Item<C>?) -> Unit,
 ) {
@@ -54,8 +55,13 @@ fun <C : ItemClass<C>> Selector(
                                 .onClick(
                                     matcher = PointerMatcher.mouse(PointerButton.Secondary),
                                     onClick = {
-                                        option.enabled = false
-                                        onOptionRemoved(option.item)
+                                        if (option.enabled) {
+                                            option.enabled = false
+                                            onOptionRemoved(option.item)
+                                        } else {
+                                            option.enabled = true
+                                            onOptionAdded(option.item)
+                                        }
                                     }
                                 )
                         )