PR review fixes

Author: mj12albert

docs/data/components/accordion/accordion.mdx

@@ -28,7 +28,7 @@ Accordions are implemented using a collection of related components:
 - `<Accordion.Root />` is a top-level component that wraps the other components.
 - `<Accordion.Item />` is a component that wraps each section of content
 - `<Accordion.Trigger />` is a button that toggles the open state of it's associated `Item`
-- `<Accordion.Header />` is an element that wraps the `Trigger`
+- `<Accordion.Header />` is a heading (`h3` by default) that wraps the `Trigger`
 - `<Accordion.Panel />` is the element that contains content in a `Item`
 
 ```tsx

packages/mui-base/src/Accordion/Header/AccordionHeader.test.tsx

@@ -1,12 +1,10 @@
 import * as React from 'react';
-// import { expect } from 'chai';
-// import { spy } from 'sinon';
 import * as Accordion from '@base_ui/react/Accordion';
 import * as Collapsible from '@base_ui/react/Collapsible';
 import { describeConformance, createRenderer } from '#test-utils';
 import { NOOP } from '../../utils/noop';
-
-const { AccordionRootContext, AccordionItemContext } = Accordion;
+import { AccordionRootContext } from '../Root/AccordionRootContext';
+import { AccordionItemContext } from '../Item/AccordionItemContext';
 
 const { CollapsibleContext } = Collapsible;
 
@@ -61,7 +59,6 @@ describe('<Accordion.Header />', () => {
   const { render } = createRenderer();
 
   describeConformance(<Accordion.Header />, () => ({
-    inheritComponent: 'h3',
     render: (node) =>
       render(
         <AccordionRootContext.Provider value={accordionRootContextValue}>

packages/mui-base/src/Accordion/Header/AccordionHeader.tsx

@@ -21,7 +21,7 @@ const AccordionHeader = React.forwardRef(function AccordionHeader(
   props: AccordionHeader.Props,
   forwardedRef: React.ForwardedRef<HTMLHeadingElement>,
 ) {
-  const { render, className, ...otherProps } = props;
+  const { render, className, ...other } = props;
 
   const { ownerState } = useAccordionItemContext();
 
@@ -30,19 +30,19 @@ const AccordionHeader = React.forwardRef(function AccordionHeader(
     ownerState,
     className,
     ref: forwardedRef,
-    extraProps: otherProps,
+    extraProps: other,
     customStyleHookMapping: accordionStyleHookMapping,
   });
 
   return renderElement();
 });
 
-export { AccordionHeader };
-
 export namespace AccordionHeader {
   export interface Props extends BaseUIComponentProps<'h3', AccordionItem.OwnerState> {}
 }
 
+export { AccordionHeader };
+
 AccordionHeader.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐
   // │ These PropTypes are generated from the TypeScript type definitions. │

packages/mui-base/src/Accordion/Item/AccordionItem.test.tsx

@@ -1,11 +1,8 @@
 import * as React from 'react';
-// import { expect } from 'chai';
-// import { spy } from 'sinon';
 import * as Accordion from '@base_ui/react/Accordion';
 import { describeConformance, createRenderer } from '#test-utils';
 import { NOOP } from '../../utils/noop';
-
-const { AccordionRootContext } = Accordion;
+import { AccordionRootContext } from '../Root/AccordionRootContext';
 
 const accordionRootContextValue: Accordion.Root.Context = {
   accordionItemRefs: { current: [] },
@@ -27,7 +24,6 @@ describe('<Accordion.Item />', () => {
   const { render } = createRenderer();
 
   describeConformance(<Accordion.Item />, () => ({
-    inheritComponent: 'div',
     render: (node) =>
       render(
         <AccordionRootContext.Provider value={accordionRootContextValue}>

packages/mui-base/src/Accordion/Item/AccordionItem.tsx

@@ -36,12 +36,11 @@ const AccordionItem = React.forwardRef(function AccordionItem(
     onOpenChange: onOpenChangeProp,
     render,
     value: valueProp,
-    ...otherProps
+    ...other
   } = props;
 
-  const sectionRef = React.useRef<HTMLElement>(null);
   const { ref: listItemRef, index } = useCompositeListItem();
-  const mergedRef = useForkRef(forwardedRef, listItemRef, sectionRef);
+  const mergedRef = useForkRef(forwardedRef, listItemRef);
 
   const {
     animated,
@@ -71,9 +70,7 @@ const AccordionItem = React.forwardRef(function AccordionItem(
 
   const onOpenChange = useEventCallback((nextOpen: boolean) => {
     handleOpenChange(value, nextOpen);
-    if (onOpenChangeProp) {
-      onOpenChangeProp(nextOpen);
-    }
+    onOpenChangeProp?.(nextOpen);
   });
 
   const collapsible = useCollapsibleRoot({
@@ -128,7 +125,7 @@ const AccordionItem = React.forwardRef(function AccordionItem(
     className,
     ownerState,
     ref: mergedRef,
-    extraProps: otherProps,
+    extraProps: other,
     customStyleHookMapping: accordionStyleHookMapping,
   });
 
@@ -141,8 +138,6 @@ const AccordionItem = React.forwardRef(function AccordionItem(
   );
 });
 
-export { AccordionItem };
-
 export namespace AccordionItem {
   export type Value = number | string;
 
@@ -166,6 +161,8 @@ export namespace AccordionItem {
   }
 }
 
+export { AccordionItem };
+
 AccordionItem.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐
   // │ These PropTypes are generated from the TypeScript type definitions. │

packages/mui-base/src/Accordion/Panel/AccordionPanel.test.tsx

@@ -1,12 +1,10 @@
 import * as React from 'react';
-// import { expect } from 'chai';
-// import { spy } from 'sinon';
 import * as Accordion from '@base_ui/react/Accordion';
 import * as Collapsible from '@base_ui/react/Collapsible';
 import { describeConformance, createRenderer } from '#test-utils';
 import { NOOP } from '../../utils/noop';
-
-const { AccordionRootContext, AccordionItemContext } = Accordion;
+import { AccordionRootContext } from '../Root/AccordionRootContext';
+import { AccordionItemContext } from '../Item/AccordionItemContext';
 
 const { CollapsibleContext } = Collapsible;
 
@@ -61,7 +59,6 @@ describe('<Accordion.Panel />', () => {
   const { render } = createRenderer();
 
   describeConformance(<Accordion.Panel />, () => ({
-    inheritComponent: 'div',
     render: (node) =>
       render(
         <AccordionRootContext.Provider value={accordionRootContextValue}>

packages/mui-base/src/Accordion/Panel/AccordionPanel.tsx

@@ -71,14 +71,14 @@ const AccordionPanel = React.forwardRef(function AccordionPanel(
   return renderElement();
 });
 
-export { AccordionPanel };
-
 export namespace AccordionPanel {
   export interface Props
     extends BaseUIComponentProps<'div', AccordionItem.OwnerState>,
       Pick<useCollapsibleContent.Parameters, 'hiddenUntilFound'> {}
 }
 
+export { AccordionPanel };
+
 AccordionPanel.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐
   // │ These PropTypes are generated from the TypeScript type definitions. │

packages/mui-base/src/Accordion/Root/AccordionRoot.test.tsx

@@ -8,7 +8,6 @@ describe('<Accordion.Root />', () => {
   const { render } = createRenderer();
 
   describeConformance(<Accordion.Root />, () => ({
-    inheritComponent: 'div',
     render,
     refInstanceof: window.HTMLDivElement,
   }));

packages/mui-base/src/Accordion/Root/AccordionRoot.tsx

@@ -102,8 +102,6 @@ const AccordionRoot = React.forwardRef(function AccordionRoot(
   );
 });
 
-export { AccordionRoot };
-
 export namespace AccordionRoot {
   export interface Context extends Omit<useAccordionRoot.ReturnValue, 'getRootProps'> {
     ownerState: OwnerState;
@@ -123,6 +121,8 @@ export namespace AccordionRoot {
   }
 }
 
+export { AccordionRoot };
+
 AccordionRoot.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐
   // │ These PropTypes are generated from the TypeScript type definitions. │

packages/mui-base/src/Accordion/Trigger/AccordionTrigger.test.tsx

@@ -1,12 +1,10 @@
 import * as React from 'react';
-// import { expect } from 'chai';
-// import { spy } from 'sinon';
 import * as Accordion from '@base_ui/react/Accordion';
 import * as Collapsible from '@base_ui/react/Collapsible';
 import { describeConformance, createRenderer } from '#test-utils';
 import { NOOP } from '../../utils/noop';
-
-const { AccordionRootContext, AccordionItemContext } = Accordion;
+import { AccordionRootContext } from '../Root/AccordionRootContext';
+import { AccordionItemContext } from '../Item/AccordionItemContext';
 
 const { CollapsibleContext } = Collapsible;
 
@@ -61,7 +59,6 @@ describe('<Accordion.Trigger />', () => {
   const { render } = createRenderer();
 
   describeConformance(<Accordion.Trigger />, () => ({
-    inheritComponent: 'button',
     render: (node) =>
       render(
         <AccordionRootContext.Provider value={accordionRootContextValue}>

packages/mui-base/src/Accordion/Trigger/AccordionTrigger.tsx

@@ -58,12 +58,12 @@ const AccordionTrigger = React.forwardRef(function AccordionTrigger(
   return renderElement();
 });
 
-export { AccordionTrigger };
-
 namespace AccordionTrigger {
   export interface Props extends BaseUIComponentProps<'button', AccordionItem.OwnerState> {}
 }
 
+export { AccordionTrigger };
+
 AccordionTrigger.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐
   // │ These PropTypes are generated from the TypeScript type definitions. │

packages/mui-base/src/Accordion/index.ts

@@ -1,10 +1,5 @@
 export { AccordionRoot as Root } from './Root/AccordionRoot';
-export { useAccordionRoot } from './Root/useAccordionRoot';
-export { AccordionRootContext, useAccordionRootContext } from './Root/AccordionRootContext';
-
 export { AccordionItem as Item } from './Item/AccordionItem';
-export { AccordionItemContext, useAccordionItemContext } from './Item/AccordionItemContext';
-
 export { AccordionHeader as Header } from './Header/AccordionHeader';
 export { AccordionTrigger as Trigger } from './Trigger/AccordionTrigger';
 export { AccordionPanel as Panel } from './Panel/AccordionPanel';