@hubspot/ui-extensions 0.9.6 → 0.9.7

package/dist/__tests__/experimental/crm/fetchAssociations.spec.js

@@ -8,7 +8,7 @@ Object.defineProperty(global, 'self', {
     value: mockSelf,
     writable: true,
 });
-import { fetchAssociations, pageToOffset, offsetToPage, calculatePaginationFlags, } from '../../../experimental/crm/fetchAssociations';
+import { fetchAssociations, calculatePaginationFlags, } from '../../../experimental/crm/fetchAssociations';
 describe('fetchAssociations', () => {
     // Helper functions
     const createMockResponse = (data, overrides = {}) => ({
@@ -394,28 +394,6 @@ describe('fetchAssociations', () => {
         });
     });
     describe('pagination utilities', () => {
-        describe('pageToOffset', () => {
-            it('should convert page numbers to offsets', () => {
-                expect(pageToOffset(1, 10)).toBe(0);
-                expect(pageToOffset(3, 10)).toBe(20);
-                expect(pageToOffset(2, 25)).toBe(25);
-            });
-            it('should always return 0 for page 1', () => {
-                expect(pageToOffset(1, 10)).toBe(0);
-                expect(pageToOffset(1, 50)).toBe(0);
-            });
-        });
-        describe('offsetToPage', () => {
-            it('should convert offsets to page numbers', () => {
-                expect(offsetToPage(0, 10)).toBe(1);
-                expect(offsetToPage(20, 10)).toBe(3);
-                expect(offsetToPage(15, 10)).toBe(2); // partial page
-            });
-            it('should always return 1 for offset 0', () => {
-                expect(offsetToPage(0, 10)).toBe(1);
-                expect(offsetToPage(0, 25)).toBe(1);
-            });
-        });
         describe('calculatePaginationFlags', () => {
             it('should calculate pagination flags correctly', () => {
                 // Page 1 scenarios

package/dist/__tests__/experimental/hooks/useAssociations.spec.js

@@ -118,7 +118,7 @@ describe('useAssociations with Pagination', () => {
                 toObjectType: '0-1',
                 properties: ['firstname', 'lastname'],
                 pageLength: 10,
-                offset: 0,
+                offset: undefined, // First page starts with undefined offset
             }), expect.any(Object));
         });
         it('should handle empty results correctly', async () => {
@@ -182,7 +182,7 @@ describe('useAssociations with Pagination', () => {
             });
             // Verify API was called with correct offset for page 2
             expect(mockFetchAssociations).toHaveBeenLastCalledWith(expect.objectContaining({
-                offset: 10, // (page 2 - 1) * pageSize 10 = 10
+                offset: 10, // Uses nextOffset (10) from first page response
             }), expect.any(Object));
         });
         it('should navigate to previous page correctly', async () => {

package/dist/experimental/crm/fetchAssociations.d.ts

@@ -1,13 +1,5 @@
 import { FetchCrmPropertiesOptions } from './fetchCrmProperties';
 export declare const DEFAULT_PAGE_SIZE = 10;
-/**
- * Convert page number and page size to offset for API calls
- */
-export declare function pageToOffset(page: number, pageSize: number): number;
-/**
- * Convert offset and page size to page number
- */
-export declare function offsetToPage(offset: number, pageSize: number): number;
 /**
  * Calculate pagination flags based on current page and API hasMore flag
  */

package/dist/experimental/crm/fetchAssociations.js

@@ -1,16 +1,4 @@
 export const DEFAULT_PAGE_SIZE = 10;
-/**
- * Convert page number and page size to offset for API calls
- */
-export function pageToOffset(page, pageSize) {
-    return (page - 1) * pageSize;
-}
-/**
- * Convert offset and page size to page number
- */
-export function offsetToPage(offset, pageSize) {
-    return Math.floor(offset / pageSize) + 1;
-}
 /**
  * Calculate pagination flags based on current page and API hasMore flag
  */

package/dist/experimental/hooks/useAssociations.js

@@ -1,6 +1,6 @@
 import { useEffect, useReducer, useMemo, useRef, useCallback } from 'react';
 import { logger } from '../../logger';
-import { fetchAssociations, DEFAULT_PAGE_SIZE, pageToOffset, calculatePaginationFlags, } from '../crm/fetchAssociations';
+import { fetchAssociations, DEFAULT_PAGE_SIZE, calculatePaginationFlags, } from '../crm/fetchAssociations';
 function createInitialState(pageSize) {
     return {
         results: [],
@@ -9,6 +9,9 @@ function createInitialState(pageSize) {
         currentPage: 1,
         pageSize,
         hasMore: false,
+        currentOffset: undefined,
+        nextOffset: undefined,
+        offsetHistory: [],
     };
 }
 function associationsReducer(state, action) {
@@ -25,6 +28,8 @@ function associationsReducer(state, action) {
                 isLoading: false,
                 results: action.payload.results,
                 hasMore: action.payload.hasMore,
+                currentOffset: action.payload.currentOffset,
+                nextOffset: action.payload.nextOffset,
                 error: null,
             };
         case 'FETCH_ERROR':
@@ -34,17 +39,31 @@ function associationsReducer(state, action) {
                 error: action.payload,
                 results: [],
                 hasMore: false,
+                currentOffset: undefined,
+                nextOffset: undefined,
             };
         case 'NEXT_PAGE':
             return {
                 ...state,
                 currentPage: state.currentPage + 1,
+                offsetHistory: state.currentOffset !== undefined
+                    ? [...state.offsetHistory, state.currentOffset]
+                    : state.offsetHistory,
+                currentOffset: state.nextOffset,
+                nextOffset: undefined,
             };
-        case 'PREVIOUS_PAGE':
+        case 'PREVIOUS_PAGE': {
+            const newPage = Math.max(1, state.currentPage - 1);
+            const newHistory = [...state.offsetHistory];
+            const previousOffset = newHistory.pop();
             return {
                 ...state,
-                currentPage: Math.max(1, state.currentPage - 1),
+                currentPage: newPage,
+                offsetHistory: newHistory,
+                currentOffset: previousOffset,
+                nextOffset: undefined,
             };
+        }
         case 'RESET':
             return {
                 ...state,
@@ -52,6 +71,9 @@ function associationsReducer(state, action) {
                 results: [],
                 hasMore: false,
                 error: null,
+                currentOffset: undefined,
+                nextOffset: undefined,
+                offsetHistory: [],
             };
         default:
             return state;
@@ -117,12 +139,12 @@ export function useAssociations(config, options = DEFAULT_OPTIONS) {
         const fetchData = async () => {
             try {
                 dispatch({ type: 'FETCH_START' });
-                // Build request using current page and pagination utilities
+                // Build request using current offset token
                 const request = {
                     toObjectType: stableConfig.toObjectType,
                     properties: stableConfig.properties,
                     pageLength: pageSize,
-                    offset: pageToOffset(state.currentPage, pageSize),
+                    offset: state.currentOffset,
                 };
                 const result = await fetchAssociations(request, {
                     propertiesToFormat: stableOptions.propertiesToFormat,
@@ -134,6 +156,8 @@ export function useAssociations(config, options = DEFAULT_OPTIONS) {
                         payload: {
                             results: result.data.results,
                             hasMore: result.data.hasMore,
+                            nextOffset: result.data.nextOffset,
+                            currentOffset: state.currentOffset,
                         },
                     });
                     cleanup = result.cleanup;
@@ -156,7 +180,13 @@ export function useAssociations(config, options = DEFAULT_OPTIONS) {
                 cleanup();
             }
         };
-    }, [stableConfig, stableOptions, state.currentPage, pageSize]);
+    }, [
+        stableConfig,
+        stableOptions,
+        state.currentPage,
+        state.currentOffset,
+        pageSize,
+    ]);
     // Calculate pagination flags
     const paginationFlags = calculatePaginationFlags(state.currentPage, state.hasMore);
     return {

package/dist/types.d.ts

@@ -1304,6 +1304,8 @@ export interface StackProps {
      */
     width?: 'auto' | '100%';
 }
+export type FlexJustify = 'center' | 'end' | 'start' | 'around' | 'between';
+export type FlexAlign = 'start' | 'center' | 'baseline' | 'end' | 'stretch';
 /**
  * The props type for {@link !components.Flex}.
  *
@@ -1332,18 +1334,18 @@ export interface FlexProps {
      *
      * @defaultValue `"start"`
      */
-    justify?: 'center' | 'end' | 'start' | 'around' | 'between';
+    justify?: FlexJustify;
     /**
      * Distributes components along the cross-axis using the available free space.
      *
      * @defaultValue `"stretch"`
      */
-    align?: 'start' | 'center' | 'baseline' | 'end' | 'stretch';
+    align?: FlexAlign;
     /**
      * Overrides Flex's `alignItem` value for this element.
      *
      */
-    alignSelf?: 'start' | 'center' | 'baseline' | 'end' | 'stretch';
+    alignSelf?: FlexAlign;
     /**
      * Whether components will wrap instead of trying to fit on one line.
      *
@@ -1381,8 +1383,6 @@ export interface BoxProps {
      */
     flex?: 'initial' | 'auto' | 'none' | number;
 }
-export type FlexJustify = 'center' | 'end' | 'start' | 'around' | 'between';
-export type FlexAlign = 'start' | 'center' | 'baseline' | 'end' | 'stretch';
 /**
  * The props type for {@link !components.Inline}.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/ui-extensions",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -66,5 +66,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "5.0.4"
   },
-  "gitHead": "1b458008ea50e3fb395db1766239aea3abb6753e"
+  "gitHead": "b9a6650baca7fd7326e7de6ffeacc8d5c097e126"
 }