fix: index referring to scope?.[scopeName] being undefined (#3047)

radix-ui · Sep 27, 2024 · 32d176d · 32d176d
1 parent 5d7b5fb
commit 32d176d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/react/context/src/createContext.tsx b/packages/react/context/src/createContext.tsx
@@ -57,7 +57,7 @@ function createContextScope(scopeName: string, createContextScopeDeps: CreateSco
       ContextValueType & { scope: Scope<ContextValueType>; children: React.ReactNode }
     > = (props) => {
       const { scope, children, ...context } = props;
-      const Context = scope?.[scopeName][index] || BaseContext;
+      const Context = scope?.[scopeName]?.[index] || BaseContext;
       // Only re-memoize when prop values change
       // eslint-disable-next-line react-hooks/exhaustive-deps
       const value = React.useMemo(() => context, Object.values(context)) as ContextValueType;
@@ -67,7 +67,7 @@ function createContextScope(scopeName: string, createContextScopeDeps: CreateSco
     Provider.displayName = rootComponentName + 'Provider';
 
     function useContext(consumerName: string, scope: Scope<ContextValueType | undefined>) {
-      const Context = scope?.[scopeName][index] || BaseContext;
+      const Context = scope?.[scopeName]?.[index] || BaseContext;
       const context = React.useContext(Context);
       if (context) return context;
       if (defaultContext !== undefined) return defaultContext;