can assign ball to player in the code (need render and destroy ball now)
continuous-integration/drone/push Build is passing Details

pull/40/head
Vivien DUFOUR 1 year ago
parent dac0c54cec
commit 7ab18786cc

@ -2,7 +2,7 @@ import React from "react";
import "../../style/ball.css"; import "../../style/ball.css";
import Ball from "../../assets/icon/ball.svg"; import Ball from "../../assets/icon/ball.svg?react";
export function BallPiece() { export function BallPiece() {
return ( return (

@ -21,7 +21,6 @@ export default function CourtPlayer({
player, player,
onChange, onChange,
onRemove, onRemove,
assignBall,
parentRef, parentRef,
}: PlayerProps) { }: PlayerProps) {
const pieceRef = useRef<HTMLDivElement>(null) const pieceRef = useRef<HTMLDivElement>(null)
@ -42,11 +41,12 @@ export default function CourtPlayer({
const { x, y } = calculateRatio(pieceBounds, parentBounds) const { x, y } = calculateRatio(pieceBounds, parentBounds)
onChange({ onChange({
id : player.id,
rightRatio: x, rightRatio: x,
bottomRatio: y, bottomRatio: y,
team: player.team, team: player.team,
role: player.role, role: player.role,
hasBall: false hasBall: player.hasBall
}) })
}}> }}>
<div <div
@ -57,7 +57,7 @@ export default function CourtPlayer({
left: `${x * 100}%`, left: `${x * 100}%`,
top: `${y * 100}%`, top: `${y * 100}%`,
}}> }}>
<div <div id={player.id}
tabIndex={0} tabIndex={0}
className="player-content" className="player-content"
onKeyUp={(e) => { onKeyUp={(e) => {

@ -1,6 +1,8 @@
import { Team } from "./Team" import { Team } from "./Team"
export interface Player { export interface Player {
id : string
/** /**
* the player's team * the player's team
* */ * */

@ -24,6 +24,7 @@ import SavingState, {
SaveState, SaveState,
SaveStates, SaveStates,
} from "../components/editor/SavingState" } from "../components/editor/SavingState"
import Draggable from "react-draggable";
const ERROR_STYLE: CSSProperties = { const ERROR_STYLE: CSSProperties = {
borderColor: "red", borderColor: "red",
@ -113,8 +114,7 @@ function EditorView({
getRackPlayers(Team.Opponents, content.players), getRackPlayers(Team.Opponents, content.players),
) )
const ballPiece = useRef<HTMLDivElement>(null)
const [ball, setBall] = useState<Ball[]>([]);
const courtDivContentRef = useRef<HTMLDivElement>(null) const courtDivContentRef = useRef<HTMLDivElement>(null)
@ -143,6 +143,7 @@ function EditorView({
players: [ players: [
...content.players, ...content.players,
{ {
id: "player-" + content.players.length,
team: element.team, team: element.team,
role: element.key, role: element.key,
rightRatio: x, rightRatio: x,
@ -154,37 +155,22 @@ function EditorView({
}) })
} }
const canDetachBall = (ref: HTMLDivElement) => { const onElementDetachBall = () => {
const refBounds = ref.getBoundingClientRect(); const ballBounds = ballPiece.current!.getBoundingClientRect()
const courtBounds = courtDivContentRef.current!.getBoundingClientRect();
//check if we give the ball to a player on the court for (const player of content.players) {
if (!canDetach(ref)) { const playerBounds = document.getElementById(player.id)!.getBoundingClientRect()
return false; const doesNotOverlap = (
ballBounds.top > playerBounds.bottom ||
ballBounds.right < playerBounds.left ||
ballBounds.bottom < playerBounds.top ||
ballBounds.left > playerBounds.right
)
if (doesNotOverlap) {
continue
} }
/*for(const player in players) { player.hasBall = true
const rightRatio = player
}*/
return false;
} }
const onElementDetachBall = (ref: HTMLDivElement) => {
const refBounds = ref.getBoundingClientRect()
const courtBounds = courtDivContentRef.current!.getBoundingClientRect();
const relativeXPixels = refBounds.x - courtBounds.x;
const relativeYPixels = refBounds.y - courtBounds.y;
const xPercent = relativeXPixels / courtBounds.width;
const yPercent = relativeYPixels / courtBounds.height;
setBall(ball => {
return [...ball, {
right_percentage: xPercent,
bottom_percentage: yPercent,
}]
})
} }
@ -220,13 +206,15 @@ function EditorView({
<PlayerPiece team={team} text={key} key={key}/> <PlayerPiece team={team} text={key} key={key}/>
)} )}
/> />
<Rack
id="ball-rack" <Draggable
objects={ball} onStop={onElementDetachBall}
onChange={setBall} >
canDetach={canDetachBall} <div ref={ballPiece}>
onElementDetached={onElementDetachBall} <BallPiece/>
render={({pos}) => <BallPiece key={pos}/>}/> </div>
</Draggable>
<Rack <Rack
id="opponent-rack" id="opponent-rack"
objects={opponents} objects={opponents}

Loading…
Cancel
Save