@dxos/react-ui-gameboard 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-gameboard",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fffef41",
   "description": "Game board.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -9,6 +9,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
@@ -26,33 +27,34 @@
     "@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.9.0",
-    "chess.js": "^1.0.0",
+    "@preact/signals-core": "^1.12.1",
+    "@radix-ui/react-context": "1.1.1",
+    "chess.js": "^1.4.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/debug": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/node-std": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@dxos/invariant": "0.8.4-main.fffef41",
+    "@dxos/debug": "0.8.4-main.fffef41",
+    "@dxos/log": "0.8.4-main.fffef41",
+    "@dxos/node-std": "0.8.4-main.fffef41",
+    "@dxos/util": "0.8.4-main.fffef41"
   },
   "devDependencies": {
     "@svgr/cli": "^8.1.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
     "lodash.defaultsdeep": "^4.6.1",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/storybook-utils": "0.8.4-main.fffef41"
   },
   "peerDependencies": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41"
   },
   "publishConfig": {
     "access": "public"
@@ -60,7 +62,7 @@
   "scripts": {
     "gen:pieces": "pnpm gen:pieces:chess",
     "gen:pieces:chess": "pnpm gen:pieces:chess:alpha && pnpm gen:pieces:chess:cburnett",
-    "gen:pieces:chess:alpha": "pnpm svgr --typescript --filename-case=camel --out-dir ./src/gen/pieces/chess/alpha ./assets/pieces/chess/alpha",
-    "gen:pieces:chess:cburnett": "pnpm svgr --typescript --filename-case=camel --out-dir ./src/gen/pieces/chess/cburnett ./assets/pieces/chess/cburnett"
+    "gen:pieces:chess:alpha": "pnpm svgr --typescript --filename-case=camel --out-dir ./src/gen/pieces/chess/alpha ./assets/pieces/chess/alpha > /dev/null",
+    "gen:pieces:chess:cburnett": "pnpm svgr --typescript --filename-case=camel --out-dir ./src/gen/pieces/chess/cburnett ./assets/pieces/chess/cburnett > /dev/null"
   }
 }

package/src/{Chessboard → components/Chessboard}/Chessboard.stories.tsx

@@ -2,31 +2,30 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { log } from '@dxos/log';
 import { Button, Toolbar } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { Gameboard, type GameboardRootProps, type Move, type Player } from '../Gameboard';
 
-import { Chessboard, type ChessboardProps } from './Chessboard';
 import { ChessModel } from './chess';
-import { Board, type BoardRootProps, type Player, type Move } from '../Board';
+import { Chessboard, type ChessboardProps } from './Chessboard';
 
