Preserve event listener ordering

nytimes · Nov 17, 2023 · 7462291 · 7462291
1 parent 526548a
commit 7462291
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.yarn/versions/d438c5f0.yml b/.yarn/versions/d438c5f0.yml
@@ -0,0 +1,2 @@
+releases:
+  "@nytimes/react-prosemirror": patch
diff --git a/src/hooks/useComponentEventListeners.tsx b/src/hooks/useComponentEventListeners.tsx
@@ -34,13 +34,13 @@ import {
  */
 export function useComponentEventListeners() {
   const [registry, setRegistry] = useState(
-    new Map<keyof DOMEventMap, Set<EventHandler>>()
+    new Map<keyof DOMEventMap, Array<EventHandler>>()
   );
 
   const registerEventListener = useCallback(
     (eventType: keyof DOMEventMap, handler: EventHandler) => {
-      const handlers = registry.get(eventType) ?? new Set<EventHandler>();
-      handlers.add(handler);
+      const handlers = registry.get(eventType) ?? [];
+      handlers.unshift(handler);
       if (!registry.has(eventType)) {
         registry.set(eventType, handlers);
         setRegistry(new Map(registry));
@@ -52,7 +52,7 @@ export function useComponentEventListeners() {
   const unregisterEventListener = useCallback(
     (eventType: keyof DOMEventMap, handler: EventHandler) => {
       const handlers = registry.get(eventType);
-      handlers?.delete(handler);
+      handlers?.splice(handlers.indexOf(handler), 1);
     },
     [registry]
   );

diff --git a/src/plugins/componentEventListeners.ts b/src/plugins/componentEventListeners.ts
@@ -11,7 +11,7 @@ export type EventHandler<
 ) => boolean | void;
 
 export function componentEventListeners(
-  eventHandlerRegistry: Map<keyof DOMEventMap, Set<EventHandler>>
+  eventHandlerRegistry: Map<keyof DOMEventMap, Iterable<EventHandler>>
 ) {
   const domEventHandlers: Record<keyof DOMEventMap, EventHandler> = {};