@etsoo/materialui 1.2.21 → 1.2.23

package/lib/pages/ViewPage.js

@@ -1,3 +1,4 @@
+import { ScrollRestoration } from "@etsoo/react";
 import { DateUtils, Utils } from "@etsoo/shared";
 import { Grid, LinearProgress, Stack, Typography } from "@mui/material";
 import React from "react";
@@ -113,10 +114,11 @@ export function ViewPage(props) {
                     ":")),
                 typeof itemData === "object" ? (itemData) : (React.createElement(Typography, { variant: "subtitle2" }, itemData))));
         })),
-        React.createElement(Stack, { className: "ET-ViewPage-Actions", direction: "row", width: "100%", flexWrap: "wrap", justifyContent: "flex-end", paddingTop: actions == null ? undefined : paddings, paddingBottom: paddings, gap: paddings }, actions != null && Utils.getResult(actions, data, refresh)),
+        actions !== null && (React.createElement(Stack, { className: "ET-ViewPage-Actions", direction: "row", width: "100%", flexWrap: "wrap", justifyContent: "flex-end", paddingTop: actions == null ? undefined : paddings, paddingBottom: paddings, gap: paddings }, actions != null && Utils.getResult(actions, data, refresh))),
         Utils.getResult(children, data, refresh),
         pullToRefresh && (React.createElement(PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: refresh, shouldPullToRefresh: () => {
                 const container = document.querySelector(pullContainer);
                 return !(container === null || container === void 0 ? void 0 : container.scrollTop);
-            } }))))));
+            } })),
+        React.createElement(ScrollRestoration, null)))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.21",
+  "version": "1.2.23",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -52,7 +52,7 @@
     "@emotion/styled": "^11.10.8",
     "@etsoo/appscript": "^1.3.98",
     "@etsoo/notificationbase": "^1.1.24",
-    "@etsoo/react": "^1.6.71",
+    "@etsoo/react": "^1.6.72",
     "@etsoo/shared": "^1.2.1",
     "@mui/icons-material": "^5.11.16",
     "@mui/material": "^5.12.2",

package/src/pages/ViewPage.tsx

@@ -1,4 +1,8 @@
-import { GridColumnRenderProps, GridDataType } from "@etsoo/react";
+import {
+  GridColumnRenderProps,
+  GridDataType,
+  ScrollRestoration
+} from "@etsoo/react";
 import { DataTypes, DateUtils, Utils } from "@etsoo/shared";
 import {
   Grid,
@@ -288,18 +292,20 @@ export function ViewPage<T extends DataTypes.StringRecord>(
               );
             })}
           </Grid>
-          <Stack
-            className="ET-ViewPage-Actions"
-            direction="row"
-            width="100%"
-            flexWrap="wrap"
-            justifyContent="flex-end"
-            paddingTop={actions == null ? undefined : paddings}
-            paddingBottom={paddings}
-            gap={paddings}
-          >
-            {actions != null && Utils.getResult(actions, data, refresh)}
-          </Stack>
+          {actions !== null && (
+            <Stack
+              className="ET-ViewPage-Actions"
+              direction="row"
+              width="100%"
+              flexWrap="wrap"
+              justifyContent="flex-end"
+              paddingTop={actions == null ? undefined : paddings}
+              paddingBottom={paddings}
+              gap={paddings}
+            >
+              {actions != null && Utils.getResult(actions, data, refresh)}
+            </Stack>
+          )}
           {Utils.getResult(children, data, refresh)}
           {pullToRefresh && (
             <PullToRefreshUI
@@ -315,6 +321,7 @@ export function ViewPage<T extends DataTypes.StringRecord>(
               }}
             />
           )}
+          <ScrollRestoration />
         </React.Fragment>
       )}
     </CommonPage>