Merge pull request #182 from komarovalexander/dev

Rename checkbox to checked
komarovalexander · Oct 5, 2021 · 51d8bc1 · 51d8bc1
2 parents c2b3097 + b96dadd
commit 51d8bc1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ka-table",
-  "version": "7.1.3",
+  "version": "7.2.0",
   "license": "MIT",
   "repository": "github:komarovalexander/ka-table",
   "homepage": "https://komarovalexander.github.io/ka-table/#/overview",

diff --git a/src/Demos/MenuItems.tsx b/src/Demos/MenuItems.tsx
@@ -11,8 +11,8 @@ export class MenuItem {
   public isActive?: boolean;
 }
 
-const newItems: string[] = ['GroupedColumnsDemo'];
-const updateItems: string[] = ['Grouping'];
+const newItems: string[] = ['HeaderFilterDemo'];
+const updateItems: string[] = ['Filtering'];
 
 const MenuItems: React.FC<{ items: MenuItem[] }> = ({ items }) => {
 

diff --git a/src/lib/Components/PopupContentItem/PopupContentItem.tsx b/src/lib/Components/PopupContentItem/PopupContentItem.tsx
@@ -16,7 +16,7 @@ const PopupContentItem: React.FC<IPopupContentItemProps> = (props) => {
   const checked: boolean = column.headerFilterValues?.includes(item) ?? false;
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    dispatch(updateHeaderFilterValues(column.key, event.currentTarget.checked, item));
+    dispatch(updateHeaderFilterValues(column.key, item, event.currentTarget.checked));
   }
 
   const { elementAttributes, content } = getElementCustomization({

diff --git a/src/lib/Reducers/kaReducer.ts b/src/lib/Reducers/kaReducer.ts
@@ -40,7 +40,7 @@ const kaReducer: any = (props: ITableProps, action: any): ITableProps => {
       const newColumns = columns.map((c: Column) => {
         if (c.key === action.columnKey) {
           let headerFilterValues = c.headerFilterValues;
-          if (action.checkbox) {
+          if (action.checked) {
             if (headerFilterValues === undefined) {
               headerFilterValues = [];
             }

diff --git a/src/lib/actionCreators.ts b/src/lib/actionCreators.ts
@@ -3,9 +3,9 @@ import { Focused } from './Models/Focused';
 import { PopupPosition } from './Models/PopupPosition';
 import { IMoveFocusedSettings } from './Utils/NavigationUtils';
 
-export const updateHeaderFilterValues = (columnKey: string, checkbox: boolean, item: any) => ({
+export const updateHeaderFilterValues = (columnKey: string, item: any, checked: boolean) => ({
   columnKey,
-  checkbox,
+  checked,
   item,
   type: ActionType.UpdateHeaderFilterValues
 });
@@ -15,7 +15,7 @@ export const updatePopupPosition = (popupPosition: PopupPosition) => ({
   type: ActionType.UpdatePopupPosition
 });
 
-export const updateHeaderFilterPopupState = (columnKey: string, isHeaderFilterPopupShown: boolean | undefined) => ({
+export const updateHeaderFilterPopupState = (columnKey: string, isHeaderFilterPopupShown?: boolean) => ({
   columnKey,
   isHeaderFilterPopupShown,
   type: ActionType.UpdateHeaderFilterPopupState