@dxos/react-ui-gameboard 0.8.4-main.ae835ea → 0.8.4-main.bc674ce

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/react-ui-gameboard",
-  "version": "0.8.4-main.ae835ea",
+  "version": "0.8.4-main.bc674ce",
   "description": "Game board.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "type": "module",
@@ -24,37 +28,36 @@
     "src"
   ],
   "dependencies": {
-    "@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
-    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.12.1",
+    "@atlaskit/pragmatic-drag-and-drop": "1.7.7",
+    "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
+    "@effect-atom/atom-react": "^0.4.6",
     "@radix-ui/react-context": "1.1.1",
-    "chess.js": "^1.4.0",
+    "chess.js": "^1.0.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/debug": "0.8.4-main.ae835ea",
-    "@dxos/invariant": "0.8.4-main.ae835ea",
-    "@dxos/node-std": "0.8.4-main.ae835ea",
-    "@dxos/util": "0.8.4-main.ae835ea",
-    "@dxos/log": "0.8.4-main.ae835ea"
+    "@dxos/debug": "0.8.4-main.bc674ce",
+    "@dxos/invariant": "0.8.4-main.bc674ce",
+    "@dxos/node-std": "0.8.4-main.bc674ce",
+    "@dxos/log": "0.8.4-main.bc674ce",
+    "@dxos/util": "0.8.4-main.bc674ce"
   },
   "devDependencies": {
     "@svgr/cli": "^8.1.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
     "lodash.defaultsdeep": "^4.6.1",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/react-ui": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
-    "@dxos/storybook-utils": "0.8.4-main.ae835ea"
+    "@dxos/react-ui": "0.8.4-main.bc674ce",
+    "@dxos/storybook-utils": "0.8.4-main.bc674ce",
+    "@dxos/ui-theme": "0.8.4-main.bc674ce"
   },
   "peerDependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.bc674ce",
+    "@dxos/ui-theme": "0.8.4-main.bc674ce"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Chessboard/Chessboard.stories.tsx

@@ -2,11 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
+import { RegistryContext } from '@effect-atom/atom-react';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
 import { Button, Toolbar } from '@dxos/react-ui';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { withRegistry } from '@dxos/storybook-utils';
 
 import { Gameboard, type GameboardRootProps, type Move, type Player } from '../Gameboard';
 
