Merge branch 'develop' into feature/project-table-to-demo

epam · Oct 9, 2023 · 7b3a4c2 · 7b3a4c2
2 parents 91e9976 + 417c4f6
commit 7b3a4c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/app/src/demo/tables/masterDetailedTable/FilterPanel/FilterPanel.tsx b/app/src/demo/tables/masterDetailedTable/FilterPanel/FilterPanel.tsx
@@ -5,9 +5,9 @@ import {
 } from '@epam/uui';
 import { ReactComponent as CloseIcon } from '@epam/assets/icons/common/navigation-close-24.svg';
 
-import { PresetsBlock } from './PresetsBlock';
+// import { PresetsBlock } from './PresetsBlock';
 import { FiltersBlock } from './FiltersBlock';
-import { ColumnsBlock } from './ColumnsBlock';
+// import { ColumnsBlock } from './ColumnsBlock';
 import { GroupingBlock } from './GroupingBlock';
 
 export interface IFilterPanelProps<TFilter extends Record<string, any>> extends ITableState<TFilter> {
@@ -28,9 +28,9 @@ function FilterPanel<TFilter = any>(props: IFilterPanelProps<TFilter>) {
             </FlexRow>
 
             <ScrollBars>
-                <PresetsBlock { ...props } />
+                {/* <PresetsBlock { ...props } /> */}
                 <FiltersBlock filters={ props.filters } tableState={ props.tableState } setTableState={ props.setTableState } />
-                <ColumnsBlock columnsConfig={ props.tableState.columnsConfig } onColumnsConfigChange={ props.setColumnsConfig } columns={ props.columns } />
+                {/* <ColumnsBlock columnsConfig={ props.tableState.columnsConfig } onColumnsConfigChange={ props.setColumnsConfig } columns={ props.columns } /> */}
                 <GroupingBlock tableState={ props.tableState } setTableState={ props.setTableState } />
             </ScrollBars>
         </>

diff --git a/app/src/demo/tables/masterDetailedTable/FilterPanel/FiltersBlock/Filter/Filter.tsx b/app/src/demo/tables/masterDetailedTable/FilterPanel/FiltersBlock/Filter/Filter.tsx
@@ -18,9 +18,9 @@ function FilterImpl<TFilter extends Record<string, any>>(props: IFilterProps<TFi
 
     const handleChange = useCallback(
         (filterValue: TFilter[keyof TFilter]) => {
-            onValueChange({ [filterConfig.field]: filterValue } as TFilter);
+            onValueChange({ ...value, [filterConfig.field]: filterValue } as TFilter);
         },
-        [filterConfig.field, onValueChange],
+        [filterConfig.field, value, onValueChange],
     );
 
     const renderPicker = () => {

diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,7 @@
 * [DataTable]: added pinned rows functionality.
 
 **What's Fixed**
+* [DropdownMenuButton]: Fix bug in `DropdownMenuButton` where `isDisabled` prop was not being passed to it's child `IconButton`.
 * [PickerItem]: fixed 'cx' prop
 * [Contexts]: fixed context initialization for react 18 with strict mode
 * [ModalWindow]: changed role attribute value from 'modal' to 'dialog'

diff --git a/uui/components/overlays/DropdownMenu.tsx b/uui/components/overlays/DropdownMenu.tsx
@@ -108,6 +108,7 @@ export const DropdownMenuButton = React.forwardRef<any, IDropdownMenuItemProps>(
                 icon={ icon }
                 color={ isActive ? 'info' : 'default' }
                 onClick={ onIconClick }
+                isDisabled={ isDisabled }
                 cx={ cx(css.icon, iconPosition === 'right' ? css.iconAfter : css.iconBefore) }
             />
         );