Fix CI

mj12albert · May 20, 2024 · ff4cf43 · ff4cf43
1 parent 62d1ee7
commit ff4cf43
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 26 deletions.
diff --git a/docs/data/base/components/slider/slider.md b/docs/data/base/components/slider/slider.md
@@ -1,7 +1,7 @@
 ---
 productId: base-ui
 title: React Slider component and hook
-components: Slider
+components: Slider, SliderRoot, SliderOutput, SliderThumb, SliderTrack
 hooks: useSlider
 githubLabel: 'component: slider'
 waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/slider-multithumb/

diff --git a/docs/pages/experiments/slider-label.tsx b/docs/pages/experiments/slider-label.tsx
@@ -4,6 +4,21 @@ import { valueToPercent } from '@base_ui/react/Slider2/utils';
 import { useSliderContext } from '@base_ui/react/Slider2';
 import { useId } from '@base_ui/react/utils/useId';
 
+const axisProps = {
+  horizontal: {
+    offset: (percent: number) => ({ left: `${percent}%` }),
+    leap: (percent: number) => ({ width: `${percent}%` }),
+  },
+  'horizontal-reverse': {
+    offset: (percent: number) => ({ right: `${percent}%` }),
+    leap: (percent: number) => ({ width: `${percent}%` }),
+  },
+  vertical: {
+    offset: (percent: number) => ({ bottom: `${percent}%` }),
+    leap: (percent: number) => ({ height: `${percent}%` }),
+  },
+};
+
 function TrackFillSingleThumb(props: any) {
   const { value: values, min, max } = useSliderContext('Track');
   const value = values[0];
@@ -22,7 +37,7 @@ function TrackFillSingleThumb(props: any) {
 }
 
 function TrackFillRange(props: any) {
-  const { axis, axisProps, min, max, value: values } = useSliderContext('Track');
+  const { axis, min, max, value: values } = useSliderContext('Track');
   const { style, ...otherProps } = props;
 
   const trackOffset = valueToPercent(values[0], min, max);

diff --git a/docs/pages/experiments/slider-vertical.tsx b/docs/pages/experiments/slider-vertical.tsx
@@ -3,6 +3,21 @@ import * as Slider from '@base_ui/react/Slider2';
 import { valueToPercent } from '@base_ui/react/Slider2/utils';
 import { useSliderContext } from '@base_ui/react/Slider2';
 
+const axisProps = {
+  horizontal: {
+    offset: (percent: number) => ({ left: `${percent}%` }),
+    leap: (percent: number) => ({ width: `${percent}%` }),
+  },
+  'horizontal-reverse': {
+    offset: (percent: number) => ({ right: `${percent}%` }),
+    leap: (percent: number) => ({ width: `${percent}%` }),
+  },
+  vertical: {
+    offset: (percent: number) => ({ bottom: `${percent}%` }),
+    leap: (percent: number) => ({ height: `${percent}%` }),
+  },
+};
+
 function TrackFillSingleThumb(props: any) {
   const { value: values, min, max, disabled } = useSliderContext('Track');
   const value = values[0];
@@ -22,7 +37,7 @@ function TrackFillSingleThumb(props: any) {
 }
 
 function TrackFillRange(props: any) {
-  const { axis, axisProps, disabled, min, max, value: values } = useSliderContext('Track');
+  const { axis, disabled, min, max, value: values } = useSliderContext('Track');
   const { style, ...otherProps } = props;
 
   const trackOffset = valueToPercent(values[0], min, max);

diff --git a/packages/mui-base/src/Slider2/Root/SliderProvider.tsx b/packages/mui-base/src/Slider2/Root/SliderProvider.tsx
@@ -47,7 +47,6 @@ SliderProvider.propTypes /* remove-proptypes */ = {
     active: PropTypes.number.isRequired,
     'aria-labelledby': PropTypes.string,
     axis: PropTypes.oneOf(['horizontal-reverse', 'horizontal', 'vertical']).isRequired,
-    axisProps: PropTypes /* @typescript-to-proptypes-ignore */.object,
     changeValue: PropTypes.func.isRequired,
     compoundComponentContextValue: PropTypes.shape({
       getItemIndex: PropTypes.func.isRequired,

diff --git a/packages/mui-base/src/Slider2/Root/SliderRoot.types.ts b/packages/mui-base/src/Slider2/Root/SliderRoot.types.ts
@@ -180,10 +180,6 @@ export interface UseSliderReturnValue {
    * The orientation of the slider.
    */
   axis: Axis;
-  /**
-   * Returns the `offset` and `leap` methods to calculate the positioning styles based on the slider axis.
-   */
-  axisProps?: { [key in Axis]: AxisProps<key> };
   changeValue: (
     valueInput: number,
     index: number,

diff --git a/packages/mui-base/src/Slider2/Root/useSliderRoot.ts b/packages/mui-base/src/Slider2/Root/useSliderRoot.ts
@@ -111,23 +111,6 @@ export function trackFinger(
   };
 }
 
-// TODO: keep this here if we provide "Track Fill" component(s)
-// if not move to Thumb and can probably remove leap/trackLeap too
-const axisProps = {
-  horizontal: {
-    offset: (percent: number) => ({ left: `${percent}%` }),
-    leap: (percent: number) => ({ width: `${percent}%` }),
-  },
-  'horizontal-reverse': {
-    offset: (percent: number) => ({ right: `${percent}%` }),
-    leap: (percent: number) => ({ width: `${percent}%` }),
-  },
-  vertical: {
-    offset: (percent: number) => ({ bottom: `${percent}%` }),
-    leap: (percent: number) => ({ height: `${percent}%` }),
-  },
-};
-
 export const Identity = (x: any) => x;
 
 function useSliderRoot(parameters: UseSliderParameters): UseSliderReturnValue {
@@ -388,7 +371,6 @@ function useSliderRoot(parameters: UseSliderParameters): UseSliderReturnValue {
       active,
       'aria-labelledby': ariaLabelledby,
       axis,
-      axisProps,
       changeValue,
       compoundComponentContextValue,
       dragging,