Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions .changeset/forty-apes-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
"overlay-kit": patch
---

fix: prevent unnecessary re-renders of existing overlays with memo

Prevent unnecessary re-renders of existing overlays when new overlays are opened, improving performance.

### Key Changes

- **Added React.memo**: Applied memo to overlay controller component to prevent re-renders when props haven't changed
- **Integrated state management**: Streamlined state management by integrating it directly into the component and removing redundant prop passing

### Performance Improvements

- Eliminated unnecessary re-renders of existing overlays when adding new overlays in multi-overlay scenarios
- Provides more predictable and maintainable state management flow
- Maintained existing API compatibility while optimizing internal performance

This change maintains backward compatibility and provides performance improvements without requiring any code changes from users.
53 changes: 20 additions & 33 deletions packages/src/context/provider/content-overlay-controller.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { type FC, useEffect, useRef } from 'react';
import { type FC, useEffect, type ActionDispatch, memo } from 'react';
import { type OverlayReducerAction } from '../reducer';

type OverlayControllerProps = {
overlayId: string;
Expand All @@ -16,40 +17,26 @@ export type OverlayAsyncControllerComponent<T> = FC<OverlayAsyncControllerProps<

type ContentOverlayControllerProps = {
isOpen: boolean;
current: string | null;
overlayId: string;
onMounted: () => void;
onCloseModal: () => void;
onExitModal: () => void;
overlayDispatch: ActionDispatch<[action: OverlayReducerAction]>;
controller: OverlayControllerComponent;
};

export function ContentOverlayController({
isOpen,
current,
overlayId,
onMounted,
onCloseModal,
onExitModal,
controller: Controller,
}: ContentOverlayControllerProps) {
const prevCurrent = useRef(current);
const onMountedRef = useRef(onMounted);

/**
* @description Executes when closing and reopening an overlay without unmounting.
*/
if (prevCurrent.current !== current) {
prevCurrent.current = current;

if (current === overlayId) {
onMountedRef.current();
}
export const ContentOverlayController = memo(
({ isOpen, overlayId, overlayDispatch, controller: Controller }: ContentOverlayControllerProps) => {
useEffect(() => {
requestAnimationFrame(() => {
overlayDispatch({ type: 'OPEN', overlayId });
});
}, [overlayDispatch, overlayId]);

return (
<Controller
overlayId={overlayId}
isOpen={isOpen}
close={() => overlayDispatch({ type: 'CLOSE', overlayId })}
unmount={() => overlayDispatch({ type: 'REMOVE', overlayId })}
/>
);
}

useEffect(() => {
onMountedRef.current();
}, []);

return <Controller overlayId={overlayId} isOpen={isOpen} close={onCloseModal} unmount={onExitModal} />;
}
);
9 changes: 1 addition & 8 deletions packages/src/context/provider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,8 @@ export function createOverlayProvider() {
<ContentOverlayController
key={componentKey}
isOpen={isOpen}
current={overlayState.current}
overlayId={currentOverlayId}
onMounted={() => {
requestAnimationFrame(() => {
overlayDispatch({ type: 'OPEN', overlayId: currentOverlayId });
});
}}
onCloseModal={() => overlay.close(currentOverlayId)}
onExitModal={() => overlay.unmount(currentOverlayId)}
overlayDispatch={overlayDispatch}
controller={currentController}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/src/context/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export type OverlayData = {
overlayData: Record<OverlayId, OverlayItem>;
};

type OverlayReducerAction =
export type OverlayReducerAction =
| { type: 'ADD'; overlay: OverlayItem }
| { type: 'OPEN'; overlayId: string }
| { type: 'CLOSE'; overlayId: string }
Expand Down