diff --git a/packages/redux-devtools-inspector-monitor/src/ActionList.tsx b/packages/redux-devtools-inspector-monitor/src/ActionList.tsx index a72278a0..f9f115f8 100644 --- a/packages/redux-devtools-inspector-monitor/src/ActionList.tsx +++ b/packages/redux-devtools-inspector-monitor/src/ActionList.tsx @@ -83,7 +83,7 @@ export default function ActionList>({ onReorderAction, }: Props): JSX.Element { const nodeRef = useRef(null); - const prevLastActionId = useRef(); + const prevLastActionId = useRef(undefined); useLayoutEffect(() => { if (nodeRef.current && prevLastActionId.current !== lastActionId) { diff --git a/patches/@dnd-kit__core.patch b/patches/@dnd-kit__core.patch new file mode 100644 index 00000000..98b790ad --- /dev/null +++ b/patches/@dnd-kit__core.patch @@ -0,0 +1,59 @@ +diff --git a/dist/components/Accessibility/Accessibility.d.ts b/dist/components/Accessibility/Accessibility.d.ts +index bb8c25b3e818b31da14a1dc64c7d8cc4ad2c1b2f..dc8a50037b90a7a4044d54f2abdf58d1b3dc4bd3 100644 +--- a/dist/components/Accessibility/Accessibility.d.ts ++++ b/dist/components/Accessibility/Accessibility.d.ts +@@ -6,5 +6,5 @@ interface Props { + screenReaderInstructions?: ScreenReaderInstructions; + hiddenTextDescribedById: string; + } +-export declare function Accessibility({ announcements, container, hiddenTextDescribedById, screenReaderInstructions, }: Props): JSX.Element | null; ++export declare function Accessibility({ announcements, container, hiddenTextDescribedById, screenReaderInstructions, }: Props): React.JSX.Element | null; + export {}; +diff --git a/dist/components/DragOverlay/DragOverlay.d.ts b/dist/components/DragOverlay/DragOverlay.d.ts +index 36fc7a419fac52cbe265c90106cddc43fe95dcb8..e98ba4a1b81a8266d2b9aa657d6a79f8b4176bb1 100644 +--- a/dist/components/DragOverlay/DragOverlay.d.ts ++++ b/dist/components/DragOverlay/DragOverlay.d.ts +@@ -5,7 +5,7 @@ import type { DropAnimation } from './hooks'; + export interface Props extends Pick { + dropAnimation?: DropAnimation | null | undefined; + modifiers?: Modifiers; +- wrapperElement?: keyof JSX.IntrinsicElements; ++ wrapperElement?: keyof React.JSX.IntrinsicElements; + zIndex?: number; + } +-export declare const DragOverlay: React.MemoExoticComponent<({ adjustScale, children, dropAnimation: dropAnimationConfig, style, transition, modifiers, wrapperElement, className, zIndex, }: Props) => JSX.Element>; ++export declare const DragOverlay: React.MemoExoticComponent<({ adjustScale, children, dropAnimation: dropAnimationConfig, style, transition, modifiers, wrapperElement, className, zIndex, }: Props) => React.JSX.Element>; +diff --git a/dist/components/DragOverlay/components/AnimationManager/AnimationManager.d.ts b/dist/components/DragOverlay/components/AnimationManager/AnimationManager.d.ts +index 8099a21266bdc99774a36a536428957338c4df41..1022ed4621ed50172909fae7ea695fb78a514091 100644 +--- a/dist/components/DragOverlay/components/AnimationManager/AnimationManager.d.ts ++++ b/dist/components/DragOverlay/components/AnimationManager/AnimationManager.d.ts +@@ -5,4 +5,4 @@ export interface Props { + animation: Animation; + children: React.ReactElement | null; + } +-export declare function AnimationManager({ animation, children }: Props): JSX.Element; ++export declare function AnimationManager({ animation, children }: Props): React.JSX.Element; +diff --git a/dist/components/DragOverlay/components/NullifiedContextProvider/NullifiedContextProvider.d.ts b/dist/components/DragOverlay/components/NullifiedContextProvider/NullifiedContextProvider.d.ts +index cae101110ecb6fdabf90e0fd5018fe1e13512230..c8b9f458b41952bbde8549f0a29d32c4eb2d75a3 100644 +--- a/dist/components/DragOverlay/components/NullifiedContextProvider/NullifiedContextProvider.d.ts ++++ b/dist/components/DragOverlay/components/NullifiedContextProvider/NullifiedContextProvider.d.ts +@@ -2,5 +2,5 @@ import React from 'react'; + interface Props { + children: React.ReactNode; + } +-export declare function NullifiedContextProvider({ children }: Props): JSX.Element; ++export declare function NullifiedContextProvider({ children }: Props): React.JSX.Element; + export {}; +diff --git a/dist/components/DragOverlay/components/PositionedOverlay/PositionedOverlay.d.ts b/dist/components/DragOverlay/components/PositionedOverlay/PositionedOverlay.d.ts +index 59dba0b1ca8e7b9fed4ea85036c8ad5c0e92caa6..badcc14baa5c99a4a16e6bcf47344deee88ae194 100644 +--- a/dist/components/DragOverlay/components/PositionedOverlay/PositionedOverlay.d.ts ++++ b/dist/components/DragOverlay/components/PositionedOverlay/PositionedOverlay.d.ts +@@ -3,7 +3,7 @@ import type { Transform } from '@dnd-kit/utilities'; + import type { ClientRect, UniqueIdentifier } from '../../../../types'; + declare type TransitionGetter = (activatorEvent: Event | null) => React.CSSProperties['transition'] | undefined; + export interface Props { +- as: keyof JSX.IntrinsicElements; ++ as: keyof React.JSX.IntrinsicElements; + activatorEvent: Event | null; + adjustScale?: boolean; + children?: React.ReactNode; diff --git a/patches/@dnd-kit__sortable.patch b/patches/@dnd-kit__sortable.patch new file mode 100644 index 00000000..10f45218 --- /dev/null +++ b/patches/@dnd-kit__sortable.patch @@ -0,0 +1,11 @@ +diff --git a/dist/components/SortableContext.d.ts b/dist/components/SortableContext.d.ts +index 718e8db4aa98759ac82b151650c15568d9a9f538..98d5b11a96d27f1f094bf3aeedc889e2c7325c93 100644 +--- a/dist/components/SortableContext.d.ts ++++ b/dist/components/SortableContext.d.ts +@@ -22,5 +22,5 @@ interface ContextDescriptor { + strategy: SortingStrategy; + } + export declare const Context: React.Context; +-export declare function SortableContext({ children, id, items: userDefinedItems, strategy, disabled: disabledProp, }: Props): JSX.Element; ++export declare function SortableContext({ children, id, items: userDefinedItems, strategy, disabled: disabledProp, }: Props): React.JSX.Element; + export {}; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3ab612b4..08e2a5bf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,14 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +patchedDependencies: + '@dnd-kit/core': + hash: bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17 + path: patches/@dnd-kit__core.patch + '@dnd-kit/sortable': + hash: e47dc0c4389a046873ebf71cee394de1946ef0e0ee96c171579932908f628d7f + path: patches/@dnd-kit__sortable.patch + importers: .: @@ -1247,13 +1255,13 @@ importers: version: 7.27.1 '@dnd-kit/core': specifier: ^6.3.1 - version: 6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + version: 6.3.1(patch_hash=bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@dnd-kit/modifiers': specifier: ^9.0.0 - version: 9.0.0(@dnd-kit/core@6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) + version: 9.0.0(@dnd-kit/core@6.3.1(patch_hash=bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) '@dnd-kit/sortable': specifier: ^10.0.0 - version: 10.0.0(@dnd-kit/core@6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) + version: 10.0.0(patch_hash=e47dc0c4389a046873ebf71cee394de1946ef0e0ee96c171579932908f628d7f)(@dnd-kit/core@6.3.1(patch_hash=bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) '@dnd-kit/utilities': specifier: ^3.2.2 version: 3.2.2(react@19.1.0) @@ -11451,7 +11459,7 @@ snapshots: react: 19.1.0 tslib: 2.8.1 - '@dnd-kit/core@6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)': + '@dnd-kit/core@6.3.1(patch_hash=bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)': dependencies: '@dnd-kit/accessibility': 3.1.1(react@19.1.0) '@dnd-kit/utilities': 3.2.2(react@19.1.0) @@ -11459,16 +11467,16 @@ snapshots: react-dom: 19.1.0(react@19.1.0) tslib: 2.8.1 - '@dnd-kit/modifiers@9.0.0(@dnd-kit/core@6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0)': + '@dnd-kit/modifiers@9.0.0(@dnd-kit/core@6.3.1(patch_hash=bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0)': dependencies: - '@dnd-kit/core': 6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + '@dnd-kit/core': 6.3.1(patch_hash=bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@dnd-kit/utilities': 3.2.2(react@19.1.0) react: 19.1.0 tslib: 2.8.1 - '@dnd-kit/sortable@10.0.0(@dnd-kit/core@6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0)': + '@dnd-kit/sortable@10.0.0(patch_hash=e47dc0c4389a046873ebf71cee394de1946ef0e0ee96c171579932908f628d7f)(@dnd-kit/core@6.3.1(patch_hash=bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0)': dependencies: - '@dnd-kit/core': 6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + '@dnd-kit/core': 6.3.1(patch_hash=bee825e5edf3dc4325af458bf5a68b629e8b0a189ea0eee259b66d28981f8a17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@dnd-kit/utilities': 3.2.2(react@19.1.0) react: 19.1.0 tslib: 2.8.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index e012e69d..2939d6a6 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -18,3 +18,6 @@ onlyBuiltDependencies: - esbuild - msw - sqlite3 +patchedDependencies: + '@dnd-kit/core': patches/@dnd-kit__core.patch + '@dnd-kit/sortable': patches/@dnd-kit__sortable.patch