@etsoo/materialui 1.4.91 → 1.4.92
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -247,17 +247,18 @@ function ViewPage(props) {
|
|
|
247
247
|
MessageUtils_1.MessageUtils.offRefresh(refreshHandler);
|
|
248
248
|
};
|
|
249
249
|
}, [refresh]);
|
|
250
|
-
|
|
250
|
+
let leftResult;
|
|
251
|
+
return ((0, jsx_runtime_1.jsx)(CommonPage_1.CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, sx: {
|
|
252
|
+
".MuiTypography-subtitle2": {
|
|
253
|
+
fontWeight: "bold"
|
|
254
|
+
}
|
|
255
|
+
}, ...rest, scrollContainer: globalThis, fabColumnDirection: fabColumnDirection, fabTop: fabTop, supportBack: supportBack, children: data == null ? ((0, jsx_runtime_1.jsx)(material_1.LinearProgress, {})) : ((0, jsx_runtime_1.jsxs)(react_3.default.Fragment, { children: [operationMessageHandler && ((0, jsx_runtime_1.jsx)(OperationMessageContainer_1.OperationMessageContainer, { handler: "id" in operationMessageHandler
|
|
251
256
|
? [
|
|
252
257
|
operationMessageHandler.types,
|
|
253
258
|
refresh,
|
|
254
259
|
operationMessageHandler.id
|
|
255
260
|
]
|
|
256
|
-
: operationMessageHandler })), titleBar && titleBar(data), (0, jsx_runtime_1.jsxs)(material_1.Grid2, { container: true, justifyContent: "left", className: "ET-ViewPage", ref: gridRef, spacing: spacing,
|
|
257
|
-
".MuiTypography-subtitle2": {
|
|
258
|
-
fontWeight: "bold"
|
|
259
|
-
}
|
|
260
|
-
}, children: [leftContainer && ((0, jsx_runtime_1.jsxs)(react_3.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid2, { container: true, className: "ET-ViewPage-LeftContainer", spacing: spacing, size: size, ...leftContainerPropsRest, children: leftContainer(data) }), (0, jsx_runtime_1.jsx)(material_1.Grid2, { container: true, className: "ET-ViewPage-LeftOthers", spacing: spacing, size: ViewPageSize.matchSize(size), children: createFields(data, leftContainerLines * (12 - getItemSize(bp, size))) })] })), createFields(data)] }), actions !== null && ((0, jsx_runtime_1.jsx)(material_1.Stack, { className: "ET-ViewPage-Actions", direction: "row", width: "100%", flexWrap: "wrap", justifyContent: "flex-end", paddingTop: actions == null ? undefined : paddings, paddingBottom: paddings, gap: paddings, children: actions != null && shared_1.Utils.getResult(actions, data, refresh) })), shared_1.Utils.getResult(children, data, refresh), pullToRefresh && ((0, jsx_runtime_1.jsx)(PullToRefreshUI_1.PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: refresh, shouldPullToRefresh: () => {
|
|
261
|
+
: operationMessageHandler })), titleBar && titleBar(data), (0, jsx_runtime_1.jsxs)(material_1.Grid2, { container: true, justifyContent: "left", className: "ET-ViewPage", ref: gridRef, spacing: spacing, children: [leftContainer && (leftResult = leftContainer(data)) != null && ((0, jsx_runtime_1.jsxs)(react_3.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid2, { container: true, className: "ET-ViewPage-LeftContainer", spacing: spacing, size: size, ...leftContainerPropsRest, children: leftResult }), (0, jsx_runtime_1.jsx)(material_1.Grid2, { container: true, className: "ET-ViewPage-LeftOthers", spacing: spacing, size: ViewPageSize.matchSize(size), children: createFields(data, leftContainerLines * (12 - getItemSize(bp, size))) })] })), createFields(data)] }), actions !== null && ((0, jsx_runtime_1.jsx)(material_1.Stack, { className: "ET-ViewPage-Actions", direction: "row", width: "100%", flexWrap: "wrap", justifyContent: "flex-end", paddingTop: actions == null ? undefined : paddings, paddingBottom: paddings, gap: paddings, children: actions != null && shared_1.Utils.getResult(actions, data, refresh) })), shared_1.Utils.getResult(children, data, refresh), pullToRefresh && ((0, jsx_runtime_1.jsx)(PullToRefreshUI_1.PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: refresh, shouldPullToRefresh: () => {
|
|
261
262
|
const container = document.querySelector(pullContainer);
|
|
262
263
|
return !container?.scrollTop;
|
|
263
264
|
} })), (0, jsx_runtime_1.jsx)(react_2.ScrollRestoration, {})] })) }));
|
|
@@ -239,17 +239,18 @@ export function ViewPage(props) {
|
|
|
239
239
|
MessageUtils.offRefresh(refreshHandler);
|
|
240
240
|
};
|
|
241
241
|
}, [refresh]);
|
|
242
|
-
|
|
242
|
+
let leftResult;
|
|
243
|
+
return (_jsx(CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, sx: {
|
|
244
|
+
".MuiTypography-subtitle2": {
|
|
245
|
+
fontWeight: "bold"
|
|
246
|
+
}
|
|
247
|
+
}, ...rest, scrollContainer: globalThis, fabColumnDirection: fabColumnDirection, fabTop: fabTop, supportBack: supportBack, children: data == null ? (_jsx(LinearProgress, {})) : (_jsxs(React.Fragment, { children: [operationMessageHandler && (_jsx(OperationMessageContainer, { handler: "id" in operationMessageHandler
|
|
243
248
|
? [
|
|
244
249
|
operationMessageHandler.types,
|
|
245
250
|
refresh,
|
|
246
251
|
operationMessageHandler.id
|
|
247
252
|
]
|
|
248
|
-
: operationMessageHandler })), titleBar && titleBar(data), _jsxs(Grid2, { container: true, justifyContent: "left", className: "ET-ViewPage", ref: gridRef, spacing: spacing,
|
|
249
|
-
".MuiTypography-subtitle2": {
|
|
250
|
-
fontWeight: "bold"
|
|
251
|
-
}
|
|
252
|
-
}, children: [leftContainer && (_jsxs(React.Fragment, { children: [_jsx(Grid2, { container: true, className: "ET-ViewPage-LeftContainer", spacing: spacing, size: size, ...leftContainerPropsRest, children: leftContainer(data) }), _jsx(Grid2, { container: true, className: "ET-ViewPage-LeftOthers", spacing: spacing, size: ViewPageSize.matchSize(size), children: createFields(data, leftContainerLines * (12 - getItemSize(bp, size))) })] })), createFields(data)] }), actions !== null && (_jsx(Stack, { className: "ET-ViewPage-Actions", direction: "row", width: "100%", flexWrap: "wrap", justifyContent: "flex-end", paddingTop: actions == null ? undefined : paddings, paddingBottom: paddings, gap: paddings, children: actions != null && Utils.getResult(actions, data, refresh) })), Utils.getResult(children, data, refresh), pullToRefresh && (_jsx(PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: refresh, shouldPullToRefresh: () => {
|
|
253
|
+
: operationMessageHandler })), titleBar && titleBar(data), _jsxs(Grid2, { container: true, justifyContent: "left", className: "ET-ViewPage", ref: gridRef, spacing: spacing, children: [leftContainer && (leftResult = leftContainer(data)) != null && (_jsxs(React.Fragment, { children: [_jsx(Grid2, { container: true, className: "ET-ViewPage-LeftContainer", spacing: spacing, size: size, ...leftContainerPropsRest, children: leftResult }), _jsx(Grid2, { container: true, className: "ET-ViewPage-LeftOthers", spacing: spacing, size: ViewPageSize.matchSize(size), children: createFields(data, leftContainerLines * (12 - getItemSize(bp, size))) })] })), createFields(data)] }), actions !== null && (_jsx(Stack, { className: "ET-ViewPage-Actions", direction: "row", width: "100%", flexWrap: "wrap", justifyContent: "flex-end", paddingTop: actions == null ? undefined : paddings, paddingBottom: paddings, gap: paddings, children: actions != null && Utils.getResult(actions, data, refresh) })), Utils.getResult(children, data, refresh), pullToRefresh && (_jsx(PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: refresh, shouldPullToRefresh: () => {
|
|
253
254
|
const container = document.querySelector(pullContainer);
|
|
254
255
|
return !container?.scrollTop;
|
|
255
256
|
} })), _jsx(ScrollRestoration, {})] })) }));
|
package/package.json
CHANGED
package/src/pages/ViewPage.tsx
CHANGED
|
@@ -481,11 +481,18 @@ export function ViewPage<T extends DataTypes.StringRecord>(
|
|
|
481
481
|
};
|
|
482
482
|
}, [refresh]);
|
|
483
483
|
|
|
484
|
+
let leftResult: React.ReactNode;
|
|
485
|
+
|
|
484
486
|
return (
|
|
485
487
|
<CommonPage
|
|
486
488
|
paddings={paddings}
|
|
487
489
|
onRefresh={supportRefresh ? refresh : undefined}
|
|
488
490
|
onUpdate={supportRefresh ? undefined : refresh}
|
|
491
|
+
sx={{
|
|
492
|
+
".MuiTypography-subtitle2": {
|
|
493
|
+
fontWeight: "bold"
|
|
494
|
+
}
|
|
495
|
+
}}
|
|
489
496
|
{...rest}
|
|
490
497
|
scrollContainer={globalThis}
|
|
491
498
|
fabColumnDirection={fabColumnDirection}
|
|
@@ -516,13 +523,8 @@ export function ViewPage<T extends DataTypes.StringRecord>(
|
|
|
516
523
|
className="ET-ViewPage"
|
|
517
524
|
ref={gridRef}
|
|
518
525
|
spacing={spacing}
|
|
519
|
-
sx={{
|
|
520
|
-
".MuiTypography-subtitle2": {
|
|
521
|
-
fontWeight: "bold"
|
|
522
|
-
}
|
|
523
|
-
}}
|
|
524
526
|
>
|
|
525
|
-
{leftContainer && (
|
|
527
|
+
{leftContainer && (leftResult = leftContainer(data)) != null && (
|
|
526
528
|
<React.Fragment>
|
|
527
529
|
<Grid2
|
|
528
530
|
container
|
|
@@ -531,7 +533,7 @@ export function ViewPage<T extends DataTypes.StringRecord>(
|
|
|
531
533
|
size={size}
|
|
532
534
|
{...leftContainerPropsRest}
|
|
533
535
|
>
|
|
534
|
-
{
|
|
536
|
+
{leftResult}
|
|
535
537
|
</Grid2>
|
|
536
538
|
<Grid2
|
|
537
539
|
container
|