jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Webatrice: update deps (#4700)

Browse source 
* save work

* fix reset styling

* fix toast reducer

* update non-react deps

* update react libraries

* remove jquery, use sanitize-html instead

* add missing change

* fix deps and dev deps

* update workflow to target Node 16

* run @mui/codemod to remove @mui/styles

* add default body font size

* update react 17 to 18

* declare enum before use

* add rel attr to links

* fix font sizing issue

* trailing commas

* refactor deep destructuring

Co-authored-by: Jeremy Letto <jeremy.letto@datasite.com>
This commit is contained in:
Jeremy Letto 2022-11-01 12:41:42 -05:00 • committed by GitHub
parent 5854a635ca
commit 26d7fe2ff0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 26225 additions and 3552 deletions
Download patch file Download diff file Expand all files Collapse all files

12
webclient/src/components/Toast/ToastContext.tsx
View file

@ -1,4 +1,4 @@
import { createContext, FC, ReactChild, ReactNode, useContext, useEffect, useReducer, ContextType, Context } from 'react'
import { createContext, FC, PropsWithChildren, ReactChild, ReactNode, useContext, useEffect, useReducer, ContextType, Context } from 'react'
import { ACTIONS, initialState, reducer } from './reducer';
import Toast from './Toast'
@ -24,15 +24,15 @@ const ToastContext: Context<any> = createContext<ToastState>({
removeToast: (key) => {},
});
export const ToastProvider: FC<ReactNode> = (props) => {
export const ToastProvider: FC<PropsWithChildren> = (props) => {
const { children } = props
const [state, dispatch] = useReducer(reducer, initialState)
const providerState = {
toasts: state.toasts,
addToast: (key, children) => dispatch({ type: ACTIONS.ADD_TOAST, payload: { key, children } }),
openToast: key => dispatch({ type: ACTIONS.OPEN_TOAST, payload: key }),
closeToast: key => dispatch({ type: ACTIONS.CLOSE_TOAST, payload: key }),
removeToast: key => dispatch({ type: ACTIONS.REMOVE_TOAST, payload: key }),
openToast: key => dispatch({ type: ACTIONS.OPEN_TOAST, payload: { key } }),
closeToast: key => dispatch({ type: ACTIONS.CLOSE_TOAST, payload: { key } }),
removeToast: key => dispatch({ type: ACTIONS.REMOVE_TOAST, payload: { key } }),
}
return (
<ToastContext.Provider value={providerState}>
@ -41,7 +41,7 @@ export const ToastProvider: FC<ReactNode> = (props) => {
{Array.from(state.toasts).map(([key, value]) => {
const { isOpen, children } = value;
return (
<Toast key={key} open={isOpen} onClose={() => dispatch({ type: ACTIONS.CLOSE_TOAST, payload: key })}>
<Toast key={key} open={isOpen} onClose={() => dispatch({ type: ACTIONS.CLOSE_TOAST, payload: { key } })}>
{children}
</Toast>
)

63
webclient/src/components/Toast/reducer.ts
View file

@ -6,41 +6,54 @@ export const ACTIONS = {
}
export const initialState = {
toasts: new Map()
toasts: {}
}
export function reducer(state, action) {
const { type, payload } = action
export function reducer(state, { type, payload }) {
const { key, children } = payload;
switch (type) {
case ACTIONS.ADD_TOAST: {
const newState = { ...state }
newState.toasts = new Map(Array.from(state.toasts))
const { toasts } = newState;
const { key, children } = payload
toasts.set(key, { isOpen: false, children })
return newState
return {
...state,
toasts: {
...state.toasts,
[key]: {
isOpen: false,
children,
},
},
};
}
case ACTIONS.OPEN_TOAST: {
const newState = { ...state }
newState.toasts = new Map(Array.from(state.toasts))
const { toasts } = newState;
const toast = toasts.get(payload)
toasts.set(payload, { isOpen: true, children: toast.children })
return newState
return {
...state,
toasts: {
...state.toasts,
[key]: {
...state.toasts[key],
isOpen: true,
},
},
};
}
case ACTIONS.CLOSE_TOAST: {
const newState = { ...state }
newState.toasts = new Map(Array.from(state.toasts))
const { toasts } = newState;
const toast = toasts.get(payload)
toasts.set(payload, { isOpen: false, children: toast.children })
return newState
return {
...state,
toasts: {
...state.toasts,
[key]: {
...state.toasts[key],
isOpen: false,
},
},
};
}
case ACTIONS.REMOVE_TOAST: {
const newState = { ...state }
newState.toasts = new Map(Array.from(state.toasts))
newState.toasts.delete(payload)
return newState
const newState = { ...state };
delete newState.toasts[key];
return newState;
}
default:
throw Error('Please pick an available action')