From 43885e6d0bdc0717c7f3a05e9d49ef06941cc177 Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <blank@example.com>
Date: Mon, 18 Sep 2023 15:58:57 +0200
Subject: [PATCH 01/15] make auto wrapping in markdown optional

---
 packages/mermaid/src/config.type.ts                       | 1 +
 .../mermaid/src/rendering-util/handle-markdown-text.ts    | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/mermaid/src/config.type.ts b/packages/mermaid/src/config.type.ts
index ca55d9af4..017410dce 100644
--- a/packages/mermaid/src/config.type.ts
+++ b/packages/mermaid/src/config.type.ts
@@ -139,6 +139,7 @@ export interface MermaidConfig {
    * You can set this attribute to base the seed on a static string.
    *
    */
+  markdownAutoWrap?: boolean;
   deterministicIDSeed?: string;
   flowchart?: FlowchartDiagramConfig;
   sequence?: SequenceDiagramConfig;
diff --git a/packages/mermaid/src/rendering-util/handle-markdown-text.ts b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
index ce694edcd..e5e171285 100644
--- a/packages/mermaid/src/rendering-util/handle-markdown-text.ts
+++ b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
@@ -2,6 +2,7 @@ import type { Content } from 'mdast';
 import { fromMarkdown } from 'mdast-util-from-markdown';
 import { dedent } from 'ts-dedent';
 import type { MarkdownLine, MarkdownWordType } from './types.js';
+import { getConfig } from '../config.js';
 
 /**
  * @param markdown - markdown to process
@@ -58,10 +59,15 @@ export function markdownToLines(markdown: string): MarkdownLine[] {
 
 export function markdownToHTML(markdown: string) {
   const { children } = fromMarkdown(markdown);
+  const markdownAutoWrap = getConfig().markdownAutoWrap;
 
   function output(node: Content): string {
     if (node.type === 'text') {
-      return node.value.replace(/\n/g, '<br/>');
+      if (!markdownAutoWrap) {
+        return node.value.replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;');
+      } else {
+        return node.value.replace(/\n/g, '<br/>');
+      }
     } else if (node.type === 'strong') {
       return `<strong>${node.children.map(output).join('')}</strong>`;
     } else if (node.type === 'emphasis') {

From bca39e8081b51a05674c5a76e9759cdbb00104dc Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <blank@example.com>
Date: Tue, 19 Sep 2023 15:38:17 +0200
Subject: [PATCH 02/15] optional wrap and test

---
 .../src/rendering-util/handle-markdown-text.spec.ts      | 9 +++++++++
 .../mermaid/src/rendering-util/handle-markdown-text.ts   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/mermaid/src/rendering-util/handle-markdown-text.spec.ts b/packages/mermaid/src/rendering-util/handle-markdown-text.spec.ts
index 3ca7a3d7a..55c40127f 100644
--- a/packages/mermaid/src/rendering-util/handle-markdown-text.spec.ts
+++ b/packages/mermaid/src/rendering-util/handle-markdown-text.spec.ts
@@ -1,5 +1,6 @@
 import { markdownToLines, markdownToHTML } from './handle-markdown-text.js';
 import { test, expect } from 'vitest';
+import { setConfig } from '../config.js';
 
 test('markdownToLines - Basic test', () => {
   const input = `This is regular text
@@ -262,3 +263,11 @@ test('markdownToHTML - Unsupported formatting', () => {
   - l3`)
   ).toMatchInlineSnapshot('"<p>Hello</p>Unsupported markdown: list"');
 });
+
+test('markdownToHTML - no auto wrapping', () => {
+  setConfig({ markdownAutoWrap: false });
+  expect(
+    markdownToHTML(`Hello, how do
+  you do?`)
+  ).toMatchInlineSnapshot('"<p>Hello,&nbsp;how&nbsp;do<br/>you&nbsp;do?</p>"');
+});
diff --git a/packages/mermaid/src/rendering-util/handle-markdown-text.ts b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
index e5e171285..160be86da 100644
--- a/packages/mermaid/src/rendering-util/handle-markdown-text.ts
+++ b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
@@ -63,7 +63,7 @@ export function markdownToHTML(markdown: string) {
 
   function output(node: Content): string {
     if (node.type === 'text') {
-      if (!markdownAutoWrap) {
+      if (markdownAutoWrap === false) {
         return node.value.replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;');
       } else {
         return node.value.replace(/\n/g, '<br/>');

From a75d14f5d0ebb2f026080dfe5f73e2fc7a431c1e Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <blank@example.com>
Date: Tue, 19 Sep 2023 17:03:47 +0200
Subject: [PATCH 03/15] removed commented out code

---
 packages/mermaid/src/rendering-util/createText.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mermaid/src/rendering-util/createText.ts b/packages/mermaid/src/rendering-util/createText.ts
index a0aaa66ba..a55f09723 100644
--- a/packages/mermaid/src/rendering-util/createText.ts
+++ b/packages/mermaid/src/rendering-util/createText.ts
@@ -169,9 +169,9 @@ export const createText = (
   log.info('createText', text, style, isTitle, classes, useHtmlLabels, isNode, addSvgBackground);
   if (useHtmlLabels) {
     // TODO: addHtmlLabel accepts a labelStyle. Do we possibly have that?
-    // text = text.replace(/\\n|\n/g, '<br />');
+
     const htmlText = markdownToHTML(text);
-    // log.info('markdo  wnToHTML' + text, markdownToHTML(text));
+
     const node = {
       isNode,
       label: decodeEntities(htmlText).replace(

From 0af77a3c2caedd54da9540abd3006b80a81a2f3d Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <dev.blankenhaus@gmail.com>
Date: Tue, 19 Sep 2023 17:57:59 +0200
Subject: [PATCH 04/15] optional auto wrapping for markdownToLines

---
 packages/mermaid/src/rendering-util/handle-markdown-text.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/mermaid/src/rendering-util/handle-markdown-text.ts b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
index 160be86da..572b28c99 100644
--- a/packages/mermaid/src/rendering-util/handle-markdown-text.ts
+++ b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
@@ -9,10 +9,16 @@ import { getConfig } from '../config.js';
  * @returns processed markdown
  */
 function preprocessMarkdown(markdown: string): string {
+  const markdownAutoWrap = getConfig().markdownAutoWrap;
   // Replace multiple newlines with a single newline
   const withoutMultipleNewlines = markdown.replace(/\n{2,}/g, '\n');
   // Remove extra spaces at the beginning of each line
   const withoutExtraSpaces = dedent(withoutMultipleNewlines);
+  /*
+  if (markdownAutoWrap === false) {
+    return withoutExtraSpaces.replace(/ /g, '&nbsp;');
+  }
+  */
   return withoutExtraSpaces;
 }
 

From a5cb58ca96df639da35ad5646579ff83c9f34fdf Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <dev.blankenhaus@gmail.com>
Date: Tue, 19 Sep 2023 17:59:35 +0200
Subject: [PATCH 05/15] add flowchart documentation

---
 docs/syntax/flowchart.md                      | 10 ++++++++++
 packages/mermaid/src/docs/syntax/flowchart.md |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/docs/syntax/flowchart.md b/docs/syntax/flowchart.md
index 23b05af7f..ca1058989 100644
--- a/docs/syntax/flowchart.md
+++ b/docs/syntax/flowchart.md
@@ -828,6 +828,16 @@ Formatting:
 
 This feature is applicable to node labels, edge labels, and subgraph labels.
 
+The auto wrapping can be disabled by using
+
+```mermaid-example
+%%{init: {"markdownAutoWrap": false} }%%
+```
+
+```mermaid
+%%{init: {"markdownAutoWrap": false} }%%
+```
+
 ## Interaction
 
 It is possible to bind a click event to a node, the click can lead to either a javascript callback or to a link which will be opened in a new browser tab.
diff --git a/packages/mermaid/src/docs/syntax/flowchart.md b/packages/mermaid/src/docs/syntax/flowchart.md
index 7946d5725..fbfdd9fad 100644
--- a/packages/mermaid/src/docs/syntax/flowchart.md
+++ b/packages/mermaid/src/docs/syntax/flowchart.md
@@ -519,6 +519,12 @@ Formatting:
 
 This feature is applicable to node labels, edge labels, and subgraph labels.
 
+The auto wrapping can be disabled by using
+
+```mermaid-example
+%%{init: {"markdownAutoWrap": false} }%%
+```
+
 ## Interaction
 
 It is possible to bind a click event to a node, the click can lead to either a javascript callback or to a link which will be opened in a new browser tab.

From b561d5ad9a5d925bf2a4578cec5bdfd7f14f2dee Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <dev.blankenhaus@gmail.com>
Date: Tue, 19 Sep 2023 18:00:48 +0200
Subject: [PATCH 06/15] removed commented out code

---
 packages/mermaid/src/rendering-util/handle-markdown-text.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/mermaid/src/rendering-util/handle-markdown-text.ts b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
index 572b28c99..cde16bc11 100644
--- a/packages/mermaid/src/rendering-util/handle-markdown-text.ts
+++ b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
@@ -14,11 +14,9 @@ function preprocessMarkdown(markdown: string): string {
   const withoutMultipleNewlines = markdown.replace(/\n{2,}/g, '\n');
   // Remove extra spaces at the beginning of each line
   const withoutExtraSpaces = dedent(withoutMultipleNewlines);
-  /*
   if (markdownAutoWrap === false) {
     return withoutExtraSpaces.replace(/ /g, '&nbsp;');
   }
-  */
   return withoutExtraSpaces;
 }
 

From 1102bf271db11f924fa8e1b167369a796d3b2b9a Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <dev.blankenhaus@gmail.com>
Date: Tue, 19 Sep 2023 18:12:57 +0200
Subject: [PATCH 07/15] corrected documentation

---
 docs/syntax/flowchart.md                      | 2 ++
 packages/mermaid/src/docs/syntax/flowchart.md | 1 +
 2 files changed, 3 insertions(+)

diff --git a/docs/syntax/flowchart.md b/docs/syntax/flowchart.md
index ca1058989..c06819519 100644
--- a/docs/syntax/flowchart.md
+++ b/docs/syntax/flowchart.md
@@ -832,10 +832,12 @@ The auto wrapping can be disabled by using
 
 ```mermaid-example
 %%{init: {"markdownAutoWrap": false} }%%
+graph LR
 ```
 
 ```mermaid
 %%{init: {"markdownAutoWrap": false} }%%
+graph LR
 ```
 
 ## Interaction
diff --git a/packages/mermaid/src/docs/syntax/flowchart.md b/packages/mermaid/src/docs/syntax/flowchart.md
index fbfdd9fad..5680266b7 100644
--- a/packages/mermaid/src/docs/syntax/flowchart.md
+++ b/packages/mermaid/src/docs/syntax/flowchart.md
@@ -523,6 +523,7 @@ The auto wrapping can be disabled by using
 
 ```mermaid-example
 %%{init: {"markdownAutoWrap": false} }%%
+graph LR
 ```
 
 ## Interaction

From f256a57f273b9b74b99b6a191ef74fb3ca02d15d Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <dev.blankenhaus@gmail.com>
Date: Tue, 19 Sep 2023 18:16:23 +0200
Subject: [PATCH 08/15] again correction to documentation

---
 docs/syntax/flowchart.md                      | 11 ++---------
 packages/mermaid/src/docs/syntax/flowchart.md |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/syntax/flowchart.md b/docs/syntax/flowchart.md
index c06819519..fbf751e74 100644
--- a/docs/syntax/flowchart.md
+++ b/docs/syntax/flowchart.md
@@ -830,15 +830,8 @@ This feature is applicable to node labels, edge labels, and subgraph labels.
 
 The auto wrapping can be disabled by using
 
-```mermaid-example
-%%{init: {"markdownAutoWrap": false} }%%
-graph LR
-```
-
-```mermaid
-%%{init: {"markdownAutoWrap": false} }%%
-graph LR
-```
+    %%{init: {"markdownAutoWrap": false} }%%
+    graph LR
 
 ## Interaction
 
diff --git a/packages/mermaid/src/docs/syntax/flowchart.md b/packages/mermaid/src/docs/syntax/flowchart.md
index 5680266b7..dfafac9b9 100644
--- a/packages/mermaid/src/docs/syntax/flowchart.md
+++ b/packages/mermaid/src/docs/syntax/flowchart.md
@@ -521,7 +521,7 @@ This feature is applicable to node labels, edge labels, and subgraph labels.
 
 The auto wrapping can be disabled by using
 
-```mermaid-example
+```
 %%{init: {"markdownAutoWrap": false} }%%
 graph LR
 ```

From 589f90762a2969a28c3f25083e4eef15ed093850 Mon Sep 17 00:00:00 2001
From: Hans Blankenhaus <dev.blankenhaus@gmail.com>
Date: Tue, 19 Sep 2023 19:24:16 +0200
Subject: [PATCH 09/15] change congig.schema.yaml for consistency

---
 packages/mermaid/src/config.type.ts             | 2 +-
 packages/mermaid/src/schemas/config.schema.yaml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/mermaid/src/config.type.ts b/packages/mermaid/src/config.type.ts
index 017410dce..b72364c29 100644
--- a/packages/mermaid/src/config.type.ts
+++ b/packages/mermaid/src/config.type.ts
@@ -139,7 +139,6 @@ export interface MermaidConfig {
    * You can set this attribute to base the seed on a static string.
    *
    */
-  markdownAutoWrap?: boolean;
   deterministicIDSeed?: string;
   flowchart?: FlowchartDiagramConfig;
   sequence?: SequenceDiagramConfig;
@@ -159,6 +158,7 @@ export interface MermaidConfig {
   dompurifyConfig?: DOMPurifyConfiguration;
   wrap?: boolean;
   fontSize?: number;
+  markdownAutoWrap?: boolean;
 }
 /**
  * This interface was referenced by `MermaidConfig`'s JSON-Schema
diff --git a/packages/mermaid/src/schemas/config.schema.yaml b/packages/mermaid/src/schemas/config.schema.yaml
index 6f01d5715..eea5d295d 100644
--- a/packages/mermaid/src/schemas/config.schema.yaml
+++ b/packages/mermaid/src/schemas/config.schema.yaml
@@ -217,6 +217,8 @@ properties:
   fontSize:
     type: number
     default: 16
+  markdownAutoWrap:
+    type: boolean
 
 $defs: # JSON Schema definition (maybe we should move these to a seperate file)
   BaseDiagramConfig:

From 60be7012aa6681bc6b7a32f18428d922e202eb18 Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 23 Mar 2024 14:15:22 +0530
Subject: [PATCH 10/15] chore: Increase ESLint memory limit

---
 .husky/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index a9e30b9be..ad85fc42c 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-pnpm run pre-commit
+NODE_OPTIONS="--max_old_space_size=8192" pnpm run pre-commit

From f907ac30c6755b87d2c9fdf777f66242d5d9cc74 Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 23 Mar 2024 14:15:33 +0530
Subject: [PATCH 11/15] chore: Minor fixes #4856

---
 docs/syntax/flowchart.md                      |  5 ++-
 packages/mermaid/src/docs/syntax/flowchart.md |  5 ++-
 .../mermaid/src/rendering-util/createText.ts  |  8 +++--
 .../handle-markdown-text.spec.ts              | 35 ++++++++++++++++---
 .../rendering-util/handle-markdown-text.ts    | 15 ++++----
 .../mermaid/src/schemas/config.schema.yaml    |  1 +
 6 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/docs/syntax/flowchart.md b/docs/syntax/flowchart.md
index fa981df78..fe119fdb9 100644
--- a/docs/syntax/flowchart.md
+++ b/docs/syntax/flowchart.md
@@ -852,7 +852,10 @@ This feature is applicable to node labels, edge labels, and subgraph labels.
 
 The auto wrapping can be disabled by using
 
-    %%{init: {"markdownAutoWrap": false} }%%
+    ---
+    config:
+      markdownAutoWrap: false
+    ---
     graph LR
 
 ## Interaction
diff --git a/packages/mermaid/src/docs/syntax/flowchart.md b/packages/mermaid/src/docs/syntax/flowchart.md
index b875a2949..462a9aecc 100644
--- a/packages/mermaid/src/docs/syntax/flowchart.md
+++ b/packages/mermaid/src/docs/syntax/flowchart.md
@@ -540,7 +540,10 @@ This feature is applicable to node labels, edge labels, and subgraph labels.
 The auto wrapping can be disabled by using
 
 ```
-%%{init: {"markdownAutoWrap": false} }%%
+---
+config:
+  markdownAutoWrap: false
+---
 graph LR
 ```
 
diff --git a/packages/mermaid/src/rendering-util/createText.ts b/packages/mermaid/src/rendering-util/createText.ts
index e53c18725..c50a019f1 100644
--- a/packages/mermaid/src/rendering-util/createText.ts
+++ b/packages/mermaid/src/rendering-util/createText.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // @ts-nocheck TODO: Fix types
+import type { MermaidConfig } from '../config.type.js';
 import type { Group } from '../diagram-api/types.js';
 import type { D3TSpanElement, D3TextElement } from '../diagrams/common/commonTypes.js';
 import { log } from '../logger.js';
@@ -181,13 +182,14 @@ export const createText = (
     isNode = true,
     width = 200,
     addSvgBackground = false,
-  } = {}
+  } = {},
+  config: MermaidConfig = {}
 ) => {
   log.info('createText', text, style, isTitle, classes, useHtmlLabels, isNode, addSvgBackground);
   if (useHtmlLabels) {
     // TODO: addHtmlLabel accepts a labelStyle. Do we possibly have that?
 
-    const htmlText = markdownToHTML(text);
+    const htmlText = markdownToHTML(text, config);
     const node = {
       isNode,
       label: decodeEntities(htmlText).replace(
@@ -199,7 +201,7 @@ export const createText = (
     const vertexNode = addHtmlSpan(el, node, width, classes, addSvgBackground);
     return vertexNode;
   } else {
-    const structuredText = markdownToLines(text);
+    const structuredText = markdownToLines(text, config);
     const svgLabel = createFormattedText(width, el, structuredText, addSvgBackground);
     return svgLabel;
   }
diff --git a/packages/mermaid/src/rendering-util/handle-markdown-text.spec.ts b/packages/mermaid/src/rendering-util/handle-markdown-text.spec.ts
index 55c40127f..7362e6f70 100644
--- a/packages/mermaid/src/rendering-util/handle-markdown-text.spec.ts
+++ b/packages/mermaid/src/rendering-util/handle-markdown-text.spec.ts
@@ -1,6 +1,6 @@
+/* eslint-disable no-irregular-whitespace */
 import { markdownToLines, markdownToHTML } from './handle-markdown-text.js';
 import { test, expect } from 'vitest';
-import { setConfig } from '../config.js';
 
 test('markdownToLines - Basic test', () => {
   const input = `This is regular text
@@ -204,6 +204,31 @@ Word!`;
   expect(output).toEqual(expectedOutput);
 });
 
+test('markdownToLines - No auto wrapping', () => {
+  expect(
+    markdownToLines(
+      `Hello, how do
+  you do?`,
+      { markdownAutoWrap: false }
+    )
+  ).toMatchInlineSnapshot(`
+    [
+      [
+        {
+          "content": "Hello, how do",
+          "type": "normal",
+        },
+      ],
+      [
+        {
+          "content": "you do?",
+          "type": "normal",
+        },
+      ],
+    ]
+  `);
+});
+
 test('markdownToHTML - Basic test', () => {
   const input = `This is regular text
 Here is a new line
@@ -265,9 +290,11 @@ test('markdownToHTML - Unsupported formatting', () => {
 });
 
 test('markdownToHTML - no auto wrapping', () => {
-  setConfig({ markdownAutoWrap: false });
   expect(
-    markdownToHTML(`Hello, how do
-  you do?`)
+    markdownToHTML(
+      `Hello, how do
+  you do?`,
+      { markdownAutoWrap: false }
+    )
   ).toMatchInlineSnapshot('"<p>Hello,&nbsp;how&nbsp;do<br/>you&nbsp;do?</p>"');
 });
diff --git a/packages/mermaid/src/rendering-util/handle-markdown-text.ts b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
index cde16bc11..c539f7268 100644
--- a/packages/mermaid/src/rendering-util/handle-markdown-text.ts
+++ b/packages/mermaid/src/rendering-util/handle-markdown-text.ts
@@ -2,14 +2,13 @@ import type { Content } from 'mdast';
 import { fromMarkdown } from 'mdast-util-from-markdown';
 import { dedent } from 'ts-dedent';
 import type { MarkdownLine, MarkdownWordType } from './types.js';
-import { getConfig } from '../config.js';
+import type { MermaidConfig } from '../config.type.js';
 
 /**
  * @param markdown - markdown to process
  * @returns processed markdown
  */
-function preprocessMarkdown(markdown: string): string {
-  const markdownAutoWrap = getConfig().markdownAutoWrap;
+function preprocessMarkdown(markdown: string, { markdownAutoWrap }: MermaidConfig): string {
   // Replace multiple newlines with a single newline
   const withoutMultipleNewlines = markdown.replace(/\n{2,}/g, '\n');
   // Remove extra spaces at the beginning of each line
@@ -23,8 +22,8 @@ function preprocessMarkdown(markdown: string): string {
 /**
  * @param markdown - markdown to split into lines
  */
-export function markdownToLines(markdown: string): MarkdownLine[] {
-  const preprocessedMarkdown = preprocessMarkdown(markdown);
+export function markdownToLines(markdown: string, config: MermaidConfig = {}): MarkdownLine[] {
+  const preprocessedMarkdown = preprocessMarkdown(markdown, config);
   const { children } = fromMarkdown(preprocessedMarkdown);
   const lines: MarkdownLine[] = [[]];
   let currentLine = 0;
@@ -61,17 +60,15 @@ export function markdownToLines(markdown: string): MarkdownLine[] {
   return lines;
 }
 
-export function markdownToHTML(markdown: string) {
+export function markdownToHTML(markdown: string, { markdownAutoWrap }: MermaidConfig = {}) {
   const { children } = fromMarkdown(markdown);
-  const markdownAutoWrap = getConfig().markdownAutoWrap;
 
   function output(node: Content): string {
     if (node.type === 'text') {
       if (markdownAutoWrap === false) {
         return node.value.replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;');
-      } else {
-        return node.value.replace(/\n/g, '<br/>');
       }
+      return node.value.replace(/\n/g, '<br/>');
     } else if (node.type === 'strong') {
       return `<strong>${node.children.map(output).join('')}</strong>`;
     } else if (node.type === 'emphasis') {
diff --git a/packages/mermaid/src/schemas/config.schema.yaml b/packages/mermaid/src/schemas/config.schema.yaml
index f613f8664..769e0a028 100644
--- a/packages/mermaid/src/schemas/config.schema.yaml
+++ b/packages/mermaid/src/schemas/config.schema.yaml
@@ -237,6 +237,7 @@ properties:
     default: 16
   markdownAutoWrap:
     type: boolean
+    default: true
 
 $defs: # JSON Schema definition (maybe we should move these to a separate file)
   BaseDiagramConfig:

From be37f2c576a3e9cc508fccb896b0afbabce0fbec Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 23 Mar 2024 14:58:55 +0530
Subject: [PATCH 12/15] fix: Remove repeated config calls

---
 packages/mermaid/src/config.ts                |  2 +-
 .../mermaid/src/dagre-wrapper/clusters.js     |  2 +-
 packages/mermaid/src/dagre-wrapper/edges.js   | 18 +++++++----
 .../mermaid/src/dagre-wrapper/shapes/util.js  | 31 ++++++++++---------
 .../mermaid/src/diagrams/mindmap/svgDraw.ts   | 15 ++++++---
 .../mermaid/src/rendering-util/createText.ts  |  2 +-
 6 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/packages/mermaid/src/config.ts b/packages/mermaid/src/config.ts
index ede3a568d..4168c24c4 100644
--- a/packages/mermaid/src/config.ts
+++ b/packages/mermaid/src/config.ts
@@ -124,7 +124,7 @@ export const setConfig = (conf: MermaidConfig): MermaidConfig => {
  * | --------- | ------------------------- | ----------- | ------------------------------ |
  * | getConfig | Obtains the currentConfig | Get Request | Any Values from current Config |
  *
- * **Notes**: Returns **any** the currentConfig
+ * **Notes**: Avoid calling this function repeatedly. Instead, store the result in a variable and use it, and pass it down to function calls.
  *
  * @returns The currentConfig
  */
diff --git a/packages/mermaid/src/dagre-wrapper/clusters.js b/packages/mermaid/src/dagre-wrapper/clusters.js
index 9dde40187..2c7746876 100644
--- a/packages/mermaid/src/dagre-wrapper/clusters.js
+++ b/packages/mermaid/src/dagre-wrapper/clusters.js
@@ -30,7 +30,7 @@ const rect = (parent, node) => {
   //   .appendChild(createLabel(node.labelText, node.labelStyle, undefined, true));
   const text =
     node.labelType === 'markdown'
-      ? createText(label, node.labelText, { style: node.labelStyle, useHtmlLabels })
+      ? createText(label, node.labelText, { style: node.labelStyle, useHtmlLabels }, siteConfig)
       : label.node().appendChild(createLabel(node.labelText, node.labelStyle, undefined, true));
 
   // Get the size of the label
diff --git a/packages/mermaid/src/dagre-wrapper/edges.js b/packages/mermaid/src/dagre-wrapper/edges.js
index 6f7e4695d..1a72328e8 100644
--- a/packages/mermaid/src/dagre-wrapper/edges.js
+++ b/packages/mermaid/src/dagre-wrapper/edges.js
@@ -18,15 +18,21 @@ export const clear = () => {
 };
 
 export const insertEdgeLabel = (elem, edge) => {
-  const useHtmlLabels = evaluate(getConfig().flowchart.htmlLabels);
+  const config = getConfig();
+  const useHtmlLabels = evaluate(config.flowchart.htmlLabels);
   // Create the actual text element
   const labelElement =
     edge.labelType === 'markdown'
-      ? createText(elem, edge.label, {
-          style: edge.labelStyle,
-          useHtmlLabels,
-          addSvgBackground: true,
-        })
+      ? createText(
+          elem,
+          edge.label,
+          {
+            style: edge.labelStyle,
+            useHtmlLabels,
+            addSvgBackground: true,
+          },
+          config
+        )
       : createLabel(edge.label, edge.labelStyle);
 
   // Create outer g, edgeLabel, this will be positioned after graph layout
diff --git a/packages/mermaid/src/dagre-wrapper/shapes/util.js b/packages/mermaid/src/dagre-wrapper/shapes/util.js
index df2c27bd5..1d0d2d77e 100644
--- a/packages/mermaid/src/dagre-wrapper/shapes/util.js
+++ b/packages/mermaid/src/dagre-wrapper/shapes/util.js
@@ -6,8 +6,9 @@ import { evaluate, sanitizeText } from '../../diagrams/common/common.js';
 import { decodeEntities } from '../../utils.js';
 
 export const labelHelper = async (parent, node, _classes, isNode) => {
+  const config = getConfig();
   let classes;
-  const useHtmlLabels = node.useHtmlLabels || evaluate(getConfig().flowchart.htmlLabels);
+  const useHtmlLabels = node.useHtmlLabels || evaluate(config.flowchart.htmlLabels);
   if (!_classes) {
     classes = 'node default';
   } else {
@@ -35,26 +36,26 @@ export const labelHelper = async (parent, node, _classes, isNode) => {
   let text;
   if (node.labelType === 'markdown') {
     // text = textNode;
-    text = createText(label, sanitizeText(decodeEntities(labelText), getConfig()), {
-      useHtmlLabels,
-      width: node.width || getConfig().flowchart.wrappingWidth,
-      classes: 'markdown-node-label',
-    });
+    text = createText(
+      label,
+      sanitizeText(decodeEntities(labelText), config),
+      {
+        useHtmlLabels,
+        width: node.width || config.flowchart.wrappingWidth,
+        classes: 'markdown-node-label',
+      },
+      config
+    );
   } else {
     text = textNode.appendChild(
-      createLabel(
-        sanitizeText(decodeEntities(labelText), getConfig()),
-        node.labelStyle,
-        false,
-        isNode
-      )
+      createLabel(sanitizeText(decodeEntities(labelText), config), node.labelStyle, false, isNode)
     );
   }
   // Get the size of the label
   let bbox = text.getBBox();
   const halfPadding = node.padding / 2;
 
-  if (evaluate(getConfig().flowchart.htmlLabels)) {
+  if (evaluate(config.flowchart.htmlLabels)) {
     const div = text.children[0];
     const dv = select(text);
 
@@ -76,8 +77,8 @@ export const labelHelper = async (parent, node, _classes, isNode) => {
 
                 if (noImgText) {
                   // default size if no text
-                  const bodyFontSize = getConfig().fontSize
-                    ? getConfig().fontSize
+                  const bodyFontSize = config.fontSize
+                    ? config.fontSize
                     : window.getComputedStyle(document.body).fontSize;
                   const enlargingFactor = 5;
                   const width = parseInt(bodyFontSize, 10) * enlargingFactor + 'px';
diff --git a/packages/mermaid/src/diagrams/mindmap/svgDraw.ts b/packages/mermaid/src/diagrams/mindmap/svgDraw.ts
index 3c7da8615..c84a7b16c 100644
--- a/packages/mermaid/src/diagrams/mindmap/svgDraw.ts
+++ b/packages/mermaid/src/diagrams/mindmap/svgDraw.ts
@@ -196,11 +196,16 @@ export const drawNode = function (
   // Create the wrapped text element
   const textElem = nodeElem.append('g');
   const description = node.descr.replace(/(<br\/*>)/g, '\n');
-  const newEl = createText(textElem, description, {
-    useHtmlLabels: htmlLabels,
-    width: node.width,
-    classes: 'mindmap-node-label',
-  });
+  const newEl = createText(
+    textElem,
+    description,
+    {
+      useHtmlLabels: htmlLabels,
+      width: node.width,
+      classes: 'mindmap-node-label',
+    },
+    conf
+  );
 
   if (!htmlLabels) {
     textElem
diff --git a/packages/mermaid/src/rendering-util/createText.ts b/packages/mermaid/src/rendering-util/createText.ts
index c50a019f1..d5c30b8bb 100644
--- a/packages/mermaid/src/rendering-util/createText.ts
+++ b/packages/mermaid/src/rendering-util/createText.ts
@@ -183,7 +183,7 @@ export const createText = (
     width = 200,
     addSvgBackground = false,
   } = {},
-  config: MermaidConfig = {}
+  config: MermaidConfig
 ) => {
   log.info('createText', text, style, isTitle, classes, useHtmlLabels, isNode, addSvgBackground);
   if (useHtmlLabels) {

From 45a5424ebf7609ea3955c0ad4a6d418708de2e7e Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 23 Mar 2024 14:59:36 +0530
Subject: [PATCH 13/15] fix: Remove space which caused extra newline on
 diagrams

---
 packages/mermaid/src/diagrams/common/common.ts    | 6 ++----
 packages/mermaid/src/rendering-util/createText.ts | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/mermaid/src/diagrams/common/common.ts b/packages/mermaid/src/diagrams/common/common.ts
index 04be2a5f4..017b2b091 100644
--- a/packages/mermaid/src/diagrams/common/common.ts
+++ b/packages/mermaid/src/diagrams/common/common.ts
@@ -346,11 +346,9 @@ export const renderKatex = async (text: string, config: MermaidConfig): Promise<
     .split(lineBreakRegex)
     .map((line) =>
       hasKatex(line)
-        ? `
-            <div style="display: flex; align-items: center; justify-content: center; white-space: nowrap;">
+        ? `<div style="display: flex; align-items: center; justify-content: center; white-space: nowrap;">
               ${line}
-            </div>
-          `
+            </div>`
         : `<div>${line}</div>`
     )
     .join('')
diff --git a/packages/mermaid/src/rendering-util/createText.ts b/packages/mermaid/src/rendering-util/createText.ts
index d5c30b8bb..725d65da6 100644
--- a/packages/mermaid/src/rendering-util/createText.ts
+++ b/packages/mermaid/src/rendering-util/createText.ts
@@ -22,8 +22,7 @@ function addHtmlSpan(element, node, width, classes, addBackground = false) {
   const label = node.label;
   const labelClass = node.isNode ? 'nodeLabel' : 'edgeLabel';
   div.html(
-    `
-    <span class="${labelClass} ${classes}" ` +
+    `<span class="${labelClass} ${classes}" ` +
       (node.labelStyle ? 'style="' + node.labelStyle + '"' : '') +
       '>' +
       label +

From 64757670fcc6d194d2c9e38c315cba0f32f75774 Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 23 Mar 2024 15:43:32 +0530
Subject: [PATCH 14/15] Update docs

---
 docs/config/setup/modules/config.md |  2 +-
 docs/syntax/flowchart.md            | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/config/setup/modules/config.md b/docs/config/setup/modules/config.md
index f1de64e2d..48e687577 100644
--- a/docs/config/setup/modules/config.md
+++ b/docs/config/setup/modules/config.md
@@ -50,7 +50,7 @@ Pushes in a directive to the configuration
 | --------- | ------------------------- | ----------- | ------------------------------ |
 | getConfig | Obtains the currentConfig | Get Request | Any Values from current Config |
 
-**Notes**: Returns **any** the currentConfig
+**Notes**: Avoid calling this function repeatedly. Instead, store the result in a variable and use it, and pass it down to function calls.
 
 #### Returns
 
diff --git a/docs/syntax/flowchart.md b/docs/syntax/flowchart.md
index cd6d6c55d..83676b0e4 100644
--- a/docs/syntax/flowchart.md
+++ b/docs/syntax/flowchart.md
@@ -854,11 +854,13 @@ This feature is applicable to node labels, edge labels, and subgraph labels.
 
 The auto wrapping can be disabled by using
 
-    ---
-    config:
-      markdownAutoWrap: false
-    ---
-    graph LR
+```
+---
+config:
+  markdownAutoWrap: false
+---
+graph LR
+```
 
 ## Interaction
 

From 94874ddbbe8d0c7099d0d0faa5feca360b3924e6 Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Sat, 23 Mar 2024 16:35:47 +0530
Subject: [PATCH 15/15] Add visual test

---
 cypress/integration/rendering/flowchart-v2.spec.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cypress/integration/rendering/flowchart-v2.spec.js b/cypress/integration/rendering/flowchart-v2.spec.js
index 857d395be..5b358e051 100644
--- a/cypress/integration/rendering/flowchart-v2.spec.js
+++ b/cypress/integration/rendering/flowchart-v2.spec.js
@@ -904,6 +904,18 @@ end
         );
       });
     });
+
+    it('should not auto wrap when markdownAutoWrap is false', () => {
+      imgSnapshotTest(
+        `flowchart TD
+    angular_velocity["\`**angular_velocity**
+      *angular_displacement / duration*
+      [rad/s, 1/s]
+      {vector}\`"]
+    frequency["frequency\n(1 / period_duration)\n[Hz, 1/s]"]`,
+        { markdownAutoWrap: false }
+      );
+    });
   });
   describe('Subgraph title margins', () => {
     it('Should render subgraphs with title margins set (LR)', () => {