Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: useOverlay #127

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
24 changes: 15 additions & 9 deletions packages/src/context/provider/content-overlay-controller.tsx
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
import { type FC, useEffect, useRef } from 'react';
import { type OverlayItemContext } from '../store';

type OverlayControllerProps = {
type OverlayControllerProps<C extends OverlayItemContext> = {
overlayId: string;
isOpen: boolean;
close: () => void;
unmount: () => void;
context: C;
};

type OverlayAsyncControllerProps<T> = Omit<OverlayControllerProps, 'close'> & {
type OverlayAsyncControllerProps<T, C extends OverlayItemContext> = Omit<OverlayControllerProps<C>, 'close'> & {
close: (param: T) => void;
};

export type OverlayControllerComponent = FC<OverlayControllerProps>;
export type OverlayAsyncControllerComponent<T> = FC<OverlayAsyncControllerProps<T>>;
export type OverlayControllerComponent<C extends OverlayItemContext> = FC<OverlayControllerProps<C>>;
export type OverlayAsyncControllerComponent<T, C extends OverlayItemContext> = FC<OverlayAsyncControllerProps<T, C>>;

type ContentOverlayControllerProps = {
type ContentOverlayControllerProps<C extends OverlayItemContext> = {
isOpen: boolean;
current: string | null;
overlayId: string;
onMounted: () => void;
onCloseModal: () => void;
onExitModal: () => void;
controller: OverlayControllerComponent;
controller: OverlayControllerComponent<C>;
context: C;
};

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

Expand All @@ -51,5 +55,7 @@ export function ContentOverlayController({
onMountedRef.current();
}, []);

return <Controller overlayId={overlayId} isOpen={isOpen} close={onCloseModal} unmount={onExitModal} />;
return (
<Controller overlayId={overlayId} isOpen={isOpen} close={onCloseModal} unmount={onExitModal} context={context} />
);
}
1 change: 1 addition & 0 deletions packages/src/context/provider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export function createOverlayProvider(overlayStore: OverlayStore) {
overlayStore.dispatchOverlay({ type: 'OPEN', overlayId: currentOverlayId });
});
}}
context={overlayState.overlayData[currentOverlayId].context}
onCloseModal={() => overlay.close(currentOverlayId)}
onExitModal={() => overlay.unmount(currentOverlayId)}
controller={currentController}
Expand Down
18 changes: 14 additions & 4 deletions packages/src/context/reducer.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { type OverlayData, type OverlayItem } from './store';
import { type OverlayItemContext, type OverlayData, type OverlayItem } from './store';

export type OverlayReducerAction =
| { type: 'ADD'; overlay: OverlayItem }
| { type: 'ADD'; overlay: OverlayItem<OverlayItemContext> }
| { type: 'OPEN'; overlayId: string }
| { type: 'CLOSE'; overlayId: string }
| { type: 'REMOVE'; overlayId: string }
| { type: 'UPDATE_CONTEXT'; overlayId: string; context: OverlayItemContext }
| { type: 'CLOSE_ALL' }
| { type: 'REMOVE_ALL' };

Expand Down Expand Up @@ -147,14 +148,23 @@ export function overlayReducer(state: OverlayData, action: OverlayReducerAction)
[curr]: {
...state.overlayData[curr],
isOpen: false,
} satisfies OverlayItem,
} satisfies OverlayItem<OverlayItemContext>,
}),
{} satisfies Record<string, OverlayItem>
{} satisfies Record<string, OverlayItem<OverlayItemContext>>
),
};
}
case 'REMOVE_ALL': {
return { current: null, overlayOrderList: [], overlayData: {} };
}
case 'UPDATE_CONTEXT': {
return {
...state,
overlayData: {
...state.overlayData,
[action.overlayId]: { ...state.overlayData[action.overlayId], context: action.context },
},
};
}
}
}
11 changes: 8 additions & 3 deletions packages/src/context/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ import { type OverlayControllerComponent } from './provider/content-overlay-cont
import { type OverlayReducerAction, overlayReducer } from './reducer';

