Merge branch 'fix/form/fix-unexpected-reloads' into 'master'

Fix unexpected reloads See merge request miare/milingo!97
miare-ir · Apr 22, 2024 · 53ac6c2 · 53ac6c2
2 parents ffc4528 + da353a4
commit 53ac6c2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/dist/components/file-input/index.d.ts b/dist/components/file-input/index.d.ts
@@ -25,6 +25,7 @@ export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
     tryAgainText?: string | React.ReactNode;
     inputRef?: React.RefObject<HTMLInputElement>;
     isClear?: boolean;
+    buttonType?: React.ButtonHTMLAttributes<HTMLButtonElement>['type'];
 }
 export interface FileInputState {
     touched: boolean;

diff --git a/dist/components/form/form.d.ts b/dist/components/form/form.d.ts
@@ -5,6 +5,7 @@ export interface FormProps extends Omit<React.HTMLProps<HTMLDivElement>, 'title'
     children?: React.ReactNode;
     title?: React.ReactNode;
     description?: string;
+    formProps?: React.ComponentProps<'form'>;
 }
 declare class Form extends React.Component<FormProps, {}> {
     render(): React.ReactNode;

diff --git a/dist/index.js b/dist/index.js
@@ -4374,7 +4374,7 @@ var FileInput = /** @class */ (function (_super) {
                     files.map(function (file, index) {
                         return _this.renderFiles(states && states[index], file, index);
                     }),
-                React.createElement(button_1.default, { disabled: disabled, primary: true },
+                React.createElement(button_1.default, { type: props.buttonType, disabled: disabled, primary: true },
                     children ? children : 'افزودن فایل',
                     React.createElement("input", __assign({ disabled: disabled, type: "file", ref: inputRef, onChange: this.handleInput, value: "" }, props))))));
     };
@@ -4558,9 +4558,9 @@ var Form = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Form.prototype.render = function () {
-        var _a = this.props, className = _a.className, children = _a.children, title = _a.title, description = _a.description, props = __rest(_a, ["className", "children", "title", "description"]);
+        var _a = this.props, className = _a.className, children = _a.children, title = _a.title, description = _a.description, formProps = _a.formProps, props = __rest(_a, ["className", "children", "title", "description", "formProps"]);
         var componentClassName = classNames('form-container', className);
-        return (React.createElement("form", null,
+        return (React.createElement("form", __assign({}, formProps),
             React.createElement("div", __assign({ className: componentClassName }, props),
                 React.createElement("h4", { className: "form-title" }, title),
                 React.createElement("p", { className: "form-description" }, description),

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Miare <[email protected]> (https://mia.re)",
-  "version": "0.8.14",
+  "version": "0.8.15",
   "keywords": [
     "design-library",
     "react"

diff --git a/src/components/file-input/index.tsx b/src/components/file-input/index.tsx
@@ -31,6 +31,7 @@ export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
   tryAgainText?: string | React.ReactNode;
   inputRef?: React.RefObject<HTMLInputElement>;
   isClear?: boolean;
+  buttonType?: React.ButtonHTMLAttributes<HTMLButtonElement>['type'];
 }
 
 export interface FileInputState {
@@ -138,7 +139,7 @@ class FileInput extends React.Component<FileInputProps, FileInputState> {
             files.map((file, index) =>
               this.renderFiles(states && states[index], file, index),
             )}
-          <Button disabled={disabled} primary>
+          <Button type={props.buttonType} disabled={disabled} primary>
             {children ? children : 'افزودن فایل'}
             <input
               disabled={disabled}

diff --git a/src/components/form/form.tsx b/src/components/form/form.tsx
@@ -9,15 +9,17 @@ export interface FormProps
   children?: React.ReactNode;
   title?: React.ReactNode;
   description?: string;
+  formProps?: React.ComponentProps<'form'>;
 }
 
 class Form extends React.Component<FormProps, {}> {
   render(): React.ReactNode {
-    const { className, children, title, description, ...props } = this.props;
+    const { className, children, title, description, formProps, ...props } =
+      this.props;
     const componentClassName = classNames('form-container', className);
 
     return (
-      <form>
+      <form {...formProps}>
         <div className={componentClassName} {...props}>
           <h4 className="form-title">{title}</h4>
           <p className="form-description">{description}</p>