Skip to content

refactor: remove derived state useEffects from Carousel and Disclosure #183

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

Open
vass-k wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: remove derived state useEffects from Carousel and Disclosure #183

Show file tree
Hide file tree
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
22 changes: 6 additions & 16 deletions components/core/carousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,24 @@ function useCarousel() {

export type CarouselProviderProps = {
children: ReactNode;
initialIndex?: number;
onIndexChange?: (newIndex: number) => void;
index: number;
onIndexChange: (newIndex: number) => void;
disableDrag?: boolean;
};

function CarouselProvider({
children,
initialIndex = 0,
index,
onIndexChange,
disableDrag = false,
}: CarouselProviderProps) {
const [index, setIndex] = useState<number>(initialIndex);
const [itemsCount, setItemsCount] = useState<number>(0);

const handleSetIndex = (newIndex: number) => {
setIndex(newIndex);
onIndexChange?.(newIndex);
};

useEffect(() => {
setIndex(initialIndex);
}, [initialIndex]);

return (
<CarouselContext.Provider
value={{
index,
setIndex: handleSetIndex,
setIndex: onIndexChange,
itemsCount,
setItemsCount,
disableDrag,
Expand Down Expand Up @@ -102,7 +92,7 @@ function Carousel({

return (
<CarouselProvider
initialIndex={currentIndex}
index={currentIndex}
onIndexChange={handleIndexChange}
disableDrag={disableDrag}
>
Expand All @@ -129,7 +119,7 @@ function CarouselNavigation({
return (
<div
className={cn(
'pointer-events-none absolute left-[-12.5%] top-1/2 flex w-[125%] -translate-y-1/2 justify-between px-2',
'pointer-events-none absolute top-1/2 left-[-12.5%] flex w-[125%] -translate-y-1/2 justify-between px-2',
className
)}
>
Expand Down
24 changes: 13 additions & 11 deletions components/core/disclosure.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Variant,
Variants,
} from 'motion/react';
import { createContext, useContext, useState, useId, useEffect } from 'react';
import { createContext, useContext, useState, useId } from 'react';
import { cn } from '@/lib/utils';

export type DisclosureContextType = {
Expand All @@ -23,7 +23,7 @@ const DisclosureContext = createContext<DisclosureContextType | undefined>(

export type DisclosureProviderProps = {
children: React.ReactNode;
open: boolean;
open?: boolean;
onOpenChange?: (open: boolean) => void;
variants?: { expanded: Variant; collapsed: Variant };
};
Expand All @@ -34,15 +34,17 @@ function DisclosureProvider({
onOpenChange,
variants,
}: DisclosureProviderProps) {
const [internalOpenValue, setInternalOpenValue] = useState<boolean>(openProp);

useEffect(() => {
setInternalOpenValue(openProp);
}, [openProp]);
const [internalOpenValue, setInternalOpenValue] = useState<boolean>(false);
const isControlled = openProp !== undefined;
const open = isControlled ? openProp : internalOpenValue;

const toggle = () => {
const newOpen = !internalOpenValue;
setInternalOpenValue(newOpen);
const newOpen = !open;

if (!isControlled) {
setInternalOpenValue(newOpen);
}

if (onOpenChange) {
onOpenChange(newOpen);
}
Expand All @@ -51,7 +53,7 @@ function DisclosureProvider({
return (
<DisclosureContext.Provider
value={{
open: internalOpenValue,
open,
toggle,
variants,
}}
Expand Down Expand Up @@ -79,7 +81,7 @@ export type DisclosureProps = {
};

export function Disclosure({
open: openProp = false,
open: openProp,
onOpenChange,
children,
className,
Expand Down
Loading