@etsoo/materialui 1.2.59 → 1.2.61

package/lib/FileUploadButton.d.ts

@@ -0,0 +1,22 @@
+import { ButtonProps } from "@mui/material";
+import React from "react";
+/**
+ * File upload button props
+ */
+export type FileUploadButtonProps = ButtonProps<"label"> & {
+    /**
+     * Input field attributes
+     */
+    inputProps?: Omit<React.InputHTMLAttributes<HTMLInputElement>, "type" | "hidden">;
+    /**
+     * Upload files callback
+     * @param files Files
+     */
+    onUploadFiles?: (files: FileList) => void;
+};
+/**
+ * File upload button
+ * @param props Props
+ * @returns Component
+ */
+export declare function FileUploadButton(props: FileUploadButtonProps): React.JSX.Element;

package/lib/FileUploadButton.js

@@ -0,0 +1,27 @@
+import { Button } from "@mui/material";
+import React from "react";
+/**
+ * File upload button
+ * @param props Props
+ * @returns Component
+ */
+export function FileUploadButton(props) {
+    // Destruct
+    const { inputProps, onUploadFiles, children, ...rest } = props;
+    const { onChange } = inputProps !== null && inputProps !== void 0 ? inputProps : {};
+    // Layout
+    return (React.createElement(Button, { component: "label", ...rest },
+        children,
+        React.createElement("input", { type: "file", hidden: true, onChange: (event) => {
+                if (onChange)
+                    onChange(event);
+                if (event.isDefaultPrevented())
+                    return;
+                if (onUploadFiles) {
+                    const files = event.target.files;
+                    if (files == null || files.length == 0)
+                        return;
+                    onUploadFiles(files);
+                }
+            }, ...inputProps })));
+}

package/lib/UserAvatarEditor.js

@@ -8,6 +8,7 @@ import DoneIcon from "@mui/icons-material/Done";
 import RemoveIcon from "@mui/icons-material/Remove";
 import AddIcon from "@mui/icons-material/Add";
 import { Labels } from "./app/Labels";
