diff --git a/README.md b/README.md index c394cba..c18d8f4 100644 --- a/README.md +++ b/README.md @@ -10,15 +10,19 @@ With this plugin, you can either import PGNs or simply start a fresh new game. I ## Table of contents -- [Motivation](#motivation) -- [Installation](#installation) -- [Usage](#usage) -- [Features](#features) -- [Settings](#settings) -- [Roadmap](#roadmap) -- [Tools Used](#tools-used) -- [Alternatives](#alternatives) -- [License](#license) +- [Obsidian Chess Study](#obsidian-chess-study) + - [Table of contents](#table-of-contents) + - [Motivation](#motivation) + - [Installation](#installation) + - [Usage](#usage) + - [Features](#features) + - [1.0.0](#100) + - [1.0.1](#101) + - [Settings](#settings) + - [Roadmap](#roadmap) + - [Tools Used](#tools-used) + - [Alternatives](#alternatives) + - [License](#license) ## Motivation @@ -40,12 +44,14 @@ Once you click `Submit`, Obsidian Chess Study will parse the PGN, generate a new ![chess-study-codeblock](imgs/chess-study-codeblock.png) -After that the PGN viewer/editor will render and you are good to go: +After that the PGN viewer/editor will render and you are good to go (styles are aligned with your theme and accent color): -![cchess-study-codeblock](imgs/chess-study-demo.gif) +![chess-study-codeblock](imgs/chess-study-demo.gif) ## Features +### 1.0.0 + - [x] Import PGNs - [x] Store game state in JSON - [x] Add custom PGN viewer @@ -54,6 +60,12 @@ After that the PGN viewer/editor will render and you are good to go: - [x] Draw and sync shapes - [x] Add and sync comments with Markdown support +### 1.0.1 + +- [x] Add support for variants (depth 1) + +![chess-study-variants](imgs/chess-study-variants.png) + ## Settings Here are the available settings for a `chessStudy` code block: @@ -68,7 +80,7 @@ You can permanently set some settings in the [Obsidian](https://obsidian.md/) pl ## Roadmap -- [ ] Add support for variants +- [ ] Add undo button - [ ] Add view to manage stored games - [ ] Add more styles - [ ] Add more settings diff --git a/imgs/chess-study-variants.png b/imgs/chess-study-variants.png new file mode 100644 index 0000000..a7e666c Binary files /dev/null and b/imgs/chess-study-variants.png differ diff --git a/manifest.json b/manifest.json index 272531c..c49c1d3 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "chess-study", "name": "Chess Study", - "version": "1.0.0", + "version": "1.0.1", "minAppVersion": "0.15.0", "description": "A chess study helper and PGN viewer/editor.", "author": "Christoph Lindstädt", diff --git a/package-lock.json b/package-lock.json index 938f64b..788a45e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,13 +14,15 @@ "@tiptap/starter-kit": "2.0.3", "chess.js": "1.0.0-beta.6", "chessground": "8.3.7", - "lucide-react": "0.217.0", + "immer": "^10.0.2", + "lucide-react": "0.220.0", "nanoid": "4.0.2", "react": "18.2.0", - "react-dom": "18.2.0" + "react-dom": "18.2.0", + "use-immer": "^0.9.0" }, "devDependencies": { - "@types/node": "20.1.7", + "@types/node": "20.2.1", "@types/react": "18.2.6", "@types/react-dom": "18.2.4", "@typescript-eslint/eslint-plugin": "5.59.6", @@ -34,7 +36,7 @@ "prettier": "2.8.8", "prettier-plugin-organize-imports": "3.2.2", "pretty-quick": "3.1.3", - "tslib": "2.5.0", + "tslib": "2.5.2", "typescript": "5.0.4" } }, @@ -1528,9 +1530,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.1.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.7.tgz", - "integrity": "sha512-WCuw/o4GSwDGMoonES8rcvwsig77dGCMbZDrZr2x4ZZiNW4P/gcoZXe/0twgtobcTkmg9TuKflxYL/DuwDyJzg==", + "version": "20.2.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.1.tgz", + "integrity": "sha512-DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg==", "dev": true }, "node_modules/@types/object.omit": { @@ -3147,6 +3149,15 @@ "node": ">= 4" } }, + "node_modules/immer": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/immer/-/immer-10.0.2.tgz", + "integrity": "sha512-Rx3CqeqQ19sxUtYV9CU911Vhy8/721wRFnJv3REVGWUmoAcIwzifTsdmJte/MV+0/XpM35LZdQMBGkRIoLPwQA==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/immer" + } + }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -3638,9 +3649,9 @@ } }, "node_modules/lucide-react": { - "version": "0.217.0", - "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.217.0.tgz", - "integrity": "sha512-I4DHIW9EDYuAFNFpkYHZw7lh++BM9Vim86L+gLdSAnb7WwAB2JpGrOl9j8a6c8PSw67UXc3gxj3c26smyZ+7mg==", + "version": "0.220.0", + "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.220.0.tgz", + "integrity": "sha512-bYtGUsLAWBvZu+BzAU/ziP1gzE4LwMEXLnlgSr1yUKEPPalLG77JLd5GdYebOVkpm+GtqRqnp6tEKDX7Bm8ZlQ==", "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0" } @@ -4863,9 +4874,9 @@ } }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz", + "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==", "dev": true }, "node_modules/tsutils": { @@ -5001,6 +5012,15 @@ "punycode": "^2.1.0" } }, + "node_modules/use-immer": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/use-immer/-/use-immer-0.9.0.tgz", + "integrity": "sha512-/L+enLi0nvuZ6j4WlyK0US9/ECUtV5v9RUbtxnn5+WbtaXYUaOBoKHDNL9I5AETdurQ4rIFIj/s+Z5X80ATyKw==", + "peerDependencies": { + "immer": ">=2.0.0", + "react": "^16.8.0 || ^17.0.1 || ^18.0.0" + } + }, "node_modules/w3c-keyname": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", diff --git a/package.json b/package.json index 84c6434..2659afa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chess-study", - "version": "1.0.0", + "version": "1.0.1", "description": "A chess study helper and PGN viewer/editor.", "keywords": [ "chess", @@ -22,13 +22,15 @@ "@tiptap/starter-kit": "2.0.3", "chess.js": "1.0.0-beta.6", "chessground": "8.3.7", - "lucide-react": "0.217.0", + "immer": "^10.0.2", + "lucide-react": "0.220.0", "nanoid": "4.0.2", "react": "18.2.0", - "react-dom": "18.2.0" + "react-dom": "18.2.0", + "use-immer": "^0.9.0" }, "devDependencies": { - "@types/node": "20.1.7", + "@types/node": "20.2.1", "@types/react": "18.2.6", "@types/react-dom": "18.2.4", "@typescript-eslint/eslint-plugin": "5.59.6", @@ -42,7 +44,7 @@ "prettier": "2.8.8", "prettier-plugin-organize-imports": "3.2.2", "pretty-quick": "3.1.3", - "tslib": "2.5.0", + "tslib": "2.5.2", "typescript": "5.0.4" } } diff --git a/src/components/ReactView.tsx b/src/components/ReactView.tsx index 7818f5b..dbe28cb 100644 --- a/src/components/ReactView.tsx +++ b/src/components/ReactView.tsx @@ -1,7 +1,7 @@ import { App, MarkdownRenderChild } from 'obsidian'; import * as React from 'react'; import * as ReactDOM from 'react-dom/client'; -import { ChessStudyDataAdapter, ChessStudyFileData } from 'src/utils'; +import { ChessStudyDataAdapter, ChessStudyFileData } from 'src/lib/storage'; import { ChessStudyPluginSettings } from './obsidian/SettingsTab'; import { ChessStudy } from './react/ChessStudy'; diff --git a/src/components/react/ChessStudy.tsx b/src/components/react/ChessStudy.tsx index f0c126d..fe9d246 100644 --- a/src/components/react/ChessStudy.tsx +++ b/src/components/react/ChessStudy.tsx @@ -2,20 +2,29 @@ import { JSONContent } from '@tiptap/react'; import { Chess, Move } from 'chess.js'; import { Api } from 'chessground/api'; import { DrawShape } from 'chessground/draw'; +import { nanoid } from 'nanoid'; import { App, Notice } from 'obsidian'; import * as React from 'react'; import { useCallback, useMemo, useState } from 'react'; import { ChessStudyPluginSettings } from 'src/components/obsidian/SettingsTab'; +import { parseUserConfig } from 'src/lib/obsidian'; import { ChessStudyDataAdapter, ChessStudyFileData, - parseUserConfig, -} from 'src/utils'; -import { ChessGroundSettings, ChessgroundWrapper } from './ChessgroundWrapper'; + ChessStudyMove, + VariantMove, +} from 'src/lib/storage'; +import { + displayMoveInHistory, + findMoveIndex, + getCurrentMove, +} from 'src/lib/ui-state'; +import { useImmerReducer } from 'use-immer'; +import { ChessgroundProps, ChessgroundWrapper } from './ChessgroundWrapper'; import { CommentSection } from './CommentSection'; import { PgnViewer } from './PgnViewer'; -export type ChessStudyConfig = ChessGroundSettings; +export type ChessStudyConfig = ChessgroundProps; interface AppProps { source: string; @@ -25,6 +34,20 @@ interface AppProps { dataAdapter: ChessStudyDataAdapter; } +export interface GameState { + currentMove: ChessStudyMove | VariantMove; + isViewOnly: boolean; + study: ChessStudyFileData; +} + +export type GameActions = + | { type: 'ADD_MOVE_TO_HISTORY'; move: Move } + | { type: 'DISPLAY_NEXT_MOVE_IN_HISTORY' } + | { type: 'DISPLAY_PREVIOUS_MOVE_IN_HISTORY' } + | { type: 'DISPLAY_SELECTED_MOVE_IN_HISTORY'; moveId: string } + | { type: 'SYNC_SHAPES'; shapes: DrawShape[] } + | { type: 'SYNC_COMMENT'; comment: JSONContent | null }; + export const ChessStudy = ({ source, pluginSettings, @@ -37,11 +60,11 @@ export const ChessStudy = ({ source ); - const [chessStudyDataModified] = useState(chessStudyData); - - // Setup Chessboard and Chess.js APIs + // Setup Chessground API const [chessView, setChessView] = useState(null); - const chessLogic = useMemo(() => { + + // Setup Chess.js API + const initialChessLogic = useMemo(() => { const chess = new Chess(); chessStudyData.moves.forEach((move) => { @@ -54,131 +77,211 @@ export const ChessStudy = ({ return chess; }, [chessStudyData.moves]); - // Track Application State - const [history, setHistory] = useState([]); - const [isViewOnly, setIsViewOnly] = useState(false); - const [currentMove, setCurrentMove] = useState(0); - const [shapes, setShapes] = useState( - chessStudyData.moves.map((data) => data.shapes) - ); - const [comments, setComments] = useState<(JSONContent | null)[]>( - chessStudyData.moves.map((data) => data.comment) - ); + const [chessLogic, setChessLogic] = useState(initialChessLogic); - //PgnViewer Functions - const onBackButtonClick = useCallback(() => { - if (currentMove >= 0) { - setCurrentMove((currentMove) => { - const move = history[currentMove]; - const tempChess = new Chess(move.before); - chessView?.set({ - fen: move.before, - check: tempChess.isCheck(), - }); - setIsViewOnly(true); - return currentMove - 1; - }); - } - }, [chessView, currentMove, history]); + const [gameState, dispatch] = useImmerReducer( + (draft, action) => { + switch (action.type) { + case 'DISPLAY_NEXT_MOVE_IN_HISTORY': { + if (!chessView) return draft; - const onForwardButtonClick = useCallback(() => { - if (currentMove < history.length - 1) { - setCurrentMove((currentMove) => { - const move = history[currentMove + 1]; - const tempChess = new Chess(move.after); - chessView?.set({ - fen: move.after, - check: tempChess.isCheck(), - }); - if (currentMove + 1 === history.length - 1) setIsViewOnly(false); - return currentMove + 1; - }); - } - }, [currentMove, chessView, history]); - - const onMoveItemClick = useCallback( - (moveIndex: number) => { - if (moveIndex !== currentMove) { - setCurrentMove(() => { - const move = history[moveIndex]; - const tempChess = new Chess(move.after); - chessView?.set({ - fen: move.after, - check: tempChess.isCheck(), + displayMoveInHistory(draft, chessView, setChessLogic, { + offset: 1, + selectedMoveId: null, }); - if (moveIndex !== history.length - 1) { - setIsViewOnly(true); + + return draft; + } + case 'DISPLAY_PREVIOUS_MOVE_IN_HISTORY': { + if (!chessView) return draft; + + displayMoveInHistory(draft, chessView, setChessLogic, { + offset: -1, + selectedMoveId: null, + }); + + return draft; + } + case 'DISPLAY_SELECTED_MOVE_IN_HISTORY': { + if (!chessView) return draft; + + const selectedMoveId = action.moveId; + + displayMoveInHistory(draft, chessView, setChessLogic, { + offset: 0, + selectedMoveId: selectedMoveId, + }); + + return draft; + } + case 'SYNC_SHAPES': { + const move = getCurrentMove(draft); + + move.shapes = action.shapes; + draft.currentMove = move; + + return draft; + } + case 'SYNC_COMMENT': { + const move = getCurrentMove(draft); + + move.comment = action.comment; + draft.currentMove = move; + + return draft; + } + case 'ADD_MOVE_TO_HISTORY': { + const newMove = action.move; + + const moves = draft.study.moves; + const currentMoveId = draft.currentMove?.moveId; + + const currentMoveIndex = moves.findIndex( + (move) => move.moveId === currentMoveId + ); + + const { variant, moveIndex } = findMoveIndex(moves, currentMoveId); + const moveId = nanoid(); + + if (variant) { + //handle variant + const parent = moves[variant.parentMoveIndex]; + const variantMoves = parent.variants[variant.variantIndex].moves; + + const isLastMove = moveIndex === variantMoves.length - 1; + + //Only push if its the last move in the variant because depth can only be 1 + if (isLastMove) { + const move = { + ...newMove, + moveId: moveId, + shapes: [], + comment: null, + }; + variantMoves.push(move); + + const tempChess = new Chess(newMove.after); + + draft.currentMove = move; + + chessView?.set({ + fen: newMove.after, + check: tempChess.isCheck(), + }); + } } else { - setIsViewOnly(false); + //handle main line + const isLastMove = currentMoveIndex === moves.length - 1; + + if (isLastMove) { + const move = { + ...newMove, + moveId: moveId, + variants: [], + shapes: [], + comment: null, + }; + moves.push(move); + + draft.currentMove = move; + } else { + const currentMove = moves[moveIndex]; + + // check if the next move is the same move + const nextMove = moves[moveIndex + 1]; + + if (nextMove.san === newMove.san) { + draft.currentMove = nextMove; + return draft; + } + + const move = { + ...newMove, + moveId: moveId, + shapes: [], + comment: null, + }; + + currentMove.variants.push({ + parentMoveId: currentMove.moveId, + variantId: nanoid(), + moves: [move], + }); + + draft.currentMove = move; + } } - return moveIndex; - }); + return draft; + } + default: + break; } }, - [chessView, currentMove, history] + { + currentMove: chessStudyData.moves[chessStudyData.moves.length - 1], + isViewOnly: false, + study: chessStudyData, + } ); const onSaveButtonClick = useCallback(async () => { - const chessStudyData: ChessStudyFileData = { - header: chessStudyDataModified.header, - moves: chessLogic.history({ verbose: true }).map((move, index) => ({ - ...move, - variants: [], - shapes: shapes[index], - comment: comments[index], - })), - }; - - await dataAdapter.saveFile(chessStudyData, chessStudyId); - - new Notice('Save successfull!'); - }, [ - chessLogic, - chessStudyDataModified.header, - chessStudyId, - comments, - dataAdapter, - shapes, - ]); + try { + await dataAdapter.saveFile(gameState.study, chessStudyId); + new Notice('Save successfull!'); + } catch (e) { + new Notice('Something went wrong during saving:', e); + } + }, [chessStudyId, dataAdapter, gameState.study]); return ( -
+
+ dispatch({ type: 'ADD_MOVE_TO_HISTORY', move }) + } + isViewOnly={gameState.isViewOnly} + syncShapes={(shapes: DrawShape[]) => + dispatch({ type: 'SYNC_SHAPES', shapes }) + } + shapes={gameState.currentMove?.shapes} />
+ dispatch({ type: 'DISPLAY_PREVIOUS_MOVE_IN_HISTORY' }) + } + onForwardButtonClick={() => + dispatch({ type: 'DISPLAY_NEXT_MOVE_IN_HISTORY' }) + } + onMoveItemClick={(moveId: string) => + dispatch({ + type: 'DISPLAY_SELECTED_MOVE_IN_HISTORY', + moveId: moveId, + }) + } onSaveButtonClick={onSaveButtonClick} />
-
+
+ dispatch({ type: 'SYNC_COMMENT', comment: comment }) + } />
diff --git a/src/components/react/ChessgroundWrapper/index.tsx b/src/components/react/ChessgroundWrapper/index.tsx index c6445fa..73a4864 100644 --- a/src/components/react/ChessgroundWrapper/index.tsx +++ b/src/components/react/ChessgroundWrapper/index.tsx @@ -1,43 +1,36 @@ -import { Chessground as ChessgroundApi } from 'chessground'; -import * as React from 'react'; -import { useEffect, useRef } from 'react'; - import { Chess, Move } from 'chess.js'; +import { Chessground as ChessgroundApi } from 'chessground'; import { Api } from 'chessground/api'; import { Config } from 'chessground/config'; import { DrawShape } from 'chessground/draw'; -import { playOtherSide, toColor, toDests } from 'src/utils'; +import * as React from 'react'; +import { useEffect, useRef } from 'react'; +import { playOtherSide, toColor, toDests } from 'src/lib/chess-logic'; -export interface ChessGroundSettings { +export interface ChessgroundProps { api: Api | null; setApi: React.Dispatch>; - chessStudyId: string; + chess: Chess; + addMoveToHistory: (move: Move) => void; + syncShapes: (shapes: DrawShape[]) => void; + isViewOnly: boolean; + shapes: DrawShape[]; config?: Config; boardColor?: 'brown' | 'green'; - chess: Chess; - setHistory: React.Dispatch>; - setShapes: React.Dispatch>; - setMoveNumber: React.Dispatch>; - currentMoveNumber: number; - isViewOnly: boolean; - currentMoveShapes: DrawShape[]; } export const ChessgroundWrapper = React.memo( ({ api, setApi, - chessStudyId, + chess, + addMoveToHistory, + syncShapes: setShapes, + isViewOnly, + shapes, boardColor = 'green', config = {}, - chess, - setHistory, - setMoveNumber, - currentMoveNumber, - setShapes, - isViewOnly, - currentMoveShapes, - }: ChessGroundSettings) => { + }: ChessgroundProps) => { const ref = useRef(null); //Chessground Init @@ -51,67 +44,52 @@ export const ChessgroundWrapper = React.memo( free: false, color: toColor(chess), dests: toDests(chess), - events: { - //Hook up the Chessground UI changes to our App State - after: (orig, dest, _metadata) => { - const handler = playOtherSide(chessgroundApi, chess); - - setHistory(handler(orig, dest)); - setMoveNumber((state) => state + 1); - }, - }, }, highlight: { check: true, }, + drawable: { + onChange: (shapes) => { + setShapes(shapes); + }, + }, turnColor: toColor(chess), ...config, }); - setHistory(chess.history({ verbose: true })); setApi(chessgroundApi); - setMoveNumber(chess.history().length - 1); } else if (ref.current && api) { api.set(config); } - }, [ - ref, - chess, - api, - chessStudyId, - config, - setApi, - setHistory, - setMoveNumber, - setShapes, - currentMoveNumber, - ]); + }, [addMoveToHistory, api, chess, config, setApi, setShapes]); + + //Sync Chess Logic + useEffect(() => { + api?.set({ + movable: { + events: { + //Hook up the Chessground UI changes to our App State + after: (orig, dest, _metadata) => { + const handler = playOtherSide(api, chess); + + addMoveToHistory(handler(orig, dest)); + }, + }, + }, + }); + }, [addMoveToHistory, api, chess]); //Sync View Only useEffect(() => { api?.set({ viewOnly: isViewOnly }); }, [isViewOnly, api]); - //Sync Shapes To State + // Load Shapes useEffect(() => { - api?.set({ - drawable: { - onChange(shapes) { - setShapes((currentShapes) => { - const shapesModified = [...currentShapes]; - shapesModified[currentMoveNumber] = shapes; - - return shapesModified; - }); - }, - }, - }); - }, [api, currentMoveNumber, setShapes]); - - //Load Shapes - useEffect(() => { - if (currentMoveShapes) api?.setShapes(currentMoveShapes); - }, [api, currentMoveNumber, currentMoveShapes, setShapes]); + if (shapes) { + api?.setShapes([...shapes]); + } + }, [api, shapes]); return (
diff --git a/src/components/react/CommentSection/index.tsx b/src/components/react/CommentSection/index.tsx index 057a635..acfdb08 100644 --- a/src/components/react/CommentSection/index.tsx +++ b/src/components/react/CommentSection/index.tsx @@ -4,21 +4,17 @@ import * as React from 'react'; import { useEffect } from 'react'; interface CommentSectionProps { - currentMove: number; currentComment: JSONContent | null; - setComments: React.Dispatch>; + setComments: (comment: JSONContent) => void; } export const CommentSection = React.memo( - ({ currentMove, currentComment, setComments }: CommentSectionProps) => { + ({ currentComment, setComments }: CommentSectionProps) => { const editor = useEditor({ extensions: [StarterKit], onUpdate: (state) => { - setComments((currentComments) => { - const currentCommentModified = [...currentComments]; - currentCommentModified[currentMove] = state.editor.getJSON(); - return currentCommentModified; - }); + const comment = state.editor.getJSON(); + if (comment) setComments(comment); }, }); diff --git a/src/components/react/PgnViewer/index.tsx b/src/components/react/PgnViewer/index.tsx index fefac1f..d4066dd 100644 --- a/src/components/react/PgnViewer/index.tsx +++ b/src/components/react/PgnViewer/index.tsx @@ -1,7 +1,7 @@ -import { Move } from 'chess.js'; import { ArrowLeft, ArrowRight, Save } from 'lucide-react'; import * as React from 'react'; -import { useEffect, useMemo, useRef } from 'react'; +import { ReactNode, useEffect, useMemo, useRef } from 'react'; +import { ChessStudyMove } from 'src/lib/storage'; const chunkArray = (array: T[], chunkSize: number) => { return array.reduce((resultArray, item, index) => { @@ -54,20 +54,70 @@ const MoveItem = ({ ); }; +const VariantMoveItem = ({ + isCurrentMove, + san, + onMoveItemClick, + moveIndicator = null, +}: { + isCurrentMove: boolean; + san: string; + onMoveItemClick: () => void; + moveIndicator?: string | null; +}) => { + const ref = useRef(null); + + useEffect(() => { + if (ref.current && isCurrentMove) { + ref.current?.scrollIntoView({ + behavior: 'smooth', + block: 'nearest', + inline: 'end', + }); + } + }, [isCurrentMove]); + + return ( +
{ + e.stopPropagation(); + onMoveItemClick(); + }} + ref={ref} + > + {moveIndicator} + {san} +
+ ); +}; + +const VariantMoveItemContainer = ({ children }: { children: ReactNode }) => { + return
{children}
; +}; + +const VariantContainer = ({ children }: { children: ReactNode }) => { + return
{children}
; +}; + +const VariantsContainer = ({ children }: { children: ReactNode }) => { + return
{children}
; +}; + export const PgnViewer = React.memo( ({ history, - currentMove, + currentMoveId, onBackButtonClick, onForwardButtonClick, onMoveItemClick, onSaveButtonClick, }: { - history: Move[]; - currentMove: number; + history: ChessStudyMove[]; + currentMoveId: string; onBackButtonClick: () => void; onForwardButtonClick: () => void; - onMoveItemClick: (moveIndex: number) => void; + onMoveItemClick: (moveId: string) => void; onSaveButtonClick: () => void; }) => { const movePairs = useMemo(() => chunkArray(history, 2), [history]); @@ -76,23 +126,142 @@ export const PgnViewer = React.memo(
- {movePairs.map((pair, i) => { + {movePairs.map((pair, currentMoveIndex) => { const [wMove, bMove] = pair; + return ( - -

{i + 1}

+ +

+ {currentMoveIndex + 1} +

onMoveItemClick(i * 2)} + isCurrentMove={wMove.moveId === currentMoveId} + onMoveItemClick={() => onMoveItemClick(wMove.moveId)} /> {bMove && ( onMoveItemClick(i * 2 + 1)} + isCurrentMove={bMove.moveId === currentMoveId} + onMoveItemClick={() => onMoveItemClick(bMove.moveId)} /> )} + {!!wMove.variants.concat(bMove?.variants || []).length && ( + + {!!wMove.variants.length && ( + + {wMove.variants.map((variant) => { + return ( + + {chunkArray(variant.moves, 2).map( + (pair, wMoveVarianti) => { + const [bMove, wMove] = pair; + + return ( + + + onMoveItemClick(bMove.moveId) + } + moveIndicator={ + (wMoveVarianti === 0 && + `${ + currentMoveIndex + + 1 + + wMoveVarianti + }... `) || + null + } + /> + {wMove && ( + + onMoveItemClick(wMove.moveId) + } + moveIndicator={ + (wMoveVarianti % 2 === 0 && + null) || + `${ + currentMoveIndex + + 2 + + wMoveVarianti + }. ` + } + /> + )} + + ); + } + )} + + ); + })} + + )} + {!!bMove?.variants.length && ( + + {bMove.variants.map((variant) => { + return ( + + {chunkArray(variant.moves, 2).map( + (pair, bMoveVarianti) => { + const [wMove, bMove] = pair; + return ( + + + onMoveItemClick(wMove.moveId) + } + moveIndicator={`${ + currentMoveIndex + 2 + bMoveVarianti + }. `} + /> + {bMove && ( + + onMoveItemClick(bMove.moveId) + } + /> + )} + + ); + } + )} + + ); + })} + + )} + + )} ); })} diff --git a/src/lib/chess-logic/index.ts b/src/lib/chess-logic/index.ts new file mode 100644 index 0000000..7ee820b --- /dev/null +++ b/src/lib/chess-logic/index.ts @@ -0,0 +1,47 @@ +import { Chess, QUEEN, SQUARES, Square } from 'chess.js'; +import { Api } from 'chessground/api'; +import { Config } from 'chessground/config'; + +export function toColor(chess: Chess) { + return chess.turn() === 'w' ? 'white' : 'black'; +} + +export function toDests(chess: Chess): Map { + const dests = new Map(); + SQUARES.forEach((s) => { + const ms = chess.moves({ square: s, verbose: true }); + if (ms.length) + dests.set( + s, + ms.map((m) => m.to) + ); + }); + return dests; +} + +export function playOtherSide(cg: Api, chess: Chess) { + return (orig: string, dest: string) => { + const move = chess.move({ from: orig, to: dest, promotion: QUEEN }); + + const commonTurnProperties: Partial = { + turnColor: toColor(chess), + movable: { + color: toColor(chess), + dests: toDests(chess), + }, + check: chess.isCheck(), + }; + + if (move.flags === 'e' || move.promotion) { + //Handle En Passant && Promote to Queen by default + cg.set({ + fen: chess.fen(), + ...commonTurnProperties, + }); + } else { + cg.set(commonTurnProperties); + } + + return move; + }; +} diff --git a/src/lib/obsidian/index.ts b/src/lib/obsidian/index.ts new file mode 100644 index 0000000..545abd9 --- /dev/null +++ b/src/lib/obsidian/index.ts @@ -0,0 +1,25 @@ +import { parseYaml } from 'obsidian'; +import { ChessStudyPluginSettings } from 'src/components/obsidian/SettingsTab'; + +type ChessStudyAppConfig = ChessStudyPluginSettings & { + chessStudyId: string; +}; + +export const parseUserConfig = ( + settings: ChessStudyPluginSettings, + content: string +): ChessStudyAppConfig => { + const chessStudyConfig: ChessStudyAppConfig = { + ...settings, + chessStudyId: '', + }; + + try { + return { + ...chessStudyConfig, + ...parseYaml(content), + }; + } catch (e) { + throw Error('Something went wrong during parsing. :('); + } +}; diff --git a/src/lib/storage/index.ts b/src/lib/storage/index.ts new file mode 100644 index 0000000..1abe140 --- /dev/null +++ b/src/lib/storage/index.ts @@ -0,0 +1,68 @@ +import { JSONContent } from '@tiptap/react'; +import { Move } from 'chess.js'; +import { DrawShape } from 'chessground/draw'; +import { nanoid } from 'nanoid'; +import { DataAdapter, normalizePath } from 'obsidian'; + +export const CURRENT_STORAGE_VERSION = '0.0.1'; + +export interface VariantMove extends Move { + moveId: string; + shapes: DrawShape[]; + comment: JSONContent | null; +} + +export interface Variant { + variantId: string; + parentMoveId: string; + moves: VariantMove[]; +} + +export interface ChessStudyMove extends Move { + moveId: string; + variants: Variant[]; + shapes: DrawShape[]; + comment: JSONContent | null; +} + +export interface ChessStudyFileData { + version: string; + header: { title: string | null }; + moves: ChessStudyMove[]; +} + +export class ChessStudyDataAdapter { + adapter: DataAdapter; + storagePath: string; + + constructor(adapter: DataAdapter, storagePath: string) { + this.adapter = adapter; + this.storagePath = storagePath; + } + + async saveFile(data: ChessStudyFileData, id?: string) { + const chessStudyId = id || nanoid(); + await this.adapter.write( + normalizePath(`${this.storagePath}/${chessStudyId}.json`), + JSON.stringify(data, null, 2), + {} + ); + + return chessStudyId; + } + + async loadFile(id: string): Promise { + const data = await this.adapter.read( + normalizePath(`${this.storagePath}/${id}.json`) + ); + return JSON.parse(data); + } + + async createStorageFolderIfNotExists() { + const folderExists = await this.adapter.exists(this.storagePath); + + if (!folderExists) { + this.adapter.mkdir(this.storagePath); + } + } +} diff --git a/src/lib/ui-state/index.ts b/src/lib/ui-state/index.ts new file mode 100644 index 0000000..0a9667a --- /dev/null +++ b/src/lib/ui-state/index.ts @@ -0,0 +1,111 @@ +import { Chess } from 'chess.js'; +import { Api as ChessgroundApi } from 'chessground/api'; +import { Draft } from 'immer'; +import { GameState } from 'src/components/react/ChessStudy'; +import { toColor, toDests } from '../chess-logic'; +import { ChessStudyMove, VariantMove } from '../storage'; + +interface MovePosition { + variant: { parentMoveIndex: number; variantIndex: number } | null; + moveIndex: number; +} + +export const findMoveIndex = ( + moves: ChessStudyMove[], + moveId: string +): MovePosition => { + for (const [iMainLine, move] of moves.entries()) { + if (move.moveId === moveId) return { variant: null, moveIndex: iMainLine }; + + for (const [iVariant, variant] of move.variants.entries()) { + const moveIndex = variant.moves.findIndex( + (move) => move.moveId === moveId + ); + + if (moveIndex >= 0) + return { + variant: { parentMoveIndex: iMainLine, variantIndex: iVariant }, + moveIndex: moveIndex, + }; + } + } + + return { variant: null, moveIndex: -1 }; +}; + +export const displayMoveInHistory = ( + draft: Draft, + chessView: ChessgroundApi, + setChessLogic: React.Dispatch>, + options: { offset: number; selectedMoveId: string | null } = { + offset: 0, + selectedMoveId: null, + } +): Draft => { + let moveToDisplay: ChessStudyMove | VariantMove | null = null; + + const { offset, selectedMoveId } = options; + + //Figure out where we are + const currentMove = draft.currentMove; + const currentMoveId = currentMove.moveId; + + const moves = draft.study.moves; + + //If we pass a moveId, find out where that is and offset from there, otherwise take current moveId + const baseMoveId = selectedMoveId || currentMoveId; + + const { variant, moveIndex } = findMoveIndex(moves, baseMoveId); + //Are we in a variant? Are we not? Decide which move to display + + if (variant) { + const variantMoves = + moves[variant.parentMoveIndex].variants[variant.variantIndex].moves; + + if (typeof variantMoves[moveIndex + offset] !== 'undefined') { + moveToDisplay = variantMoves[moveIndex + offset]; + } + } else { + if (typeof moves[moveIndex + offset] !== 'undefined') { + moveToDisplay = moves[moveIndex + offset]; + } + } + + if (!moveToDisplay) return draft; + + const chess = new Chess(moveToDisplay.after); + + chessView.set({ + fen: moveToDisplay.after, + check: chess.isCheck(), + movable: { + free: false, + color: toColor(chess), + dests: toDests(chess), + }, + turnColor: toColor(chess), + }); + + draft.currentMove = moveToDisplay; + + setChessLogic(chess); + + return draft; +}; + +export const getCurrentMove = ( + draft: Draft +): Draft | Draft => { + const currentMoveId = draft.currentMove?.moveId; + const moves = draft.study.moves; + + const { variant, moveIndex } = findMoveIndex(moves, currentMoveId); + + if (variant) { + return moves[variant.parentMoveIndex].variants[variant.variantIndex].moves[ + moveIndex + ]; + } else { + return moves[moveIndex]; + } +}; diff --git a/src/main.css b/src/main.css index 434fe0f..322cb71 100644 --- a/src/main.css +++ b/src/main.css @@ -1,18 +1,8 @@ /* General */ - .chess-study button:active { transform: translateY(1px); } -.chess-study .border { - border: 1px var(--color-base-10) solid; - border-radius: 5px; -} - -.chess-study .border-top { - border: 1px var(--color-base-10) solid; -} - .chess-study .vertical-align { display: flex; align-items: center; @@ -34,12 +24,13 @@ } .chess-study { + height: 100%; + max-width: 750px; line-height: 1.5; -webkit-font-smoothing: antialiased; -} - -.chess-study { - height: 100%; + background-color: var(--background-secondary); + border: 1px solid var(--background-secondary-alt); + border-radius: 5px; } .chess-study *, @@ -85,6 +76,7 @@ } /* PGN Viewer */ + .chess-study .move-item-section { height: 415px; } @@ -98,10 +90,12 @@ height: 35px; } +/* Move Items */ + .chess-study .move-item-container { display: grid; grid-template-columns: 0.15fr 0.425fr 0.425fr; - grid-auto-rows: 30px; + grid-auto-rows: minmax(30px, auto); width: 100%; max-height: 415px; overflow-y: scroll; @@ -132,6 +126,21 @@ font-weight: bold; } +/* Variant Move Items */ + +.chess-study .variants-container { + grid-column: span 3 / auto; + display: flex; + flex-direction: column; + border-bottom: 1px solid var(--color-base-50); +} + +.chess-study .variant-container { + grid-column: span 3 / auto; + display: flex; + flex-direction: column; +} + .chess-study .move-indicator { color: var(--color-base-60); text-align: center; @@ -140,6 +149,28 @@ cursor: default; } +.chess-study .variant-move-item { + padding-left: 6px; + user-select: none; + cursor: pointer; +} + +.chess-study .variant-move-item-container { + display: flex; + flex-wrap: wrap; + padding: 4px 0; + border-top: 1px solid var(--color-base-50); +} + +.chess-study .variant-move-item.active, +.chess-study .variant-move-item:hover { + color: hsl(var(--accent-h), var(--accent-s), calc(var(--accent-l) - 10%)); +} + +.chess-study .variant-move-indicator { + font-weight: bold; +} + /* Comment Section */ .chess-study .editor-input { @@ -158,10 +189,11 @@ height: 250px; padding-top: 5px; overflow: scroll; + border-top: 1px solid var(--background-secondary-alt); } -.chess-study.ProseMirror, -.chess-study.CommentSection > div { +.chess-study .ProseMirror, +.chess-study .CommentSection > div { width: 100%; height: 100%; } diff --git a/src/main.tsx b/src/main.tsx index 1261628..c4a4a18 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,5 +1,10 @@ import { Chess } from 'chess.js'; import { Editor, Notice, Plugin, normalizePath } from 'obsidian'; +import { + CURRENT_STORAGE_VERSION, + ChessStudyDataAdapter, + ChessStudyFileData, +} from 'src/lib/storage'; import { ReactView } from './components/ReactView'; import { PgnModal } from './components/obsidian/PgnModal'; import { @@ -7,17 +12,14 @@ import { DEFAULT_SETTINGS, SettingsTab, } from './components/obsidian/SettingsTab'; -import { - ChessStudyDataAdapter, - ChessStudyFileData, - parseUserConfig, -} from './utils'; // these styles must be imported somewhere import 'assets/board/green.css'; import 'chessground/assets/chessground.base.css'; import 'chessground/assets/chessground.brown.css'; import 'chessground/assets/chessground.cburnett.css'; +import { nanoid } from 'nanoid'; +import { parseUserConfig } from './lib/obsidian'; import './main.css'; export default class ChessStudyPlugin extends Plugin { @@ -61,11 +63,13 @@ export default class ChessStudyPlugin extends Plugin { } const chessStudyFileData: ChessStudyFileData = { + version: CURRENT_STORAGE_VERSION, header: { title: chess.header()['opening'] || null, }, moves: chess.history({ verbose: true }).map((move) => ({ ...move, + moveId: nanoid(), variants: [], shapes: [], comment: null, @@ -75,7 +79,7 @@ export default class ChessStudyPlugin extends Plugin { const id = await this.dataAdapter.saveFile(chessStudyFileData); editor.replaceRange( - `\`\`\`chessStudy\nchessStudyId: ${id}\nboardOrientation: white\nboardColor: green\n\`\`\``, + `\`\`\`chessStudy\nchessStudyId: ${id}\n\`\`\``, cursorPosition ); } catch (e) { diff --git a/src/utils/index.ts b/src/utils/index.ts deleted file mode 100644 index 3c01f9d..0000000 --- a/src/utils/index.ts +++ /dev/null @@ -1,124 +0,0 @@ -import { JSONContent } from '@tiptap/react'; -import { Chess, Move, QUEEN, SQUARES, Square } from 'chess.js'; -import { Api } from 'chessground/api'; -import { Config } from 'chessground/config'; -import { DrawShape } from 'chessground/draw'; -import { nanoid } from 'nanoid'; -import { DataAdapter, normalizePath, parseYaml } from 'obsidian'; -import { ChessStudyPluginSettings } from 'src/components/obsidian/SettingsTab'; - -//Chess Logic -type ChessStudyAppConfig = ChessStudyPluginSettings & { - chessStudyId: string; -}; - -export const parseUserConfig = ( - settings: ChessStudyPluginSettings, - content: string -): ChessStudyAppConfig => { - const chessStudyConfig: ChessStudyAppConfig = { - ...settings, - chessStudyId: '', - }; - - try { - return { - ...chessStudyConfig, - ...parseYaml(content), - }; - } catch (e) { - throw Error('Something went wrong during parsing. :('); - } -}; - -export function toColor(chess: Chess) { - return chess.turn() === 'w' ? 'white' : 'black'; -} - -export function toDests(chess: Chess): Map { - const dests = new Map(); - SQUARES.forEach((s) => { - const ms = chess.moves({ square: s, verbose: true }); - if (ms.length) - dests.set( - s, - ms.map((m) => m.to) - ); - }); - return dests; -} - -export function playOtherSide(cg: Api, chess: Chess) { - return (orig: string, dest: string) => { - const move = chess.move({ from: orig, to: dest, promotion: QUEEN }); - - const commonTurnProperties: Partial = { - turnColor: toColor(chess), - movable: { - color: toColor(chess), - dests: toDests(chess), - }, - check: chess.isCheck(), - }; - - if (move.flags === 'e' || move.promotion) { - //Handle En Passant && Promote to Queen by default - cg.set({ - fen: chess.fen(), - ...commonTurnProperties, - }); - } else { - cg.set(commonTurnProperties); - } - - return chess.history({ verbose: true }); - }; -} - -//Storage Logic - -interface ChessStudyMove extends Move { - variants: Move[][]; - shapes: DrawShape[]; - comment: JSONContent | null; -} -export interface ChessStudyFileData { - header: { title: string | null }; - moves: ChessStudyMove[]; -} - -export class ChessStudyDataAdapter { - adapter: DataAdapter; - storagePath: string; - - constructor(adapter: DataAdapter, storagePath: string) { - this.adapter = adapter; - this.storagePath = storagePath; - } - - async saveFile(data: ChessStudyFileData, id?: string) { - const chessStudyId = id || nanoid(); - await this.adapter.write( - normalizePath(`${this.storagePath}/${chessStudyId}.json`), - JSON.stringify(data, null, 2), - {} - ); - - return chessStudyId; - } - - async loadFile(id: string): Promise { - const data = await this.adapter.read( - normalizePath(`${this.storagePath}/${id}.json`) - ); - return JSON.parse(data); - } - - async createStorageFolderIfNotExists() { - const folderExists = await this.adapter.exists(this.storagePath); - - if (!folderExists) { - this.adapter.mkdir(this.storagePath); - } - } -} diff --git a/styles.css b/styles.css index 8c088aa..0656493 100644 --- a/styles.css +++ b/styles.css @@ -265,13 +265,6 @@ cg-board square.current-premove { .chess-study button:active { transform: translateY(1px); } -.chess-study .border { - border: 1px var(--color-base-10) solid; - border-radius: 5px; -} -.chess-study .border-top { - border: 1px var(--color-base-10) solid; -} .chess-study .vertical-align { display: flex; align-items: center; @@ -289,11 +282,13 @@ cg-board square.current-premove { display: table; } .chess-study { + height: 100%; + max-width: 750px; line-height: 1.5; -webkit-font-smoothing: antialiased; -} -.chess-study { - height: 100%; + background-color: var(--background-secondary); + border: 1px solid var(--background-secondary-alt); + border-radius: 5px; } .chess-study *, .chess-study *::before, @@ -344,7 +339,7 @@ cg-board square.current-premove { .chess-study .move-item-container { display: grid; grid-template-columns: 0.15fr 0.425fr 0.425fr; - grid-auto-rows: 30px; + grid-auto-rows: minmax(30px, auto); width: 100%; max-height: 415px; overflow-y: scroll; @@ -371,6 +366,17 @@ cg-board square.current-premove { color: var(--text-on-accent); font-weight: bold; } +.chess-study .variants-container { + grid-column: span 3 / auto; + display: flex; + flex-direction: column; + border-bottom: 1px solid var(--color-base-50); +} +.chess-study .variant-container { + grid-column: span 3 / auto; + display: flex; + flex-direction: column; +} .chess-study .move-indicator { color: var(--color-base-60); text-align: center; @@ -378,6 +384,24 @@ cg-board square.current-premove { user-select: none; cursor: default; } +.chess-study .variant-move-item { + padding-left: 6px; + user-select: none; + cursor: pointer; +} +.chess-study .variant-move-item-container { + display: flex; + flex-wrap: wrap; + padding: 4px 0; + border-top: 1px solid var(--color-base-50); +} +.chess-study .variant-move-item.active, +.chess-study .variant-move-item:hover { + color: hsl(var(--accent-h), var(--accent-s), calc(var(--accent-l) - 10%)); +} +.chess-study .variant-move-indicator { + font-weight: bold; +} .chess-study .editor-input { min-height: 150px; resize: none; @@ -393,10 +417,10 @@ cg-board square.current-premove { height: 250px; padding-top: 5px; overflow: scroll; + border-top: 1px solid var(--background-secondary-alt); } -.chess-study.ProseMirror, -.chess-study.CommentSection > div { +.chess-study .ProseMirror, +.chess-study .CommentSection > div { width: 100%; height: 100%; } -/*# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["assets/board/green.css", "node_modules/chessground/assets/chessground.base.css", "node_modules/chessground/assets/chessground.brown.css", "node_modules/chessground/assets/chessground.cburnett.css", "src/main.css"],
  "sourcesContent": [".green-board cg-board {\n\tbackground-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4PSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIgogICAgIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyI+CjxnIGlkPSJhIj4KICA8ZyBpZD0iYiI+CiAgICA8ZyBpZD0iYyI+CiAgICAgIDxnIGlkPSJkIj4KICAgICAgICA8cmVjdCB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSIjZmZmZmRkIiBpZD0iZSIvPgogICAgICAgIDx1c2UgeD0iMSIgeT0iMSIgaHJlZj0iI2UiIHg6aHJlZj0iI2UiLz4KICAgICAgICA8cmVjdCB5PSIxIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSIjODZhNjY2IiBpZD0iZiIvPgogICAgICAgIDx1c2UgeD0iMSIgeT0iLTEiIGhyZWY9IiNmIiB4OmhyZWY9IiNmIi8+CiAgICAgIDwvZz4KICAgICAgPHVzZSB4PSIyIiBocmVmPSIjZCIgeDpocmVmPSIjZCIvPgogICAgPC9nPgogICAgPHVzZSB4PSI0IiBocmVmPSIjYyIgeDpocmVmPSIjYyIvPgogIDwvZz4KICA8dXNlIHk9IjIiIGhyZWY9IiNiIiB4OmhyZWY9IiNiIi8+CjwvZz4KPHVzZSB5PSI0IiBocmVmPSIjYSIgeDpocmVmPSIjYSIvPgo8L3N2Zz4K');\n}\n", ".cg-wrap {\n  box-sizing: content-box;\n  position: relative;\n  display: block;\n}\n\ncg-container {\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  display: block;\n  top: 0;\n}\n\ncg-board {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  -webkit-user-select: none;\n  -moz-user-select: none;\n  -ms-user-select: none;\n  user-select: none;\n  line-height: 0;\n  background-size: cover;\n}\n\n.cg-wrap.manipulable cg-board {\n  cursor: pointer;\n}\n\ncg-board square {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 12.5%;\n  height: 12.5%;\n  pointer-events: none;\n}\n\ncg-board square.move-dest {\n  pointer-events: auto;\n}\n\ncg-board square.last-move {\n  will-change: transform;\n}\n\n.cg-wrap piece {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 12.5%;\n  height: 12.5%;\n  background-size: cover;\n  z-index: 2;\n  will-change: transform;\n  pointer-events: none;\n}\n\ncg-board piece.dragging {\n  cursor: move;\n  /* !important to override z-index from 3D piece inline style */\n  z-index: 11 !important;\n}\n\npiece.anim {\n  z-index: 8;\n}\n\npiece.fading {\n  z-index: 1;\n  opacity: 0.5;\n}\n\n.cg-wrap piece.ghost {\n  opacity: 0.3;\n}\n\n.cg-wrap piece svg {\n  overflow: hidden;\n  position: relative;\n  top: 0px;\n  left: 0px;\n  width: 100%;\n  height: 100%;\n  pointer-events: none;\n  z-index: 2;\n  opacity: 0.6;\n}\n\n.cg-wrap cg-auto-pieces,\n.cg-wrap .cg-shapes,\n.cg-wrap .cg-custom-svgs {\n  overflow: visible;\n  position: absolute;\n  top: 0px;\n  left: 0px;\n  width: 100%;\n  height: 100%;\n  pointer-events: none;\n}\n\n.cg-wrap cg-auto-pieces {\n  z-index: 2;\n}\n\n.cg-wrap cg-auto-pieces piece {\n  opacity: 0.3;\n}\n\n.cg-wrap .cg-shapes {\n  overflow: hidden;\n  opacity: 0.6;\n  z-index: 2;\n}\n\n.cg-wrap .cg-custom-svgs {\n  /* over piece.anim = 8, but under piece.dragging = 11 */\n  z-index: 9;\n}\n\n.cg-wrap .cg-custom-svgs svg {\n  overflow: visible;\n}\n\n.cg-wrap coords {\n  position: absolute;\n  display: flex;\n  pointer-events: none;\n  opacity: 0.8;\n  font-family: sans-serif;\n  font-size: 9px;\n}\n\n.cg-wrap coords.ranks {\n  left: 4px;\n  top: -20px;\n  flex-flow: column-reverse;\n  height: 100%;\n  width: 12px;\n}\n\n.cg-wrap coords.ranks.black {\n  flex-flow: column;\n}\n\n.cg-wrap coords.ranks.left {\n  left: -15px;\n  align-items: flex-end;\n}\n\n.cg-wrap coords.files {\n  bottom: -4px;\n  left: 24px;\n  flex-flow: row;\n  width: 100%;\n  height: 16px;\n  text-transform: uppercase;\n  text-align: center;\n}\n\n.cg-wrap coords.files.black {\n  flex-flow: row-reverse;\n}\n\n.cg-wrap coords coord {\n  flex: 1 1 auto;\n}\n\n.cg-wrap coords.ranks coord {\n  transform: translateY(39%);\n}\n", "/** Colored board squares as an embedded SVG */\ncg-board {\n  background-color: #f0d9b5;\n  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4PSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIgogICAgIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyI+CjxnIGlkPSJhIj4KICA8ZyBpZD0iYiI+CiAgICA8ZyBpZD0iYyI+CiAgICAgIDxnIGlkPSJkIj4KICAgICAgICA8cmVjdCB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBpZD0iZSIgb3BhY2l0eT0iMCIvPgogICAgICAgIDx1c2UgeD0iMSIgeT0iMSIgaHJlZj0iI2UiIHg6aHJlZj0iI2UiLz4KICAgICAgICA8cmVjdCB5PSIxIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBpZD0iZiIgb3BhY2l0eT0iMC4yIi8+CiAgICAgICAgPHVzZSB4PSIxIiB5PSItMSIgaHJlZj0iI2YiIHg6aHJlZj0iI2YiLz4KICAgICAgPC9nPgogICAgICA8dXNlIHg9IjIiIGhyZWY9IiNkIiB4OmhyZWY9IiNkIi8+CiAgICA8L2c+CiAgICA8dXNlIHg9IjQiIGhyZWY9IiNjIiB4OmhyZWY9IiNjIi8+CiAgPC9nPgogIDx1c2UgeT0iMiIgaHJlZj0iI2IiIHg6aHJlZj0iI2IiLz4KPC9nPgo8dXNlIHk9IjQiIGhyZWY9IiNhIiB4OmhyZWY9IiNhIi8+Cjwvc3ZnPg==');\n}\n\n/** Interactive board square colors */\ncg-board square.move-dest {\n  background: radial-gradient(rgba(20, 85, 30, 0.5) 22%, #208530 0, rgba(0, 0, 0, 0.3) 0, rgba(0, 0, 0, 0) 0);\n}\ncg-board square.premove-dest {\n  background: radial-gradient(rgba(20, 30, 85, 0.5) 22%, #203085 0, rgba(0, 0, 0, 0.3) 0, rgba(0, 0, 0, 0) 0);\n}\ncg-board square.oc.move-dest {\n  background: radial-gradient(transparent 0%, transparent 80%, rgba(20, 85, 0, 0.3) 80%);\n}\ncg-board square.oc.premove-dest {\n  background: radial-gradient(transparent 0%, transparent 80%, rgba(20, 30, 85, 0.2) 80%);\n}\ncg-board square.move-dest:hover {\n  background: rgba(20, 85, 30, 0.3);\n}\ncg-board square.premove-dest:hover {\n  background: rgba(20, 30, 85, 0.2);\n}\ncg-board square.last-move {\n  background-color: rgba(155, 199, 0, 0.41);\n}\ncg-board square.selected {\n  background-color: rgba(20, 85, 30, 0.5);\n}\ncg-board square.check {\n  background: radial-gradient(\n    ellipse at center,\n    rgba(255, 0, 0, 1) 0%,\n    rgba(231, 0, 0, 1) 25%,\n    rgba(169, 0, 0, 0) 89%,\n    rgba(158, 0, 0, 0) 100%\n  );\n}\ncg-board square.current-premove {\n  background-color: rgba(20, 30, 85, 0.5);\n}\n\n/** Alternating colors in rank/file labels */\n.cg-wrap.orientation-white coords.ranks coord:nth-child(2n),\n.cg-wrap.orientation-white coords.files coord:nth-child(2n),\n.cg-wrap.orientation-black coords.ranks coord:nth-child(2n + 1),\n.cg-wrap.orientation-black coords.files coord:nth-child(2n + 1) {\n  color: rgba(72, 72, 72, 0.8);\n}\n\n.cg-wrap.orientation-black coords.ranks coord:nth-child(2n),\n.cg-wrap.orientation-black coords.files coord:nth-child(2n),\n.cg-wrap.orientation-white coords.ranks coord:nth-child(2n + 1),\n.cg-wrap.orientation-white coords.files coord:nth-child(2n + 1) {\n  color: rgba(255, 255, 255, 0.8);\n}\n", "/** Embedded SVGs for all chess pieces */\n.cg-wrap piece.pawn.white {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PHBhdGggZD0iTTIyLjUgOWMtMi4yMSAwLTQgMS43OS00IDQgMCAuODkuMjkgMS43MS43OCAyLjM4QzE3LjMzIDE2LjUgMTYgMTguNTkgMTYgMjFjMCAyLjAzLjk0IDMuODQgMi40MSA1LjAzLTMgMS4wNi03LjQxIDUuNTUtNy40MSAxMy40N2gyM2MwLTcuOTItNC40MS0xMi40MS03LjQxLTEzLjQ3IDEuNDctMS4xOSAyLjQxLTMgMi40MS01LjAzIDAtMi40MS0xLjMzLTQuNS0zLjI4LTUuNjIuNDktLjY3Ljc4LTEuNDkuNzgtMi4zOCAwLTIuMjEtMS43OS00LTQtNHoiIGZpbGw9IiNmZmYiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPjwvc3ZnPg==');\n}\n.cg-wrap piece.bishop.white {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxnIGZpbGw9IiNmZmYiIHN0cm9rZS1saW5lY2FwPSJidXR0Ij48cGF0aCBkPSJNOSAzNmMzLjM5LS45NyAxMC4xMS40MyAxMy41LTIgMy4zOSAyLjQzIDEwLjExIDEuMDMgMTMuNSAyIDAgMCAxLjY1LjU0IDMgMi0uNjguOTctMS42NS45OS0zIC41LTMuMzktLjk3LTEwLjExLjQ2LTEzLjUtMS0zLjM5IDEuNDYtMTAuMTEuMDMtMTMuNSAxLTEuMzU0LjQ5LTIuMzIzLjQ3LTMtLjUgMS4zNTQtMS45NCAzLTIgMy0yeiIvPjxwYXRoIGQ9Ik0xNSAzMmMyLjUgMi41IDEyLjUgMi41IDE1IDAgLjUtMS41IDAtMiAwLTIgMC0yLjUtMi41LTQtMi41LTQgNS41LTEuNSA2LTExLjUtNS0xNS41LTExIDQtMTAuNSAxNC01IDE1LjUgMCAwLTIuNSAxLjUtMi41IDQgMCAwLS41LjUgMCAyeiIvPjxwYXRoIGQ9Ik0yNSA4YTIuNSAyLjUgMCAxIDEtNSAwIDIuNSAyLjUgMCAxIDEgNSAweiIvPjwvZz48cGF0aCBkPSJNMTcuNSAyNmgxME0xNSAzMGgxNW0tNy41LTE0LjV2NU0yMCAxOGg1IiBzdHJva2UtbGluZWpvaW49Im1pdGVyIi8+PC9nPjwvc3ZnPg==');\n}\n.cg-wrap piece.knight.white {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxwYXRoIGQ9Ik0yMiAxMGMxMC41IDEgMTYuNSA4IDE2IDI5SDE1YzAtOSAxMC02LjUgOC0yMSIgZmlsbD0iI2ZmZiIvPjxwYXRoIGQ9Ik0yNCAxOGMuMzggMi45MS01LjU1IDcuMzctOCA5LTMgMi0yLjgyIDQuMzQtNSA0LTEuMDQyLS45NCAxLjQxLTMuMDQgMC0zLTEgMCAuMTkgMS4yMy0xIDItMSAwLTQuMDAzIDEtNC00IDAtMiA2LTEyIDYtMTJzMS44OS0xLjkgMi0zLjVjLS43My0uOTk0LS41LTItLjUtMyAxLTEgMyAyLjUgMyAyLjVoMnMuNzgtMS45OTIgMi41LTNjMSAwIDEgMyAxIDMiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNOS41IDI1LjVhLjUuNSAwIDEgMS0xIDAgLjUuNSAwIDEgMSAxIDB6bTUuNDMzLTkuNzVhLjUgMS41IDMwIDEgMS0uODY2LS41LjUgMS41IDMwIDEgMSAuODY2LjV6IiBmaWxsPSIjMDAwIi8+PC9nPjwvc3ZnPg==');\n}\n.cg-wrap piece.rook.white {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbD0iI2ZmZiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxwYXRoIGQ9Ik05IDM5aDI3di0zSDl2M3ptMy0zdi00aDIxdjRIMTJ6bS0xLTIyVjloNHYyaDVWOWg1djJoNVY5aDR2NSIgc3Ryb2tlLWxpbmVjYXA9ImJ1dHQiLz48cGF0aCBkPSJNMzQgMTRsLTMgM0gxNGwtMy0zIi8+PHBhdGggZD0iTTMxIDE3djEyLjVIMTRWMTciIHN0cm9rZS1saW5lY2FwPSJidXR0IiBzdHJva2UtbGluZWpvaW49Im1pdGVyIi8+PHBhdGggZD0iTTMxIDI5LjVsMS41IDIuNWgtMjBsMS41LTIuNSIvPjxwYXRoIGQ9Ik0xMSAxNGgyMyIgZmlsbD0ibm9uZSIgc3Ryb2tlLWxpbmVqb2luPSJtaXRlciIvPjwvZz48L3N2Zz4=');\n}\n.cg-wrap piece.queen.white {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbD0iI2ZmZiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxwYXRoIGQ9Ik04IDEyYTIgMiAwIDEgMS00IDAgMiAyIDAgMSAxIDQgMHptMTYuNS00LjVhMiAyIDAgMSAxLTQgMCAyIDIgMCAxIDEgNCAwek00MSAxMmEyIDIgMCAxIDEtNCAwIDIgMiAwIDEgMSA0IDB6TTE2IDguNWEyIDIgMCAxIDEtNCAwIDIgMiAwIDEgMSA0IDB6TTMzIDlhMiAyIDAgMSAxLTQgMCAyIDIgMCAxIDEgNCAweiIvPjxwYXRoIGQ9Ik05IDI2YzguNS0xLjUgMjEtMS41IDI3IDBsMi0xMi03IDExVjExbC01LjUgMTMuNS0zLTE1LTMgMTUtNS41LTE0VjI1TDcgMTRsMiAxMnoiIHN0cm9rZS1saW5lY2FwPSJidXR0Ii8+PHBhdGggZD0iTTkgMjZjMCAyIDEuNSAyIDIuNSA0IDEgMS41IDEgMSAuNSAzLjUtMS41IDEtMS41IDIuNS0xLjUgMi41LTEuNSAxLjUuNSAyLjUuNSAyLjUgNi41IDEgMTYuNSAxIDIzIDAgMCAwIDEuNS0xIDAtMi41IDAgMCAuNS0xLjUtMS0yLjUtLjUtMi41LS41LTIgLjUtMy41IDEtMiAyLjUtMiAyLjUtNC04LjUtMS41LTE4LjUtMS41LTI3IDB6IiBzdHJva2UtbGluZWNhcD0iYnV0dCIvPjxwYXRoIGQ9Ik0xMS41IDMwYzMuNS0xIDE4LjUtMSAyMiAwTTEyIDMzLjVjNi0xIDE1LTEgMjEgMCIgZmlsbD0ibm9uZSIvPjwvZz48L3N2Zz4=');\n}\n.cg-wrap piece.king.white {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxwYXRoIGQ9Ik0yMi41IDExLjYzVjZNMjAgOGg1IiBzdHJva2UtbGluZWpvaW49Im1pdGVyIi8+PHBhdGggZD0iTTIyLjUgMjVzNC41LTcuNSAzLTEwLjVjMCAwLTEtMi41LTMtMi41cy0zIDIuNS0zIDIuNWMtMS41IDMgMyAxMC41IDMgMTAuNSIgZmlsbD0iI2ZmZiIgc3Ryb2tlLWxpbmVjYXA9ImJ1dHQiIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiLz48cGF0aCBkPSJNMTEuNSAzN2M1LjUgMy41IDE1LjUgMy41IDIxIDB2LTdzOS00LjUgNi0xMC41Yy00LTYuNS0xMy41LTMuNS0xNiA0VjI3di0zLjVjLTMuNS03LjUtMTMtMTAuNS0xNi00LTMgNiA1IDEwIDUgMTBWMzd6IiBmaWxsPSIjZmZmIi8+PHBhdGggZD0iTTExLjUgMzBjNS41LTMgMTUuNS0zIDIxIDBtLTIxIDMuNWM1LjUtMyAxNS41LTMgMjEgMG0tMjEgMy41YzUuNS0zIDE1LjUtMyAyMSAwIi8+PC9nPjwvc3ZnPg==');\n}\n.cg-wrap piece.pawn.black {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PHBhdGggZD0iTTIyLjUgOWMtMi4yMSAwLTQgMS43OS00IDQgMCAuODkuMjkgMS43MS43OCAyLjM4QzE3LjMzIDE2LjUgMTYgMTguNTkgMTYgMjFjMCAyLjAzLjk0IDMuODQgMi40MSA1LjAzLTMgMS4wNi03LjQxIDUuNTUtNy40MSAxMy40N2gyM2MwLTcuOTItNC40MS0xMi40MS03LjQxLTEzLjQ3IDEuNDctMS4xOSAyLjQxLTMgMi40MS01LjAzIDAtMi40MS0xLjMzLTQuNS0zLjI4LTUuNjIuNDktLjY3Ljc4LTEuNDkuNzgtMi4zOCAwLTIuMjEtMS43OS00LTQtNHoiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPjwvc3ZnPg==');\n}\n.cg-wrap piece.bishop.black {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxnIGZpbGw9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJidXR0Ij48cGF0aCBkPSJNOSAzNmMzLjM5LS45NyAxMC4xMS40MyAxMy41LTIgMy4zOSAyLjQzIDEwLjExIDEuMDMgMTMuNSAyIDAgMCAxLjY1LjU0IDMgMi0uNjguOTctMS42NS45OS0zIC41LTMuMzktLjk3LTEwLjExLjQ2LTEzLjUtMS0zLjM5IDEuNDYtMTAuMTEuMDMtMTMuNSAxLTEuMzU0LjQ5LTIuMzIzLjQ3LTMtLjUgMS4zNTQtMS45NCAzLTIgMy0yeiIvPjxwYXRoIGQ9Ik0xNSAzMmMyLjUgMi41IDEyLjUgMi41IDE1IDAgLjUtMS41IDAtMiAwLTIgMC0yLjUtMi41LTQtMi41LTQgNS41LTEuNSA2LTExLjUtNS0xNS41LTExIDQtMTAuNSAxNC01IDE1LjUgMCAwLTIuNSAxLjUtMi41IDQgMCAwLS41LjUgMCAyeiIvPjxwYXRoIGQ9Ik0yNSA4YTIuNSAyLjUgMCAxIDEtNSAwIDIuNSAyLjUgMCAxIDEgNSAweiIvPjwvZz48cGF0aCBkPSJNMTcuNSAyNmgxME0xNSAzMGgxNW0tNy41LTE0LjV2NU0yMCAxOGg1IiBzdHJva2U9IiNlY2VjZWMiIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiLz48L2c+PC9zdmc+');\n}\n.cg-wrap piece.knight.black {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxwYXRoIGQ9Ik0yMiAxMGMxMC41IDEgMTYuNSA4IDE2IDI5SDE1YzAtOSAxMC02LjUgOC0yMSIgZmlsbD0iIzAwMCIvPjxwYXRoIGQ9Ik0yNCAxOGMuMzggMi45MS01LjU1IDcuMzctOCA5LTMgMi0yLjgyIDQuMzQtNSA0LTEuMDQyLS45NCAxLjQxLTMuMDQgMC0zLTEgMCAuMTkgMS4yMy0xIDItMSAwLTQuMDAzIDEtNC00IDAtMiA2LTEyIDYtMTJzMS44OS0xLjkgMi0zLjVjLS43My0uOTk0LS41LTItLjUtMyAxLTEgMyAyLjUgMyAyLjVoMnMuNzgtMS45OTIgMi41LTNjMSAwIDEgMyAxIDMiIGZpbGw9IiMwMDAiLz48cGF0aCBkPSJNOS41IDI1LjVhLjUuNSAwIDEgMS0xIDAgLjUuNSAwIDEgMSAxIDB6bTUuNDMzLTkuNzVhLjUgMS41IDMwIDEgMS0uODY2LS41LjUgMS41IDMwIDEgMSAuODY2LjV6IiBmaWxsPSIjZWNlY2VjIiBzdHJva2U9IiNlY2VjZWMiLz48cGF0aCBkPSJNMjQuNTUgMTAuNGwtLjQ1IDEuNDUuNS4xNWMzLjE1IDEgNS42NSAyLjQ5IDcuOSA2Ljc1UzM1Ljc1IDI5LjA2IDM1LjI1IDM5bC0uMDUuNWgyLjI1bC4wNS0uNWMuNS0xMC4wNi0uODgtMTYuODUtMy4yNS0yMS4zNC0yLjM3LTQuNDktNS43OS02LjY0LTkuMTktNy4xNmwtLjUxLS4xeiIgZmlsbD0iI2VjZWNlYyIgc3Ryb2tlPSJub25lIi8+PC9nPjwvc3ZnPg==');\n}\n.cg-wrap piece.rook.black {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxwYXRoIGQ9Ik05IDM5aDI3di0zSDl2M3ptMy41LTdsMS41LTIuNWgxN2wxLjUgMi41aC0yMHptLS41IDR2LTRoMjF2NEgxMnoiIHN0cm9rZS1saW5lY2FwPSJidXR0Ii8+PHBhdGggZD0iTTE0IDI5LjV2LTEzaDE3djEzSDE0eiIgc3Ryb2tlLWxpbmVjYXA9ImJ1dHQiIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiLz48cGF0aCBkPSJNMTQgMTYuNUwxMSAxNGgyM2wtMyAyLjVIMTR6TTExIDE0VjloNHYyaDVWOWg1djJoNVY5aDR2NUgxMXoiIHN0cm9rZS1saW5lY2FwPSJidXR0Ii8+PHBhdGggZD0iTTEyIDM1LjVoMjFtLTIwLTRoMTltLTE4LTJoMTdtLTE3LTEzaDE3TTExIDE0aDIzIiBmaWxsPSJub25lIiBzdHJva2U9IiNlY2VjZWMiIHN0cm9rZS13aWR0aD0iMSIgc3Ryb2tlLWxpbmVqb2luPSJtaXRlciIvPjwvZz48L3N2Zz4=');\n}\n.cg-wrap piece.queen.black {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxnIHN0cm9rZT0ibm9uZSI+PGNpcmNsZSBjeD0iNiIgY3k9IjEyIiByPSIyLjc1Ii8+PGNpcmNsZSBjeD0iMTQiIGN5PSI5IiByPSIyLjc1Ii8+PGNpcmNsZSBjeD0iMjIuNSIgY3k9IjgiIHI9IjIuNzUiLz48Y2lyY2xlIGN4PSIzMSIgY3k9IjkiIHI9IjIuNzUiLz48Y2lyY2xlIGN4PSIzOSIgY3k9IjEyIiByPSIyLjc1Ii8+PC9nPjxwYXRoIGQ9Ik05IDI2YzguNS0xLjUgMjEtMS41IDI3IDBsMi41LTEyLjVMMzEgMjVsLS4zLTE0LjEtNS4yIDEzLjYtMy0xNC41LTMgMTQuNS01LjItMTMuNkwxNCAyNSA2LjUgMTMuNSA5IDI2eiIgc3Ryb2tlLWxpbmVjYXA9ImJ1dHQiLz48cGF0aCBkPSJNOSAyNmMwIDIgMS41IDIgMi41IDQgMSAxLjUgMSAxIC41IDMuNS0xLjUgMS0xLjUgMi41LTEuNSAyLjUtMS41IDEuNS41IDIuNS41IDIuNSA2LjUgMSAxNi41IDEgMjMgMCAwIDAgMS41LTEgMC0yLjUgMCAwIC41LTEuNS0xLTIuNS0uNS0yLjUtLjUtMiAuNS0zLjUgMS0yIDIuNS0yIDIuNS00LTguNS0xLjUtMTguNS0xLjUtMjcgMHoiIHN0cm9rZS1saW5lY2FwPSJidXR0Ii8+PHBhdGggZD0iTTExIDM4LjVhMzUgMzUgMSAwIDAgMjMgMCIgZmlsbD0ibm9uZSIgc3Ryb2tlLWxpbmVjYXA9ImJ1dHQiLz48cGF0aCBkPSJNMTEgMjlhMzUgMzUgMSAwIDEgMjMgMG0tMjEuNSAyLjVoMjBtLTIxIDNhMzUgMzUgMSAwIDAgMjIgMG0tMjMgM2EzNSAzNSAxIDAgMCAyNCAwIiBmaWxsPSJub25lIiBzdHJva2U9IiNlY2VjZWMiLz48L2c+PC9zdmc+');\n}\n.cg-wrap piece.king.black {\n  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0NSIgaGVpZ2h0PSI0NSI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxwYXRoIGQ9Ik0yMi41IDExLjYzVjYiIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiLz48cGF0aCBkPSJNMjIuNSAyNXM0LjUtNy41IDMtMTAuNWMwIDAtMS0yLjUtMy0yLjVzLTMgMi41LTMgMi41Yy0xLjUgMyAzIDEwLjUgMyAxMC41IiBmaWxsPSIjMDAwIiBzdHJva2UtbGluZWNhcD0iYnV0dCIgc3Ryb2tlLWxpbmVqb2luPSJtaXRlciIvPjxwYXRoIGQ9Ik0xMS41IDM3YzUuNSAzLjUgMTUuNSAzLjUgMjEgMHYtN3M5LTQuNSA2LTEwLjVjLTQtNi41LTEzLjUtMy41LTE2IDRWMjd2LTMuNWMtMy41LTcuNS0xMy0xMC41LTE2LTQtMyA2IDUgMTAgNSAxMFYzN3oiIGZpbGw9IiMwMDAiLz48cGF0aCBkPSJNMjAgOGg1IiBzdHJva2UtbGluZWpvaW49Im1pdGVyIi8+PHBhdGggZD0iTTMyIDI5LjVzOC41LTQgNi4wMy05LjY1QzM0LjE1IDE0IDI1IDE4IDIyLjUgMjQuNWwuMDEgMi4xLS4wMS0yLjFDMjAgMTggOS45MDYgMTQgNi45OTcgMTkuODVjLTIuNDk3IDUuNjUgNC44NTMgOSA0Ljg1MyA5IiBzdHJva2U9IiNlY2VjZWMiLz48cGF0aCBkPSJNMTEuNSAzMGM1LjUtMyAxNS41LTMgMjEgMG0tMjEgMy41YzUuNS0zIDE1LjUtMyAyMSAwbS0yMSAzLjVjNS41LTMgMTUuNS0zIDIxIDAiIHN0cm9rZT0iI2VjZWNlYyIvPjwvZz48L3N2Zz4=');\n}\n", "/* General */\n\n.chess-study button:active {\n\ttransform: translateY(1px);\n}\n\n.chess-study .border {\n\tborder: 1px var(--color-base-10) solid;\n\tborder-radius: 5px;\n}\n\n.chess-study .border-top {\n\tborder: 1px var(--color-base-10) solid;\n}\n\n.chess-study .vertical-align {\n\tdisplay: flex;\n\talign-items: center;\n}\n\n.chess-study .center {\n\tdisplay: flex;\n\talign-items: center;\n\tjustify-content: center;\n}\n\n.chess-study .height-width-100 {\n\twidth: 100%;\n\theight: 100%;\n}\n\n.chess-study .table {\n\tdisplay: table;\n}\n\n.chess-study {\n\tline-height: 1.5;\n\t-webkit-font-smoothing: antialiased;\n}\n\n.chess-study {\n\theight: 100%;\n}\n\n.chess-study *,\n.chess-study *::before,\n.chess-study *::after {\n\tbox-sizing: border-box;\n}\n.chess-study * {\n\tmargin: 0;\n}\n\n.chess-study input,\n.chess-study button,\n.chess-study textarea,\n.chess-study select {\n\tfont: inherit;\n}\n\n.chess-study p,\n.chess-study h1,\n.chess-study h2,\n.chess-study h3,\n.chess-study h4,\n.chess-study h5,\n.chess-study h6 {\n\toverflow-wrap: break-word;\n}\n\n/* Container */\n.chess-study .chessground-pgn-container {\n\tdisplay: flex;\n\theight: 450px;\n}\n\n.chess-study .chessground-pgn-container .chessground-container {\n\tflex: 0 0 450px;\n\theight: 100%;\n}\n\n.chess-study .chessground-pgn-container .pgn-container {\n\tflex: 1;\n\theight: 100%;\n}\n\n/* PGN Viewer */\n.chess-study .move-item-section {\n\theight: 415px;\n}\n\n.chess-study .button-section {\n\tdisplay: flex;\n\tjustify-content: center;\n\talign-items: center;\n\twidth: 100%;\n\tgap: 4px;\n\theight: 35px;\n}\n\n.chess-study .move-item-container {\n\tdisplay: grid;\n\tgrid-template-columns: 0.15fr 0.425fr 0.425fr;\n\tgrid-auto-rows: 30px;\n\twidth: 100%;\n\tmax-height: 415px;\n\toverflow-y: scroll;\n}\n\n.chess-study .move-item {\n\tpadding-left: 8px;\n\tuser-select: none;\n}\n\n.chess-study .move-item:hover {\n\tbackground-color: hsl(\n\t\tvar(--accent-h),\n\t\tvar(--accent-s),\n\t\tcalc(var(--accent-l))\n\t);\n\tcolor: var(--text-on-accent);\n\tcursor: pointer;\n}\n\n.chess-study .move-item.active {\n\tbackground-color: hsl(\n\t\tvar(--accent-h),\n\t\tvar(--accent-s),\n\t\tcalc(var(--accent-l) - 10%)\n\t);\n\tcolor: var(--text-on-accent);\n\tfont-weight: bold;\n}\n\n.chess-study .move-indicator {\n\tcolor: var(--color-base-60);\n\ttext-align: center;\n\tbackground-color: var(--color-base-10);\n\tuser-select: none;\n\tcursor: default;\n}\n\n/* Comment Section */\n\n.chess-study .editor-input {\n\tmin-height: 150px;\n\tresize: none;\n\tfont-size: 15px;\n\tcaret-color: rgb(5, 5, 5);\n\tposition: relative;\n\ttab-size: 1;\n\toutline: 0;\n\tpadding: 15px 10px;\n\tcaret-color: #444;\n}\n\n.chess-study .CommentSection {\n\theight: 250px;\n\tpadding-top: 5px;\n\toverflow: scroll;\n}\n\n.chess-study.ProseMirror,\n.chess-study.CommentSection > div {\n\twidth: 100%;\n\theight: 100%;\n}\n"],
  "mappings": ";AAAA;AACC;AAAA;;;ACDD;AACE;AACA;AACA;AAAA;AAGF;AACE;AACA;AACA;AACA;AACA;AAAA;AAGF;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AACA;AACA;AACA;AACA;AACA;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGF;AACE;AAEA;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AACA;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGF;AAAA;AAAA;AAGE;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AACA;AACA;AAAA;AAGF;AAEE;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AACA;AACA;AACA;AACA;AACA;AAAA;AAGF;AACE;AACA;AACA;AACA;AACA;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AACA;AAAA;AAGF;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AAAA;AAGF;AACE;AAAA;;;AC3KF;AACE;AACA;AAAA;AAIF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAQF;AACE;AAAA;AAIF;AAAA;AAAA;AAAA;AAIE;AAAA;AAGF;AAAA;AAAA;AAAA;AAIE;AAAA;;;ACvDF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;AAEF;AACE;AAAA;;;ACjCF;AACC;AAAA;AAGD;AACC;AACA;AAAA;AAGD;AACC;AAAA;AAGD;AACC;AACA;AAAA;AAGD;AACC;AACA;AACA;AAAA;AAGD;AACC;AACA;AAAA;AAGD;AACC;AAAA;AAGD;AACC;AACA;AAAA;AAGD;AACC;AAAA;AAGD;AAAA;AAAA;AAGC;AAAA;AAED;AACC;AAAA;AAGD;AAAA;AAAA;AAAA;AAIC;AAAA;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAOC;AAAA;AAID;AACC;AACA;AAAA;AAGD;AACC;AACA;AAAA;AAGD;AACC;AACA;AAAA;AAID;AACC;AAAA;AAGD;AACC;AACA;AACA;AACA;AACA;AACA;AAAA;AAGD;AACC;AACA;AACA;AACA;AACA;AACA;AAAA;AAGD;AACC;AACA;AAAA;AAGD;AACC;AAKA;AACA;AAAA;AAGD;AACC;AAKA;AACA;AAAA;AAGD;AACC;AACA;AACA;AACA;AACA;AAAA;AAKD;AACC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAGD;AACC;AACA;AACA;AAAA;AAGD;AAAA;AAEC;AACA;AAAA;",
  "names": []
}
 */ diff --git a/versions.json b/versions.json index 26382a1..189c17e 100644 --- a/versions.json +++ b/versions.json @@ -1,3 +1,4 @@ { - "1.0.0": "0.15.0" + "1.0.0": "0.15.0", + "1.0.1": "0.15.0" }