@etsoo/materialui 1.6.25 → 1.6.27

package/lib/cjs/SearchBar.js

@@ -201,8 +201,7 @@ function SearchBar(props) {
     const handleForm = (event) => {
         if (checkFormEvent(event))
             return;
-        if (state.form == null)
-            state.form = event.currentTarget;
+        state.form = event.currentTarget;
         delayed.call();
     };
     // Handle more button click
@@ -213,15 +212,15 @@ function SearchBar(props) {
     const moreFormChange = (event) => {
         if (checkFormEvent(event))
             return;
-        if (state.moreForm == null)
-            state.moreForm = event.currentTarget;
+        state.moreForm = event.currentTarget;
         delayed.call();
     };
     // Submit at once
     const handleSubmitInstant = (reset = false) => {
         // Prepare data
         const data = new FormData(state.form);
-        if (state.moreForm != null) {
+        // Check 'hasMoreItems' to make sure the 'moreForm' is rendered by purpose
+        if (hasMoreItems && state.moreForm != null) {
             shared_1.DomUtils.mergeFormData(data, new FormData(state.moreForm));
         }
         onSubmit(data, reset);

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

@@ -1,4 +1,4 @@
-import React, { FormEventHandler } from "react";
+import React, { SubmitEventHandler } from "react";
 import { CommonPageProps } from "./CommonPage";
 import type { OperationMessageHandlerAll } from "../messages/OperationMessageHandler";
 /**
@@ -12,7 +12,7 @@ export interface EditPageProps extends Omit<CommonPageProps, "onSubmit"> {
     /**
      * On form submit
      */
-    onSubmit?: FormEventHandler<HTMLFormElement>;
+    onSubmit?: SubmitEventHandler<HTMLFormElement>;
     /**
      * On delete callback
      */

package/lib/mjs/SearchBar.js

@@ -195,8 +195,7 @@ export function SearchBar(props) {
     const handleForm = (event) => {
         if (checkFormEvent(event))
             return;
-        if (state.form == null)
-            state.form = event.currentTarget;
+        state.form = event.currentTarget;
         delayed.call();
     };
     // Handle more button click
@@ -207,15 +206,15 @@ export function SearchBar(props) {
     const moreFormChange = (event) => {
         if (checkFormEvent(event))
             return;
-        if (state.moreForm == null)
-            state.moreForm = event.currentTarget;
+        state.moreForm = event.currentTarget;
         delayed.call();
     };
     // Submit at once
     const handleSubmitInstant = (reset = false) => {
         // Prepare data
         const data = new FormData(state.form);
-        if (state.moreForm != null) {
+        // Check 'hasMoreItems' to make sure the 'moreForm' is rendered by purpose
+        if (hasMoreItems && state.moreForm != null) {
             DomUtils.mergeFormData(data, new FormData(state.moreForm));
         }
         onSubmit(data, reset);

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

@@ -1,4 +1,4 @@
-import React, { FormEventHandler } from "react";
+import React, { SubmitEventHandler } from "react";
 import { CommonPageProps } from "./CommonPage";
 import type { OperationMessageHandlerAll } from "../messages/OperationMessageHandler";
 /**
@@ -12,7 +12,7 @@ export interface EditPageProps extends Omit<CommonPageProps, "onSubmit"> {
     /**
      * On form submit
      */
-    onSubmit?: FormEventHandler<HTMLFormElement>;
+    onSubmit?: SubmitEventHandler<HTMLFormElement>;
     /**
      * On delete callback
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.6.25",
+  "version": "1.6.27",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",

package/src/SearchBar.tsx

@@ -100,7 +100,7 @@ const setChildState = (child: Element, enabled: boolean) => {
   }
 };
 
-function checkFormEvent(event: React.FormEvent<HTMLFormElement>) {
+function checkFormEvent(event: React.ChangeEvent<HTMLFormElement>) {
   if (event.nativeEvent.cancelable && !event.nativeEvent.composed) return true;
 
   if (
@@ -291,10 +291,10 @@ export function SearchBar(props: SearchBarProps) {
   const hasMoreItems = moreItems.length > 0;
 
   // Handle main form
-  const handleForm = (event: React.FormEvent<HTMLFormElement>) => {
+  const handleForm = (event: React.ChangeEvent<HTMLFormElement>) => {
     if (checkFormEvent(event)) return;
 
-    if (state.form == null) state.form = event.currentTarget;
+    state.form = event.currentTarget;
 
     delayed.call();
   };
@@ -305,10 +305,10 @@ export function SearchBar(props: SearchBarProps) {
   };
 
   // More form change
-  const moreFormChange = (event: React.FormEvent<HTMLFormElement>) => {
+  const moreFormChange = (event: React.ChangeEvent<HTMLFormElement>) => {
     if (checkFormEvent(event)) return;
 
-    if (state.moreForm == null) state.moreForm = event.currentTarget;
+    state.moreForm = event.currentTarget;
 
     delayed.call();
   };
@@ -317,7 +317,9 @@ export function SearchBar(props: SearchBarProps) {
   const handleSubmitInstant = (reset: boolean = false) => {
     // Prepare data
     const data = new FormData(state.form);
-    if (state.moreForm != null) {
+
+    // Check 'hasMoreItems' to make sure the 'moreForm' is rendered by purpose
+    if (hasMoreItems && state.moreForm != null) {
       DomUtils.mergeFormData(data, new FormData(state.moreForm));
     }
 

package/src/pages/EditPage.tsx

@@ -1,4 +1,4 @@
-import React, { FormEventHandler } from "react";
+import React, { SubmitEventHandler } from "react";
 import { MUGlobal } from "../MUGlobal";
 import { CommonPage, CommonPageProps } from "./CommonPage";
 import SaveIcon from "@mui/icons-material/Save";
@@ -22,7 +22,7 @@ export interface EditPageProps extends Omit<CommonPageProps, "onSubmit"> {
   /**
    * On form submit
    */
-  onSubmit?: FormEventHandler<HTMLFormElement>;
+  onSubmit?: SubmitEventHandler<HTMLFormElement>;
 
   /**
    * On delete callback