{button ? (
button({ open: isOpen, setOpen })
) : (
- {labelButton}
+ {labelButton}
{iconFilters}
- {!!count && {count}
}
+ {!!count && {count}}
)}
diff --git a/packages/react/src/components/SFS/SFSSorting/SFSSorting.tsx b/packages/react/src/components/SFS/SFSSorting/SFSSorting.tsx
index 0b403268f..2caf751ae 100644
--- a/packages/react/src/components/SFS/SFSSorting/SFSSorting.tsx
+++ b/packages/react/src/components/SFS/SFSSorting/SFSSorting.tsx
@@ -50,17 +50,17 @@ export const SFSSorting = memo(function SFSSorting({
return (
-
+
{values.length === 1 ? options.find((o) => o.value === values[0].value)?.label : labelButton}
-
+
{iconSort}
{values.length === 1 && (
-
+
{values[0].direction === 'asc' ? iconAsc : iconDesc}
-
+
)}
{values.length > 1 && (
- {values.length}
+ {values.length}
)}
= ({ ref: inR
{text}
- {!!children && }
+ {!!children && }
{!!children &&
React.Children.map(children, (child: any, idx: number) => {
const { text, inset, onClick, ...rest } = child.props;
@@ -263,6 +263,7 @@ export const SidebarItem: OverridableComponent = ({ ref: inR
ref={itemRef}
button
className={clsx('es-sidebar-item__button', `es-sidebar-item__button--color--${color}`)}
+ {...({ component: 'div' } as any)}
onClick={onItemClick}
onKeyDown={onItemKeyDown}
onTouchStart={onItemTouchStart}
diff --git a/packages/react/src/components/Sidenav/SidenavItem/SidenavItem.tsx b/packages/react/src/components/Sidenav/SidenavItem/SidenavItem.tsx
index 875ff7791..f7c383242 100644
--- a/packages/react/src/components/Sidenav/SidenavItem/SidenavItem.tsx
+++ b/packages/react/src/components/Sidenav/SidenavItem/SidenavItem.tsx
@@ -139,6 +139,7 @@ export const SidenavItem: OverridableComponent = ({ ref: inR
ref={itemRef}
button
className={clsx('es-sidenav-item', `es-sidenav-item--color--${color}`, className)}
+ {...({ component: 'div' } as any)}
data-id={id}
selected={selected}
onClick={onItemClick}
diff --git a/packages/react/src/components/Slider/useSlider.ts b/packages/react/src/components/Slider/useSlider.ts
index b230a475d..cd2863e20 100644
--- a/packages/react/src/components/Slider/useSlider.ts
+++ b/packages/react/src/components/Slider/useSlider.ts
@@ -664,8 +664,8 @@ export function useSlider(parameters: UseSliderParameters): UseSliderReturnValue
tabIndex,
'aria-labelledby': ariaLabelledby,
'aria-orientation': orientation,
- 'aria-valuemax': scale(max),
- 'aria-valuemin': scale(min),
+ 'aria-valuemax': scale(max) === max ? undefined : scale(max),
+ 'aria-valuemin': scale(min) === min ? undefined : scale(min),
name,
type: 'range',
min: parameters.min,
diff --git a/packages/react/src/components/SortingMenu/SortingMenu.tsx b/packages/react/src/components/SortingMenu/SortingMenu.tsx
index 9881e1914..2add00fdc 100644
--- a/packages/react/src/components/SortingMenu/SortingMenu.tsx
+++ b/packages/react/src/components/SortingMenu/SortingMenu.tsx
@@ -229,10 +229,10 @@ export const SortingMenu = memo(function SortingMenu({
? sortMap[item.value].labelAsc || labelAsc
: sortMap[item.value].labelDesc || labelDesc}
-
+
{item.direction === 'asc' ? iconItemAsc : iconItemDesc}
{isMultiple && {i + 1}}
-
+
)}
diff --git a/packages/react/src/components/SvgIcon/SvgIcon.tsx b/packages/react/src/components/SvgIcon/SvgIcon.tsx
index 6f9b4fca4..f9bdb4692 100644
--- a/packages/react/src/components/SvgIcon/SvgIcon.tsx
+++ b/packages/react/src/components/SvgIcon/SvgIcon.tsx
@@ -40,7 +40,7 @@ export const SvgIcon = (inProps: SvgIconProps) => {
if (container) {
return (
- {
}}
>
{svg}
-
+
);
}
diff --git a/packages/react/src/components/SvgIcon/SvgIcon.types.ts b/packages/react/src/components/SvgIcon/SvgIcon.types.ts
index fe2318081..fe98fad2a 100644
--- a/packages/react/src/components/SvgIcon/SvgIcon.types.ts
+++ b/packages/react/src/components/SvgIcon/SvgIcon.types.ts
@@ -30,5 +30,5 @@ export type SvgIconProps = {
title?: string;
/** Props applied to the container element. */
- ContainerProps?: DetailedHTMLProps, HTMLDivElement>;
+ ContainerProps?: DetailedHTMLProps, HTMLSpanElement>;
} & SVGProps;
diff --git a/packages/react/src/components/Swiper/SwiperPaginationItem/SwiperPaginationItem.tsx b/packages/react/src/components/Swiper/SwiperPaginationItem/SwiperPaginationItem.tsx
index 6bc40fb74..fe771552e 100644
--- a/packages/react/src/components/Swiper/SwiperPaginationItem/SwiperPaginationItem.tsx
+++ b/packages/react/src/components/Swiper/SwiperPaginationItem/SwiperPaginationItem.tsx
@@ -49,7 +49,7 @@ export const SwiperPaginationItem = ({
value={index}
onChange={onSlideChange}
/>
-
-
+
diff --git a/packages/react/src/components/TouchRipple/TouchRipple.tsx b/packages/react/src/components/TouchRipple/TouchRipple.tsx
index cc4246296..577a946fa 100644
--- a/packages/react/src/components/TouchRipple/TouchRipple.tsx
+++ b/packages/react/src/components/TouchRipple/TouchRipple.tsx
@@ -11,11 +11,11 @@ import { useDefaultProps } from '../../theming';
/**
* The touch ripple for ButtonBase component.
*/
-export const TouchRipple = ({ ref, ...inProps }: TouchRippleProps & RefAttributes) => {
+export const TouchRipple = ({ ref, ...inProps }: TouchRippleProps & RefAttributes) => {
const { className, style } = useDefaultProps({
props: inProps,
name: 'ESTouchRipple',
});
- return ;
+ return ;
};
diff --git a/packages/react/src/components/TouchRipple/useTouchRipple.ts b/packages/react/src/components/TouchRipple/useTouchRipple.ts
index 25e40d790..d7af948c9 100644
--- a/packages/react/src/components/TouchRipple/useTouchRipple.ts
+++ b/packages/react/src/components/TouchRipple/useTouchRipple.ts
@@ -71,7 +71,7 @@ export const useTouchRipple = ({
...rest
}: TouchRippleParams) => {
- const ref = useRef(null);
+ const ref = useRef(null);
const [pressed, setPressed] = useState(false);
diff --git a/packages/theme/lib/components/_breadcrumbs.scss b/packages/theme/lib/components/_breadcrumbs.scss
index 0b28bf047..643f5c1e3 100644
--- a/packages/theme/lib/components/_breadcrumbs.scss
+++ b/packages/theme/lib/components/_breadcrumbs.scss
@@ -74,7 +74,8 @@
}
&--disabled {
- & div {
+ & div,
+ & .es-button-base__wrapper {
cursor: not-allowed;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/packages/theme/lib/components/_pagination.scss b/packages/theme/lib/components/_pagination.scss
index b0b3c8335..b391cb643 100644
--- a/packages/theme/lib/components/_pagination.scss
+++ b/packages/theme/lib/components/_pagination.scss
@@ -31,6 +31,11 @@
padding: 0;
}
+ &__item {
+ align-items: center;
+ display: flex;
+ }
+
&__button {
border-radius: 50%;
diff --git a/packages/theme/lib/components/_switch.scss b/packages/theme/lib/components/_switch.scss
index ff4a67995..761f447c5 100644
--- a/packages/theme/lib/components/_switch.scss
+++ b/packages/theme/lib/components/_switch.scss
@@ -320,6 +320,7 @@
background-color: var(--es-common-switch);
border: 2px solid currentcolor;
border-radius: 50%;
+ display: block;
transition: 150ms;
transition-property: width, height, border, border-radius;
}
diff --git a/packages/theme/lib/components/_touch-ripple.scss b/packages/theme/lib/components/_touch-ripple.scss
index 898e240a3..619ba6f1b 100644
--- a/packages/theme/lib/components/_touch-ripple.scss
+++ b/packages/theme/lib/components/_touch-ripple.scss
@@ -1,6 +1,7 @@
@mixin include() {
.es-touch-ripple {
border-radius: inherit;
+ display: block;
inset: 0;
overflow: hidden;
pointer-events: none;