@@ -18,7 +20,8 @@ type DefaultStoryProps = Pick<ChessboardProps, 'orientation' | 'showLabels' | 'd
 };
 
 const DefaultStory = ({ orientation: _orientation, pgn, ...props }: DefaultStoryProps) => {
-  const model = useMemo(() => new ChessModel(pgn), [pgn]);
+  const registry = useContext(RegistryContext);
+  const model = useMemo(() => new ChessModel(registry, pgn), [registry, pgn]);
   const [orientation, setOrientation] = useState<Player | undefined>(_orientation);
 
   const handleDrop = useCallback<NonNullable<GameboardRootProps<ChessModel>['onDrop']>>(
@@ -52,7 +55,8 @@ const DefaultStory = ({ orientation: _orientation, pgn, ...props }: DefaultStory
 };
 
 const GridStory = () => {
-  const models = useMemo(() => Array.from({ length: 9 }).map(() => new ChessModel()), []);
+  const registry = useContext(RegistryContext);
+  const models = useMemo(() => Array.from({ length: 9 }).map(() => new ChessModel(registry)), [registry]);
   useEffect(() => {
     const i = setInterval(() => {
       const model = models[Math.floor(Math.random() * models.length)];
@@ -62,7 +66,7 @@ const GridStory = () => {
   }, []);
 
   return (
-    <div className='h-full aspect-square mx-auto'>
+    <div className='bs-full aspect-square mx-auto'>
       <div className='grid grid-cols-3 gap-2'>
         {models.map((model, i) => (
           <div key={i} className='aspect-square'>
@@ -80,7 +84,7 @@ const meta = {
   title: 'ui/react-ui-gameboard/Chessboard',
   component: Chessboard,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ container: 'column' })],
+  decorators: [withRegistry, withTheme, withLayout({ layout: 'column' })],
 } satisfies Meta<typeof Chessboard>;
 
 export default meta;

package/src/components/Chessboard/Chessboard.tsx

@@ -2,17 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Atom, useAtomValue } from '@effect-atom/atom-react';
 import React, { type PropsWithChildren, forwardRef, memo, useEffect, useMemo, useRef, useState } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 
 import { type ThemedClassName, useForwardedRef } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 import {
   type DOMRectBounds,
   Gameboard,
   type Location,
+  type PieceMap,
   type PieceRecord,
   type Player,
   getRelativeBounds,
@@ -22,6 +24,9 @@ import {
 
 import { type ChessModel, type ChessPiece, ChessPieces, boardStyles, getSquareColor, locationToPos } from './chess';
 
+/** Fallback atom for when model is undefined. */
+const EMPTY_PIECES_ATOM = Atom.make<PieceMap<ChessPiece>>({});
+
 export type ChessboardProps = ThemedClassName<
   PropsWithChildren<{
     orientation?: Player;
@@ -40,6 +45,7 @@ const ChessboardComponent = forwardRef<HTMLDivElement, ChessboardProps>(
     const targetRef = useForwardedRef(forwardedRef);
     const { width, height } = useResizeDetector({ targetRef, refreshRate: 200 });
     const { model, promoting, onPromotion } = useGameboardContext<ChessModel>(Chessboard.displayName!);
+    const pieces = useAtomValue(model?.pieces ?? EMPTY_PIECES_ATOM);
 
     // Board squares.
     const squares = useMemo<Location[]>(() => {
@@ -84,7 +90,7 @@ const ChessboardComponent = forwardRef<HTMLDivElement, ChessboardProps>(
         return [];
       }
 
-      return Object.values(model?.pieces.value ?? {})
+      return Object.values(pieces)
         .map((piece) => {
           if (piece.id === promoting?.id) {
             return null;
@@ -94,7 +100,7 @@ const ChessboardComponent = forwardRef<HTMLDivElement, ChessboardProps>(
           return { piece, bounds };
         })
         .filter(isNonNullable);
-    }, [grid, model?.pieces.value, promoting]);
+    }, [grid, pieces, promoting]);
 
     return (
       <div ref={targetRef} tabIndex={0} className={mx('relative outline-none', classNames)}>
@@ -134,7 +140,7 @@ const ChessboardComponent = forwardRef<HTMLDivElement, ChessboardProps>(
             piece={promoting}
             onSelect={(piece) => {
               onPromotion({
-                from: Object.values(model.pieces.value).find((p) => p.id === promoting.id)!.location,
+                from: Object.values(pieces).find((p) => p.id === promoting.id)!.location,
                 to: piece.location,
                 piece: promoting.type,
                 promotion: piece.type,

package/src/components/Chessboard/chess.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type ReadonlySignal, signal } from '@preact/signals-core';
+import { Atom, type Registry } from '@effect-atom/atom-react';
 import { Chess as ChessJS } from 'chess.js';
 import { type FC, type SVGProps } from 'react';
 
@@ -85,15 +85,18 @@ export const createChess = (pgn?: string): ChessJS => {
  */
 export class ChessModel implements GameboardModel<ChessPiece> {
   private readonly _chess = new ChessJS();
-  private readonly _pieces = signal<PieceMap<ChessPiece>>({});
-  private readonly _moveIndex = signal(0);
+  private readonly _pieces = Atom.make<PieceMap<ChessPiece>>({});
+  private readonly _moveIndex = Atom.make(0);
 
-  constructor(pgn?: string) {
+  constructor(
+    private readonly _registry: Registry.Registry,
+    pgn?: string,
+  ) {
     this.update(pgn);
   }
 
   get readonly(): boolean {
-    return this._moveIndex.value !== this._chess.history().length;
+    return this._registry.get(this._moveIndex) !== this._chess.history().length;
   }
 
   get turn(): Player {
@@ -104,11 +107,11 @@ export class ChessModel implements GameboardModel<ChessPiece> {
     return this._chess;
   }
 
-  get pieces(): ReadonlySignal<PieceMap<ChessPiece>> {
+  get pieces(): Atom.Atom<PieceMap<ChessPiece>> {
     return this._pieces;
   }
 
-  get moveIndex(): ReadonlySignal<number> {
+  get moveIndex(): Atom.Atom<number> {
     return this._moveIndex;
   }
 
@@ -158,7 +161,7 @@ export class ChessModel implements GameboardModel<ChessPiece> {
 
     const current = this._chess.history();
     if (!isValidNextMove(previous, current)) {
-      this._pieces.value = {};
+      this._registry.set(this._pieces, {});
     }
 
     this._updateBoard(this._chess);
@@ -201,8 +204,8 @@ export class ChessModel implements GameboardModel<ChessPiece> {
    * Update pieces preserving identity.
    */
   private _updateBoard(chess: ChessJS): void {
-    this._pieces.value = createPieceMap(chess);
-    this._moveIndex.value = chess.history().length;
+    this._registry.set(this._pieces, createPieceMap(chess));
+    this._registry.set(this._moveIndex, chess.history().length);
   }
 }
 

package/src/components/Gameboard/Gameboard.tsx

@@ -8,13 +8,13 @@ import React, { type PropsWithChildren, forwardRef, useCallback, useEffect, useS
 
 import { log } from '@dxos/log';
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { Piece, type PieceProps } from './Piece';
 import { Square, type SquareProps } from './Square';
 import { type GameboardModel, type Move, type PieceRecord, isLocation, isPiece } from './types';
 
-export type GameboardContextValue<M extends GameboardModel> = {
+export type GameboardContextValue<M extends GameboardModel<any>> = {
   model: M;
   dragging?: boolean; // TODO(burdon): Change to PieceRecord.
   promoting?: PieceRecord;
@@ -23,7 +23,7 @@ export type GameboardContextValue<M extends GameboardModel> = {
 
 const [GameboardContextProvider, useRadixGameboardContext] = createContext<GameboardContextValue<any>>('Gameboard');
 
-const useGameboardContext = <M extends GameboardModel>(consumerName: string): GameboardContextValue<M> => {
+const useGameboardContext = <M extends GameboardModel<any>>(consumerName: string): GameboardContextValue<M> => {
   return useRadixGameboardContext(consumerName);
 };
 
@@ -31,7 +31,7 @@ const useGameboardContext = <M extends GameboardModel>(consumerName: string): Ga
 // Root
 //
 
-type GameboardRootProps<M extends GameboardModel> = PropsWithChildren<{
+type GameboardRootProps<M extends GameboardModel<any>> = PropsWithChildren<{
   model?: M;
   moveNumber?: number;
   onDrop?: (move: Move) => boolean;
@@ -40,11 +40,16 @@ type GameboardRootProps<M extends GameboardModel> = PropsWithChildren<{
 /**
  * Generic board container.
  */
-const GameboardRoot = <M extends GameboardModel>({ children, model, moveNumber, onDrop }: GameboardRootProps<M>) => {
+const GameboardRoot = <M extends GameboardModel<any>>({
+  children,
+  model,
+  moveNumber,
+  onDrop,
+}: GameboardRootProps<M>) => {
   const [dragging, setDragging] = useState(false);
   const [promoting, setPromoting] = useState<PieceRecord | undefined>();
 
-  const handlePromotion = useCallback<GameboardContextValue<M>['onPromotion']>((move) => {
+  const handlePromotion = useCallback<GameboardContextValue<GameboardModel<any>>['onPromotion']>((move) => {
     log('onPromotion', { move });
     setPromoting(undefined);
     onDrop?.(move);

package/src/components/Gameboard/Piece.tsx

@@ -11,7 +11,7 @@ import { createPortal } from 'react-dom';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { type ThemedClassName, useDynamicRef } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { useGameboardContext } from './Gameboard';
 import { type Location, type PieceRecord, type Player, isEqualLocation, isLocation } from './types';

package/src/components/Gameboard/Square.tsx

@@ -8,7 +8,7 @@ import React, { memo, useEffect, useRef, useState } from 'react';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { useGameboardContext } from './Gameboard';
 import { type Location, isPiece } from './types';

package/src/components/Gameboard/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type ReadonlySignal } from '@preact/signals-core';
+import { type Atom } from '@effect-atom/atom-react';
 
 // TODO(burdon): Don't make this assumption.
 export type Player = 'black' | 'white';
@@ -54,8 +54,7 @@ export const isEqualLocation = (l1: Location, l2: Location): boolean => l1[0] ==
 export interface GameboardModel<T extends PieceType = PieceType> {
   readonly: boolean;
   turn: Player;
-  /** @reactive */
-  pieces: ReadonlySignal<PieceMap<T>>;
+  pieces: Atom.Atom<PieceMap<T>>;
   isValidMove: (move: Move) => boolean;
   canPromote?: (move: Move) => boolean;
 }