Merge remote-tracking branch 'origin/main' into react/type_widgets

apps/client/src/widgets/react/HelpRemoveButtons.tsx

@@ -14,17 +14,20 @@ export default function HelpRemoveButtons({ help, removeText, onRemove }: HelpRe
             {help && <>
                 <Dropdown
                     className="help-dropdown"
-                    buttonClassName="bx bx-help-circle icon-action"                    
+                    buttonClassName="bx bx-help-circle icon-action"
                     hideToggleArrow
                 >{help}</Dropdown>
                 {" "}
-            </>}            
+            </>}
             <ActionButton
                 icon="bx bx-x"
                 className="search-option-del"
                 text={removeText ?? ""}
-                onClick={onRemove}
+                onClick={(e) => {
+                    e.preventDefault();
+                    onRemove?.();
+                }}
             />
         </td>
     );
-}
+}

apps/client/src/widgets/react/Modal.tsx

@@ -36,9 +36,9 @@ interface ModalProps {
     onSubmit?: () => void;
     /** Called when the modal is shown. */
     onShown?: () => void;
-    /** 
+    /**
      * Called when the modal is hidden, either via close button, backdrop click or submit.
-     * 
+     *
      * Here it's generally a good idea to set `show` to false to reflect the actual state of the modal.
      */
     onHidden: () => void;
@@ -71,23 +71,25 @@ export default function Modal({ children, className, size, title, header, footer
 
     useEffect(() => {
         const modalElement = modalRef.current;
-        if (!modalElement) {
-            return;
-        }
+        if (!modalElement) return;
+
         if (onShown) {
             modalElement.addEventListener("shown.bs.modal", onShown);
         }
-        modalElement.addEventListener("hidden.bs.modal", () => {
+
+        function onModalHidden() {
             onHidden();
             if (elementToFocus.current && "focus" in elementToFocus.current) {
                 (elementToFocus.current as HTMLElement).focus();
             }
-        });
+        }
+
+        modalElement.addEventListener("hidden.bs.modal", onModalHidden);
         return () => {
             if (onShown) {
                 modalElement.removeEventListener("shown.bs.modal", onShown);
             }
-            modalElement.removeEventListener("hidden.bs.modal", onHidden);
+            modalElement.removeEventListener("hidden.bs.modal", onModalHidden);
         };
     }, [ onShown, onHidden ]);
 
@@ -180,4 +182,4 @@ const ModalInner = memo(({ children, footer, footerAlignment, bodyStyle, footerS
             )}
         </>
     );
-});
+});