fix(plugins/selection): remove the props.id and other unused props

Author: afshinm

plugins/selection/src/rowSelection/rowSelection.tsx

@@ -5,24 +5,19 @@ import { Row } from 'gridjs';
 import { Cell } from 'gridjs';
 
 interface RowSelectionProps {
-  // row identifier
-  id: (row?: Row) => string;
   // it's optional because thead doesn't have a row
   row?: Row;
   cell?: Cell;
-  selectedClassName?: string;
-  checkboxClassName?: string;
 }
 
 export function RowSelection(props: RowSelectionProps) {
   const { dispatch } = useStore();
   const state = useSelector((state) => state.rowSelection);
   const [isChecked, setIsChecked] = useState(false);
-  const selectedClassName =
-    props.selectedClassName || className('tr', 'selected');
-  const checkboxClassName = props.checkboxClassName || className('checkbox');
-  const isDataCell = (props): boolean => props.row !== undefined;
-  const getParentTR = (): Element =>
+  const selectedClassName = className('tr', 'selected');
+  const checkboxClassName = className('checkbox');
+  const isDataCell = (props) => props.row !== undefined;
+  const getParentTR = () =>
     this.base &&
     this.base.parentElement &&
     (this.base.parentElement.parentElement as Element);
@@ -40,7 +35,8 @@ export function RowSelection(props: RowSelectionProps) {
 
     if (!parent) return;
 
-    const isChecked = state.rowIds.indexOf(props.id(props.row)) > -1;
+    const rowIds = state?.rowIds || [];
+    const isChecked = rowIds.indexOf(props.row.id) > -1;
     setIsChecked(isChecked);
 
     if (isChecked) {
@@ -51,12 +47,12 @@ export function RowSelection(props: RowSelectionProps) {
   }, [state]);
 
   const check = () => {
-    dispatch(actions.CheckRow(props.id(props.row)));
+    dispatch(actions.CheckRow(props.row.id));
     props.cell?.update(true);
   };
 
   const uncheck = () => {
-    dispatch(actions.UncheckRow(props.id(props.row)));
+    dispatch(actions.UncheckRow(props.row.id));
     props.cell?.update(false);
   };
 

src/state/store.ts

@@ -1,6 +1,6 @@
 export class Store<S = Record<string, unknown>> {
   private state: S;
-  private listeners: (() => void)[] = [];
+  private listeners: ((current?: S, prev?: S) => void)[] = [];
   private isDispatching = false;
 
   constructor(initialState: S) {
@@ -18,20 +18,21 @@ export class Store<S = Record<string, unknown>> {
 
     this.isDispatching = true;
 
+    const prevState = this.state;
     try {
       this.state = reducer(this.state);
     } finally {
       this.isDispatching = false;
     }
 
     for (const listener of this.listeners) {
-      listener();
+      listener(this.state, prevState);
     }
 
     return this.state;
   };
 
-  subscribe = (listener: () => void): (() => void) => {
+  subscribe = (listener: (current?: S, prev?: S) => void): (() => void) => {
     if (typeof listener !== 'function')
       throw new Error('Listener is not a function');
 

tests/jest/state/store.test.ts

@@ -0,0 +1,88 @@
+import { Store } from '../../../src/state/store';
+
+describe('Store', () => {
+  it('should set the initial state', () => {
+    const stubState = {
+      a: 45,
+    };
+    const store = new Store(stubState);
+    expect(store.getState()).toEqual(stubState);
+  });
+
+  it('should update the state', () => {
+    const store = new Store({
+      hello: 'world',
+    });
+    store.dispatch((state) => {
+      return {
+        ...state,
+        newKey: 42,
+      };
+    });
+    expect(store.getState()).toEqual({
+      hello: 'world',
+      newKey: 42,
+    });
+  });
+
+  it('should override the state', () => {
+    const store = new Store({
+      hello: 'world',
+    });
+    store.dispatch((state) => {
+      return {
+        ...state,
+        hello: 'updated',
+      };
+    });
+    expect(store.getState()).toEqual({
+      hello: 'updated',
+    });
+  });
+
+  it('should call the subscribers', () => {
+    const store = new Store({
+      hello: 'world',
+    });
+
+    const mockSubscriber = jest.fn();
+
+    store.subscribe(mockSubscriber);
+
+    store.dispatch((state) => {
+      return {
+        ...state,
+        hello: 'updated',
+        newKey: 42,
+      };
+    });
+
+    expect(mockSubscriber).toBeCalledTimes(1);
+    expect(mockSubscriber).toBeCalledWith(
+      {
+        hello: 'updated',
+        newKey: 42,
+      },
+      {
+        hello: 'world',
+      },
+    );
+  });
+
+  it('should return a list of subscribers', () => {
+    const store = new Store({
+      hello: 'world',
+    });
+
+    const mockSubscriber1 = jest.fn();
+    const mockSubscriber2 = jest.fn();
+
+    store.subscribe(mockSubscriber1);
+    store.subscribe(mockSubscriber2);
+
+    expect(store.getListeners()).toHaveLength(2);
+    expect(store.getListeners()).toEqual(
+      expect.arrayContaining([mockSubscriber2, mockSubscriber1]),
+    );
+  });
+});