update trigger function

Author: dev-javascript

package-lock.json

@@ -541,12 +541,7 @@ describe('onChange callback : ', () => {
       currentData.selectedTabID = '6';
       previousData.selectedTabID = '6';
     });
-    const onChange2 = jest.fn(({currentData, previousData, closedTabIDs, openedTabIDs}) => {
-      closedTabIDs.push('7');
-      openedTabIDs.push('7');
-      currentData.selectedTabID = '7';
-      previousData.selectedTabID = '7';
-    });
+    const onChange2 = jest.fn(({currentData, previousData, closedTabIDs, openedTabIDs}) => {});
     const onOpen = jest.fn(() => {});
     const onClose = jest.fn(() => {});
     const onSelect = jest.fn(() => {});
@@ -595,6 +590,9 @@ describe('onChange callback : ', () => {
       expect(this.hasOwnProperty('getData')).toBe(true);
     });
     renderApp();
+    act(() => {
+      instance.select('2');
+    });
     op.onChange = function () {};
   });
 });
@@ -620,9 +618,7 @@ describe('onSelect callback : ', () => {
     const onSelect1 = jest.fn((param) => {
       param.previousSelectedTabId = 19;
     });
-    const onSelect2 = jest.fn((param) => {
-      param.previousSelectedTabId = 20;
-    });
+    const onSelect2 = jest.fn((param) => {});
     act(() => {
       instance.setOption('onSelect', (param) => {
         param.currentSelectedTabId = 10;
@@ -644,6 +640,9 @@ describe('onSelect callback : ', () => {
       expect(this.hasOwnProperty('getData')).toBe(true);
     });
     renderApp();
+    act(() => {
+      instance.select('2');
+    });
     op.onSelect = function () {};
   });
 });
@@ -686,9 +685,7 @@ describe('onFirstSelect callback : ', () => {
     const onFirstSelect1 = jest.fn((param) => {
       param.previousSelectedTabId = 19;
     });
-    const onFirstSelect2 = jest.fn((param) => {
-      param.previousSelectedTabId = 20;
-    });
+    const onFirstSelect2 = jest.fn((param) => {});
     act(() => {
       instance.setOption('onFirstSelect', (param) => {
         param.currentSelectedTabId = 10;
@@ -709,6 +706,9 @@ describe('onFirstSelect callback : ', () => {
       expect(this.hasOwnProperty('getData')).toBe(true);
     });
     renderApp();
+    act(() => {
+      instance.select('2');
+    });
     op.onFirstSelect = function () {};
   });
 });
@@ -730,9 +730,7 @@ describe('onOpen callback : ', () => {
     const onOpen1 = jest.fn((openedTabIDs) => {
       openedTabIDs.push('5');
     });
-    const onOpen2 = jest.fn((openedTabIDs) => {
-      openedTabIDs.push('6');
-    });
+    const onOpen2 = jest.fn((openedTabIDs) => {});
     act(() => {
       instance.setOption('onOpen', (openedTabIDs) => {
         openedTabIDs.push('4');
@@ -750,6 +748,9 @@ describe('onOpen callback : ', () => {
       expect(this.hasOwnProperty('getData')).toBe(true);
     });
     renderApp();
+    act(() => {
+      instance.open({id:'3'});
+    });
     op.onOpen = function () {};
   });
 });
@@ -771,9 +772,7 @@ describe('onClose callback : ', () => {
     const onClose1 = jest.fn((closedTabIDs) => {
       closedTabIDs.push('4');
     });
-    const onClose2 = jest.fn((closedTabIDs) => {
-      closedTabIDs.push('5');
-    });
+    const onClose2 = jest.fn((closedTabIDs) => {});
     act(() => {
       instance.setOption('onClose', (closedTabIDs) => {
         closedTabIDs.push('3');
@@ -791,6 +790,9 @@ describe('onClose callback : ', () => {
       expect(this.hasOwnProperty('getData')).toBe(true);
     });
     renderApp();
+    act(() => {
+      instance.close('2');
+    });
     op.onClose = function () {};
   });
 });

src/index.test.js

@@ -33,7 +33,9 @@ function useDynamicTabs(getDeps, options = {}) {
     api.onChange({newState: state, oldState, closedTabIDs, openedTabIDs, isSwitched});
   }, [state]);
   useLayoutEffect(() => {
-    api.trigger('_onFlushEffects', api.userProxy, {currentData: api.getData(), instance: api.userProxy});
+    api.trigger('_onFlushEffects', api.userProxy, () => {
+      return [{currentData: api.getData(), instance: api.userProxy}];
+    });
   }, [flushState]);
   if (!_ref.TabListComponent)
     _ref.TabListComponent = function TabListComponent(props = {}) {

src/useDynamicTabs/useDynamicTabs.js

@@ -176,26 +176,44 @@ const _apiProps = {
 Helper.setNoneEnumProps(_apiProps, {
   onChange: function ({newState, oldState, closedTabIDs, openedTabIDs, isSwitched}) {
     if (isSwitched || openedTabIDs.length || closedTabIDs.length) {
-      this.trigger('onChange', this.userProxy, {
-        currentData: {...newState},
-        previousData: {...oldState},
-        perviousData: {...oldState},
-        closedTabIDs,
-        openedTabIDs,
+      this.trigger('onChange', this.userProxy, () => {
+        return [
+          {
+            currentData: this.helper.getCopyState(newState),
+            previousData: this.helper.getCopyState(oldState),
+            perviousData: this.helper.getCopyState(oldState),
+            closedTabIDs: closedTabIDs.slice(),
+            openedTabIDs: openedTabIDs.slice(),
+          },
+        ];
       });
-      openedTabIDs.length && this.trigger('onOpen', this.userProxy, openedTabIDs);
-      closedTabIDs.length && this.trigger('onClose', this.userProxy, closedTabIDs);
+      openedTabIDs.length &&
+        this.trigger('onOpen', this.userProxy, () => {
+          return [openedTabIDs.slice()];
+        });
+      closedTabIDs.length &&
+        this.trigger('onClose', this.userProxy, () => {
+          return [closedTabIDs.slice()];
+        });
       if (isSwitched) {
         if (newState.selectedTabID && this.activedTabsHistory.tabsId.indexOf(newState.selectedTabID) === -1) {
-          this.trigger('onFirstSelect', this.userProxy, {
-            currentSelectedTabId: newState.selectedTabID,
-            previousSelectedTabId: oldState.selectedTabID,
+          this.trigger('onFirstSelect', this.userProxy, () => {
+            return [
+              {
+                currentSelectedTabId: newState.selectedTabID,
+                previousSelectedTabId: oldState.selectedTabID,
+              },
+            ];
           });
         }
-        this.trigger('onSelect', this.userProxy, {
-          currentSelectedTabId: newState.selectedTabID,
-          previousSelectedTabId: oldState.selectedTabID,
-          perviousSelectedTabId: oldState.selectedTabID,
+        this.trigger('onSelect', this.userProxy, () => {
+          return [
+            {
+              currentSelectedTabId: newState.selectedTabID,
+              previousSelectedTabId: oldState.selectedTabID,
+              perviousSelectedTabId: oldState.selectedTabID,
+            },
+          ];
         });
       }
     }

src/utils/api/api.factory.js

@@ -441,7 +441,9 @@ describe('Api.prototype._subscribeSelectedTabsHistory : ', () => {
     const currentData = {selectedTabID: '2', openTabIDs: ['2']};
     const previousData = {selectedTabID: '2', openTabIDs: ['2']};
     const closedTabIDs = ['1', '3'];
-    obj.trigger('onChange', obj.userProxy, {currentData, previousData, closedTabIDs, openTabIDs: []});
+    obj.trigger('onChange', obj.userProxy, () => {
+      return [{currentData, previousData, closedTabIDs, openTabIDs: []}];
+    });
     expect(obj.activedTabsHistory.remove.mock.calls.length).toBe(2);
     expect(obj.activedTabsHistory.remove.mock.calls[0][0]).toBe('1');
     expect(obj.activedTabsHistory.remove.mock.calls[1][0]).toBe('3');
@@ -459,7 +461,9 @@ describe('Api.prototype._subscribeSelectedTabsHistory : ', () => {
     });
     const currentData = {selectedTabID: '2', openTabIDs: ['1', '2']};
     const previousData = {selectedTabID: '1', openTabIDs: ['1', '2']};
-    obj.trigger('onChange', obj.userProxy, {currentData, previousData, closedTabIDs: [], openTabIDs: []});
+    obj.trigger('onChange', obj.userProxy, () => {
+      return [{currentData, previousData, closedTabIDs: [], openTabIDs: []}];
+    });
     expect(obj.activedTabsHistory.add.mock.calls.length).toBe(1);
     expect(obj.activedTabsHistory.add.mock.calls[0][0]).toBe('1');
   });
@@ -526,10 +530,12 @@ describe('Api.prorotype.onChange : ', () => {
     expect(obj.trigger.mock.calls[1][0]).toBe('onFirstSelect');
     expect(obj.trigger.mock.calls[2][0]).toBe('onSelect');
     expect(obj.trigger.mock.calls[1][1]).toBe(obj.userProxy);
-    expect(obj.trigger.mock.calls[1][2]).toEqual({
-      currentSelectedTabId: '2',
-      previousSelectedTabId: '1',
-    });
+    expect(obj.trigger.mock.calls[1][2]()).toEqual([
+      {
+        currentSelectedTabId: '2',
+        previousSelectedTabId: '1',
+      },
+    ]);
   });
   it('it should not trigger onFirstSelect if activedTabsHistory.tabsId includes new selected tab id', () => {
     obj.trigger = jest.fn(() => {});

src/utils/api/api.factory.test.js

@@ -43,12 +43,12 @@ Pub_Sub.prototype.one = function (publisherName, fn) {
   return this;
 };
 helper.setNoneEnumProps(Pub_Sub.prototype, {
-  trigger: function (publisherName, context, ...param) {
+  trigger: function (publisherName, context, generateParamsCallback = () => []) {
     context = context || null;
     const result = [];
     const _subscribers = [...this._publishers[publisherName]];
     _subscribers.map((subscriber) => {
-      result.push(subscriber.apply(context, param));
+      result.push(subscriber.apply(context, generateParamsCallback()));
     });
     return result;
   },

src/utils/api/pub_sub.js

@@ -5,10 +5,9 @@ helper.getInstance = function (Fn) {
 };
 helper.resolve = (result) => Promise.resolve(result);
 helper.getCopyState = function (state) {
-  if (!Object.prototype.hasOwnProperty.call(state, 'openTabIDs')) state.openTabIDs = [];
   return {
     selectedTabID: state.selectedTabID,
-    openTabIDs: [...state.openTabIDs],
+    openTabIDs: (state.openTabIDs || []).slice(),
   };
 };
 helper.assingAll = function (targetObj, ...sourcObjs) {