@powerportalspro/react-fluent 6.0.0 → 6.1.0

package/dist/index.d.cts

@@ -4635,7 +4635,11 @@ interface MainGridProps {
      * Set to `'virtualize'` for infinite-scroll — the pager footer is
      * hidden, rows accumulate across page boundaries, and the next page
      * fetches automatically when the user scrolls past the rendered
-     * bottom.
+     * bottom. Pages are requested sequentially with the previous page's
+     * Dataverse paging cookie (cursor paging), and loading stops when the
+     * server reports no more records — not when the accumulated rows reach
+     * the total count, which can never happen if per-row permission
+     * handlers drop rows after Dataverse has counted them.
      */
     pagingMode?: PagingMode;
     /**

package/dist/index.d.ts

@@ -4635,7 +4635,11 @@ interface MainGridProps {
      * Set to `'virtualize'` for infinite-scroll — the pager footer is
      * hidden, rows accumulate across page boundaries, and the next page
      * fetches automatically when the user scrolls past the rendered
-     * bottom.
+     * bottom. Pages are requested sequentially with the previous page's
+     * Dataverse paging cookie (cursor paging), and loading stops when the
+     * server reports no more records — not when the accumulated rows reach
+     * the total count, which can never happen if per-row permission
+     * handlers drop rows after Dataverse has counted them.
      */
     pagingMode?: PagingMode;
     /**

package/dist/index.js

@@ -8304,6 +8304,36 @@ function MainGridVirtualizeFooter({
   ] });
 }
 
+// src/grids/virtualize-paging.ts
+function hasMoreRowsToLoad(state) {
+  if (state.moreRecords === false) return false;
+  if (state.moreRecords === true) return true;
+  if (state.lastPageEmpty) return false;
+  if (state.totalCount === void 0) return true;
+  return state.accumulatedCount < state.totalCount;
+}
+var VirtualizePagingCookies = class {
+  key;
+  byPage = /* @__PURE__ */ new Map();
+  /** Store the cookie the response for `page` came back with (no-op for a null / empty cookie). */
+  record(key, page, cookie) {
+    if (this.key !== key) {
+      this.key = key;
+      this.byPage = /* @__PURE__ */ new Map();
+    }
+    if (cookie) this.byPage.set(page, cookie);
+  }
+  /**
+   * The cookie to send when requesting `page` under `key`: the one page
+   * `page - 1` returned, or `undefined` when it isn't known (page 1, a
+   * non-sequential jump, or a key the store has no cookies for).
+   */
+  cookieFor(key, page) {
+    if (this.key !== key || page <= 1) return void 0;
+    return this.byPage.get(page - 1);
+  }
+};
+
 // src/grids/persisted-grid-state.ts
 function readPersistedGridStateFromUrl(queryParameterName) {
   if (!queryParameterName) return null;
@@ -8835,8 +8865,22 @@ function MainGridImpl({
       `[MainGrid] Declared <GridColumn> children override the column projection of the supplied fetchXml (columns: ${columnsKey.split(",").join(", ")}). Drop the children \u2014 or remove the conflicting <attribute> elements from the fetchXml \u2014 to silence this message.`
     );
   }, [columnsKey, useInlineFetchXml]);
