Skip to content

presenve v2 #948

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.

Sign up for GitHub

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

Draft
devagrawal09 wants to merge 1 commit into
base: next
Choose a base branch
from
+18 −35
Draft

presenve v2 #948

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 18 additions & 35 deletions packages/presence/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,9 @@ function createPresenceBase(
"enterDuration" in options ? options.enterDuration : options.transitionDuration,
);

const initialSource = untrack(source);
const initialState = options.initialEnter ? false : initialSource;
const [isVisible, setIsVisible] = createSignal<boolean>(initialState, INTERNAL_OPTIONS);
const [isMounted, setIsMounted] = createSignal<boolean>(initialSource, INTERNAL_OPTIONS);
const [hasEntered, setHasEntered] = createSignal<boolean>(initialState, INTERNAL_OPTIONS);
const [isVisible, setIsVisible] = createSignal<boolean>((prev = !options.initialEnter) => source() ? prev : false, INTERNAL_OPTIONS);
const [isMounted, setIsMounted] = createSignal<boolean>(source, INTERNAL_OPTIONS);
const [hasEntered, setHasEntered] = createSignal<boolean>((prev = !options.initialEnter) => source() ? prev : false, INTERNAL_OPTIONS);

const isExiting = createMemo(() => isMounted() && !source());
const isEntering = createMemo(() => source() && !hasEntered());
Expand All @@ -60,11 +58,7 @@ function createPresenceBase(
createEffect(
() => source(),
isActive => {
if (isActive) {
setIsMounted(true);
} else {
setHasEntered(false);
setIsVisible(false);
if (!isActive) {
const timeoutId = setTimeout(() => setIsMounted(false), exitDuration());
return () => clearTimeout(timeoutId);
}
Expand Down Expand Up @@ -143,32 +137,21 @@ export function createPresence<TItem>(
item: Accessor<TItem | undefined>,
options: Options,
): PresenceResult<TItem> {
const initial = untrack(item);
const [mountedItem, setMountedItem] = createSignal<TItem | undefined>(initial as Exclude<TItem, Function>, INTERNAL_OPTIONS);
const [shouldBeMounted, setShouldBeMounted] = createSignal<boolean>(itemShouldBeMounted(initial), INTERNAL_OPTIONS);
const { isMounted, ...rest } = createPresenceBase(shouldBeMounted, options);
const mountedItem = createMemo<TItem | undefined>((prev) => {
if (prev !== item() && !isMounted() && itemShouldBeMounted(item())) {
return item()
}
return prev
});

const shouldBeMounted = createMemo(() => {
if (mountedItem() !== item() && isMounted()) {
return false;
}
return itemShouldBeMounted(item())
});

createEffect(
() => ({
currentItem: item(),
mounted: mountedItem(),
isM: isMounted(),
}),
({ currentItem, mounted, isM }) => {
if (mounted !== currentItem) {
if (isM) {
setShouldBeMounted(false);
} else if (itemShouldBeMounted(currentItem)) {
setMountedItem(currentItem as Exclude<TItem, Function>);
setShouldBeMounted(true);
}
} else if (!itemShouldBeMounted(currentItem)) {
setShouldBeMounted(false);
} else if (itemShouldBeMounted(currentItem)) {
setShouldBeMounted(true);
}
},
);
const { isMounted, ...rest } = createPresenceBase(shouldBeMounted, options);

return {
...rest,
Expand Down