@eml-payments/ui-kit 1.8.7 → 1.8.8

package/dist/src/components/Filters/Filters.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useImperativeHandle, forwardRef, useRef } from 'react';
+import { useEffect, useImperativeHandle, forwardRef } from 'react';
 import { useForm, Controller, useWatch } from 'react-hook-form';
 import { DatePicker } from '../DatePicker';
 import { FilterSelect } from './FilterSelect';
@@ -13,7 +13,6 @@ export const Filters = forwardRef(({ filters, defaultValues, onChange, onReset,
     const { control, reset, setValue, watch } = useForm({
         defaultValues,
     });
-    const isInitialisedRef = useRef(false);
     const values = useWatch({ control });
     useImperativeHandle(ref, () => ({
         reset: () => {
@@ -28,10 +27,6 @@ export const Filters = forwardRef(({ filters, defaultValues, onChange, onReset,
     }));
     useEffect(() => {
         const subscription = watch((updatedValues) => {
-            if (!isInitialisedRef.current) {
-                isInitialisedRef.current = true;
-                return;
-            }
             onChange === null || onChange === void 0 ? void 0 : onChange(updatedValues);
         });
         return () => subscription.unsubscribe();

package/dist/src/components/Table/hooks/useUrlPaginationSync.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useLocation, useSearchParams } from 'react-router-dom';
 function getPaginationParamKeys(tableId) {
     if (tableId) {
         return {
@@ -15,9 +15,14 @@ function getPaginationParamKeys(tableId) {
 export function useUrlPaginationSync({ defaultPageSize, tableId, scoped = false, enabled = true, }) {
     const [searchParams, setSearchParams] = useSearchParams();
     const searchParamsRef = useRef(searchParams);
+    const location = useLocation();
+    const locationStateRef = useRef(location.state);
     useEffect(() => {
         searchParamsRef.current = searchParams;
     }, [searchParams]);
+    useEffect(() => {
+        locationStateRef.current = location.state;
+    }, [location.state]);
     const { pageNoKey, pageSizeKey } = useMemo(() => getPaginationParamKeys(scoped ? tableId : undefined), [tableId, scoped]);
     const initialPageIndex = useMemo(() => {
         if (!enabled) {
@@ -47,7 +52,7 @@ export function useUrlPaginationSync({ defaultPageSize, tableId, scoped = false,
         const next = new URLSearchParams(current);
         next.set(pageNoKey, nextPageNo);
         next.set(pageSizeKey, nextPageSize);
-        setSearchParams(next, { replace: true });
+        setSearchParams(next, { replace: true, state: locationStateRef.current });
     }, [enabled, setSearchParams, pageNoKey, pageSizeKey]);
     useEffect(() => {
         if (enabled) {
@@ -59,7 +64,7 @@ export function useUrlPaginationSync({ defaultPageSize, tableId, scoped = false,
         const next = new URLSearchParams(searchParams);
         next.delete(pageNoKey);
         next.delete(pageSizeKey);
-        setSearchParams(next, { replace: true });
+        setSearchParams(next, { replace: true, state: locationStateRef.current });
     }, [enabled, searchParams, setSearchParams, pageNoKey, pageSizeKey]);
     // Ensure active table pagination params exist (also when param keys change).
     useEffect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@eml-payments/ui-kit",
-	"version": "1.8.7",
+	"version": "1.8.8",
 	"private": false,
 	"description": "ARLO UIKit",
 	"homepage": "https://github.com/EML-Payments/arlo.npm.uikit#readme",