@dxos/plugin-chess 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-chess",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.bcb3aa67d6",
   "description": "Chess for new plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,15 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#blueprints": "./src/blueprints/index.ts",
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -31,6 +40,12 @@
       "browser": "./dist/lib/browser/cli/index.mjs",
       "node": "./dist/lib/node-esm/cli/index.mjs"
     },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.mjs"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
@@ -52,51 +67,52 @@
   ],
   "dependencies": {
     "@automerge/automerge": "3.2.3",
-    "@effect-atom/atom-react": "^0.4.6",
+    "@effect-atom/atom-react": "^0.5.0",
     "chess.js": "^1.0.0",
-    "effect": "3.19.11",
-    "@dxos/ai": "0.8.4-main.bc674ce",
-    "@dxos/app-framework": "0.8.4-main.bc674ce",
-    "@dxos/async": "0.8.4-main.bc674ce",
-    "@dxos/display-name": "0.8.4-main.bc674ce",
-    "@dxos/assistant": "0.8.4-main.bc674ce",
-    "@dxos/echo-db": "0.8.4-main.bc674ce",
-    "@dxos/echo": "0.8.4-main.bc674ce",
-    "@dxos/echo-react": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/blueprints": "0.8.4-main.bc674ce",
-    "@dxos/functions": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/plugin-client": "0.8.4-main.bc674ce",
-    "@dxos/operation": "0.8.4-main.bc674ce",
-    "@dxos/plugin-markdown": "0.8.4-main.bc674ce",
-    "@dxos/plugin-graph": "0.8.4-main.bc674ce",
-    "@dxos/react-client": "0.8.4-main.bc674ce",
-    "@dxos/plugin-space": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-gameboard": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-mosaic": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-sfx": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-stack": "0.8.4-main.bc674ce",
-    "@dxos/schema": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce",
-    "@dxos/types": "0.8.4-main.bc674ce"
+    "effect": "3.20.0",
+    "@dxos/app-framework": "0.8.4-main.bcb3aa67d6",
+    "@dxos/app-toolkit": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ai": "0.8.4-main.bcb3aa67d6",
+    "@dxos/assistant": "0.8.4-main.bcb3aa67d6",
+    "@dxos/async": "0.8.4-main.bcb3aa67d6",
+    "@dxos/blueprints": "0.8.4-main.bcb3aa67d6",
+    "@dxos/display-name": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-db": "0.8.4-main.bcb3aa67d6",
+    "@dxos/functions": "0.8.4-main.bcb3aa67d6",
+    "@dxos/log": "0.8.4-main.bcb3aa67d6",
+    "@dxos/invariant": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-react": "0.8.4-main.bcb3aa67d6",
+    "@dxos/operation": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-markdown": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-graph": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-space": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-gameboard": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-mosaic": "0.8.4-main.bcb3aa67d6",
+    "@dxos/schema": "0.8.4-main.bcb3aa67d6",
+    "@dxos/util": "0.8.4-main.bcb3aa67d6",
+    "@dxos/types": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-sfx": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-stack": "0.8.4-main.bcb3aa67d6"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/plugin-theme": "0.8.4-main.bc674ce",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/storybook-utils": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce"
+    "vite": "^7.1.11",
+    "@dxos/react-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-theme": "0.8.4-main.bcb3aa67d6",
+    "@dxos/storybook-utils": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-theme": "0.8.4-main.bcb3aa67d6"
   },
   "peerDependencies": {
     "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"
+    "@dxos/react-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-theme": "0.8.4-main.bcb3aa67d6"
   },
   "publishConfig": {
     "access": "public"

package/src/ChessPlugin.tsx

@@ -3,32 +3,47 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Annotation } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
 import { type CreateObject } from '@dxos/plugin-space/types';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
 
-import { ChessBlueprint } from './blueprints';
-import { BlueprintDefinition, ReactSurface } from './capabilities';
-import { meta } from './meta';
+import { ChessBlueprint } from '#blueprints';
+import { meta } from '#meta';
 import { translations } from './translations';
