Merge pull request #105 from CodebreakerApp/82-allow-to-clear-a-selection-before-a-move-is-done

82 allow to clear a selection before a move is done

Author: christiannagel

src/CodeBreaker.Blazor.Client/Components/Playground.razor.cs

@@ -135,7 +135,7 @@ private void SelectColor(string color)
         else
         {
             // If no field is selected, find the first field that is not set
-            fieldIndex = Array.FindIndex(_currentMove, f => f.Color is null && f.Shape is null);
+            fieldIndex = Array.FindIndex(_currentMove, f => f.Color is null);
 
             // If all fields are set, do not set the color
             if (fieldIndex == -1)
@@ -148,8 +148,26 @@ private void SelectColor(string color)
 
     private void SelectShape(string shape)
     {
-        _currentMove[_selectedField].Selected = true;
-        _currentMove[_selectedField].Shape = shape;
+        //_currentMove[_selectedField].Selected = true;
+        //_currentMove[_selectedField].Shape = shape;
+
+        int fieldIndex;
+
+        // If a field is selected, use the selected field
+        if (_selectedField != -1)
+            fieldIndex = _selectedField;
+        else
+        {
+            // If no field is selected, find the first field that is not set
+            fieldIndex = Array.FindIndex(_currentMove, f => f.Shape is null);
+
+            // If all fields are set, do not set the color
+            if (fieldIndex == -1)
+                return;
+        }
+
+        _currentMove[fieldIndex].Selected = true;
+        _currentMove[fieldIndex].Shape = shape;
     }
     #endregion
 

src/CodeBreaker.Blazor.Client/Components/Playground.razor.css

@@ -121,10 +121,6 @@
             height: calc(var(--game-field-height) - 4px);
         }
 
-    .game-container .game-move div {
-        margin: 0 auto;
-    }
-
     .game-container .game-row.selectable .can-drop,
     .game-container .game-row.selectable .can-drop,
     .colors div:hover {