From 2d9453eed0cc14e17b1d5c61106d8ff8fb877d03 Mon Sep 17 00:00:00 2001 From: thenick775 Date: Tue, 7 Jan 2025 09:58:28 -0800 Subject: [PATCH] fix: semantic html for panel control sliders --- .../__snapshots__/control-panel.spec.tsx.snap | 964 +++++++++--------- .../src/components/controls/control-panel.tsx | 92 +- 2 files changed, 540 insertions(+), 516 deletions(-) diff --git a/gbajs3/src/components/controls/__snapshots__/control-panel.spec.tsx.snap b/gbajs3/src/components/controls/__snapshots__/control-panel.spec.tsx.snap index 5fe163b5..3cd39c16 100644 --- a/gbajs3/src/components/controls/__snapshots__/control-panel.spec.tsx.snap +++ b/gbajs3/src/components/controls/__snapshots__/control-panel.spec.tsx.snap @@ -235,281 +235,289 @@ exports[` > renders with default desktop position and size 1`] = - -
  • - - - - - - - - - - - - - - - + + + + - + + + + + + + + +
  • -
    - + + + + + + + +
  • -
  • - - - - - - - - - + + + + - + + + + + + - - -
  • - + + + + + + +
    @@ -745,281 +753,289 @@ exports[` > renders with default mobile position and size 1`] = - -
  • - - - - - - - - - - - - - - - + + + + - + + + + + + + + +
  • -
    - + + + + + + + +
  • -
  • - - - - - - - - - + + + + - + + + + + + - - -
  • - + + + + + + +
    diff --git a/gbajs3/src/components/controls/control-panel.tsx b/gbajs3/src/components/controls/control-panel.tsx index 375ba41b..146133cf 100644 --- a/gbajs3/src/components/controls/control-panel.tsx +++ b/gbajs3/src/components/controls/control-panel.tsx @@ -163,7 +163,7 @@ const PanelControlButton = styled(ButtonBase).attrs({ } `; -const PanelControlSlider = styled.li` +const PanelControlSlider = styled.div` ${InteractivePanelControlStyle} grid-area: ${({ $gridArea }) => $gridArea}; max-height: 40px; @@ -223,22 +223,28 @@ const SliderIconButton = ({ icon, ...rest }: SliderIconButtonProps) => { const PanelSlider = forwardRef( ({ controlled, gridArea, id, maxIcon, minIcon, ...rest }, ref) => ( - - - {minIcon} - - {maxIcon} - - + + + + {minIcon} + + {maxIcon} + + + ) ); @@ -266,32 +272,34 @@ const TooltipPanelSlider = ({ ButtonIcon, ...rest }: TooltipSliderProps) => { const isMobileLandscape = useMediaQuery(theme.isMobileLandscape); const [isTooltipOpen, setIsTooltipOpen] = useState(false); - return isMobileLandscape ? ( - setIsTooltipOpen(false)}> - - - } - arrow - slotProps={{ - popper: { - sx: popperStyles - }, - tooltip: { sx: { padding: '8px 16px' } } - }} - placement="bottom-end" - > - setIsTooltipOpen((prevState) => !prevState)} - $controlled={rest.controlled} + return ( + isMobileLandscape ? ( + setIsTooltipOpen(false)}> + + + } + arrow + slotProps={{ + popper: { + sx: popperStyles + }, + tooltip: { sx: { padding: '8px 16px' } } + }} + placement="bottom-end" > - - - - ) : ( - + setIsTooltipOpen((prevState) => !prevState)} + $controlled={rest.controlled} + > + + + + ) : ( + + ) ); };