+  const accumulatorResetKey = useMemo(
+    () => [
+      resolvedViewId ?? "",
+      useInlineFetchXml ? inlineFetchXml ?? "" : "",
+      debouncedSearchText,
+      sort.map((s) => `${s.columnName}:${s.descending ? "d" : "a"}`).join("|"),
+      filtersKey,
+      pageSize,
+      tableName ?? ""
+    ].join("|"),
+    [resolvedViewId, useInlineFetchXml, inlineFetchXml, debouncedSearchText, sort, filtersKey, pageSize, tableName]
+  );
+  const [virtualizeCookies] = useState(() => new VirtualizePagingCookies());
   const searchRequest = useMemo(() => {
     const trimmed = debouncedSearchText.trim();
+    const pagingCookie = isVirtualize ? virtualizeCookies.cookieFor(accumulatorResetKey, page) : void 0;
     return {
       ...useInlineFetchXml && inlineFetchXml ? { fetchXml: inlineFetchXml } : resolvedViewId !== void 0 && { viewId: resolvedViewId },
       ...trimmed && { searchText: trimmed },
@@ -8856,7 +8900,8 @@ function MainGridImpl({
       },
       ...columnsOverride && { columns: [...columnsOverride] },
       pageNumber: page,
-      pageSize
+      pageSize,
+      ...pagingCookie && { pagingCookie }
     };
   }, [
     resolvedViewId,
@@ -8867,7 +8912,9 @@ function MainGridImpl({
     page,
     pageSize,
     filtersKey,
-    columnsKey
+    columnsKey,
+    isVirtualize,
+    accumulatorResetKey
   ]);
   const transformPending = !!transformViewAsync || isCustomActiveView;
   const recordsResult = useGridData(searchRequest, {
@@ -9164,18 +9211,6 @@ function MainGridImpl({
   ]);
   const pageRecords = dataSource ? dataSource.rows : recordsResult.data?.tableRecords ?? EMPTY_RECORDS;
   const [accumulatedRows, setAccumulatedRows] = useState(null);
-  const accumulatorResetKey = useMemo(
-    () => [
-      resolvedViewId ?? "",
-      useInlineFetchXml ? inlineFetchXml ?? "" : "",
-      debouncedSearchText,
-      sort.map((s) => `${s.columnName}:${s.descending ? "d" : "a"}`).join("|"),
-      filtersKey,
-      pageSize,
-      tableName ?? ""
-    ].join("|"),
-    [resolvedViewId, useInlineFetchXml, inlineFetchXml, debouncedSearchText, sort, filtersKey, pageSize, tableName]
-  );
   const resetVirtualizedView = useCallback(() => {
     setAccumulatedRows([]);
     setPage(1);
@@ -9201,6 +9236,12 @@ function MainGridImpl({
       return [...base, ...additions];
     });
   }, [isVirtualize, recordsResult.status, pageRecords]);
+  useEffect(() => {
+    if (!isVirtualize) return;
+    const landed = recordsResult.data;
+    if (!landed) return;
+    virtualizeCookies.record(accumulatorResetKey, page, landed.pagingInfo?.pagingCookie);
+  }, [isVirtualize, recordsResult.data]);
   const data = isVirtualize ? accumulatedRows ?? EMPTY_RECORDS : pageRecords;
   const [pendingRowUpdates, setPendingRowUpdates] = useState(() => /* @__PURE__ */ new Map());
   const [pendingRowCreates, setPendingRowCreates] = useState(() => []);
@@ -9681,7 +9722,15 @@ function MainGridImpl({
     if (raw == null) return void 0;
     return typeof raw === "number" ? raw : Number(raw);
   })();
-  const hasMoreRowsToLoad = isVirtualize && (totalCount === void 0 || (accumulatedRows?.length ?? 0) < totalCount);
+  const hasMoreRowsToLoad2 = isVirtualize && hasMoreRowsToLoad({
+    accumulatedCount: accumulatedRows?.length ?? 0,
+    totalCount,
+    moreRecords: dataSource ? dataSource.moreRecords : recordsResult.data?.pagingInfo?.moreRecords,
+    // "A page has landed and it carried no rows." In standalone mode
+    // `data` is only ever defined for a landed response (errors wipe it);
+    // the datasource has no data handle, so idle-after-success stands in.
+    lastPageEmpty: dataSource ? dataSource.status === QueryStatus.Success && !dataSource.isFetching && dataSource.rows.length === 0 : recordsResult.data !== void 0 && pageRecords.length === 0
+  });
   useEffect(() => {
     if (!isVirtualize) return;
     const sentinel = loadMoreSentinelRef.current;
@@ -9692,7 +9741,7 @@ function MainGridImpl({
         const entry = entries[0];
         if (!entry?.isIntersecting) return;
         if (recordsResult.isFetching) return;
-        if (!hasMoreRowsToLoad) return;
+        if (!hasMoreRowsToLoad2) return;
         setPage(page + 1);
       },
       {
@@ -9705,7 +9754,7 @@ function MainGridImpl({
     );
     observer.observe(sentinel);
     return () => observer.disconnect();
-  }, [isVirtualize, hasMoreRowsToLoad, recordsResult.isFetching, page, setPage]);
+  }, [isVirtualize, hasMoreRowsToLoad2, recordsResult.isFetching, page, setPage]);
   const handlePageChange = (nextPage) => {
     if (nextPage === page) return;
     setPage(nextPage);
@@ -10325,7 +10374,7 @@ function MainGridImpl({
               }
             ),
             displayedData.length === 0 && /* @__PURE__ */ jsx("div", { className: styles.emptyStateRow, children: t("app.components.grid.empty-content") }),
-            isVirtualize && hasMoreRowsToLoad && // No spinner here: the full-body `refetchScrim` overlay below is the
+            isVirtualize && hasMoreRowsToLoad2 && // No spinner here: the full-body `refetchScrim` overlay below is the
             // single load indicator. Rendering a `size="tiny"` spinner in the
             // sentinel as well meant a deps-change refetch (refresh / sort /
             // search / view switch) — which resets the accumulator to empty and
@@ -14445,6 +14494,18 @@ var useStyles12 = makeStyles({
   },
   // Scroll viewport for the merged grid so a tall result set scrolls inside the dialog.
   dialogGrid: { maxHeight: "60vh", overflowY: "auto", overflowX: "auto" },
+  // Merged-snapshot cells. Keys and sources are long single tokens (dotted keys,
+  // backslash-only absolute paths) with no natural break opportunity, so without
+  // this the text paints straight over the neighbouring column. `overflow-wrap:
+  // anywhere` (not just `break-word`) is what makes the flex cell honour its
+  // column width — it counts the soft breaks toward min-content — so the token
+  // wraps inside the column instead of stretching it. Same recipe as
+  // `sourceCell` in the per-source loads table above.
+  mergedCell: {
+    whiteSpace: "normal",
+    overflowWrap: "anywhere",
+    wordBreak: "break-word"
+  },
   filterInput: { minWidth: "260px" },
   pager: { display: "flex", alignItems: "center", gap: tokens.spacingHorizontalS },
   grow: { flex: 1 },
@@ -14926,7 +14987,7 @@ function MergedSourcesDialog({
           size: "small",
           children: [
             /* @__PURE__ */ jsx(DataGridHeader, { children: /* @__PURE__ */ jsx(DataGridRow, { children: ({ renderHeaderCell }) => /* @__PURE__ */ jsx(DataGridHeaderCell, { children: renderHeaderCell() }) }) }),
-            /* @__PURE__ */ jsx(DataGridBody, { children: ({ item, rowId }) => /* @__PURE__ */ jsx(DataGridRow, { children: ({ renderCell }) => /* @__PURE__ */ jsx(DataGridCell, { children: renderCell(item) }) }, rowId) })
+            /* @__PURE__ */ jsx(DataGridBody, { children: ({ item, rowId }) => /* @__PURE__ */ jsx(DataGridRow, { children: ({ renderCell }) => /* @__PURE__ */ jsx(DataGridCell, { className: styles.mergedCell, children: renderCell(item) }) }, rowId) })
           ]
         }
       ) })