+import { FileUploadButton } from "./FileUploadButton";
 const defaultState = {
     scale: 1,
     rotate: 0
@@ -70,12 +71,9 @@ export function UserAvatarEditor(props) {
     const handleLoad = () => {
         setReady(true);
     };
-    // Handle file change
-    const handleFileChange = (event) => {
+    // Handle file upload
+    const handleFileUpload = (files) => {
         var _a;
-        const files = event.target.files;
-        if (files == null || files.length == 0)
-            return;
         // Reset all settings
         handleReset();
         // Set new preview image
@@ -140,9 +138,7 @@ export function UserAvatarEditor(props) {
     // Load the component
     const AE = React.lazy(() => import("react-avatar-editor"));
     return (React.createElement(Stack, { direction: "column", spacing: 0.5, width: containerWidth },
-        React.createElement(Button, { variant: "outlined", size: "medium", component: "label", startIcon: React.createElement(ComputerIcon, null), fullWidth: true },
-            labels.upload,
-            React.createElement("input", { id: "fileInput", type: "file", accept: "image/png, image/jpeg", multiple: false, hidden: true, onChange: handleFileChange })),
+        React.createElement(FileUploadButton, { variant: "outlined", size: "medium", startIcon: React.createElement(ComputerIcon, null), fullWidth: true, onUploadFiles: handleFileUpload, inputProps: { multiple: false, accept: "image/png, image/jpeg" } }, labels.upload),
         React.createElement(Stack, { direction: "row", spacing: 0.5 },
             React.createElement(React.Suspense, { fallback: React.createElement(Skeleton, { variant: "rounded", width: width, height: height }) },
                 React.createElement(AE, { ref: ref, border: border, width: width, height: height, onLoadSuccess: handleLoad, image: previewImage !== null && previewImage !== void 0 ? previewImage : "", scale: editorState.scale, rotate: editorState.rotate })),

package/lib/index.d.ts

@@ -47,6 +47,7 @@ export * from "./DnDList";
 export * from "./DraggablePaperComponent";
 export * from "./EmailInput";
 export * from "./FabBox";
+export * from "./FileUploadButton";
 export * from "./FlexBox";
 export * from "./GridDataFormat";
 export * from "./HiSelector";

package/lib/index.js

@@ -47,6 +47,7 @@ export * from "./DnDList";
 export * from "./DraggablePaperComponent";
 export * from "./EmailInput";
 export * from "./FabBox";
+export * from "./FileUploadButton";
 export * from "./FlexBox";
 export * from "./GridDataFormat";
 export * from "./HiSelector";

package/lib/pages/ViewPage.d.ts

@@ -36,7 +36,7 @@ type ViewPageFieldTypeNarrow<T extends object> = (string & keyof T) | [string &
 /**
  * View page field type
  */
-export type ViewPageFieldType<T extends object> = ViewPageFieldTypeNarrow<T> | ((data: T) => React.ReactNode);
+export type ViewPageFieldType<T extends object> = ViewPageFieldTypeNarrow<T> | ((data: T, refresh: () => Promise<void>) => React.ReactNode);
 /**
  * View page props
  */

package/lib/pages/ViewPage.js

@@ -107,7 +107,7 @@ export function ViewPage(props) {
             // Get data
             if (typeof field === "function") {
                 // Most flexible way, do whatever you want
-                return field(data);
+                return field(data, refresh);
             }
             const [itemData, itemLabel, gridProps] = getItemField(field, data);
             // Some callback function may return '' instead of undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.59",
+  "version": "1.2.61",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -47,16 +47,16 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^7.0.2",
-    "@emotion/css": "^11.11.0",
+    "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@etsoo/appscript": "^1.4.19",
+    "@etsoo/appscript": "^1.4.20",
     "@etsoo/notificationbase": "^1.1.25",
     "@etsoo/react": "^1.6.93",
-    "@etsoo/shared": "^1.2.5",
+    "@etsoo/shared": "^1.2.7",
     "@mui/icons-material": "^5.11.16",
     "@mui/material": "^5.13.5",
-    "@mui/x-data-grid": "^6.7.0",
+    "@mui/x-data-grid": "^6.8.0",
     "@types/pica": "^9.0.1",
     "@types/pulltorefreshjs": "^0.1.5",
     "@types/react": "^18.2.12",

package/src/FileUploadButton.tsx

@@ -0,0 +1,55 @@
+import { Button, ButtonProps } from "@mui/material";
+import React from "react";
+
+/**
+ * File upload button props
+ */
+export type FileUploadButtonProps = ButtonProps<"label"> & {
+  /**
+   * Input field attributes
+   */
+  inputProps?: Omit<
+    React.InputHTMLAttributes<HTMLInputElement>,
+    "type" | "hidden"
+  >;
+
+  /**
+   * Upload files callback
+   * @param files Files
+   */
+  onUploadFiles?: (files: FileList) => void;
+};
+
+/**
+ * File upload button
+ * @param props Props
+ * @returns Component
+ */
+export function FileUploadButton(props: FileUploadButtonProps) {
+  // Destruct
+  const { inputProps, onUploadFiles, children, ...rest } = props;
+
+  const { onChange } = inputProps ?? {};
+
+  // Layout
+  return (
+    <Button component="label" {...rest}>
+      {children}
+      <input
+        type="file"
+        hidden={true}
+        onChange={(event) => {
+          if (onChange) onChange(event);
+          if (event.isDefaultPrevented()) return;
+
+          if (onUploadFiles) {
+            const files = event.target.files;
+            if (files == null || files.length == 0) return;
+            onUploadFiles(files);
+          }
+        }}
+        {...inputProps}
+      />
+    </Button>
+  );
+}

package/src/UserAvatarEditor.tsx

@@ -16,6 +16,7 @@ import DoneIcon from "@mui/icons-material/Done";
 import RemoveIcon from "@mui/icons-material/Remove";
 import AddIcon from "@mui/icons-material/Add";
 import { Labels } from "./app/Labels";
+import { FileUploadButton } from "./FileUploadButton";
 
 /**
  * User avatar editor to Blob helper
@@ -182,11 +183,8 @@ export function UserAvatarEditor(props: UserAvatarEditorProps) {
     setReady(true);
   };
 
-  // Handle file change
-  const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const files = event.target.files;
-    if (files == null || files.length == 0) return;
-
+  // Handle file upload
+  const handleFileUpload = (files: FileList) => {
     // Reset all settings
     handleReset();
 
@@ -266,23 +264,16 @@ export function UserAvatarEditor(props: UserAvatarEditorProps) {
 
   return (
     <Stack direction="column" spacing={0.5} width={containerWidth}>
-      <Button
+      <FileUploadButton
         variant="outlined"
         size="medium"
-        component="label"
         startIcon={<ComputerIcon />}
         fullWidth
+        onUploadFiles={handleFileUpload}
+        inputProps={{ multiple: false, accept: "image/png, image/jpeg" }}
       >
         {labels.upload}
-        <input
-          id="fileInput"
-          type="file"
-          accept="image/png, image/jpeg"
-          multiple={false}
-          hidden
-          onChange={handleFileChange}
-        />
-      </Button>
+      </FileUploadButton>
       <Stack direction="row" spacing={0.5}>
         <React.Suspense
           fallback={

package/src/index.ts

@@ -50,6 +50,7 @@ export * from "./DnDList";
 export * from "./DraggablePaperComponent";
 export * from "./EmailInput";
 export * from "./FabBox";
+export * from "./FileUploadButton";
 export * from "./FlexBox";
 export * from "./GridDataFormat";
 export * from "./HiSelector";

package/src/pages/ViewPage.tsx

@@ -65,7 +65,7 @@ type ViewPageFieldTypeNarrow<T extends object> =
  */
 export type ViewPageFieldType<T extends object> =
   | ViewPageFieldTypeNarrow<T>
-  | ((data: T) => React.ReactNode);
+  | ((data: T, refresh: () => Promise<void>) => React.ReactNode);
 
 /**
  * View page props
@@ -276,7 +276,7 @@ export function ViewPage<T extends DataTypes.StringRecord>(
               // Get data
               if (typeof field === "function") {
                 // Most flexible way, do whatever you want
-                return field(data);
+                return field(data, refresh);
               }
 
               const [itemData, itemLabel, gridProps] = getItemField(