-import { Chess } from './types';
+import { Chess } from '#types';
+
+import { BlueprintDefinition, OperationHandler, ReactSurface } from '#capabilities';
 
 export const ChessPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addMetadataModule({
     metadata: {
       id: Chess.Game.typename,
       metadata: {
-        icon: 'ph--shield-chevron--regular',
-        iconHue: 'amber',
-        blueprints: [ChessBlueprint.Key],
-        createObject: ((props) => Effect.sync(() => Chess.make(props))) satisfies CreateObject,
-        addToCollectionOnCreate: true,
+        icon: Annotation.IconAnnotation.get(Chess.Game).pipe(Option.getOrThrow).icon,
+        iconHue: Annotation.IconAnnotation.get(Chess.Game).pipe(Option.getOrThrow).hue ?? 'white',
+        blueprints: [ChessBlueprint.key],
+        createObject: ((props, options) =>
+          Effect.gen(function* () {
+            const object = Chess.make(props);
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          })) satisfies CreateObject,
       },
     },
   }),
-  Common.Plugin.addSchemaModule({ schema: [Chess.Game] }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addSchemaModule({ schema: [Chess.Game] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );

package/src/blueprints/chess-blueprint.ts

@@ -2,21 +2,21 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type AppCapabilities } from '@dxos/app-toolkit';
 import { Blueprint, Template } from '@dxos/blueprints';
-import { type FunctionDefinition } from '@dxos/functions';
 import { trim } from '@dxos/util';
 
-import { create, move, play, print } from './functions';
+import { Create, Move, Play, Print } from '#operations';
 
-export const Key = 'dxos.org/blueprint/chess';
+const BLUEPRINT_KEY = 'org.dxos.blueprint.chess';
 
-export const functions: FunctionDefinition[] = [create, move, play, print];
+const operations = [Create, Move, Play, Print];
 
-export const make = () =>
+const make = () =>
   Blueprint.make({
-    key: Key,
+    key: BLUEPRINT_KEY,
     name: 'Chess',
-    tools: Blueprint.toolDefinitions({ functions }),
+    tools: Blueprint.toolDefinitions({ operations }),
     instructions: Template.make({
       source: trim`
         You are an expert chess player.
@@ -26,3 +26,10 @@ export const make = () =>
       `,
     }),
   });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  make,
+};
+
+export default blueprint;

package/src/blueprints/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as ChessBlueprint from './chess-blueprint';
-export * as ChessFunctions from './functions';
+export { default as ChessBlueprint } from './chess-blueprint';
+export * as ChessFunctions from '../operations';

package/src/capabilities/{artifact-definition/artifact-definition.ts → artifact-definition.ts}

@@ -15,12 +15,12 @@ import { ArtifactId, VersionPin, createArtifactElement } from '@dxos/assistant';
 import { defineArtifact } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { SpaceOperation } from '@dxos/plugin-space/types';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { Filter, type Space } from '@dxos/react-client/echo';
 import { trim } from '@dxos/util';
 
-import { meta } from '../../meta';
-import { Chess } from '../../types';
+import { meta } from '#meta';
+import { Chess } from '#types';
 
 // TODO(burdon): Factor out.
 declare global {
@@ -121,8 +121,8 @@ export default Capability.makeModule(() =>
               return ToolResult.Error(error.message);
             }
 
-            Obj.change(game, (g) => {
-              g.pgn = chess.pgn();
+            Obj.change(game, (obj) => {
+              obj.pgn = chess.pgn();
             });
             return ToolResult.Success(game.pgn);
           },

package/src/capabilities/blueprint-definition.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+
+import { ChessBlueprint } from '#blueprints';
+
+const blueprintDefinition = Capability.makeModule<
+  [],
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
+>(() => Effect.succeed([Capability.contributes(AppCapabilities.BlueprintDefinition, ChessBlueprint)]));
+
+export default blueprintDefinition;

package/src/capabilities/index.ts

@@ -2,5 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './blueprint-definition';
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,14 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/operation';
+
+import { ChessHandlers } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, ChessHandlers);
+  }),
+);

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { Obj } from '@dxos/echo';
+
+import { ChessArticle, ChessCard } from '#containers';
+import { meta } from '#meta';
+import { Chess } from '#types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: meta.id,
+        role: ['article', 'section'],
+        filter: (data): data is { subject: Chess.Game } => Obj.instanceOf(Chess.Game, data.subject),
+        component: ({ data, role }) => <ChessArticle role={role} subject={data.subject} />,
+      }),
+      Surface.create({
+        id: meta.id,
+        role: ['card--content'],
+        filter: (data): data is { subject: Chess.Game } => Obj.instanceOf(Chess.Game, data.subject),
+        component: ({ data, role }) => <ChessCard role={role} subject={data.subject} />,
+      }),
+    ]),
+  ),
+);

