@openmrs/esm-form-engine-lib 3.1.5-pre.1967 → 3.1.5-pre.1969

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "3.1.5-pre.1967",
+  "version": "3.1.5-pre.1969",
   "description": "React Form Engine for O3",
   "browser": "dist/openmrs-esm-form-engine-lib.js",
   "main": "src/index.ts",

package/src/components/inputs/markdown/markdown-wrapper.component.tsx

@@ -1,22 +1,12 @@
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
 
-const MarkdownWrapper: React.FC<{ markdown: string | string[] }> = ({ markdown }) => {
+const MarkdownWrapper: React.FC<{ markdown: string }> = ({ markdown }) => {
   return (
     <ReactMarkdown
-      children={Array.isArray(markdown) ? markdown.join('\n') : markdown}
+      children={markdown}
       unwrapDisallowed={true}
-      allowedElements={[
-        'h1',
-        'h2',
-        'h3',
-        'h4',
-        'h5',
-        'h6',
-        'p',
-        'strong',
-        'em',
-      ]}
+      allowedElements={['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'strong', 'em']}
     />
   );
 };

package/src/components/inputs/markdown/markdown.component.tsx

@@ -5,12 +5,20 @@ import MarkdownWrapper from './markdown-wrapper.component';
 
 const Markdown: React.FC<FormFieldInputProps> = ({ field }) => {
   const { t } = useTranslation();
-  const markdownContent =
-    typeof field.value === 'string'
-      ? t(field.value, { defaultValue: field.value, interpolation: { escapeValue: false } })
-      : field.value;
 
-  return !field.isHidden && <MarkdownWrapper markdown={markdownContent} />;
+  const translateMarkdown = (markdownContent: string | string[]): string => {
+    if (Array.isArray(markdownContent)) {
+      return markdownContent
+        .map((line) => t(line, { defaultValue: line, interpolation: { escapeValue: false } }))
+        .join('\n\n');
+    }
+
+    return typeof markdownContent === 'string'
+      ? t(markdownContent, { defaultValue: markdownContent, interpolation: { escapeValue: false } })
+      : markdownContent;
+  };
+
+  return !field.isHidden && <MarkdownWrapper markdown={translateMarkdown(field.value)} />;
 };
 
 export default Markdown;

package/src/form-engine.component.tsx

@@ -148,7 +148,7 @@ const FormEngine = ({
                 <Sidebar
                   isFormSubmitting={isSubmitting}
                   sessionMode={mode}
-                  defaultPage={formJson.defaultPage}
+                  defaultPage={refinedFormJson.defaultPage}
                   onCancel={onCancel}
                   handleClose={handleClose}
                   hideFormCollapseToggle={hideFormCollapseToggle}