@izumisy-tailor/tailor-data-viewer 0.1.16 → 0.1.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@izumisy-tailor/tailor-data-viewer",
   "private": false,
-  "version": "0.1.16",
+  "version": "0.1.17",
   "type": "module",
   "description": "Flexible data viewer component for Tailor Platform",
   "files": [

package/src/component/hooks/use-table-data.ts

@@ -106,7 +106,7 @@ export function useTableData(
     hasNextPage: false,
     endCursor: null,
   });
-  const [cursorHistory, setCursorHistory] = useState<string[]>([]);
+  const [cursorHistory, setCursorHistory] = useState<(string | null)[]>([]);
 
   const client = useMemo(() => createGraphQLClient(appUri), [appUri]);
 
@@ -286,10 +286,8 @@ export function useTableData(
 
   const nextPage = useCallback(() => {
     if (pagination.hasNextPage && pagination.endCursor) {
-      // Store current cursor for back navigation
-      if (pagination.after) {
-        setCursorHistory((prev) => [...prev, pagination.after!]);
-      }
+      // Store current cursor for back navigation (null for first page is valid)
+      setCursorHistory((prev) => [...prev, pagination.after]);
       // Use endCursor from pageInfo for pagination
       setPagination((prev) => ({
         ...prev,
@@ -301,11 +299,11 @@ export function useTableData(
   const previousPage = useCallback(() => {
     if (cursorHistory.length > 0) {
       const newHistory = [...cursorHistory];
-      newHistory.pop();
+      const previousCursor = newHistory.pop();
       setCursorHistory(newHistory);
       setPagination((prev) => ({
         ...prev,
-        after: newHistory.length > 0 ? newHistory[newHistory.length - 1] : null,
+        after: previousCursor ?? null,
       }));
     }
   }, [cursorHistory]);