Merge branch 'develop' into patient-header-ui-design

Mahendar0701 · Dec 30, 2024 · 00084ac · 00084ac
2 parents 3e05b57 + e34f178
commit 00084ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/components/Common/Breadcrumbs.tsx b/src/components/Common/Breadcrumbs.tsx
@@ -97,6 +97,7 @@ export default function Breadcrumbs({
               <li className="mr-3 flex items-center">
                 <Button
                   variant="link"
+                  type="button"
                   className="rounded bg-gray-200/50 px-1 text-sm font-normal text-gray-800 transition hover:bg-gray-200/75 hover:no-underline"
                   size="xs"
                   onClick={() => {

diff --git a/src/components/Facility/PatientNoteCard.tsx b/src/components/Facility/PatientNoteCard.tsx
@@ -213,7 +213,9 @@ const PatientNoteCard = ({
                 </div>
               </div>
             ) : (
-              <div className="text-sm text-secondary-700">{noteField}</div>
+              <div className="text-sm text-secondary-700 whitespace-pre-wrap">
+                {noteField}
+              </div>
             )}
           </div>
         }

diff --git a/src/components/Form/Form.tsx b/src/components/Form/Form.tsx
@@ -98,11 +98,6 @@ const Form = <T extends FormDetails>({
   return (
     <form
       onSubmit={handleSubmit}
-      onKeyDown={(e) => {
-        if (e.key === "Enter") {
-          handleSubmit(e);
-        }
-      }}
       className={classNames(
         "mx-auto w-full",
         !props.noPadding && "px-8 py-5 md:px-16 md:py-11",
-Original file line number
+Diff line change
@@ Expand Up / @@ -213,7 +213,9 @@ const PatientNoteCard = ({ @@
                     </div>
                   </div>
                 ) : (
-                  <div className="text-sm text-secondary-700">{noteField}</div>
+                  <div className="text-sm text-secondary-700 whitespace-pre-wrap">
+                    {noteField}
+                  </div>
                 )}
               </div>
             }
@@ Expand Down @@