-type RenderProps = Pick<ChessboardProps, 'orientation' | 'showLabels' | 'debug'> & {
-  fen: string;
+type DefaultStoryProps = Pick<ChessboardProps, 'orientation' | 'showLabels' | 'debug'> & {
+  pgn?: string;
 };
 
-const DefaultStory = ({ fen, orientation: _orientation, ...props }: RenderProps) => {
-  const model = useMemo(() => new ChessModel(fen), [fen]);
+const DefaultStory = ({ orientation: _orientation, pgn, ...props }: DefaultStoryProps) => {
+  const model = useMemo(() => new ChessModel(pgn), [pgn]);
   const [orientation, setOrientation] = useState<Player | undefined>(_orientation);
 
-  const handleDrop = useCallback<NonNullable<BoardRootProps['onDrop']>>(
+  const handleDrop = useCallback<NonNullable<GameboardRootProps<ChessModel>['onDrop']>>(
     (move: Move) => {
-      log.info('handleDrop', { move });
-      return model.makeMove(move);
+      const result = model.makeMove(move);
+      console.log(model.pgn);
+      return result;
     },
     [model],
   );
@@ -34,7 +33,7 @@ const DefaultStory = ({ fen, orientation: _orientation, ...props }: RenderProps)
   return (
     <div className='flex flex-col grow gap-2 overflow-hidden'>
       <Toolbar.Root>
-        <Button onClick={() => model.initialize()}>Reset</Button>
+        <Button onClick={() => model.update()}>Reset</Button>
         <Button onClick={() => model.makeRandomMove()}>Move</Button>
         <div className='grow'></div>
         <Button
@@ -43,14 +42,16 @@ const DefaultStory = ({ fen, orientation: _orientation, ...props }: RenderProps)
           Toggle
         </Button>
       </Toolbar.Root>
-      <Board.Root model={model} onDrop={handleDrop}>
-        <Chessboard orientation={orientation} {...props} />
-      </Board.Root>
+      <Gameboard.Root model={model} onDrop={handleDrop}>
+        <Gameboard.Content grow contain>
+          <Chessboard orientation={orientation} {...props} />
+        </Gameboard.Content>
+      </Gameboard.Root>
     </div>
   );
 };
 
-const Grid = (props: RenderProps) => {
+const GridStory = () => {
   const models = useMemo(() => Array.from({ length: 9 }).map(() => new ChessModel()), []);
   useEffect(() => {
     const i = setInterval(() => {
@@ -61,13 +62,13 @@ const Grid = (props: RenderProps) => {
   }, []);
 
   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'>
-            <Board.Root model={model}>
+            <Gameboard.Root model={model}>
               <Chessboard />
-            </Board.Root>
+            </Gameboard.Root>
           </div>
         ))}
       </div>
@@ -75,34 +76,34 @@ const Grid = (props: RenderProps) => {
   );
 };
 
-const meta: Meta<typeof DefaultStory> = {
+const meta = {
   title: 'ui/react-ui-gameboard/Chessboard',
   component: Chessboard,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: '' })],
-};
+  decorators: [withTheme, withLayout({ container: 'column' })],
+} satisfies Meta<typeof Chessboard>;
 
 export default meta;
 
-type Story = StoryObj<typeof DefaultStory>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};
 
 export const Promotion: Story = {
   args: {
-    fen: '4k3/7P/8/8/8/8/1p6/4K3 w - - 0 1',
+    pgn: '1. e4 e5 2. Nf3 Nc6 3. Bc4 Bc5 4. c3 Nf6 5. d4 exd4 6. cxd4 Bb4+ 7. Nc3 d5 8. exd5 Nxd5 9. O-O Be6 10. Qb3 Na5 11. Qa4+ c6 12. Bxd5 Bxc3 13. Bxe6 fxe6 14. d5 Qg5 15. dxe6 Kf8 16. e7+ Kg8 *',
   },
 };
 
 export const Debug: Story = {
   args: {
-    debug: true,
-    showLabels: true,
+    pgn: '1. e4 e5 2. Nf3 Nc6 3. Bc4 Bc5 4. c3 Nf6 5. d4 exd4 6. cxd4 Bb4+ 7. Nc3 d5 8. exd5 Nxd5 9. O-O Be6 10. Qb3 Na5 11. Qa4+ c6 12. Bxd5 Bxc3 13. Bxe6 fxe6 *',
     orientation: 'black',
-    fen: 'q3k1nr/1pp1nQpp/3p4/1P2p3/4P3/B1PP1b2/B5PP/5K2 b k - 0 17',
+    showLabels: true,
+    debug: true,
   },
 };
 
