Fix contexts

mui · Oct 17, 2024 · bb49414 · bb49414
1 parent 49598c5
commit bb49414
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/packages/mui-base/src/Accordion/Header/AccordionHeader.test.tsx b/packages/mui-base/src/Accordion/Header/AccordionHeader.test.tsx
@@ -6,7 +6,7 @@ import { CollapsibleRootContext } from '../../Collapsible/Root/CollapsibleRootCo
 import { AccordionRootContext } from '../Root/AccordionRootContext';
 import { AccordionItemContext } from '../Item/AccordionItemContext';
 
-const accordionRootContextValue: Accordion.Root.Context = {
+const accordionRootContextValue: AccordionRootContext = {
   accordionItemRefs: { current: [] },
   animated: false,
   direction: 'ltr',

diff --git a/packages/mui-base/src/Accordion/Item/AccordionItem.test.tsx b/packages/mui-base/src/Accordion/Item/AccordionItem.test.tsx
@@ -4,7 +4,7 @@ import { describeConformance, createRenderer } from '#test-utils';
 import { NOOP } from '../../utils/noop';
 import { AccordionRootContext } from '../Root/AccordionRootContext';
 
-const accordionRootContextValue: Accordion.Root.Context = {
+const accordionRootContextValue: AccordionRootContext = {
   accordionItemRefs: { current: [] },
   animated: false,
   direction: 'ltr',

diff --git a/packages/mui-base/src/Accordion/Item/AccordionItemContext.tsx b/packages/mui-base/src/Accordion/Item/AccordionItemContext.tsx
@@ -22,7 +22,9 @@ if (process.env.NODE_ENV !== 'production') {
 export function useAccordionItemContext() {
   const context = React.useContext(AccordionItemContext);
   if (context === undefined) {
-    throw new Error('useAccordionItemContext must be used inside the <Accordion.Item /> component');
+    throw new Error(
+      'Base UI: AccordionItemContext is missing. Accordion parts must be placed within <Accordion.Item>.',
+    );
   }
   return context;
 }
diff --git a/packages/mui-base/src/Accordion/Panel/AccordionPanel.test.tsx b/packages/mui-base/src/Accordion/Panel/AccordionPanel.test.tsx
@@ -6,7 +6,7 @@ import { CollapsibleRootContext } from '../../Collapsible/Root/CollapsibleRootCo
 import { AccordionRootContext } from '../Root/AccordionRootContext';
 import { AccordionItemContext } from '../Item/AccordionItemContext';
 
-const accordionRootContextValue: Accordion.Root.Context = {
+const accordionRootContextValue: AccordionRootContext = {
   accordionItemRefs: { current: [] },
   animated: false,
   direction: 'ltr',

diff --git a/packages/mui-base/src/Accordion/Root/AccordionRoot.tsx b/packages/mui-base/src/Accordion/Root/AccordionRoot.tsx
@@ -68,7 +68,7 @@ const AccordionRoot = React.forwardRef(function AccordionRoot(
     [accordion.value, accordion.disabled, accordion.orientation],
   );
 
-  const contextValue: AccordionRoot.Context = React.useMemo(
+  const contextValue: AccordionRootContext = React.useMemo(
     () => ({
       ...accordion,
       hiddenUntilFound,
@@ -103,11 +103,6 @@ const AccordionRoot = React.forwardRef(function AccordionRoot(
 });
 
 export namespace AccordionRoot {
-  export interface Context extends Omit<useAccordionRoot.ReturnValue, 'getRootProps'> {
-    ownerState: OwnerState;
-    hiddenUntilFound: boolean;
-  }
-
   export interface OwnerState {
     value: useAccordionRoot.Value;
     disabled: boolean;

diff --git a/packages/mui-base/src/Accordion/Root/AccordionRootContext.tsx b/packages/mui-base/src/Accordion/Root/AccordionRootContext.tsx
@@ -1,11 +1,14 @@
 'use client';
 import * as React from 'react';
 import type { AccordionRoot } from './AccordionRoot';
+import type { useAccordionRoot } from './useAccordionRoot';
 
-/**
- * @ignore - internal component.
- */
-export const AccordionRootContext = React.createContext<AccordionRoot.Context | undefined>(
+export interface AccordionRootContext extends Omit<useAccordionRoot.ReturnValue, 'getRootProps'> {
+  ownerState: AccordionRoot.OwnerState;
+  hiddenUntilFound: boolean;
+}
+
+export const AccordionRootContext = React.createContext<AccordionRootContext | undefined>(
   undefined,
 );
 
@@ -16,7 +19,9 @@ if (process.env.NODE_ENV !== 'production') {
 export function useAccordionRootContext() {
   const context = React.useContext(AccordionRootContext);
   if (context === undefined) {
-    throw new Error('useAccordionRootContext must be used inside a Accordion component');
+    throw new Error(
+      'Base UI: AccordionRootContext is missing. Accordion parts must be placed within <Accordion.Root>.',
+    );
   }
   return context;
 }
diff --git a/packages/mui-base/src/Accordion/Trigger/AccordionTrigger.test.tsx b/packages/mui-base/src/Accordion/Trigger/AccordionTrigger.test.tsx
@@ -6,7 +6,7 @@ import { CollapsibleRootContext } from '../../Collapsible/Root/CollapsibleRootCo
 import { AccordionRootContext } from '../Root/AccordionRootContext';
 import { AccordionItemContext } from '../Item/AccordionItemContext';
 
-const accordionRootContextValue: Accordion.Root.Context = {
+const accordionRootContextValue: AccordionRootContext = {
   accordionItemRefs: { current: [] },
   animated: false,
   direction: 'ltr',