Skip to content

fix: types #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
delucis merged 4 commits into from
Sep 13, 2020
Merged

fix: types #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7752937
fix: types
Pong420 Sep 11, 2020
7748cd1
Merge branch 'master' into pong420/fix-types
Pong420 Sep 11, 2020
e578cb3
style(client): Run prettier
delucis Sep 13, 2020
e5ab5f0
fix(client): Better represent data composition in React client types
delucis Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/client/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
Reducer,
State,
Store,
Ctx,
} from '../types';

type ClientAction = ActionShape.Reset | ActionShape.Sync | ActionShape.Update;
Expand Down Expand Up @@ -86,8 +87,11 @@ export const createEventDispatchers = createDispatchers.bind(null, 'gameEvent');
// Creates a set of dispatchers to dispatch actions to plugins.
export const createPluginDispatchers = createDispatchers.bind(null, 'plugin');

export interface ClientOpts<G extends any = any> {
game: Game<G>;
export interface ClientOpts<
G extends any = any,
CtxWithPlugins extends Ctx = Ctx
> {
game: Game<G, CtxWithPlugins>;
debug?: DebugOpt | boolean;
numPlayers?: number;
multiplayer?: (opts: TransportOpts) => Transport;
Expand Down
32 changes: 17 additions & 15 deletions src/client/react.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Client as RawClient, ClientOpts, _ClientImpl } from './client';
import { State } from '../types';

type WrappedBoardDelegates = 'matchID' | 'playerID' | 'credentials';

Expand All @@ -18,20 +17,23 @@ export type WrappedBoardProps = Pick<
WrappedBoardDelegates | 'debug'
>;

export type BoardProps<G extends any = any> = State<G> &
Pick<
_ClientImpl<G>,
| 'log'
| 'moves'
| 'events'
| 'reset'
| 'undo'
| 'redo'
| 'playerID'
| 'matchID'
| 'matchData'
> & {
isActive: boolean;
type ClientState<G extends any = any> = ReturnType<_ClientImpl<G>['getState']>;
type ExposedClientProps<G extends any = any> = Pick<
_ClientImpl<G>,
| 'log'
| 'moves'
| 'events'
| 'reset'
| 'undo'
| 'redo'
| 'playerID'
| 'matchID'
| 'matchData'
>;

export type BoardProps<G extends any = any> = ClientState<G> &
Omit<WrappedBoardProps, keyof ExposedClientProps<G>> &
ExposedClientProps<G> & {
isMultiplayer: boolean;
};

Expand Down