type OverlayId = string;
export type OverlayItem = {

export type OverlayItemContext = Record<string, unknown>;

export type OverlayItem<C extends OverlayItemContext> = {
id: OverlayId;
isOpen: boolean;
controller: OverlayControllerComponent;
controller: OverlayControllerComponent<C>;
context: C;
};

export type OverlayData = {
current: OverlayId | null;
overlayOrderList: OverlayId[];
overlayData: Record<OverlayId, OverlayItem>;
overlayData: Record<OverlayId, OverlayItem<OverlayItemContext>>;
};

export type OverlayStore = ReturnType<typeof createRegisterOverlaysStore>;
Expand Down
23 changes: 18 additions & 5 deletions packages/src/event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,39 @@ import {
type OverlayAsyncControllerComponent,
type OverlayControllerComponent,
} from './context/provider/content-overlay-controller';
import { type OverlayStore } from './context/store';
import { type OverlayItemContext, type OverlayStore } from './context/store';
import { randomId } from './utils/random-id';

type OpenOverlayOptions = {
type OpenOverlayOptions<C extends OverlayItemContext> = {
overlayId?: string;
context?: C;
};

export function createOverlay(overlayStore: OverlayStore) {
function open(controller: OverlayControllerComponent, options?: OpenOverlayOptions) {
function open<C extends OverlayItemContext>(
controller: OverlayControllerComponent<C>,
options?: OpenOverlayOptions<C>
) {
const overlayId = options?.overlayId ?? randomId();
const context = options?.context;

overlayStore.dispatchOverlay({
type: 'ADD',
overlay: {
id: overlayId,
isOpen: false,
controller: controller,
controller: controller as OverlayControllerComponent<OverlayItemContext>,
context: context ?? ({} as C),
},
});

return overlayId;
}

async function openAsync<T>(controller: OverlayAsyncControllerComponent<T>, options?: OpenOverlayOptions) {
async function openAsync<T, C extends OverlayItemContext>(
controller: OverlayAsyncControllerComponent<T, C>,
options?: OpenOverlayOptions<C>
) {
return new Promise<T>((resolve) => {
open((overlayProps, ...deprecatedLegacyContext) => {
/**
Expand Down Expand Up @@ -56,6 +65,9 @@ export function createOverlay(overlayStore: OverlayStore) {
function unmountAll() {
overlayStore.dispatchOverlay({ type: 'REMOVE_ALL' });
}
function updateContext<C extends OverlayItemContext>(overlayId: string, context: C) {
overlayStore.dispatchOverlay({ type: 'UPDATE_CONTEXT', overlayId, context });
}

return {
open,
Expand All @@ -64,5 +76,6 @@ export function createOverlay(overlayStore: OverlayStore) {
closeAll,
unmountAll,
openAsync,
updateContext,
};
}
29 changes: 29 additions & 0 deletions packages/src/hook/use-overlay.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { useEffect, useState } from 'react';
import {
type OverlayAsyncControllerComponent,
type OverlayControllerComponent,
} from '../context/provider/content-overlay-controller';
import { type OverlayItemContext } from '../context/store';
import { overlay } from '../utils';
import { randomId } from '../utils/random-id';

export interface UseOverlayProps<C extends OverlayItemContext> {
context?: C;
overlayId?: string;
}

export function useOverlay<C extends OverlayItemContext>({ context, overlayId }: UseOverlayProps<C>) {
const [id] = useState(() => overlayId ?? randomId());

useEffect(() => {
overlay.updateContext(id, context ?? ({} as C));
}, [context, id]);

return {
open: (controller: OverlayControllerComponent<C>) => overlay.open(controller, { overlayId: id, context }),
openAsync: <T>(controller: OverlayAsyncControllerComponent<T, C>) =>
overlay.openAsync(controller, { overlayId: id, context }),
close: () => overlay.close(id),
unmount: () => overlay.unmount(id),
};
}
1 change: 1 addition & 0 deletions packages/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './utils';
export * from './hook/use-overlay';