Update package versions

package.json

@@ -59,11 +59,11 @@
     "react": "18.2.0",
     "react-color": "2.19.3",
     "react-dom": "18.2.0",
-    "react-redux": "8.1.3",
+    "react-redux": "9.1.2",
     "react-tooltip": "4.5.1",
-    "redux": "4.2.1",
+    "redux": "5.0.1",
     "redux-saga": "1.3.0",
-    "redux-thunk": "2.4.2",
+    "redux-thunk": "3.1.0",
     "rxjs": "7.8.1",
     "styled-components": "5.3.11",
     "tslib": "2.6.2",

src/main/components/store/model-store.tsx

@@ -1,17 +1,8 @@
 import React, { Component, PropsWithChildren } from 'react';
 import { Provider } from 'react-redux';
-import {
-  applyMiddleware,
-  combineReducers,
-  compose,
-  createStore,
-  PreloadedState,
-  Reducer,
-  Store,
-  StoreEnhancer,
-} from 'redux';
+import { applyMiddleware, combineReducers, compose, createStore, Reducer, Store, StoreEnhancer } from 'redux';
 import createSagaMiddleware, { SagaMiddleware } from 'redux-saga';
-import thunk, { ThunkMiddleware } from 'redux-thunk';
+import { thunk, ThunkMiddleware } from 'redux-thunk';
 import { Actions } from '../../services/actions';
 import { ILayer } from '../../services/layouter/layer';
 import { LayouterRepository } from '../../services/layouter/layouter-repository';
@@ -34,18 +25,18 @@ import { UMLModel } from '../../typings';
 import { merge } from './merge';
 
 type OwnProps = PropsWithChildren<{
-  initialState?: PreloadedState<PartialModelState>;
+  initialState?: PartialModelState;
   patcher?: Patcher<UMLModel>;
 }>;
 
 type Props = OwnProps & CanvasContext;
 
 export const createReduxStore = (
-  initialState: PreloadedState<PartialModelState> = {},
+  initialState: PartialModelState = {},
   layer: ILayer | null = null,
   patcher?: Patcher<UMLModel>,
 ): Store<ModelState, Actions> => {
-  const baseReducer: Reducer<ModelState, Actions> = undoable(combineReducers<ModelState, Actions>(reducers));
+  const baseReducer: Reducer<ModelState, Actions> = undoable<ModelState, Actions>(combineReducers(reducers) as any);
   const patchReducer =
     patcher &&
     createPatcherReducer<UMLModel, ModelState>(patcher, {
@@ -57,7 +48,7 @@ export const createReduxStore = (
   const reducer: Reducer<ModelState, Actions> = (state, action) => {
     const baseState = baseReducer(state, action);
     if (patchReducer) {
-      return patchReducer(baseState, action);
+      return patchReducer(baseState, action as any);
     } else {
       return baseState;
     }
@@ -93,7 +84,7 @@ export const createReduxStore = (
 };
 
 const getInitialState = (
-  initialState: PreloadedState<PartialModelState> = {},
+  initialState: PartialModelState = {},
   layer: ILayer | null = null,
   patcher?: Patcher<UMLModel>,
 ): { store: Store<ModelState, Actions> } => {

src/main/services/patcher/patcher-reducer.ts

@@ -1,6 +1,7 @@
 import { Reducer } from 'redux';
 import { Patcher } from './patcher';
-import { PatcherActionTypes } from './patcher-types';
+import { Patch, PatcherActionTypes } from './patcher-types';
+import { SignedPatch } from './patch-verifier';
 
 export type PatcherReducerOptions<T, U = T> = {
   /**
@@ -53,7 +54,7 @@ export function createPatcherReducer<T, U = T>(
   return (state, action) => {
     const { type, payload } = action;
     if (type === PatcherActionTypes.PATCH) {
-      const res = patcher.patch(payload, transformInverse(state as U));
+      const res = patcher.patch(payload as Patch | SignedPatch, transformInverse(state as U));
 
       if (res.patched) {
         return merge((state ?? {}) as U, transform(res.result));

src/main/utils/actions/actions.ts

@@ -3,12 +3,12 @@ import { PutEffect } from 'redux-saga/effects';
 import { ThunkAction, ThunkDispatch } from 'redux-thunk';
 import { ModelState } from '../../components/store/model-state';
 
-export interface Action<T = any> extends ReduxAction<T> {
+export interface Action<T extends string = string> extends ReduxAction<T> {
   payload: object;
   undoable: boolean;
 }
 
-export interface RedoableAction<T = any> extends Action<T> {
+export interface RedoableAction<T extends string = string> extends Action<T> {
   redoable: true;
 }
 

src/main/utils/fx/assign.ts

@@ -1,4 +1,4 @@
-import { DeepPartial } from 'redux';
+import { DeepPartial } from '../../typings';
 
 export const assign = <T extends { [key: string]: any }>(target: T, source?: DeepPartial<T>): T => {
   for (const key in source) {
@@ -18,7 +18,7 @@ export const assign = <T extends { [key: string]: any }>(target: T, source?: Dee
       if (target === undefined) {
         target = {} as T;
       }
-      target[key] = source[key] as T[Extract<keyof T, string>];
+      target[key] = source[key] as T[Extract<keyof DeepPartial<T>, string>];
     }
   }