@etsoo/materialui 1.2.86 → 1.2.88

package/lib/AutocompleteExtendedProps.d.ts

@@ -40,6 +40,10 @@ export type AutocompleteExtendedProps<T extends object, D extends DataTypes.Keys
      * @default false
      */
     inputRequired?: boolean;
+    /**
+     * Set 'data-reset'
+     */
+    inputReset?: boolean;
     /**
      * The variant to use.
      * @default 'outlined'

package/lib/ComboBox.js

@@ -16,7 +16,7 @@ export function ComboBox(props) {
     // Labels
     const labels = globalApp === null || globalApp === void 0 ? void 0 : globalApp.getLabels("noOptions", "loading", "open", "add");
     // Destruct
-    const { search = false, autoAddBlankItem = search, idField = "id", idValue, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, defaultValue, label, labelField = "label", loadData, onLoadData, name, inputAutoComplete = "off", options, dataReadonly = true, readOnly, onChange, onValueChange, openOnFocus = true, value, disableCloseOnSelect = false, getOptionLabel = (option) => `${option[labelField]}`, sx = { minWidth: "150px", flexGrow: 2 }, noOptionsText = labels === null || labels === void 0 ? void 0 : labels.noOptions, loadingText = labels === null || labels === void 0 ? void 0 : labels.loading, openText = labels === null || labels === void 0 ? void 0 : labels.open, addLabel = labels === null || labels === void 0 ? void 0 : labels.add, onAdd, ...rest } = props;
+    const { search = false, autoAddBlankItem = search, idField = "id", idValue, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputReset, inputVariant, defaultValue, label, labelField = "label", loadData, onLoadData, name, inputAutoComplete = "off", options, dataReadonly = true, readOnly, onChange, onValueChange, openOnFocus = true, value, disableCloseOnSelect = false, getOptionLabel = (option) => `${option[labelField]}`, sx = { minWidth: "150px", flexGrow: 2 }, noOptionsText = labels === null || labels === void 0 ? void 0 : labels.noOptions, loadingText = labels === null || labels === void 0 ? void 0 : labels.loading, openText = labels === null || labels === void 0 ? void 0 : labels.open, addLabel = labels === null || labels === void 0 ? void 0 : labels.add, onAdd, ...rest } = props;
     // Value input ref
     const inputRef = React.createRef();
     // Options state
@@ -125,7 +125,7 @@ export function ComboBox(props) {
                         onChange(event, value, reason, details);
                     if (onValueChange)
                         onValueChange(value);
-                }, openOnFocus: openOnFocus, sx: sx, renderInput: (params) => search ? (React.createElement(SearchField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText })) : (React.createElement(InputField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText })), options: localOptions, noOptionsText: noOptionsText, loadingText: loadingText, openText: openText, ...rest }),
+                }, openOnFocus: openOnFocus, sx: sx, renderInput: (params) => search ? (React.createElement(SearchField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText, "data-reset": inputReset })) : (React.createElement(InputField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText, "data-reset": inputReset })), options: localOptions, noOptionsText: noOptionsText, loadingText: loadingText, openText: openText, ...rest }),
             onAdd && (React.createElement(IconButton, { size: "small", onClick: () => {
                     onAdd(doLoadData);
                 }, title: addLabel },

package/lib/ComboBoxMultiple.js

@@ -19,7 +19,7 @@ export function ComboBoxMultiple(props) {
     // Labels
     const labels = globalApp === null || globalApp === void 0 ? void 0 : globalApp.getLabels("noOptions", "loading");
     // Destruct
-    const { search = false, autoAddBlankItem = search, idField = "id", idValue, idValues, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, defaultValue, label, labelField = "label", loadData, onLoadData, name, inputAutoComplete = "off", options, dataReadonly = true, readOnly, onChange, openOnFocus = true, value, disableCloseOnSelect = true, renderOption = (props, option, { selected }) => (React.createElement("li", { ...props },
+    const { search = false, autoAddBlankItem = search, idField = "id", idValue, idValues, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputReset, inputVariant, defaultValue, label, labelField = "label", loadData, onLoadData, name, inputAutoComplete = "off", options, dataReadonly = true, readOnly, onChange, openOnFocus = true, value, disableCloseOnSelect = true, renderOption = (props, option, { selected }) => (React.createElement("li", { ...props },
         React.createElement(React.Fragment, null,
             React.createElement(Checkbox, { icon: icon, checkedIcon: checkedIcon, style: { marginRight: 8 }, checked: selected }),
             option[labelField]))), getOptionLabel = (option) => `${option[labelField]}`, sx = { minWidth: "150px" }, noOptionsText = labels === null || labels === void 0 ? void 0 : labels.noOptions, loadingText = labels === null || labels === void 0 ? void 0 : labels.loading, ...rest } = props;
@@ -128,5 +128,5 @@ export function ComboBoxMultiple(props) {
                 // Custom
                 if (onChange != null)
                     onChange(event, value, reason, details);
-            }, openOnFocus: openOnFocus, sx: sx, renderInput: (params) => search ? (React.createElement(SearchField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText })) : (React.createElement(InputField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText })), options: localOptions, renderOption: renderOption, noOptionsText: noOptionsText, loadingText: loadingText, ...rest })));
+            }, openOnFocus: openOnFocus, sx: sx, renderInput: (params) => search ? (React.createElement(SearchField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText, "data-reset": inputReset })) : (React.createElement(InputField, { ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, error: inputError, helperText: inputHelperText, "data-reset": inputReset })), options: localOptions, renderOption: renderOption, noOptionsText: noOptionsText, loadingText: loadingText, ...rest })));
 }

package/lib/SearchBar.js

@@ -14,11 +14,12 @@ const resetForm = (form) => {
             continue;
         // All non hidden inputs
         if (input instanceof HTMLInputElement) {
-            // Ignore hidden input
-            if (input.type === "hidden")
+            // Ignore hidden and data-reset=false input
+            var reset = input.dataset.reset;
+            if (input.type === "hidden" || reset === "false")
                 continue;
             // Ignore readOnly without data-reset=true inputs
-            if (!input.readOnly || input.dataset.reset === "true") {
+            if (!input.readOnly || reset === "true") {
                 ReactUtils.triggerChange(input, "", true);
             }
             continue;

package/lib/Tiplist.js

@@ -15,7 +15,7 @@ export function Tiplist(props) {
     // Labels
     const { noOptions, loading, more, open: openDefault } = (_a = globalApp === null || globalApp === void 0 ? void 0 : globalApp.getLabels("noOptions", "loading", "more", "open")) !== null && _a !== void 0 ? _a : {};
     // Destruct
-    const { search = false, idField = "id", idValue, inputAutoComplete = "off", inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, label, loadData, defaultValue, value, maxItems = 16, width = search ? 160 : undefined, name, readOnly, onChange, onValueChange, openOnFocus = true, noOptionsText = noOptions, loadingText = loading, openText = openDefault, getOptionLabel, getOptionDisabled, sx = {}, ...rest } = props;
+    const { search = false, idField = "id", idValue, inputAutoComplete = "off", inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputReset, inputVariant, label, loadData, defaultValue, value, maxItems = 16, width = search ? 160 : undefined, name, readOnly, onChange, onValueChange, openOnFocus = true, noOptionsText = noOptions, loadingText = loading, openText = openDefault, getOptionLabel, getOptionDisabled, sx = {}, ...rest } = props;
     if (width && sx)
         Object.assign(sx, { width: `${width}px` });
     // Value input ref
@@ -189,7 +189,7 @@ export function Tiplist(props) {
                     open: false,
                     ...(!states.value && { options: [] })
                 });
-            }, loading: states.loading, renderInput: (params) => search ? (React.createElement(SearchField, { onChange: changeHandle, ...addReadOnly(params), readOnly: readOnly, label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, autoComplete: inputAutoComplete, error: inputError, helperText: inputHelperText })) : (React.createElement(InputField, { onChange: changeHandle, ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, autoComplete: inputAutoComplete, error: inputError, helperText: inputHelperText })), isOptionEqualToValue: (option, value) => option[idField] === value[idField], sx: sx, noOptionsText: noOptionsText, loadingText: loadingText, openText: openText, getOptionDisabled: (item) => {
+            }, loading: states.loading, renderInput: (params) => search ? (React.createElement(SearchField, { onChange: changeHandle, ...addReadOnly(params), readOnly: readOnly, label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, autoComplete: inputAutoComplete, error: inputError, helperText: inputHelperText, "data-reset": inputReset })) : (React.createElement(InputField, { onChange: changeHandle, ...addReadOnly(params), label: label, name: name + "Input", margin: inputMargin, variant: inputVariant, required: inputRequired, autoComplete: inputAutoComplete, error: inputError, helperText: inputHelperText, "data-reset": inputReset })), isOptionEqualToValue: (option, value) => option[idField] === value[idField], sx: sx, noOptionsText: noOptionsText, loadingText: loadingText, openText: openText, getOptionDisabled: (item) => {
                 if (item[idField] === "n/a")
                     return true;
                 return getOptionDisabled ? getOptionDisabled(item) : false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.86",
+  "version": "1.2.88",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -54,16 +54,16 @@
     "@etsoo/notificationbase": "^1.1.26",
     "@etsoo/react": "^1.7.3",
     "@etsoo/shared": "^1.2.8",
-    "@mui/icons-material": "^5.14.3",
-    "@mui/material": "^5.14.5",
+    "@mui/icons-material": "^5.14.6",
+    "@mui/material": "^5.14.6",
     "@mui/x-data-grid": "^6.11.2",
     "@types/pica": "^9.0.1",
     "@types/pulltorefreshjs": "^0.1.5",
-    "@types/react": "^18.2.20",
+    "@types/react": "^18.2.21",
     "@types/react-avatar-editor": "^13.0.0",
     "@types/react-dom": "^18.2.7",
     "@types/react-input-mask": "^3.0.2",
-    "chart.js": "^4.3.3",
+    "chart.js": "^4.4.0",
     "chartjs-plugin-datalabels": "^2.2.0",
     "pica": "^9.0.1",
     "pulltorefreshjs": "^0.1.22",
@@ -76,19 +76,19 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-transform-runtime": "^7.22.10",
     "@babel/preset-env": "^7.22.10",
     "@babel/preset-react": "^7.22.5",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime-corejs3": "^7.22.10",
-    "@testing-library/jest-dom": "^6.0.1",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime-corejs3": "^7.22.11",
+    "@testing-library/jest-dom": "^6.1.2",
     "@testing-library/react": "^14.0.0",
-    "@types/jest": "^29.5.3",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
-    "jest": "^29.6.2",
-    "jest-environment-jsdom": "^29.6.2",
-    "typescript": "^5.1.6"
+    "@types/jest": "^29.5.4",
+    "@typescript-eslint/eslint-plugin": "^6.4.1",
+    "@typescript-eslint/parser": "^6.4.1",
+    "jest": "^29.6.4",
+    "jest-environment-jsdom": "^29.6.4",
+    "typescript": "^5.2.2"
   }
 }

package/src/AutocompleteExtendedProps.ts

@@ -56,6 +56,11 @@ export type AutocompleteExtendedProps<
    */
   inputRequired?: boolean;
 
