fix(datagrid-date-filter-web): fix e2e test and revert select changes

Author: iobuhov

packages/pluggableWidgets/datagrid-date-filter-web/e2e/DataGridDateFilter.spec.js

@@ -45,7 +45,8 @@ test.describe("datagrid-date-filter-web", () => {
         const filterSelector = page.locator(".filter-selector");
         await filterSelector.click();
         const filterSelectorOptions = page.locator(".filter-selectors li");
-        await filterSelectorOptions.first().click();
+        await filterSelectorOptions.first().click({ delay: 1 });
+        await expect(page.locator(".filter-selector-button")).toHaveAccessibleName("Between");
         const monthSelect = page.locator(".react-datepicker__month-select");
         await monthSelect.selectOption("October");
         const yearSelect = page.locator(".react-datepicker__year-select");

packages/shared/widget-plugin-filtering/src/controls/filter-selector/FilterSelector.tsx

@@ -85,22 +85,19 @@ function useController(props: FilterSelectorProps): ViewProps {
 
     const listboxLabel = props.ariaLabel || "Select filter type";
     const buttonLabel = selectedItem?.label || listboxLabel;
-    // Use memo to prevent max call depth in e2e
-    // https://github.com/carbon-design-system/carbon/pull/17002
-    // https://github.com/carbon-design-system/carbon/issues/17001
-    const buttonProps = useMemo(
-        () => getToggleButtonProps({ ref: refs.setReference, "aria-label": "none" }),
-        [getToggleButtonProps, refs.setReference]
-    );
-    const listboxProps = useMemo(
-        () => getMenuProps({ ref: refs.setFloating, "aria-label": "none" }),
-        [getMenuProps, refs.setFloating]
-    );
+    const buttonProps = getToggleButtonProps({
+        "aria-label": buttonLabel,
+        ref: refs.setReference
+    });
+    const listboxProps = getMenuProps({
+        "aria-label": listboxLabel,
+        ref: refs.setFloating
+    });
 
     return {
         open: isOpen,
-        buttonProps: { ...buttonProps, "aria-label": buttonLabel },
-        listboxProps: { ...listboxProps, "aria-label": listboxLabel },
+        buttonProps,
+        listboxProps,
         getItemProps,
         selectedItem,
         highlightedIndex,