@etsoo/react 1.4.40 → 1.4.44

package/lib/app/Labels.d.ts

@@ -8,6 +8,7 @@ export declare namespace Labels {
      */
     const CommonPage: {
         add: string;
+        delete: string;
         more: string;
         pullToRefresh: string;
         refresh: string;

package/lib/app/Labels.js

@@ -9,6 +9,7 @@ export var Labels;
      */
     Labels.CommonPage = {
         add: 'Add',
+        delete: 'Delete',
         more: 'More',
         pullToRefresh: 'Pull down to refresh',
         refresh: 'Refresh',

package/lib/mu/DataGridRenderers.js

@@ -67,7 +67,7 @@ export var DataGridRenderers;
             if (value)
                 return React.createElement(CheckIcon, { fontSize: "small" });
             else
-                return React.createElement(ClearIcon, { fontSize: "small", color: "error" });
+                return React.createElement(ClearIcon, { fontSize: "small", color: "warning" });
         }
         // To string
         return new String(value);

package/lib/mu/ResponsibleContainer.js

@@ -147,7 +147,7 @@ export function ResponsibleContainer(props) {
             ? undefined
             : containerBoxSx(paddings, showDataGrid) },
         React.createElement(Stack, null,
-            React.createElement(Box, { ref: dimensions[0][0], className: "SearchBox" }, searchBar),
+            React.createElement(Box, { ref: dimensions[0][0], className: "SearchBox", sx: { height: 64 } }, searchBar),
             list),
         pullToRefresh && pullContainer && (React.createElement(PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: () => { var _a; return (_a = state.ref) === null || _a === void 0 ? void 0 : _a.reset(); }, shouldPullToRefresh: () => {
                 const container = document.querySelector(pullContainer);

package/lib/mu/TabBox.d.ts

@@ -12,6 +12,10 @@ export interface TabBoxPanel extends Omit<TabProps, 'value' | 'children'> {
      * Panel box props
      */
     panel?: Omit<BoxProps, 'hidden'>;
+    /**
+     * To URL
+     */
+    to?: string;
 }
 /**
  * Tabs with box props

package/lib/mu/TabBox.js

@@ -1,5 +1,6 @@
 import { Utils } from '@etsoo/shared';
 import { Box, Tab, Tabs } from '@mui/material';
+import { Link } from '@reach/router';
 import React from 'react';
 /**
  * Tabs with box
@@ -25,6 +26,6 @@ export function TabBox(props) {
                     setValue(newValue);
                     if (onChange)
                         onChange(event, newValue);
-                }, ...rest }, tabs.map(({ children, panel, ...tabRest }, index) => (React.createElement(Tab, { key: index, value: index, ...tabRest }))))),
+                }, ...rest }, tabs.map(({ children, panel, ...tabRest }, index) => (React.createElement(Tab, { key: index, value: index, LinkComponent: tabRest.to ? Link : undefined, ...tabRest }))))),
         tabs.map(({ children, panel }, index) => (React.createElement(Box, { key: index, hidden: value !== index, ...panel }, Utils.getResult(children, value === index))))));
 }

package/lib/mu/pages/EditPage.d.ts

@@ -4,10 +4,18 @@ import { CommonPageProps } from './CommonPageProps';
  * Add / Edit page props
  */
 export interface EditPageProps extends Omit<CommonPageProps, 'onSubmit'> {
+    /**
+     * Is editing
+     */
+    isEditing?: boolean;
     /**
      * On form submit
      */
     onSubmit?: FormEventHandler<HTMLFormElement>;
+    /**
+     * On delete callback
+     */
+    onDelete?: () => Promise<void> | void;
 }
 /**
  * Add / Edit page

package/lib/mu/pages/EditPage.js

@@ -4,22 +4,24 @@ import { Labels } from '../../app/Labels';
 import { MUGlobal } from '../MUGlobal';
 import { CommonPage, CommonPageScrollContainer } from './CommonPage';
 import SaveIcon from '@mui/icons-material/Save';
+import DeleteIcon from '@mui/icons-material/Delete';
 /**
  * Add / Edit page
  * @param props Props
  */
 export function EditPage(props) {
     // Destruct
-    const { children, onSubmit, paddings = MUGlobal.pagePaddings, scrollContainer = CommonPageScrollContainer, ...rest } = props;
+    const { children, isEditing, onDelete, onSubmit, paddings = MUGlobal.pagePaddings, scrollContainer = CommonPageScrollContainer, ...rest } = props;
     // Labels
     const labels = Labels.CommonPage;
     return (React.createElement(CommonPage, { paddings: paddings, scrollContainer: scrollContainer, ...rest },
         React.createElement("form", { onSubmit: onSubmit },
             React.createElement(Grid, { container: true, justifyContent: "left", spacing: paddings, paddingTop: 1 }, children),
-            React.createElement(Grid, { container: true, position: "sticky", sx: {
+            React.createElement(Grid, { container: true, position: "sticky", display: "flex", gap: paddings, sx: {
                     top: 'auto',
                     bottom: (theme) => MUGlobal.updateWithTheme(paddings, theme.spacing),
                     paddingTop: paddings
                 } },
-                React.createElement(Button, { variant: "contained", type: "submit", fullWidth: true, startIcon: React.createElement(SaveIcon, null) }, labels.save)))));
+                isEditing && onDelete && (React.createElement(Button, { color: "primary", variant: "outlined", onClick: () => onDelete(), startIcon: React.createElement(DeleteIcon, { color: "warning" }) }, labels.delete)),
+                React.createElement(Button, { variant: "contained", type: "submit", startIcon: React.createElement(SaveIcon, null), sx: { flexGrow: 1 } }, labels.save)))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.40",
+    "version": "1.4.44",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.22",
+        "@etsoo/appscript": "^1.2.24",
         "@etsoo/notificationbase": "^1.1.0",
         "@etsoo/shared": "^1.1.3",
         "@mui/icons-material": "^5.2.5",
@@ -91,7 +91,7 @@
         "eslint-plugin-react": "^7.28.0",
         "jest": "^27.4.7",
         "react-test-renderer": "^17.0.2",
-        "ts-jest": "^27.1.2",
+        "ts-jest": "^27.1.3",
         "typescript": "^4.5.4"
     }
 }

package/src/app/Labels.ts

@@ -9,6 +9,7 @@ export namespace Labels {
      */
     export const CommonPage = {
         add: 'Add',
+        delete: 'Delete',
         more: 'More',
         pullToRefresh: 'Pull down to refresh',
         refresh: 'Refresh',

package/src/mu/DataGridRenderers.tsx

@@ -103,7 +103,7 @@ export namespace DataGridRenderers {
             }
 
             if (value) return <CheckIcon fontSize="small" />;
-            else return <ClearIcon fontSize="small" color="error" />;
+            else return <ClearIcon fontSize="small" color="warning" />;
         }
 
         // To string

package/src/mu/ResponsibleContainer.tsx

@@ -349,7 +349,11 @@ export function ResponsibleContainer<
             }
         >
             <Stack>
-                <Box ref={dimensions[0][0]} className="SearchBox">
+                <Box
+                    ref={dimensions[0][0]}
+                    className="SearchBox"
+                    sx={{ height: 64 }}
+                >
                     {searchBar}
                 </Box>
                 {list}

package/src/mu/TabBox.tsx

@@ -1,5 +1,6 @@
 import { Utils } from '@etsoo/shared';
 import { Box, BoxProps, Tab, TabProps, Tabs, TabsProps } from '@mui/material';
+import { Link } from '@reach/router';
 import React from 'react';
 
 /**
@@ -15,6 +16,11 @@ export interface TabBoxPanel extends Omit<TabProps, 'value' | 'children'> {
      * Panel box props
      */
     panel?: Omit<BoxProps, 'hidden'>;
+
+    /**
+     * To URL
+     */
+    to?: string;
 }
 
 /**
@@ -93,7 +99,12 @@ export function TabBox(props: TabBoxPros) {
                     {...rest}
                 >
                     {tabs.map(({ children, panel, ...tabRest }, index) => (
-                        <Tab key={index} value={index} {...tabRest} />
+                        <Tab
+                            key={index}
+                            value={index}
+                            LinkComponent={tabRest.to ? Link : undefined}
+                            {...tabRest}
+                        />
                     ))}
                 </Tabs>
             </Box>

package/src/mu/pages/EditPage.tsx

@@ -5,15 +5,26 @@ import { MUGlobal } from '../MUGlobal';
 import { CommonPage, CommonPageScrollContainer } from './CommonPage';
 import { CommonPageProps } from './CommonPageProps';
 import SaveIcon from '@mui/icons-material/Save';
+import DeleteIcon from '@mui/icons-material/Delete';
 
 /**
  * Add / Edit page props
  */
 export interface EditPageProps extends Omit<CommonPageProps, 'onSubmit'> {
+    /**
+     * Is editing
+     */
+    isEditing?: boolean;
+
     /**
      * On form submit
      */
     onSubmit?: FormEventHandler<HTMLFormElement>;
+
+    /**
+     * On delete callback
+     */
+    onDelete?: () => Promise<void> | void;
 }
 
 /**
@@ -24,6 +35,8 @@ export function EditPage(props: EditPageProps) {
     // Destruct
     const {
         children,
+        isEditing,
+        onDelete,
         onSubmit,
         paddings = MUGlobal.pagePaddings,
         scrollContainer = CommonPageScrollContainer,
@@ -51,6 +64,8 @@ export function EditPage(props: EditPageProps) {
                 <Grid
                     container
                     position="sticky"
+                    display="flex"
+                    gap={paddings}
                     sx={{
                         top: 'auto',
                         bottom: (theme) =>
@@ -58,11 +73,21 @@ export function EditPage(props: EditPageProps) {
                         paddingTop: paddings
                     }}
                 >
+                    {isEditing && onDelete && (
+                        <Button
+                            color="primary"
+                            variant="outlined"
+                            onClick={() => onDelete()}
+                            startIcon={<DeleteIcon color="warning" />}
+                        >
+                            {labels.delete}
+                        </Button>
+                    )}
                     <Button
                         variant="contained"
                         type="submit"
-                        fullWidth
                         startIcon={<SaveIcon />}
+                        sx={{ flexGrow: 1 }}
                     >
                         {labels.save}
                     </Button>