@omercnet/paseo-queens 0.1.0-next.128.1 → 0.1.0-next.130.1

package/client/puzzle-selector.tsx

@@ -134,10 +134,10 @@ function createStyles(theme: PluginSurfaceProps["theme"], compact: boolean): Sel
       flexDirection: "row",
       flexWrap: "wrap",
       justifyContent: "center",
-      gap: compact ? 8 : 12,
+      gap: compact ? 6 : 12,
     },
     step: {
-      minWidth: compact ? 136 : 152,
+      minWidth: compact ? 132 : 152,
       minHeight: 44,
       flexDirection: "row",
       alignItems: "center",
@@ -161,7 +161,7 @@ function createStyles(theme: PluginSurfaceProps["theme"], compact: boolean): Sel
       fontWeight: "500",
     },
     valueBlock: {
-      minWidth: compact ? 56 : 68,
+      minWidth: compact ? 52 : 68,
       flex: 1,
       alignItems: "center",
       gap: 1,

package/client/queens-board.tsx

@@ -32,18 +32,44 @@ type BoardLayout = {
 
 type DragReplacement = "empty" | "excluded";
 
+type DragSelection = {
+  readonly indexes: ReadonlySet<number>;
+  readonly replacement: DragReplacement;
+};
+
 type DragGesture = {
   readonly startIndex: number;
-  readonly indexes: Set<number>;
-  readonly replacement: DragReplacement;
+  indexes: Set<number>;
+  replacement: DragReplacement;
   moved: boolean;
   cancelled: boolean;
 };
 
-type DragPreview = {
-  readonly indexes: ReadonlySet<number>;
-  readonly replacement: DragReplacement;
-};
+export function resolveDraggedCellState(
+  index: number,
+  persistedState: CellState,
+  dragSelection: DragSelection | null,
+): CellState {
+  if (persistedState === "marked" || dragSelection === null || !dragSelection.indexes.has(index)) {
+    return persistedState;
+  }
+
+  if (dragSelection.replacement === "empty") {
+    return persistedState === "excluded" ? "empty" : persistedState;
+  }
+
+  return persistedState === "empty" ? "excluded" : persistedState;
+}
+
+export function collectDragIndexes(
+  cells: readonly CellState[],
+  selection: DragSelection,
+): number[] {
+  return [...selection.indexes].filter((index) => {
+    const persistedState = cells[index] ?? "empty";
+    return resolveDraggedCellState(index, persistedState, selection) !== persistedState;
+  });
+}
 
 type PendingTap = {
   readonly releasedAt: number;
@@ -200,7 +226,7 @@ export function QueensBoard({
   const cellsRef = useRef(cells);
   const onSetCellsRef = useRef(onSetCells);
   const onGestureActiveChangeRef = useRef(onGestureActiveChange);
-  const [dragPreview, setDragPreview] = useState<DragPreview | null>(null);
+  const [dragPreview, setDragPreview] = useState<DragSelection | null>(null);
   cellsRef.current = cells;
   onSetCellsRef.current = onSetCells;
   onGestureActiveChangeRef.current = onGestureActiveChange;
@@ -291,6 +317,7 @@ export function QueensBoard({
     },
     [dragEnabled, puzzle.size],
   );
+
   const finishGesture = useCallback(() => {
     const gesture = gestureRef.current;
     gestureRef.current = null;
@@ -309,11 +336,9 @@ export function QueensBoard({
       pending?.cancel();
       pendingTapsRef.current.delete(index);
     }
-    const indexes =
-      gesture.replacement === "empty"
-        ? [...gesture.indexes].filter((index) => cellsRef.current[index] === "excluded")
-        : [...gesture.indexes];
-    onSetCellsRef.current(indexes, gesture.replacement);
+
+    const indexes = collectDragIndexes(cellsRef.current, gesture);
+    if (indexes.length > 0) onSetCellsRef.current(indexes, gesture.replacement);
   }, [handleTapRelease]);
 
   const cancelGesture = useCallback(() => {
@@ -330,13 +355,8 @@ export function QueensBoard({
             {coordinates.map((column) => {
               const index = row * puzzle.size + column;
               const persistedState = cells[index] ?? "empty";
-              let state = persistedState;
-              if (dragPreview?.indexes.has(index)) {
-                if (dragPreview.replacement === "excluded" || persistedState === "excluded") {
-                  state = dragPreview.replacement;
-                }
-              }
               const region = puzzle.regions[index] ?? 0;
+              const state = resolveDraggedCellState(index, persistedState, dragPreview);
               const conflicted = conflicts.has(index);
               const markColor = solved
                 ? theme.colors.statusSuccess

package/client/queens-popover.tsx

@@ -74,7 +74,6 @@ function QueensPopoverGame({
   theme,
   host,
   layout,
-  close,
   deck,
   catalog,
 }: PluginButtonContentProps & {
@@ -151,25 +150,6 @@ function QueensPopoverGame({
 
   return (
     <View style={styles.root}>
-      {!layout.compact ? (
-        <View style={styles.header}>
-          <View style={styles.titleRow}>
-            <GameMark size={22} color={theme.colors.accent} />
-            <Text accessibilityRole="header" style={styles.title}>
-              Queens
-            </Text>
-          </View>
-          <Pressable
-            accessibilityRole="button"
-            accessibilityLabel="Close Queens"
-            onPress={close}
-            style={styles.doneButton}
-          >
-            <Text style={styles.doneText}>Done</Text>
-          </Pressable>
-        </View>
-      ) : null}
-
       <View style={styles.metaRow}>
         <Text style={styles.metaText}>
           #{puzzleNumber}/{state.puzzles.length}
@@ -207,7 +187,7 @@ function QueensPopoverGame({
         <QueensBoard
           key={`${host.id}:${puzzle.id}:popover`}
           dragEnabled={!layout.compact}
-          maxSize={layout.compact ? 296 : 184}
+          maxSize={layout.compact ? 296 : 146}
           puzzle={puzzle}
           cells={progress.cells}
           conflicts={conflicts}
@@ -252,28 +232,11 @@ function QueensPopoverGame({
 function createStyles(theme: PluginButtonContentProps["theme"], compact: boolean) {
   return StyleSheet.create({
     root: {
-      width: compact ? "100%" : 300,
+      width: "100%",
       alignSelf: "center",
       alignItems: "center",
       gap: compact ? 12 : 6,
     },
-    header: {
-      width: "100%",
-      flexDirection: "row",
-      alignItems: "center",
-      justifyContent: "space-between",
-      gap: 12,
-    },
-    titleRow: {
-      flexDirection: "row",
-      alignItems: "center",
-      gap: 8,
-    },
-    title: {
-      color: theme.colors.foreground,
-      fontSize: 18,
-      fontWeight: "800",
-    },
     doneButton: {
       minHeight: 36,
       justifyContent: "center",
@@ -307,7 +270,7 @@ function createStyles(theme: PluginButtonContentProps["theme"], compact: boolean
     },
     boardFrame: {
       width: "100%",
-      maxWidth: compact ? 296 : 184,
+      maxWidth: compact ? 296 : 146,
     },
     statusCard: {
       minHeight: 30,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omercnet/paseo-queens",
-  "version": "0.1.0-next.128.1",
+  "version": "0.1.0-next.130.1",
   "type": "module",
   "description": "A cross-platform Queens logic puzzle for Paseo.",
   "license": "MIT",
@@ -38,17 +38,22 @@
     "paseo-plugin.json"
   ],
   "scripts": {
-    "check": "biome check .",
+    "check": "biome check --error-on-warnings .",
     "import:puzzles": "node scripts/import-curated-puzzles.mjs",
-    "test": "vitest run",
+    "test": "run-s test:ci:*",
     "typecheck": "tsc --noEmit",
-    "verify:package": "npm pack --dry-run"
+    "verify:package": "npm pack --dry-run",
+    "check:write": "biome check --write .",
+    "test:ci:unit": "vitest run",
+    "build": "node ../.github/scripts/build-plugin.mjs"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.5.10",
+    "@biomejs/biome": "^2.5.14",
     "@getpaseo/plugin": "0.9.0-beta.1",
+    "@getpaseo/server": "0.9.0-beta.1",
     "@types/node": "^24.5.2",
     "@types/react": "~19.2.0",
+    "npm-run-all2": "^9.0.3",
     "react": "19.1.0",
     "react-native": "0.81.5",
     "typescript": "^7.0.0",