+  /**
+   * Set 'data-reset'
+   */
+  inputReset?: boolean;
+
   /**
    * The variant to use.
    * @default 'outlined'

package/src/ComboBox.tsx

@@ -93,6 +93,7 @@ export function ComboBox<
     inputMargin,
     inputOnChange,
     inputRequired,
+    inputReset,
     inputVariant,
     defaultValue,
     label,
@@ -274,6 +275,7 @@ export function ComboBox<
                 required={inputRequired}
                 error={inputError}
                 helperText={inputHelperText}
+                data-reset={inputReset}
               />
             ) : (
               <InputField
@@ -285,6 +287,7 @@ export function ComboBox<
                 required={inputRequired}
                 error={inputError}
                 helperText={inputHelperText}
+                data-reset={inputReset}
               />
             )
           }

package/src/ComboBoxMultiple.tsx

@@ -93,6 +93,7 @@ export function ComboBoxMultiple<
     inputMargin,
     inputOnChange,
     inputRequired,
+    inputReset,
     inputVariant,
     defaultValue,
     label,
@@ -286,6 +287,7 @@ export function ComboBoxMultiple<
               required={inputRequired}
               error={inputError}
               helperText={inputHelperText}
+              data-reset={inputReset}
             />
           ) : (
             <InputField
@@ -297,6 +299,7 @@ export function ComboBoxMultiple<
               required={inputRequired}
               error={inputError}
               helperText={inputHelperText}
+              data-reset={inputReset}
             />
           )
         }

package/src/SearchBar.tsx

@@ -41,11 +41,12 @@ const resetForm = (form: HTMLFormElement) => {
 
     // All non hidden inputs
     if (input instanceof HTMLInputElement) {
-      // Ignore hidden input
-      if (input.type === "hidden") continue;
+      // Ignore hidden and data-reset=false input
+      var reset = input.dataset.reset;
+      if (input.type === "hidden" || reset === "false") continue;
 
       // Ignore readOnly without data-reset=true inputs
-      if (!input.readOnly || input.dataset.reset === "true") {
+      if (!input.readOnly || reset === "true") {
         ReactUtils.triggerChange(input, "", true);
       }
       continue;

package/src/Tiplist.tsx

@@ -70,6 +70,7 @@ export function Tiplist<
     inputMargin,
     inputOnChange,
     inputRequired,
+    inputReset,
     inputVariant,
     label,
     loadData,
@@ -337,6 +338,7 @@ export function Tiplist<
               autoComplete={inputAutoComplete}
               error={inputError}
               helperText={inputHelperText}
+              data-reset={inputReset}
             />
           ) : (
             <InputField
@@ -350,6 +352,7 @@ export function Tiplist<
               autoComplete={inputAutoComplete}
               error={inputError}
               helperText={inputHelperText}
+              data-reset={inputReset}
             />
           )
         }