(fix) O3-3906: ComposedModal usage missing scroll bar

openmrs · Sep 10, 2024 · d861aba · d861aba
1 parent ebdf1b0
commit d861aba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx b/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx
@@ -21,7 +21,7 @@ import {
   InlineNotification,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { type Location } from '@openmrs/esm-framework';
+import { getCoreTranslation, type Location } from '@openmrs/esm-framework';
 import type { BedType, BedFormData } from '../types';
 import { type BedAdministrationData } from './bed-administration-types';
 
@@ -119,7 +119,7 @@ const BedAdministrationForm: React.FC<BedAdministrationFormProps> = ({
     <ComposedModal open={showModal} onClose={() => onModalChange(false)} preventCloseOnClickOutside>
       <ModalHeader title={headerTitle} />
       <ModalBody hasScrollingContent>
-        <Form onSubmit={handleSubmit(onSubmit, onError)}>
+        <Form>
           <Stack gap={3}>
             <FormGroup legendText={''}>
               <Controller
@@ -279,7 +279,7 @@ const BedAdministrationForm: React.FC<BedAdministrationFormProps> = ({
       </ModalBody>
       <ModalFooter>
         <Button onClick={() => onModalChange(false)} kind="secondary">
-          {t('cancel', 'Cancel')}
+          {getCoreTranslation('cancel', 'Cancel')}
         </Button>
         <Button disabled={!isDirty} onClick={handleSubmit(onSubmit, onError)}>
           <span>{t('save', 'Save')}</span>

diff --git a/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx b/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx
@@ -78,7 +78,7 @@ const BedTagsAdministrationForm: React.FC<BedTagAdministrationFormProps> = ({
     <ComposedModal open={showModal} onClose={() => onModalChange(false)} preventCloseOnClickOutside>
       <ModalHeader title={headerTitle} />
       <ModalBody hasScrollingContent>
-        <Form onSubmit={handleSubmit(onSubmit, onError)}>
+        <Form>
           <Stack gap={3}>
             <FormGroup legendText={''}>
               <Controller

diff --git a/packages/esm-bed-management-app/src/bed-type/bed-type-admin-form.component.tsx b/packages/esm-bed-management-app/src/bed-type/bed-type-admin-form.component.tsx
@@ -82,7 +82,7 @@ const BedTypeAdministrationForm: React.FC<BedAdministrationFormProps> = ({
     <ComposedModal open={showModal} onClose={() => onModalChange(false)} preventCloseOnClickOutside>
       <ModalHeader title={headerTitle} />
       <ModalBody hasScrollingContent>
-        <Form onSubmit={handleSubmit(onSubmit, onError)}>
+        <Form>
           <Stack gap={3}>
             <FormGroup legendText={''}>
               <Controller