package/src/cli/plugin.ts

@@ -4,23 +4,34 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
 import { type CreateObject } from '@dxos/plugin-space/types';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
 
-import { meta } from '../meta';
-import { Chess } from '../types';
+import { meta } from '#meta';
+import { Chess } from '#types';
 
 // TODO(wittjosiah): Factor out shared modules.
 export const ChessPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addSchemaModule({ schema: [Chess.Game] }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addMetadataModule({
     metadata: {
       id: Chess.Game.typename,
       metadata: {
-        createObject: ((props) => Effect.sync(() => Chess.make(props))) satisfies CreateObject,
-        addToCollectionOnCreate: true,
+        createObject: ((props, options) =>
+          Effect.gen(function* () {
+            const object = Chess.make(props);
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          })) satisfies CreateObject,
       },
     },
   }),
+  AppPlugin.addSchemaModule({ schema: [Chess.Game] }),
   Plugin.make,
 );

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

@@ -0,0 +1,94 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
+
+import { withClientProvider } from '@dxos/react-client/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { type Player } from '@dxos/react-ui-gameboard';
+
+import { translations } from '../../translations';
+import { Chess } from '#types';
+
+import { Chessboard, type ChessboardController, type ChessboardInfoProps } from './Chessboard';
+
+const SAMPLE_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 *';
+
+const PROMOTION_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 *';
+
+type DefaultStoryProps = {
+  pgn?: string;
+};
+
+const DefaultStory = ({ pgn }: DefaultStoryProps) => {
+  const game = useMemo(() => Chess.make(pgn ? { pgn } : undefined), [pgn]);
+  const [orientation, setOrientation] = useState<Player>('white');
+  const [showInfo, setShowInfo] = useState(true);
+  const controller = useRef<ChessboardController>(null);
+
+  const handleSelect = useCallback<NonNullable<ChessboardInfoProps['onSelect']>>((index) => {
+    controller.current?.setMoveNumber(index);
+  }, []);
+
+  return (
+    <Chessboard.Root game={game} ref={controller}>
+      <div className='flex h-full w-full gap-4 p-4 overflow-hidden'>
+        <Chessboard.Content classNames='grow'>
+          <Chessboard.Board classNames='border rounded-xs' orientation={orientation} />
+        </Chessboard.Content>
+        {showInfo && (
+          <div className='flex flex-col justify-center items-center overflow-hidden'>
+            <Chessboard.Info
+              orientation={orientation}
+              min={8}
+              max={8}
+              onOrientationChange={setOrientation}
+              onClose={() => setShowInfo(false)}
+              onSelect={handleSelect}
+            />
+          </div>
+        )}
+      </div>
+    </Chessboard.Root>
+  );
+};
+
+const meta = {
+  title: 'plugins/plugin-chess/components/Chessboard',
+  component: DefaultStory,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' }), withClientProvider({ createIdentity: true })],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {},
+};
+
+export const WithPgn: Story = {
+  args: {
+    pgn: SAMPLE_PGN,
+  },
+};
+
+export const Promotion: Story = {
+  args: {
+    pgn: PROMOTION_PGN,
+  },
+};
+
+export const NewGame: Story = {
+  args: {
+    pgn: undefined,
+  },
+};

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

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import { RegistryContext } from '@effect-atom/atom-react';
 import React, {
   type PropsWithChildren,
   forwardRef,
@@ -15,10 +15,10 @@ import React, {
 } from 'react';
 
 import { addEventListener } from '@dxos/async';
-import { Obj } from '@dxos/echo';
+import { useObject } from '@dxos/echo-react';
 import { type ThemedClassName } from '@dxos/react-ui';
 import {
-  ChessModel,
+  type ChessModel,
   Gameboard,
   type GameboardRootProps,
   Chessboard as NaturalChessboard,
@@ -27,25 +27,16 @@ import {
   useGameboardContext,
 } from '@dxos/react-ui-gameboard';
 import { useSoundEffect } from '@dxos/react-ui-sfx';
-import { mx } from '@dxos/ui-theme';
 
-import { type Chess } from '../types';
+import { type Chess } from '#types';
 
 import { Info, type InfoProps } from './Info';
+import { ExtendedChessModel } from './types';
 
 export interface ChessboardController {
   setMoveNumber(index: number): void;
 }
 
-export class ExtendedChessModel extends ChessModel {
-  constructor(
-    registry: Registry.Registry,
-    readonly object: Chess.Game,
-  ) {
-    super(registry);
-  }
-}
-
 //
 // Root
 //
@@ -58,6 +49,7 @@ const Root = forwardRef<ChessboardController, RootProps>(({ game, children }, fo
   const registry = useContext(RegistryContext);
   const model = useMemo(() => new ExtendedChessModel(registry, game), [registry]);
   const click = useSoundEffect('Click');
+  const [pgn, updatePgn] = useObject(game, 'pgn');
 
   // Controller.
   useImperativeHandle(forwardedRef, () => {
@@ -66,17 +58,21 @@ const Root = forwardRef<ChessboardController, RootProps>(({ game, children }, fo
     };
   }, [model]);
 
+  // TODO(wittjosiah): Rather than useEffect to sync ECHO object to model, create an alternative model implementation.
+  //   This model would take the ECHO object and derive game state directly from that.
+  //   Mutation methods would mutate the ECHO object and other state would be derived from that.
+
   // External change.
   // NOTE: Warning if user has not interacted with the board.
   useEffect(() => {
-    if (model.pgn !== getRawPgn(game.pgn ?? '')) {
+    if (model.pgn !== getRawPgn(pgn ?? '')) {
       const silent = model.pgn === '*';
-      model.update(game.pgn);
+      model.update(pgn);
       if (!silent) {
         void click.play();
       }
     }
-  }, [game.pgn]);
+  }, [pgn]);
 
   // Move.
   const handleDrop = useCallback<NonNullable<GameboardRootProps<ChessModel>['onDrop']>>(
@@ -86,9 +82,7 @@ const Root = forwardRef<ChessboardController, RootProps>(({ game, children }, fo
       }
 
       void click.play();
-      Obj.change(game, (g) => {
-        g.pgn = model.pgn;
-      });
+      updatePgn(() => model.pgn);
       return true;
     },
     [model],
@@ -105,17 +99,13 @@ const Root = forwardRef<ChessboardController, RootProps>(({ game, children }, fo
 // Content
 //
 
-type Role = 'card--popover' | 'card--intrinsic' | 'card--extrinsic';
+type Role = 'card--content';
 
 type ContentProps = ThemedClassName<PropsWithChildren<{ role?: Role }>>;
 
-const Content = ({ classNames, children, role }: ContentProps) => {
+const Content = ({ classNames, children }: ContentProps) => {
   return (
-    <Gameboard.Content
-      classNames={mx(classNames, role === 'card--popover' && 'size-container popover-square')}
-      grow={!role || role === 'card--extrinsic'}
-      contain={!role || role === 'card--extrinsic' || role === 'card--popover'}
-    >
+    <Gameboard.Content grow contain classNames={classNames}>
       {children}
     </Gameboard.Content>
   );
@@ -125,11 +115,13 @@ const Content = ({ classNames, children, role }: ContentProps) => {
 // Board
 //
 
+const BOARD_NAME = 'Chessboard.Board';
+
 type BoardProps = NaturalChessboardProps;
 
 const Board = (props: BoardProps) => {
   const registry = useContext(RegistryContext);
-  const { model } = useGameboardContext<ChessModel>(Board.displayName);
+  const { model } = useGameboardContext<ChessModel>(BOARD_NAME);
 
   // Keyboard navigation.
   const ref = useRef<HTMLDivElement>(null);
@@ -164,10 +156,10 @@ const Board = (props: BoardProps) => {
     });
   }, [registry, model]);
 
-  return <NaturalChessboard ref={ref} {...props} />;
+  return <NaturalChessboard {...props} ref={ref} />;
 };
 
-Board.displayName = 'Chessboard.Board';
+Board.displayName = BOARD_NAME;
 
 //
 // Chessboard