-export const Nine: Story = {
-  render: Grid,
+export const Grid = {
+  render: GridStory,
 };

package/src/components/Chessboard/Chessboard.tsx

@@ -0,0 +1,198 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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 { isNonNullable } from '@dxos/util';
+
+import {
+  type DOMRectBounds,
+  Gameboard,
+  type Location,
+  type PieceRecord,
+  type Player,
+  getRelativeBounds,
+  locationToString,
+  useGameboardContext,
+} from '../Gameboard';
+
+import { type ChessModel, type ChessPiece, ChessPieces, boardStyles, getSquareColor, locationToPos } from './chess';
+
+export type ChessboardProps = ThemedClassName<
+  PropsWithChildren<{
+    orientation?: Player;
+    showLabels?: boolean;
+    debug?: boolean;
+    rows?: number;
+    cols?: number;
+  }>
+>;
+
+/**
+ * Chessboard layout.
+ */
+const ChessboardComponent = forwardRef<HTMLDivElement, ChessboardProps>(
+  ({ classNames, orientation, showLabels, debug, rows = 8, cols = 8 }, forwardedRef) => {
+    const targetRef = useForwardedRef(forwardedRef);
+    const { width, height } = useResizeDetector({ targetRef, refreshRate: 200 });
+    const { model, promoting, onPromotion } = useGameboardContext<ChessModel>(Chessboard.displayName!);
+
+    // Board squares.
+    const squares = useMemo<Location[]>(() => {
+      return Array.from({ length: rows }, (_, i) => (orientation === 'black' ? i : rows - 1 - i)).flatMap((row) =>
+        Array.from({ length: cols }).map((_, col) => [row, col] as Location),
+      );
+    }, [orientation, rows, cols]);
+
+    // Use DOM grid layout to position squares.
+    const layout = useMemo(() => {
+      return squares.map((location) => {
+        return (
+          <div
+            key={locationToString(location)}
+            {...{
+              ['data-location' as const]: locationToString(location),
+            }}
+          />
+        );
+      });
+    }, [squares]);
+
+    // Build map of square locations to bounds.
+    const [grid, setGrid] = useState<Record<string, DOMRectBounds>>({});
+    const gridRef = useRef<HTMLDivElement>(null);
+    useEffect(() => {
+      setGrid(
+        squares.reduce(
+          (acc, location) => {
+            const square = getSquareLocation(gridRef.current!, location)!;
+            const bounds = getRelativeBounds(gridRef.current!, square);
+            return { ...acc, [locationToString(location)]: bounds };
+          },
+          {} as Record<string, DOMRectBounds>,
+        ),
+      );
+    }, [squares, width, height]);
+
+    // Get the bounds of each square and piece.
+    const positions = useMemo<{ piece: PieceRecord; bounds: DOMRectBounds }[]>(() => {
+      if (!gridRef.current) {
+        return [];
+      }
+
+      return Object.values(model?.pieces.value ?? {})
+        .map((piece) => {
+          if (piece.id === promoting?.id) {
+            return null;
+          }
+
+          const bounds = grid[locationToString(piece.location)];
+          return { piece, bounds };
+        })
+        .filter(isNonNullable);
+    }, [grid, model?.pieces.value, promoting]);
+
+    return (
+      <div ref={targetRef} tabIndex={0} className={mx('relative outline-none', classNames)}>
+        {/* DOM Layout. */}
+        <div ref={gridRef} className='grid grid-rows-8 grid-cols-8 aspect-square select-none'>
+          {layout}
+        </div>
+        {/* Squares. */}
+        <div>
+          {squares.map((location) => (
+            <Gameboard.Square
+              key={locationToString(location)}
+              location={location}
+              label={showLabels ? locationToPos(location) : undefined}
+              bounds={grid[locationToString(location)]}
+              classNames={getSquareColor(location)}
+            />
+          ))}
+        </div>
+        {/* Pieces. */}
+        <div className={mx(promoting && 'opacity-50')}>
+          {positions.map(({ bounds, piece }) => (
+            <Gameboard.Piece
+              key={piece.id}
+              piece={piece}
+              bounds={bounds}
+              label={debug ? piece.id : undefined}
+              orientation={orientation}
+              Component={ChessPieces[piece.type as ChessPiece]}
+            />
+          ))}
+        </div>
+        {/* Promotion selector. */}
+        {promoting && (
+          <PromotionSelector
+            grid={grid}
+            piece={promoting}
+            onSelect={(piece) => {
+              onPromotion({
+                from: Object.values(model.pieces.value).find((p) => p.id === promoting.id)!.location,
+                to: piece.location,
+                piece: promoting.type,
+                promotion: piece.type,
+              });
+            }}
+          />
+        )}
+      </div>
+    );
+  },
+);
+
+ChessboardComponent.displayName = 'Chessboard';
+
+export const Chessboard = memo(ChessboardComponent);
+
+const PromotionSelector = ({
+  grid,
+  piece,
+  onSelect,
+}: {
+  grid: Record<string, DOMRectBounds>;
+  piece: PieceRecord;
+  onSelect: (piece: PieceRecord) => void;
+}) => {
+  const positions = ['Q', 'N', 'R', 'B'].map((pieceType, i) => {
+    const location = [piece.location[0] + (piece.location[0] === 0 ? i : -i), piece.location[1]] as Location;
+    return {
+      piece: {
+        id: `promotion-${pieceType}`,
+        type: (piece.side === 'black' ? 'B' : 'W') + pieceType,
+        side: piece.side,
+        location,
+      },
+      bounds: grid[locationToString(location)],
+    };
+  });
+
+  const handleSelect = (selected: PieceRecord) => {
+    onSelect({ ...piece, type: selected.type });
+  };
+
+  return (
+    <>
+      {positions.map(({ piece, bounds }) => (
+        <Gameboard.Piece
+          key={piece.id}
+          classNames={mx('border-2 border-neutral-700 rounded-full', boardStyles.promotion)}
+          piece={piece}
+          bounds={bounds}
+          Component={ChessPieces[piece.type as ChessPiece]}
+          onClick={() => handleSelect(piece)}
+        />
+      ))}
+    </>
+  );
+};
+
+const getSquareLocation = (container: HTMLElement, location: Location): HTMLElement | null => {
+  return container.querySelector(`[data-location="${locationToString(location)}"]`);
+};

package/src/components/Chessboard/chess.test.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Chess as ChessJS } from 'chess.js';
+import { describe, it } from 'vitest';
+
+import { createPieceMap } from './chess';
+
+describe('ChessModel', () => {
+  it('should update pieces', ({ expect }) => {
+    const chess = new ChessJS();
+    chess.loadPgn(
+      '1. e4 e5 2. Nf3 Nc6 3. Bc4 Bc5 4. c3 Nf6 5. d4 exd4 6. cxd4 Bb4+ 7. Nc3 d5 8. exd5 Nxd5 9. O-O Be6 10. Qb3 Na5 11. Qa4+ c6 12. Bxd5 Bxc3 13. Bxe6 fxe6 *',
+    );
+    const pieces = createPieceMap(chess);
+    expect(pieces).to.exist;
+  });
+});