diff --git a/src/components/Board/Board.scss b/src/components/Board/Board.scss index 0b6b490..0fdcf2e 100644 --- a/src/components/Board/Board.scss +++ b/src/components/Board/Board.scss @@ -51,6 +51,7 @@ $LetterHoverColor: #d9d9ff; &:focus { border-color: #8b8be5; + outline: none; } } diff --git a/src/components/Board/Board.tsx b/src/components/Board/Board.tsx index 30c62f2..b4fff13 100644 --- a/src/components/Board/Board.tsx +++ b/src/components/Board/Board.tsx @@ -7,7 +7,10 @@ interface IBoardProps { numCols: number; } -type Position = [x: number, y: number]; +interface Position { + x: number; + y: number; +} interface IBoardState { board: string[][]; @@ -17,21 +20,23 @@ interface IBoardState { export default class Board extends React.Component { private line: React.RefObject; - private line_x1: string; - private line_y1: string; + private line1: Position; + private line2: Position; + private letterSize: number; constructor(props: IBoardProps) { super(props); this.state = { - board: Array(props.numCols).fill(Array(props.numRows).fill('ยท')), + board: Array(props.numCols).fill(Array(props.numRows).fill('A')), isSelectingWord: false, - startPos: [0, 0], + startPos: {x: 0, y: 0}, } this.line = React.createRef(); - this.line_x1 = "0px"; - this.line_y1 = "0px"; + this.line1 = {x: 0, y: 0}; + this.line2 = {x: 0, y: 0}; + this.letterSize = 60; } handleMouseDown(startPos: Position) { @@ -39,9 +44,8 @@ export default class Board extends React.Component { } handleMouseUp(startPos: Position) { - let [x, y] = startPos; - this.line_x1 = `${y * 100}px`; - this.line_y1 = `${x * 100}px`; + this.line1 = startPos; + this.line2 = this.state.startPos; this.setState({...this.state, startPos, isSelectingWord: false}); } @@ -53,14 +57,14 @@ export default class Board extends React.Component { render(): JSX.Element { let letters = - this.state.board.map((ox, x) => - ox.map((s, y) => + this.state.board.map((oy, y) => + oy.map((s, x) => @@ -78,10 +82,10 @@ export default class Board extends React.Component {