Merge pull request #6727 from mermaid-js/changeset-release/master

Version Packages
2025-08-15 06:19:24 +02:00 · 2025-07-07 20:52:47 +05:30 · 2025-07-07 15:21:07 +00:00 · 2025-07-07 20:49:04 +05:30 · 2025-07-07 20:29:25 +05:30 · 2025-07-07 14:08:28 +00:00
49 changed files with 3142 additions and 929 deletions
--- a/.build/types.ts
+++ b/.build/types.ts
@@ -10,13 +10,16 @@ const buildType = (packageName: string) => {
      console.log(out.toString());
    }
  } catch (e) {
-    console.error(e);
    if (e.stdout.length > 0) {
      console.error(e.stdout.toString());
    }
    if (e.stderr.length > 0) {
      console.error(e.stderr.toString());
    }
+    // Exit the build process if we are in CI
+    if (process.env.CI) {
+      throw new Error(`Failed to build types for ${packageName}`);
+    }
  }
 };

--- a/.cspell/code-terms.txt
+++ b/.cspell/code-terms.txt
@@ -88,6 +88,7 @@ NODIR
 NSTR
 outdir
 Qcontrolx
+QSTR
 reinit
 rels
 reqs
--- a/.github/lychee.toml
+++ b/.github/lychee.toml
@@ -46,6 +46,9 @@ exclude = [
 # Drupal 403
 "https://(www.)?drupal.org",

+# Phbpp 403
+"https://(www.)?phpbb.com",
+
 # Swimm returns 404, even though the link is valid
 "https://docs.swimm.io",

--- a/.github/workflows/validate-lockfile.yml
+++ b/.github/workflows/validate-lockfile.yml
@@ -0,0 +1,70 @@
+name: Validate pnpm-lock.yaml
+
+on:
+  pull_request:
+    paths:
+      - 'pnpm-lock.yaml'
+      - '**/package.json'
+      - '.github/workflows/validate-lockfile.yml'
+
+jobs:
+  validate-lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+
+      - name: Validate pnpm-lock.yaml entries
+        id: validate # give this step an ID so we can reference its outputs
+        run: |
+          issues=()
+
+          # 1) No tarball references
+          if grep -qF 'tarball:' pnpm-lock.yaml; then
+            issues+=("• Tarball references found (forbidden)")
+          fi
+
+          # 2) No unwanted vitepress paths
+          if grep -qF 'packages/mermaid/src/vitepress' pnpm-lock.yaml; then
+            issues+=("• Disallowed path 'packages/mermaid/src/vitepress' present. Run `rm -rf packages/mermaid/src/vitepress && pnpm install` to regenerate.")
+          fi
+
+          # 3) Lockfile only changes when package.json changes
+          git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} > changed.txt
+          if grep -q '^pnpm-lock.yaml$' changed.txt && ! grep -q 'package.json' changed.txt; then
+            issues+=("• pnpm-lock.yaml changed without any package.json modification")
+          fi
+
+          # If any issues, output them and fail
+          if [ ${#issues[@]} -gt 0 ]; then
+            # Use the new GITHUB_OUTPUT approach to set a multiline output
+            {
+              echo "errors<<EOF"
+              printf '%s\n' "${issues[@]}"
+              echo "EOF"
+            } >> $GITHUB_OUTPUT
+            exit 1
+          fi
+
+      - name: Comment on PR if validation failed
+        if: failure()
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            The following issue(s) were detected:
+            ${{ steps.validate.outputs.errors }}
+
+            Please address these and push an update.
+
+            _Posted automatically by GitHub Actions_
--- a/README.md
+++ b/README.md
@@ -95,10 +95,6 @@ In our release process we rely heavily on visual regression tests using [applito

 <!-- </Main description> -->

-## Mermaid AI Bot
-
-[Mermaid](https://codeparrot.ai/oracle?owner=mermaid-js&repo=mermaid) Bot will help you understand this repository better. You can ask for code examples, installation guide, debugging help and much more.
-
 ## Examples

 **The following are some examples of the diagrams, charts and graphs that can be made using Mermaid. Click here to jump into the [text syntax](https://mermaid.js.org/intro/syntax-reference.html).**
--- a/cypress/integration/rendering/treemap.spec.ts
+++ b/cypress/integration/rendering/treemap.spec.ts
@@ -0,0 +1,382 @@
+import { imgSnapshotTest } from '../../helpers/util.ts';
+
+describe('Treemap Diagram', () => {
+  it('1: should render a basic treemap', () => {
+    imgSnapshotTest(
+      `treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+      `,
+      {}
+    );
+  });
+
+  it('2: should render a hierarchical treemap', () => {
+    imgSnapshotTest(
+      `treemap-beta
+"Products"
+    "Electronics"
+        "Phones": 50
+        "Computers": 30
+        "Accessories": 20
+    "Clothing"
+        "Men's"
+            "Shirts": 10
+            "Pants": 15
+        "Women's"
+            "Dresses": 20
+            "Skirts": 10
+      `,
+      {}
+    );
+  });
+
+  it('3: should render a treemap with styling using classDef', () => {
+    imgSnapshotTest(
+      `treemap-beta
+"Section 1"
+    "Leaf 1.1": 12
+    "Section 1.2":::class1
+      "Leaf 1.2.1": 12
+"Section 2"
+    "Leaf 2.1": 20:::class1
+    "Leaf 2.2": 25
+    "Leaf 2.3": 12
+
+classDef class1 fill:red,color:blue,stroke:#FFD600;
+      `,
+      {}
+    );
+  });
+
+  it('4: should handle long text that wraps', () => {
+    imgSnapshotTest(
+      `treemap-beta
+"Main Category"
+    "This is a very long item name that should wrap to the next line when rendered in the treemap diagram": 50
+    "Short item": 20
+      `,
+      {}
+    );
+  });
+
+  it('5: should render with a forest theme', () => {
+    imgSnapshotTest(
+      `---
+config:
+  theme: forest
+---
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+      `,
+      {}
+    );
+  });
+
+  it('6: should handle multiple levels of nesting', () => {
+    imgSnapshotTest(
+      `treemap-beta
+"Level 1"
+    "Level 2A"
+        "Level 3A": 10
+        "Level 3B": 15
+    "Level 2B"
+        "Level 3C": 20
+        "Level 3D"
+            "Level 4A": 5
+            "Level 4B": 5
+      `,
+      {}
+    );
+  });
+
+  it('7: should handle classDef with multiple styles', () => {
+    imgSnapshotTest(
+      `treemap-beta
+"Main"
+    "A": 20
+    "B":::important
+        "B1": 10
+        "B2": 15
+    "C": 5:::secondary
+
+classDef important fill:#f96,stroke:#333,stroke-width:2px;
+classDef secondary fill:#6cf,stroke:#333,stroke-dasharray:5 5;
+      `,
+      {}
+    );
+  });
+
+  it('8: should handle dollar value formatting with thousands separator', () => {
+    imgSnapshotTest(
+      `---
+config:
+  treemap:
+    valueFormat: "$0,0"
+---
+treemap
+"Budget"
+    "Operations"
+        "Salaries": 700000
+        "Equipment": 200000
+        "Supplies": 100000
+    "Marketing"
+        "Advertising": 400000
+        "Events": 100000
+      `,
+      {}
+    );
+  });
+
+  it('8a: should handle percentage formatting', () => {
+    imgSnapshotTest(
+      `---
+config:
+  treemap:
+    valueFormat: ".1%"
+---
+treemap-beta
+"Market Share"
+    "Company A": 0.35
+    "Company B": 0.25
+    "Company C": 0.15
+    "Others": 0.25
+      `,
+      {}
+    );
+  });
+
+  it('8b: should handle decimal formatting', () => {
+    imgSnapshotTest(
+      `---
+config:
+  treemap:
+    valueFormat: ".2f"
+---
+treemap-beta
+"Metrics"
+    "Conversion Rate": 0.0567
+    "Bounce Rate": 0.6723
+    "Click-through Rate": 0.1289
+    "Engagement": 0.4521
+      `,
+      {}
+    );
+  });
+
+  it('8c: should handle dollar sign with decimal places', () => {
+    imgSnapshotTest(
+      `---
+config:
+  treemap:
+    valueFormat: "$.2f"
+---
+treemap-beta
+"Product Prices"
+    "Basic": 19.99
+    "Standard": 49.99
+    "Premium": 99.99
+    "Enterprise": 199.99
+      `,
+      {}
+    );
+  });
+
+  it('8d: should handle dollar sign with thousands separator and decimal places', () => {
+    imgSnapshotTest(
+      `---
+config:
+  treemap:
+    valueFormat: "$,.2f"
+---
+treemap-beta
+"Revenue"
+    "Q1": 1250345.75
+    "Q2": 1645789.25
+    "Q3": 1845123.50
+    "Q4": 2145678.75
+      `,
+      {}
+    );
+  });
+
+  it('8e: should handle simple thousands separator', () => {
+    imgSnapshotTest(
+      `---
+config:
+  treemap:
+    valueFormat: ","
+---
+treemap-beta
+"User Counts"
+    "Active Users": 1250345
+    "New Signups": 45789
+    "Churned": 12350
+    "Converted": 78975
+      `,
+      {}
+    );
+  });
+
+  it('8f: should handle valueFormat set via directive with dollar and thousands separator', () => {
+    imgSnapshotTest(
+      `---
+config:
+  treemap:
+    valueFormat: "$,.0f"
+---
+treemap-beta
+"Sales by Region"
+    "North": 1234567
+    "South": 7654321
+    "East": 4567890
+    "West": 9876543
+      `,
+      {}
+    );
+  });
+
+  it('8g: should handle scientific notation format', () => {
+    imgSnapshotTest(
+      `---
+config:
+  treemap:
+    valueFormat: ".2e"
+---
+treemap-beta
+"Scientific Values"
+    "Value 1": 1234567
+    "Value 2": 0.0000123
+    "Value 3": 1000000000
+      `,
+      {}
+    );
+  });
+
+  it('9: should handle a complex example with multiple features', () => {
+    imgSnapshotTest(
+      `---
+config:
+  theme: dark
+  treemap:
+    valueFormat: "$0,0"
+---
+treemap-beta
+"Company Budget"
+    "Engineering":::engineering
+        "Frontend": 300000
+        "Backend": 400000
+        "DevOps": 200000
+    "Marketing":::marketing
+        "Digital": 250000
+        "Print": 100000
+        "Events": 150000
+    "Sales":::sales
+        "Direct": 500000
+        "Channel": 300000
+
+classDef engineering fill:#6b9bc3,stroke:#333;
+classDef marketing fill:#c36b9b,stroke:#333;
+classDef sales fill:#c3a66b,stroke:#333;
+      `,
+      {}
+    );
+  });
+
+  it('10: should render the example from documentation', () => {
+    imgSnapshotTest(
+      `
+    treemap-beta
+      "Section 1"
+          "Leaf 1.1": 12
+          "Section 1.2":::class1
+            "Leaf 1.2.1": 12
+      "Section 2"
+          "Leaf 2.1": 20:::class1
+          "Leaf 2.2": 25
+          "Leaf 2.3": 12
+
+      classDef class1 fill:red,color:blue,stroke:#FFD600;
+      `,
+      {}
+    );
+  });
+
+  it('11: should handle comments', () => {
+    imgSnapshotTest(
+      `
+    treemap-beta
+      %% This is a comment
+      "Category A"
+          "Item A1": 10
+          "Item A2": 20
+      %% Another comment
+      "Category B"
+          "Item B1": 15
+          "Item B2": 25
+      `,
+      {}
+    );
+  });
+  /*
+  it.skip('12: should render a treemap with title', () => {
+    imgSnapshotTest(
+      `
+    treemap-beta
+      title Treemap with Title
+      "Category A"
+          "Item A1": 10
+          "Item A2": 20
+      "Category B"
+          "Item B1": 15
+          "Item B2": 25
+      `,
+      {}
+    );
+  });
+
+  it.skip('13: should render a treemap with accessibility attributes', () => {
+    imgSnapshotTest(
+      `
+    treemap-beta
+      accTitle: Accessible Treemap Title
+      accDescr: This is a description of the treemap for accessibility purposes
+      "Category A"
+          "Item A1": 10
+          "Item A2": 20
+      "Category B"
+          "Item B1": 15
+          "Item B2": 25
+      `,
+      {}
+    );
+  });
+
+  it.skip('14: should render a treemap with title and accessibility attributes', () => {
+    imgSnapshotTest(
+      `
+    treemap
+      title Treemap with Title and Accessibility
+      accTitle: Accessible Treemap Title
+      accDescr: This is a description of the treemap for accessibility purposes
+      "Category A"
+          "Item A1": 10
+          "Item A2": 20
+      "Category B"
+          "Item B1": 15
+          "Item B2": 25
+      `,
+      {}
+    );
+  });
+  */
+});
--- a/cypress/platform/knsv2.html
+++ b/cypress/platform/knsv2.html
@@ -32,8 +32,26 @@
      href="https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&family=Rubik+Mono+One&display=swap"
      rel="stylesheet"
    />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Recursive:wght@300..1000&display=swap"
+      rel="stylesheet"
+    />

    <style>
+      .recursive-mermaid {
+        font-family: 'Recursive', sans-serif;
+        font-optical-sizing: auto;
+        font-weight: 500;
+        font-style: normal;
+        font-variation-settings:
+          'slnt' 0,
+          'CASL' 0,
+          'CRSV' 0.5,
+          'MONO' 0;
+      }
+
      body {
        /* background: rgb(221, 208, 208); */
        /* background: #333; */
@@ -45,7 +63,9 @@
      h1 {
        color: grey;
      }
-
+      .mermaid {
+        border: 1px solid red;
+      }
      .mermaid2 {
        display: none;
      }
@@ -83,6 +103,11 @@
        width: 100%;
      }

+      .class2 {
+        fill: red;
+        fill-opacity: 1;
+      }
+
      /* tspan {
              font-size: 6px !important;
            } */
@@ -106,19 +131,63 @@

  <body>
    <pre id="diagram4" class="mermaid">
+treemap
+"Section 1"
+    "Leaf 1.1": 12
+    "Section 1.2":::class1
+      "Leaf 1.2.1": 12
+"Section 2"
+    "Leaf 2.1": 20:::class1
+    "Leaf 2.2": 25
+    "Leaf 2.3": 12
+
+classDef class1   fill:red,color:blue,stroke:#FFD600;
+
+
+</pre
+    >
+    <pre id="diagram4" class="mermaid2">
+---
+config:
+  treemap:
+    valueFormat: '$0,0'
+---
+treemap
+"Budget"
+    "Operations"
+        "Salaries": 7000
+        "Equipment": 2000
+        "Supplies": 1000
+    "Marketing"
+        "Advertising": 4000
+        "Events": 1000
+
+</pre
+    >
+    <pre id="diagram4" class="mermaid">
+    treemap
+      title Accessible Treemap Title
+      "Category A"
+          "Item A1": 10
+          "Item A2": 20
+      "Category B"
+          "Item B1": 15
+          "Item B2": 25
+    </pre>
+    <pre id="diagram4" class="mermaid2">
      flowchart LR
        AB["apa@apa@"] --> B(("`apa@apa`"))
    </pre>
-    <pre id="diagram4" class="mermaid">
+    <pre id="diagram4" class="mermaid2">
      flowchart
        D(("for D"))
    </pre>
-    <pre id="diagram4" class="mermaid">
+    <pre id="diagram4" class="mermaid2">
      flowchart LR
        A e1@==> B
        e1@{ animate: true}
    </pre>
-    <pre id="diagram4" class="mermaid">
+    <pre id="diagram4" class="mermaid2">
 flowchart LR
  A e1@--> B
  classDef animate stroke-width:2,stroke-dasharray:10\,8,stroke-dashoffset:-180,animation: edge-animation-frame 6s linear infinite, stroke-linecap: round
@@ -438,7 +507,7 @@ kanban
        alert('It worked');
      }
      await mermaid.initialize({
-        // theme: 'base',
+        // theme: 'forest',
        // theme: 'default',
        // theme: 'forest',
        // handDrawnSeed: 12,
@@ -449,11 +518,7 @@ kanban
        // layout: 'fixed',
        // htmlLabels: false,
        flowchart: { titleTopMargin: 10 },
-
-        // fontFamily: 'Caveat',
-        // fontFamily: 'Kalam',
-        // fontFamily: 'courier',
-        fontFamily: 'arial',
+        fontFamily: "'Recursive', sans-serif",
        sequence: {
          actorFontFamily: 'courier',
          noteFontFamily: 'courier',
--- a/cypress/timings.json
+++ b/cypress/timings.json
@@ -2,215 +2,219 @@
  "durations": [
    {
      "spec": "cypress/integration/other/configuration.spec.js",
-      "duration": 6130
+      "duration": 5659
    },
    {
      "spec": "cypress/integration/other/external-diagrams.spec.js",
-      "duration": 1974
+      "duration": 2015
    },
    {
      "spec": "cypress/integration/other/ghsa.spec.js",
-      "duration": 3308
+      "duration": 3195
    },
    {
      "spec": "cypress/integration/other/iife.spec.js",
-      "duration": 1877
+      "duration": 1976
    },
    {
      "spec": "cypress/integration/other/interaction.spec.js",
-      "duration": 10902
+      "duration": 11149
    },
    {
      "spec": "cypress/integration/other/rerender.spec.js",
-      "duration": 1836
+      "duration": 1910
    },
    {
      "spec": "cypress/integration/other/xss.spec.js",
-      "duration": 26467
+      "duration": 26998
    },
    {
      "spec": "cypress/integration/rendering/appli.spec.js",
-      "duration": 3129
+      "duration": 3176
    },
    {
      "spec": "cypress/integration/rendering/architecture.spec.ts",
-      "duration": 104
+      "duration": 110
    },
    {
      "spec": "cypress/integration/rendering/block.spec.js",
-      "duration": 16230
+      "duration": 16265
    },
    {
      "spec": "cypress/integration/rendering/c4.spec.js",
-      "duration": 5231
+      "duration": 5431
    },
    {
      "spec": "cypress/integration/rendering/classDiagram-elk-v3.spec.js",
-      "duration": 38113
+      "duration": 38025
    },
    {
      "spec": "cypress/integration/rendering/classDiagram-handDrawn-v3.spec.js",
-      "duration": 36423
+      "duration": 36179
    },
    {
      "spec": "cypress/integration/rendering/classDiagram-v2.spec.js",
-      "duration": 22509
+      "duration": 22386
    },
    {
      "spec": "cypress/integration/rendering/classDiagram-v3.spec.js",
-      "duration": 34933
+      "duration": 35378
    },
    {
      "spec": "cypress/integration/rendering/classDiagram.spec.js",
-      "duration": 14681
+      "duration": 14967
    },
    {
      "spec": "cypress/integration/rendering/conf-and-directives.spec.js",
-      "duration": 8877
+      "duration": 9140
    },
    {
      "spec": "cypress/integration/rendering/current.spec.js",
-      "duration": 2517
+      "duration": 2652
    },
    {
      "spec": "cypress/integration/rendering/erDiagram-unified.spec.js",
-      "duration": 81226
+      "duration": 82257
    },
    {
      "spec": "cypress/integration/rendering/erDiagram.spec.js",
-      "duration": 14211
+      "duration": 14138
    },
    {
      "spec": "cypress/integration/rendering/errorDiagram.spec.js",
-      "duration": 3355
+      "duration": 3718
    },
    {
      "spec": "cypress/integration/rendering/flowchart-elk.spec.js",
-      "duration": 38857
+      "duration": 39683
    },
    {
      "spec": "cypress/integration/rendering/flowchart-handDrawn.spec.js",
-      "duration": 28570
+      "duration": 28676
    },
    {
      "spec": "cypress/integration/rendering/flowchart-icon.spec.js",
-      "duration": 6902
+      "duration": 7080
    },
    {
      "spec": "cypress/integration/rendering/flowchart-shape-alias.spec.ts",
-      "duration": 23075
+      "duration": 23175
    },
    {
      "spec": "cypress/integration/rendering/flowchart-v2.spec.js",
-      "duration": 40514
+      "duration": 40846
    },
    {
      "spec": "cypress/integration/rendering/flowchart.spec.js",
-      "duration": 28611
+      "duration": 29743
    },
    {
      "spec": "cypress/integration/rendering/gantt.spec.js",
-      "duration": 16605
+      "duration": 17352
    },
    {
      "spec": "cypress/integration/rendering/gitGraph.spec.js",
-      "duration": 47636
+      "duration": 48514
    },
    {
      "spec": "cypress/integration/rendering/iconShape.spec.ts",
-      "duration": 262219
+      "duration": 262422
    },
    {
      "spec": "cypress/integration/rendering/imageShape.spec.ts",
-      "duration": 54111
+      "duration": 54513
    },
    {
      "spec": "cypress/integration/rendering/info.spec.ts",
-      "duration": 3006
+      "duration": 3025
    },
    {
      "spec": "cypress/integration/rendering/journey.spec.js",
-      "duration": 6858
+      "duration": 6994
    },
    {
      "spec": "cypress/integration/rendering/kanban.spec.ts",
-      "duration": 7281
+      "duration": 7346
    },
    {
      "spec": "cypress/integration/rendering/katex.spec.js",
-      "duration": 3579
+      "duration": 3642
    },
    {
      "spec": "cypress/integration/rendering/marker_unique_id.spec.js",
-      "duration": 2448
+      "duration": 2464
    },
    {
      "spec": "cypress/integration/rendering/mindmap.spec.ts",
-      "duration": 10618
+      "duration": 10882
    },
    {
      "spec": "cypress/integration/rendering/newShapes.spec.ts",
-      "duration": 140874
+      "duration": 142092
    },
    {
      "spec": "cypress/integration/rendering/oldShapes.spec.ts",
-      "duration": 108015
+      "duration": 109340
    },
    {
      "spec": "cypress/integration/rendering/packet.spec.ts",
-      "duration": 4241
+      "duration": 4167
    },
    {
      "spec": "cypress/integration/rendering/pie.spec.ts",
-      "duration": 5645
+      "duration": 5736
    },
    {
      "spec": "cypress/integration/rendering/quadrantChart.spec.js",
-      "duration": 8524
+      "duration": 8628
    },
    {
      "spec": "cypress/integration/rendering/radar.spec.js",
-      "duration": 5203
+      "duration": 5311
    },
    {
      "spec": "cypress/integration/rendering/requirement.spec.js",
-      "duration": 2635
+      "duration": 2619
    },
    {
      "spec": "cypress/integration/rendering/requirementDiagram-unified.spec.js",
-      "duration": 50512
+      "duration": 50640
    },
    {
      "spec": "cypress/integration/rendering/sankey.spec.ts",
-      "duration": 6692
+      "duration": 6735
    },
    {
      "spec": "cypress/integration/rendering/sequencediagram.spec.js",
-      "duration": 34559
+      "duration": 34777
    },
    {
      "spec": "cypress/integration/rendering/stateDiagram-v2.spec.js",
-      "duration": 24421
+      "duration": 24440
    },
    {
      "spec": "cypress/integration/rendering/stateDiagram.spec.js",
-      "duration": 15316
+      "duration": 15476
    },
    {
      "spec": "cypress/integration/rendering/theme.spec.js",
-      "duration": 28240
+      "duration": 27932
    },
    {
      "spec": "cypress/integration/rendering/timeline.spec.ts",
-      "duration": 6808
+      "duration": 8162
+    },
+    {
+      "spec": "cypress/integration/rendering/treemap.spec.ts",
+      "duration": 11763
    },
    {
      "spec": "cypress/integration/rendering/xyChart.spec.js",
-      "duration": 19359
+      "duration": 19759
    },
    {
      "spec": "cypress/integration/rendering/zenuml.spec.js",
-      "duration": 3164
+      "duration": 3316
    }
  ]
 }
--- a/demos/treemap.html
+++ b/demos/treemap.html
@@ -0,0 +1,75 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Mermaid Treemap Diagram Demo</title>
+    <link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet" />
+    <style>
+      body {
+        font-family: 'Montserrat', sans-serif;
+        margin: 0 auto;
+        max-width: 900px;
+        padding: 20px;
+      }
+      .mermaid {
+        margin: 30px 0;
+      }
+      h1,
+      h2 {
+        color: #333;
+      }
+      pre {
+        background-color: #f5f5f5;
+        padding: 15px;
+        border-radius: 5px;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Treemap Diagram Demo</h1>
+    <p>This is a demo of the new treemap diagram type in Mermaid.</p>
+
+    <h2>Basic Treemap Example</h2>
+    <pre class="mermaid">
+treemap
+    "Root"
+        "Branch 1"
+            "Leaf 1.1": 10
+            "Leaf 1.2": 15
+        "Branch 2"
+            "Branch 2.1"
+                "Leaf 2.1.1": 20
+                "Leaf 2.1.2": 25
+            "Leaf 2.2": 25
+            "Leaf 2.3": 30
+    </pre>
+
+    <h2>Technology Stack Treemap Example</h2>
+    <pre class="mermaid">
+treemap
+    "Technology Stack"
+        "Frontend"
+            "React": 35
+            "CSS": 15
+            "HTML": 10
+        "Backend"
+            "Node.js": 25
+            "Express": 10
+            "MongoDB": 15
+        "DevOps"
+            "Docker": 10
+            "Kubernetes": 15
+            "CI/CD": 5
+    </pre>
+
+    <script type="module">
+      import mermaid from './mermaid.esm.mjs';
+      mermaid.initialize({
+        theme: 'forest',
+        logLevel: 1,
+        securityLevel: 'loose',
+      });
+    </script>
+  </body>
+</html>
--- a/docs/config/setup/defaultConfig/variables/configKeys.md
+++ b/docs/config/setup/defaultConfig/variables/configKeys.md
@@ -12,4 +12,4 @@

 > `const` **configKeys**: `Set`<`string`>

-Defined in: [packages/mermaid/src/defaultConfig.ts:278](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/defaultConfig.ts#L278)
+Defined in: [packages/mermaid/src/defaultConfig.ts:290](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/defaultConfig.ts#L290)
--- a/docs/ecosystem/integrations-community.md
+++ b/docs/ecosystem/integrations-community.md
@@ -245,7 +245,7 @@ Communication tools and platforms
 | GitHub + Mermaid         | -                                                                                                           | [🦊🔗](https://addons.mozilla.org/firefox/addon/github-mermaid/)               | -                                                                              | -                                                                                                                            | [🐙🔗](https://github.com/BackMarket/github-mermaid-extension)                                       |
 | Asciidoctor Live Preview | [🎡🔗](https://chromewebstore.google.com/detail/asciidoctorjs-live-previe/iaalpfgpbocpdfblpnhhgllgbdbchmia) | -                                                                              | -                                                                              | [🌀🔗](https://microsoftedge.microsoft.com/addons/detail/asciidoctorjs-live-previ/pefkelkanablhjdekgdahplkccnbdggd?hl=en-US) | -                                                                                                    |
 | Diagram Tab              | -                                                                                                           | -                                                                              | -                                                                              | -                                                                                                                            | [🐙🔗](https://github.com/khafast/diagramtab)                                                        |
-| Markdown Diagrams        | [🎡🔗](https://chromewebstore.google.com/detail/markdown-diagrams/pmoglnmodacnbbofbgcagndelmgaclel)         | [🦊🔗](https://addons.mozilla.org/en-US/firefox/addon/markdown-diagrams/)      | [🔴🔗](https://addons.opera.com/en/extensions/details/markdown-diagrams/)      | [🌀🔗](https://microsoftedge.microsoft.com/addons/detail/markdown-diagrams/hceenoomhhdkjjijnmlclkpenkapfihe)                 | [🐙🔗](https://github.com/marcozaccari/markdown-diagrams-browser-extension/tree/master/doc/examples) |
+| Markdown Diagrams        | [🎡🔗](https://chromewebstore.google.com/detail/markdown-diagrams/pmoglnmodacnbbofbgcagndelmgaclel)         | [🦊🔗](https://addons.mozilla.org/en-US/firefox/addon/markdown-diagrams/)      | -                                                                              | [🌀🔗](https://microsoftedge.microsoft.com/addons/detail/markdown-diagrams/hceenoomhhdkjjijnmlclkpenkapfihe)                 | [🐙🔗](https://github.com/marcozaccari/markdown-diagrams-browser-extension/tree/master/doc/examples) |
 | Markdown Viewer          | -                                                                                                           | [🦊🔗](https://addons.mozilla.org/en-US/firefox/addon/markdown-viewer-chrome/) | -                                                                              | -                                                                                                                            | [🐙🔗](https://github.com/simov/markdown-viewer)                                                     |
 | Extensions for Mermaid   | -                                                                                                           | -                                                                              | [🔴🔗](https://addons.opera.com/en/extensions/details/extensions-for-mermaid/) | -                                                                                                                            | [🐙🔗](https://github.com/Stefan-S/mermaid-extension)                                                |
 | Chrome Diagrammer        | [🎡🔗](https://chromewebstore.google.com/detail/chrome-diagrammer/bkpbgjmkomfoakfklcjeoegkklgjnnpk)         | -                                                                              | -                                                                              | -                                                                                                                            | -                                                                                                    |
@@ -270,5 +270,6 @@ Communication tools and platforms
  - [reveal.js-mermaid-plugin](https://github.com/ludwick/reveal.js-mermaid-plugin)
 - [Reveal CK](https://github.com/jedcn/reveal-ck)
  - [reveal-ck-mermaid-plugin](https://github.com/tmtm/reveal-ck-mermaid-plugin)
+- [Vitepress Plugin](https://github.com/sametcn99/vitepress-mermaid-renderer)

 <!--- cspell:ignore Blazorade HueHive --->
--- a/docs/ecosystem/mermaid-chart.md
+++ b/docs/ecosystem/mermaid-chart.md
@@ -30,7 +30,7 @@ Try the Ultimate AI, Mermaid, and Visual Diagramming Suite by creating an accoun

  Official Mermaid Chart plugins:

-  - [Mermaid Chart GPT](https://chat.openai.com/g/g-1IRFKwq4G-mermaid-chart)
+  - [Mermaid Chart GPT](https://chatgpt.com/g/g-684cc36f30208191b21383b88650a45d-mermaid-chart-diagrams-and-charts)
  - [Confluence](https://marketplace.atlassian.com/apps/1234056/mermaid-chart-for-confluence?hosting=cloud&tab=overview)
  - [Jira](https://marketplace.atlassian.com/apps/1234810/mermaid-chart-for-jira?tab=overview&hosting=cloud)
  - [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=MermaidChart.vscode-mermaid-chart)
--- a/docs/syntax/treemap.md
+++ b/docs/syntax/treemap.md
@@ -0,0 +1,353 @@
+> **Warning**
+>
+> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
+>
+> ## Please edit the corresponding file in [/packages/mermaid/src/docs/syntax/treemap.md](../../packages/mermaid/src/docs/syntax/treemap.md).
+
+# Treemap Diagram
+
+> A treemap diagram displays hierarchical data as a set of nested rectangles. Each branch of the tree is represented by a rectangle, which is then tiled with smaller rectangles representing sub-branches.
+
+> **Warning**
+> This is a new diagram type in Mermaid. Its syntax may evolve in future versions.
+
+## Introduction
+
+Treemap diagrams are an effective way to visualize hierarchical data and show proportions between categories and subcategories. The size of each rectangle is proportional to the value it represents, making it easy to compare different parts of a hierarchy.
+
+Treemap diagrams are particularly useful for:
+
+- Visualizing hierarchical data structures
+- Comparing proportions between categories
+- Displaying large amounts of hierarchical data in a limited space
+- Identifying patterns and outliers in hierarchical data
+
+## Syntax
+
+```
+treemap-beta
+"Section 1"
+    "Leaf 1.1": 12
+    "Section 1.2"
+      "Leaf 1.2.1": 12
+"Section 2"
+    "Leaf 2.1": 20
+    "Leaf 2.2": 25
+```
+
+### Node Definition
+
+Nodes in a treemap are defined using the following syntax:
+
+- **Section/Parent nodes**: Defined with quoted text `"Section Name"`
+- **Leaf nodes with values**: Defined with quoted text followed by a colon and value `"Leaf Name": value`
+- **Hierarchy**: Created using indentation (spaces or tabs)
+- **Styling**: Nodes can be styled using the `:::class` syntax
+
+## Examples
+
+### Basic Treemap
+
+```mermaid-example
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+```mermaid
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+### Hierarchical Treemap
+
+```mermaid-example
+treemap-beta
+"Products"
+    "Electronics"
+        "Phones": 50
+        "Computers": 30
+        "Accessories": 20
+    "Clothing"
+        "Men's": 40
+        "Women's": 40
+```
+
+```mermaid
+treemap-beta
+"Products"
+    "Electronics"
+        "Phones": 50
+        "Computers": 30
+        "Accessories": 20
+    "Clothing"
+        "Men's": 40
+        "Women's": 40
+```
+
+### Treemap with Styling
+
+```mermaid-example
+treemap-beta
+"Section 1"
+    "Leaf 1.1": 12
+    "Section 1.2":::class1
+      "Leaf 1.2.1": 12
+"Section 2"
+    "Leaf 2.1": 20:::class1
+    "Leaf 2.2": 25
+    "Leaf 2.3": 12
+
+classDef class1 fill:red,color:blue,stroke:#FFD600;
+```
+
+```mermaid
+treemap-beta
+"Section 1"
+    "Leaf 1.1": 12
+    "Section 1.2":::class1
+      "Leaf 1.2.1": 12
+"Section 2"
+    "Leaf 2.1": 20:::class1
+    "Leaf 2.2": 25
+    "Leaf 2.3": 12
+
+classDef class1 fill:red,color:blue,stroke:#FFD600;
+```
+
+## Styling and Configuration
+
+Treemap diagrams can be customized using Mermaid's styling and configuration options.
+
+### Using classDef for Styling
+
+You can define custom styles for nodes using the `classDef` syntax, which is a standard feature across many Mermaid diagram types:
+
+```mermaid-example
+treemap-beta
+"Main"
+    "A": 20
+    "B":::important
+        "B1": 10
+        "B2": 15
+    "C": 5
+
+classDef important fill:#f96,stroke:#333,stroke-width:2px;
+```
+
+```mermaid
+treemap-beta
+"Main"
+    "A": 20
+    "B":::important
+        "B1": 10
+        "B2": 15
+    "C": 5
+
+classDef important fill:#f96,stroke:#333,stroke-width:2px;
+```
+
+### Theme Configuration
+
+You can customize the colors of your treemap using the theme configuration:
+
+```mermaid-example
+---
+config:
+    theme: 'forest'
+---
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+```mermaid
+---
+config:
+    theme: 'forest'
+---
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+### Diagram Padding
+
+You can adjust the padding around the treemap diagram using the `diagramPadding` configuration option:
+
+```mermaid-example
+---
+config:
+  treemap:
+    diagramPadding: 200
+---
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+```mermaid
+---
+config:
+  treemap:
+    diagramPadding: 200
+---
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+## Configuration Options
+
+The treemap diagram supports the following configuration options:
+
+| Option         | Description                                                                 | Default |
+| -------------- | --------------------------------------------------------------------------- | ------- |
+| useMaxWidth    | When true, the diagram width is set to 100% and scales with available space | true    |
+| padding        | Internal padding between nodes                                              | 10      |
+| diagramPadding | Padding around the entire diagram                                           | 8       |
+| showValues     | Whether to show values in the treemap                                       | true    |
+| nodeWidth      | Width of nodes                                                              | 100     |
+| nodeHeight     | Height of nodes                                                             | 40      |
+| borderWidth    | Width of borders                                                            | 1       |
+| valueFontSize  | Font size for values                                                        | 12      |
+| labelFontSize  | Font size for labels                                                        | 14      |
+| valueFormat    | Format for values (see Value Formatting section)                            | ','     |
+
+## Advanced Features
+
+### Value Formatting
+
+Values in treemap diagrams can be formatted to display in different ways using the `valueFormat` configuration option. This option primarily uses [D3's format specifiers](https://github.com/d3/d3-format#locale_format) to control how numbers are displayed, with some additional special cases for common formats.
+
+Some common format patterns:
+
+- `,` - Thousands separator (default)
+- `$` - Add dollar sign
+- `.1f` - Show one decimal place
+- `.1%` - Show as percentage with one decimal place
+- `$0,0` - Dollar sign with thousands separator
+- `$.2f` - Dollar sign with 2 decimal places
+- `$,.2f` - Dollar sign with thousands separator and 2 decimal places
+
+The treemap diagram supports both standard D3 format specifiers and some common currency formats that combine the dollar sign with other formatting options.
+
+Example with currency formatting:
+
+```mermaid-example
+---
+config:
+  treemap:
+    valueFormat: '$0,0'
+---
+treemap-beta
+"Budget"
+    "Operations"
+        "Salaries": 700000
+        "Equipment": 200000
+        "Supplies": 100000
+    "Marketing"
+        "Advertising": 400000
+        "Events": 100000
+```
+
+```mermaid
+---
+config:
+  treemap:
+    valueFormat: '$0,0'
+---
+treemap-beta
+"Budget"
+    "Operations"
+        "Salaries": 700000
+        "Equipment": 200000
+        "Supplies": 100000
+    "Marketing"
+        "Advertising": 400000
+        "Events": 100000
+```
+
+Example with percentage formatting:
+
+```mermaid-example
+---
+config:
+  treemap:
+    valueFormat: '$.1%'
+---
+treemap-beta
+"Market Share"
+    "Company A": 0.35
+    "Company B": 0.25
+    "Company C": 0.15
+    "Others": 0.25
+```
+
+```mermaid
+---
+config:
+  treemap:
+    valueFormat: '$.1%'
+---
+treemap-beta
+"Market Share"
+    "Company A": 0.35
+    "Company B": 0.25
+    "Company C": 0.15
+    "Others": 0.25
+```
+
+## Common Use Cases
+
+Treemap diagrams are commonly used for:
+
+1. **Financial Data**: Visualizing budget allocations, market shares, or portfolio compositions
+2. **File System Analysis**: Showing disk space usage by folders and files
+3. **Population Demographics**: Displaying population distribution across regions and subregions
+4. **Product Hierarchies**: Visualizing product categories and their sales volumes
+5. **Organizational Structures**: Representing departments and team sizes in a company
+
+## Limitations
+
+- Treemap diagrams work best when the data has a natural hierarchy
+- Very small values may be difficult to see or label in a treemap diagram
+- Deep hierarchies (many levels) can be challenging to represent clearly
+- Treemap diagrams are not well suited for representing data with negative values
+
+## Related Diagrams
+
+If treemap diagrams don't suit your needs, consider these alternatives:
+
+- [**Pie Charts**](./pie.md): For simple proportion comparisons without hierarchy
+- **Sunburst Diagrams**: For hierarchical data with a radial layout (yet to be released in Mermaid).
+- [**Sankey Diagrams**](./sankey.md): For flow-based hierarchical data
+
+## Notes
+
+The treemap diagram implementation in Mermaid is designed to be simple to use while providing powerful visualization capabilities. As this is a newer diagram type, feedback and feature requests are welcome through the Mermaid GitHub repository.
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
    "@vitest/spy": "^3.0.6",
    "@vitest/ui": "^3.0.6",
    "ajv": "^8.17.1",
-    "chokidar": "^4.0.3",
+    "chokidar": "3.6.0",
    "concurrently": "^9.1.2",
    "cors": "^2.8.5",
    "cpy-cli": "^5.0.0",
--- a/packages/mermaid/CHANGELOG.md
+++ b/packages/mermaid/CHANGELOG.md
@@ -1,5 +1,25 @@
 # mermaid

+## 11.8.1
+
+### Patch Changes
+
+- Updated dependencies [[`0da2922`](https://github.com/mermaid-js/mermaid/commit/0da2922ee7f47959e324ec10d3d21ee70594f557)]:
+  - @mermaid-js/parser@0.6.1
+
+## 11.8.0
+
+### Minor Changes
+
+- [#6590](https://github.com/mermaid-js/mermaid/pull/6590) [`f338802`](https://github.com/mermaid-js/mermaid/commit/f338802642cdecf5b7ed6c19a20cf2a81effbbee) Thanks [@knsv](https://github.com/knsv)! - Adding support for the new diagram type nested treemap
+
+### Patch Changes
+
+- [#6707](https://github.com/mermaid-js/mermaid/pull/6707) [`592c5bb`](https://github.com/mermaid-js/mermaid/commit/592c5bb880c3b942710a2878d386bcb3eb35c137) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Log a warning when duplicate commit IDs are encountered in gitGraph to help identify and debug rendering issues caused by non-unique IDs.
+
+- Updated dependencies [[`f338802`](https://github.com/mermaid-js/mermaid/commit/f338802642cdecf5b7ed6c19a20cf2a81effbbee)]:
+  - @mermaid-js/parser@0.6.0
+
 ## 11.7.0

 ### Minor Changes
--- a/packages/mermaid/package.json
+++ b/packages/mermaid/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mermaid",
-  "version": "11.7.0",
+  "version": "11.8.1",
  "description": "Markdown-ish syntax for generating flowcharts, mindmaps, sequence diagrams, class diagrams, gantt charts, git graphs and more.",
  "type": "module",
  "module": "./dist/mermaid.core.mjs",
@@ -105,7 +105,7 @@
    "@types/stylis": "^4.2.7",
    "@types/uuid": "^10.0.0",
    "ajv": "^8.17.1",
-    "chokidar": "^4.0.3",
+    "chokidar": "3.6.0",
    "concurrently": "^9.1.2",
    "csstree-validator": "^4.0.1",
    "globby": "^14.0.2",
--- a/packages/mermaid/src/defaultConfig.ts
+++ b/packages/mermaid/src/defaultConfig.ts
@@ -262,6 +262,18 @@ const config: RequiredDeep<MermaidConfig> = {
  radar: {
    ...defaultConfigJson.radar,
  },
+  treemap: {
+    useMaxWidth: true,
+    padding: 10,
+    diagramPadding: 8,
+    showValues: true,
+    nodeWidth: 100,
+    nodeHeight: 40,
+    borderWidth: 1,
+    valueFontSize: 12,
+    labelFontSize: 14,
+    valueFormat: ',',
+  },
 };

 // eslint-disable-next-line @typescript-eslint/no-explicit-any
--- a/packages/mermaid/src/diagram-api/diagram-orchestration.ts
+++ b/packages/mermaid/src/diagram-api/diagram-orchestration.ts
@@ -27,6 +27,7 @@ import block from '../diagrams/block/blockDetector.js';
 import architecture from '../diagrams/architecture/architectureDetector.js';
 import { registerLazyLoadedDiagrams } from './detectType.js';
 import { registerDiagram } from './diagramAPI.js';
+import { treemap } from '../diagrams/treemap/detector.js';
 import '../type.d.ts';

 let hasLoadedDiagrams = false;
@@ -99,6 +100,7 @@ export const addDiagrams = () => {
    packet,
    xychart,
    block,
-    radar
+    radar,
+    treemap
  );
 };
--- a/packages/mermaid/src/diagrams/git/gitGraph.spec.ts
+++ b/packages/mermaid/src/diagrams/git/gitGraph.spec.ts
@@ -1,4 +1,4 @@
-import { rejects } from 'assert';
+import { log } from '../../logger.js';
 import { db } from './gitGraphAst.js';
 import { parser } from './gitGraphParser.js';

@@ -1319,4 +1319,42 @@ describe('when parsing a gitGraph', function () {
      }
    });
  });
+  it('should log a warning when two commits have the same ID', async () => {
+    const str = `gitGraph
+     commit id:"initial commit"
+     commit id:"work on first release"
+     commit id:"design freeze from here"
+     branch v1-rc
+     checkout v1-rc
+     commit id:"bugfix 1"
+     commit id:"bigfix 2" tag:"v1.0.1"
+     branch FORK-v1.0-MDR
+     checkout FORK-v1.0-MDR
+     commit id:"working on MDR"
+     checkout v1-rc
+     commit id:"minor design changes for MDR" tag:"v1.0.2"
+     checkout FORK-v1.0-MDR
+     merge v1-rc
+     checkout main
+     commit id:"new feature for v1.1…"
+     checkout FORK-v1.0-MDR
+     commit id:"working on MDR"
+     commit id:"finishing MDR"
+     branch v1.0-MDR
+     checkout v1.0-MDR
+     commit id:"brush up release" tag:"v1.0.2-MDR"
+     checkout v1-rc
+     commit id:"bugfix without MDR"
+     checkout main
+     commit id:"work on v1.1"
+  `;
+
+    const logWarnSpy = vi.spyOn(log, 'warn').mockImplementation(() => undefined);
+
+    await parser.parse(str);
+
+    expect(logWarnSpy).toHaveBeenCalledWith('Commit ID working on MDR already exists');
+
+    logWarnSpy.mockRestore();
+  });
 });
--- a/packages/mermaid/src/diagrams/git/gitGraphAst.ts
+++ b/packages/mermaid/src/diagrams/git/gitGraphAst.ts
@@ -125,6 +125,9 @@ export const commit = function (commitDB: CommitDB) {
  };
  state.records.head = newCommit;
  log.info('main branch', config.mainBranchName);
+  if (state.records.commits.has(newCommit.id)) {
+    log.warn(`Commit ID ${newCommit.id} already exists`);
+  }
  state.records.commits.set(newCommit.id, newCommit);
  state.records.branches.set(state.records.currBranch, newCommit.id);
  log.debug('in pushCommit ' + newCommit.id);
--- a/packages/mermaid/src/diagrams/treemap/db.ts
+++ b/packages/mermaid/src/diagrams/treemap/db.ts
@@ -0,0 +1,112 @@
+import { getConfig as commonGetConfig } from '../../config.js';
+import DEFAULT_CONFIG from '../../defaultConfig.js';
+import type { DiagramStyleClassDef } from '../../diagram-api/types.js';
+import { isLabelStyle } from '../../rendering-util/rendering-elements/shapes/handDrawnShapeStyles.js';
+
+import { cleanAndMerge } from '../../utils.js';
+import { ImperativeState } from '../../utils/imperativeState.js';
+import {
+  clear as commonClear,
+  getAccDescription,
+  getAccTitle,
+  getDiagramTitle,
+  setAccDescription,
+  setAccTitle,
+  setDiagramTitle,
+} from '../common/commonDb.js';
+import type { TreemapDB, TreemapData, TreemapDiagramConfig, TreemapNode } from './types.js';
+
+const defaultTreemapData: TreemapData = {
+  nodes: [],
+  levels: new Map(),
+  outerNodes: [],
+  classes: new Map(),
+};
+
+const state = new ImperativeState<TreemapData>(() => structuredClone(defaultTreemapData));
+
+const getConfig = (): Required<TreemapDiagramConfig> => {
+  // Use type assertion with unknown as intermediate step
+  const defaultConfig = DEFAULT_CONFIG as unknown as { treemap: Required<TreemapDiagramConfig> };
+  const userConfig = commonGetConfig() as unknown as { treemap?: Partial<TreemapDiagramConfig> };
+
+  return cleanAndMerge({
+    ...defaultConfig.treemap,
+    ...(userConfig.treemap ?? {}),
+  }) as Required<TreemapDiagramConfig>;
+};
+
+const getNodes = (): TreemapNode[] => state.records.nodes;
+
+const addNode = (node: TreemapNode, level: number) => {
+  const data = state.records;
+  data.nodes.push(node);
+  data.levels.set(node, level);
+
+  if (level === 0) {
+    data.outerNodes.push(node);
+  }
+
+  // Set the root node if this is a level 0 node and we don't have a root yet
+  if (level === 0 && !data.root) {
+    data.root = node;
+  }
+};
+
+const getRoot = (): TreemapNode | undefined => ({ name: '', children: state.records.outerNodes });
+
+const addClass = (id: string, _style: string) => {
+  const classes = state.records.classes;
+  const styleClass = classes.get(id) ?? { id, styles: [], textStyles: [] };
+  classes.set(id, styleClass);
+
+  const styles = _style.replace(/\\,/g, '§§§').replace(/,/g, ';').replace(/§§§/g, ',').split(';');
+
+  if (styles) {
+    styles.forEach((s) => {
+      if (isLabelStyle(s)) {
+        if (styleClass?.textStyles) {
+          styleClass.textStyles.push(s);
+        } else {
+          styleClass.textStyles = [s];
+        }
+      }
+      if (styleClass?.styles) {
+        styleClass.styles.push(s);
+      } else {
+        styleClass.styles = [s];
+      }
+    });
+  }
+
+  classes.set(id, styleClass);
+};
+const getClasses = (): Map<string, DiagramStyleClassDef> => {
+  return state.records.classes;
+};
+
+const getStylesForClass = (classSelector: string): string[] => {
+  return state.records.classes.get(classSelector)?.styles ?? [];
+};
+
+const clear = () => {
+  commonClear();
+  state.reset();
+};
+
+export const db: TreemapDB = {
+  getNodes,
+  addNode,
+  getRoot,
+  getConfig,
+  clear,
+  setAccTitle,
+  getAccTitle,
+  setDiagramTitle,
+  getDiagramTitle,
+  getAccDescription,
+  setAccDescription,
+  addClass,
+  getClasses,
+  getStylesForClass,
+};
--- a/packages/mermaid/src/diagrams/treemap/detector.ts
+++ b/packages/mermaid/src/diagrams/treemap/detector.ts
@@ -0,0 +1,22 @@
+import type {
+  DiagramDetector,
+  DiagramLoader,
+  ExternalDiagramDefinition,
+} from '../../diagram-api/types.js';
+
+const id = 'treemap';
+
+const detector: DiagramDetector = (txt) => {
+  return /^\s*treemap/.test(txt);
+};
+
+const loader: DiagramLoader = async () => {
+  const { diagram } = await import('./diagram.js');
+  return { id, diagram };
+};
+
+export const treemap: ExternalDiagramDefinition = {
+  id,
+  detector,
+  loader,
+};
--- a/packages/mermaid/src/diagrams/treemap/diagram.ts
+++ b/packages/mermaid/src/diagrams/treemap/diagram.ts
@@ -0,0 +1,12 @@
+import type { DiagramDefinition } from '../../diagram-api/types.js';
+import { db } from './db.js';
+import { parser } from './parser.js';
+import { renderer } from './renderer.js';
+import styles from './styles.js';
+
+export const diagram: DiagramDefinition = {
+  parser,
+  db,
+  renderer,
+  styles,
+};
--- a/packages/mermaid/src/diagrams/treemap/parser.ts
+++ b/packages/mermaid/src/diagrams/treemap/parser.ts
@@ -0,0 +1,100 @@
+import { parse } from '@mermaid-js/parser';
+import type { ParserDefinition } from '../../diagram-api/types.js';
+import { log } from '../../logger.js';
+import { populateCommonDb } from '../common/populateCommonDb.js';
+import { db } from './db.js';
+import type { TreemapNode, TreemapAst } from './types.js';
+import { buildHierarchy } from './utils.js';
+
+/**
+ * Populates the database with data from the Treemap AST
+ * @param ast - The Treemap AST
+ */
+const populate = (ast: TreemapAst) => {
+  // We need to bypass the type checking for populateCommonDb
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  populateCommonDb(ast as any, db);
+
+  const items: {
+    level: number;
+    name: string;
+    type: string;
+    value?: number;
+    classSelector?: string;
+    cssCompiledStyles?: string;
+  }[] = [];
+
+  // Extract classes and styles from the treemap
+  for (const row of ast.TreemapRows ?? []) {
+    if (row.$type === 'ClassDefStatement') {
+      db.addClass(row.className ?? '', row.styleText ?? '');
+    }
+  }
+
+  // Extract data from each row in the treemap
+  for (const row of ast.TreemapRows ?? []) {
+    const item = row.item;
+
+    if (!item) {
+      continue;
+    }
+
+    const level = row.indent ? parseInt(row.indent) : 0;
+    const name = getItemName(item);
+
+    // Get styles as a string if they exist
+    const styles = item.classSelector ? db.getStylesForClass(item.classSelector) : [];
+    const cssCompiledStyles = styles.length > 0 ? styles.join(';') : undefined;
+
+    const itemData = {
+      level,
+      name,
+      type: item.$type,
+      value: item.value,
+      classSelector: item.classSelector,
+      cssCompiledStyles,
+    };
+
+    items.push(itemData);
+  }
+
+  // Convert flat structure to hierarchical
+  const hierarchyNodes = buildHierarchy(items);
+
+  // Add all nodes to the database
+  const addNodesRecursively = (nodes: TreemapNode[], level: number) => {
+    for (const node of nodes) {
+      db.addNode(node, level);
+      if (node.children && node.children.length > 0) {
+        addNodesRecursively(node.children, level + 1);
+      }
+    }
+  };
+
+  addNodesRecursively(hierarchyNodes, 0);
+};
+
+/**
+ * Gets the name of a treemap item
+ * @param item - The treemap item
+ * @returns The name of the item
+ */
+const getItemName = (item: { name?: string | number }): string => {
+  return item.name ? String(item.name) : '';
+};
+
+export const parser: ParserDefinition = {
+  parse: async (text: string): Promise<void> => {
+    try {
+      // Use a generic parse that accepts any diagram type
+
+      const parseFunc = parse as (diagramType: string, text: string) => Promise<TreemapAst>;
+      const ast = await parseFunc('treemap', text);
+      log.debug('Treemap AST:', ast);
+      populate(ast);
+    } catch (error) {
+      log.error('Error parsing treemap:', error);
+      throw error;
+    }
+  },
+};
--- a/packages/mermaid/src/diagrams/treemap/renderer.ts
+++ b/packages/mermaid/src/diagrams/treemap/renderer.ts
@@ -0,0 +1,526 @@
+import type { Diagram } from '../../Diagram.js';
+import type {
+  DiagramRenderer,
+  DiagramStyleClassDef,
+  DrawDefinition,
+} from '../../diagram-api/types.js';
+import { selectSvgElement } from '../../rendering-util/selectSvgElement.js';
+import { setupViewPortForSVG } from '../../rendering-util/setupViewPortForSVG.js';
+import { configureSvgSize } from '../../setupGraphViewbox.js';
+import type { TreemapDB, TreemapNode } from './types.js';
+import { scaleOrdinal, treemap, hierarchy, format, select } from 'd3';
+import { styles2String } from '../../rendering-util/rendering-elements/shapes/handDrawnShapeStyles.js';
+import { getConfig } from '../../config.js';
+import { log } from '../../logger.js';
+import type { Node } from '../../rendering-util/types.js';
+
+const DEFAULT_INNER_PADDING = 10; // Default for inner padding between cells/sections
+const SECTION_INNER_PADDING = 10; // Default for inner padding between cells/sections
+const SECTION_HEADER_HEIGHT = 25;
+
+/**
+ * Draws the treemap diagram
+ */
+const draw: DrawDefinition = (_text, id, _version, diagram: Diagram) => {
+  const treemapDb = diagram.db as TreemapDB;
+  const config = treemapDb.getConfig();
+  const treemapInnerPadding = config.padding ?? DEFAULT_INNER_PADDING;
+  const title = treemapDb.getDiagramTitle();
+  const root = treemapDb.getRoot();
+  const { themeVariables } = getConfig();
+  if (!root) {
+    return;
+  }
+
+  // Define dimensions
+  const titleHeight = title ? 30 : 0;
+
+  const svg = selectSvgElement(id);
+  // Use config dimensions or defaults
+  const width = config.nodeWidth ? config.nodeWidth * SECTION_INNER_PADDING : 960;
+  const height = config.nodeHeight ? config.nodeHeight * SECTION_INNER_PADDING : 500;
+
+  const svgWidth = width;
+  const svgHeight = height + titleHeight;
+
+  // Set the SVG size
+  svg.attr('viewBox', `0 0 ${svgWidth} ${svgHeight}`);
+  configureSvgSize(svg, svgHeight, svgWidth, config.useMaxWidth);
+
+  // Format for displaying values
+  let valueFormat;
+  try {
+    // Handle special format patterns
+    const formatStr = config.valueFormat || ',';
+
+    // Handle special cases that aren't directly supported by D3 format
+    if (formatStr === '$0,0') {
+      // Currency with thousands separator
+      valueFormat = (value: number) => '$' + format(',')(value);
+    } else if (formatStr.startsWith('$') && formatStr.includes(',')) {
+      // Other dollar formats with commas
+      const precision = /\.\d+/.exec(formatStr);
+      const precisionStr = precision ? precision[0] : '';
+      valueFormat = (value: number) => '$' + format(',' + precisionStr)(value);
+    } else if (formatStr.startsWith('$')) {
+      // Simple dollar sign prefix
+      const restOfFormat = formatStr.substring(1);
+      valueFormat = (value: number) => '$' + format(restOfFormat || '')(value);
+    } else {
+      // Standard D3 format
+      valueFormat = format(formatStr);
+    }
+  } catch (error) {
+    log.error('Error creating format function:', error);
+    // Fallback to default format
+    valueFormat = format(',');
+  }
+
+  // Create color scale
+  const colorScale = scaleOrdinal<string>().range([
+    'transparent',
+    themeVariables.cScale0,
+    themeVariables.cScale1,
+    themeVariables.cScale2,
+    themeVariables.cScale3,
+    themeVariables.cScale4,
+    themeVariables.cScale5,
+    themeVariables.cScale6,
+    themeVariables.cScale7,
+    themeVariables.cScale8,
+    themeVariables.cScale9,
+    themeVariables.cScale10,
+    themeVariables.cScale11,
+  ]);
+  const colorScalePeer = scaleOrdinal<string>().range([
+    'transparent',
+    themeVariables.cScalePeer0,
+    themeVariables.cScalePeer1,
+    themeVariables.cScalePeer2,
+    themeVariables.cScalePeer3,
+    themeVariables.cScalePeer4,
+    themeVariables.cScalePeer5,
+    themeVariables.cScalePeer6,
+    themeVariables.cScalePeer7,
+    themeVariables.cScalePeer8,
+    themeVariables.cScalePeer9,
+    themeVariables.cScalePeer10,
+    themeVariables.cScalePeer11,
+  ]);
+  const colorScaleLabel = scaleOrdinal<string>().range([
+    themeVariables.cScaleLabel0,
+    themeVariables.cScaleLabel1,
+    themeVariables.cScaleLabel2,
+    themeVariables.cScaleLabel3,
+    themeVariables.cScaleLabel4,
+    themeVariables.cScaleLabel5,
+    themeVariables.cScaleLabel6,
+    themeVariables.cScaleLabel7,
+    themeVariables.cScaleLabel8,
+    themeVariables.cScaleLabel9,
+    themeVariables.cScaleLabel10,
+    themeVariables.cScaleLabel11,
+  ]);
+
+  // Draw the title if it exists
+  if (title) {
+    svg
+      .append('text')
+      .attr('x', svgWidth / 2)
+      .attr('y', titleHeight / 2)
+      .attr('class', 'treemapTitle')
+      .attr('text-anchor', 'middle')
+      .attr('dominant-baseline', 'middle')
+      .text(title);
+  }
+
+  // Create a main container for the treemap, translated below the title
+  const g = svg
+    .append('g')
+    .attr('transform', `translate(0, ${titleHeight})`)
+    .attr('class', 'treemapContainer');
+
+  // Create the hierarchical structure
+  const hierarchyRoot = hierarchy<TreemapNode>(root)
+    .sum((d) => d.value ?? 0)
+    .sort((a, b) => (b.value ?? 0) - (a.value ?? 0));
+
+  // Create treemap layout
+  const treemapLayout = treemap<TreemapNode>()
+    .size([width, height])
+    .paddingTop((d) =>
+      d.children && d.children.length > 0 ? SECTION_HEADER_HEIGHT + SECTION_INNER_PADDING : 0
+    )
+    .paddingInner(treemapInnerPadding)
+    .paddingLeft((d) => (d.children && d.children.length > 0 ? SECTION_INNER_PADDING : 0))
+    .paddingRight((d) => (d.children && d.children.length > 0 ? SECTION_INNER_PADDING : 0))
+    .paddingBottom((d) => (d.children && d.children.length > 0 ? SECTION_INNER_PADDING : 0))
+    .round(true);
+
+  // Apply the treemap layout to the hierarchy
+  const treemapData = treemapLayout(hierarchyRoot);
+
+  // Draw section nodes (branches - nodes with children)
+  const branchNodes = treemapData.descendants().filter((d) => d.children && d.children.length > 0);
+  const sections = g
+    .selectAll('.treemapSection')
+    .data(branchNodes)
+    .enter()
+    .append('g')
+    .attr('class', 'treemapSection')
+    .attr('transform', (d) => `translate(${d.x0},${d.y0})`);
+
+  // Add section header background
+  sections
+    .append('rect')
+    .attr('width', (d) => d.x1 - d.x0)
+    .attr('height', SECTION_HEADER_HEIGHT)
+    .attr('class', 'treemapSectionHeader')
+    .attr('fill', 'none')
+    .attr('fill-opacity', 0.6)
+    .attr('stroke-width', 0.6)
+    .attr('style', (d) => {
+      // Hide the label for the root section
+      if (d.depth === 0) {
+        return 'display: none;';
+      }
+      return '';
+    });
+
+  // Add clip paths for section headers to prevent text overflow
+  sections
+    .append('clipPath')
+    .attr('id', (_d, i) => `clip-section-${id}-${i}`)
+    .append('rect')
+    .attr('width', (d) => Math.max(0, d.x1 - d.x0 - 12)) // 6px padding on each side
+    .attr('height', SECTION_HEADER_HEIGHT);
+
+  sections
+    .append('rect')
+    .attr('width', (d) => d.x1 - d.x0)
+    .attr('height', (d) => d.y1 - d.y0)
+    .attr('class', (_d, i) => {
+      return `treemapSection section${i}`;
+    })
+    .attr('fill', (d) => colorScale(d.data.name))
+    .attr('fill-opacity', 0.6)
+    .attr('stroke', (d) => colorScalePeer(d.data.name))
+    .attr('stroke-width', 2.0)
+    .attr('stroke-opacity', 0.4)
+    .attr('style', (d) => {
+      // Hide the label for the root section
+      if (d.depth === 0) {
+        return 'display: none;';
+      }
+      const styles = styles2String({ cssCompiledStyles: d.data.cssCompiledStyles } as Node);
+      return styles.nodeStyles + ';' + styles.borderStyles.join(';');
+    });
+  // Add section labels
+  sections
+    .append('text')
+    .attr('class', 'treemapSectionLabel')
+    .attr('x', 6) // Keep original left padding
+    .attr('y', SECTION_HEADER_HEIGHT / 2)
+    .attr('dominant-baseline', 'middle')
+    .text((d) => (d.depth === 0 ? '' : d.data.name)) // Skip label for root section
+    .attr('font-weight', 'bold')
+    .attr('style', (d) => {
+      // Hide the label for the root section
+      if (d.depth === 0) {
+        return 'display: none;';
+      }
+      const labelStyles =
+        'dominant-baseline: middle; font-size: 12px; fill:' +
+        colorScaleLabel(d.data.name) +
+        '; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;';
+      const styles = styles2String({ cssCompiledStyles: d.data.cssCompiledStyles } as Node);
+      return labelStyles + styles.labelStyles.replace('color:', 'fill:');
+    })
+    .each(function (d) {
+      // Skip processing for root section
+      if (d.depth === 0) {
+        return;
+      }
+      const self = select(this);
+      const originalText = d.data.name;
+      self.text(originalText);
+      const totalHeaderWidth = d.x1 - d.x0;
+      const labelXPosition = 6;
+      let spaceForTextContent;
+      if (config.showValues !== false && d.value) {
+        const valueEndsAtXRelative = totalHeaderWidth - 10;
+        const estimatedValueTextActualWidth = 30;
+        const gapBetweenLabelAndValue = 10;
+        const labelMustEndBeforeX =
+          valueEndsAtXRelative - estimatedValueTextActualWidth - gapBetweenLabelAndValue;
+        spaceForTextContent = labelMustEndBeforeX - labelXPosition;
+      } else {
+        const labelOwnRightPadding = 6;
+        spaceForTextContent = totalHeaderWidth - labelXPosition - labelOwnRightPadding;
+      }
+      const minimumWidthToDisplay = 15;
+      const actualAvailableWidth = Math.max(minimumWidthToDisplay, spaceForTextContent);
+      const textNode = self.node()!;
+      const currentTextContentLength = textNode.getComputedTextLength();
+      if (currentTextContentLength > actualAvailableWidth) {
+        const ellipsis = '...';
+        let currentTruncatedText = originalText;
+        while (currentTruncatedText.length > 0) {
+          currentTruncatedText = originalText.substring(0, currentTruncatedText.length - 1);
+          if (currentTruncatedText.length === 0) {
+            self.text(ellipsis);
+            if (textNode.getComputedTextLength() > actualAvailableWidth) {
+              self.text('');
+            }
+            break;
+          }
+          self.text(currentTruncatedText + ellipsis);
+          if (textNode.getComputedTextLength() <= actualAvailableWidth) {
+            break;
+          }
+        }
+      }
+    });
+
+  // Add section values if enabled
+  if (config.showValues !== false) {
+    sections
+      .append('text')
+      .attr('class', 'treemapSectionValue')
+      .attr('x', (d) => d.x1 - d.x0 - 10)
+      .attr('y', SECTION_HEADER_HEIGHT / 2)
+      .attr('text-anchor', 'end')
+      .attr('dominant-baseline', 'middle')
+      .text((d) => (d.value ? valueFormat(d.value) : ''))
+      .attr('font-style', 'italic')
+      .attr('style', (d) => {
+        // Hide the value for the root section
+        if (d.depth === 0) {
+          return 'display: none;';
+        }
+        const labelStyles =
+          'text-anchor: end; dominant-baseline: middle; font-size: 10px; fill:' +
+          colorScaleLabel(d.data.name) +
+          '; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;';
+        const styles = styles2String({ cssCompiledStyles: d.data.cssCompiledStyles } as Node);
+        return labelStyles + styles.labelStyles.replace('color:', 'fill:');
+      });
+  }
+
+  // Draw the leaf nodes
+  const leafNodes = treemapData.leaves();
+  const cell = g
+    .selectAll('.treemapLeafGroup')
+    .data(leafNodes)
+    .enter()
+    .append('g')
+    .attr('class', (d, i) => {
+      return `treemapNode treemapLeafGroup leaf${i}${d.data.classSelector ? ` ${d.data.classSelector}` : ''}x`;
+    })
+    .attr('transform', (d) => `translate(${d.x0},${d.y0})`);
+
+  // Add rectangle for each leaf node
+  cell
+    .append('rect')
+    .attr('width', (d) => d.x1 - d.x0)
+    .attr('height', (d) => d.y1 - d.y0)
+    .attr('class', 'treemapLeaf')
+    .attr('fill', (d) => {
+      // Leaves inherit color from their immediate parent section's name.
+      // If a leaf is the root itself (no parent), it uses its own name.
+      return d.parent ? colorScale(d.parent.data.name) : colorScale(d.data.name);
+    })
+    .attr('style', (d) => {
+      const styles = styles2String({ cssCompiledStyles: d.data.cssCompiledStyles } as Node);
+      return styles.nodeStyles;
+    })
+    .attr('fill-opacity', 0.3)
+    .attr('stroke', (d) => {
+      // Leaves inherit color from their immediate parent section's name.
+      // If a leaf is the root itself (no parent), it uses its own name.
+      return d.parent ? colorScale(d.parent.data.name) : colorScale(d.data.name);
+    })
+    .attr('stroke-width', 3.0);
+
+  // Add clip paths to prevent text from extending outside nodes
+  cell
+    .append('clipPath')
+    .attr('id', (_d, i) => `clip-${id}-${i}`)
+    .append('rect')
+    .attr('width', (d) => Math.max(0, d.x1 - d.x0 - 4))
+    .attr('height', (d) => Math.max(0, d.y1 - d.y0 - 4));
+
+  // Add node labels with clipping
+  const leafLabels = cell
+    .append('text')
+    .attr('class', 'treemapLabel')
+    .attr('x', (d) => (d.x1 - d.x0) / 2)
+    .attr('y', (d) => (d.y1 - d.y0) / 2)
+    // .style('fill', (d) => colorScaleLabel(d.data.name))
+    .attr('style', (d) => {
+      const labelStyles =
+        'text-anchor: middle; dominant-baseline: middle; font-size: 38px;fill:' +
+        colorScaleLabel(d.data.name) +
+        ';';
+      const styles = styles2String({ cssCompiledStyles: d.data.cssCompiledStyles } as Node);
+      return labelStyles + styles.labelStyles.replace('color:', 'fill:');
+    })
+    .attr('clip-path', (_d, i) => `url(#clip-${id}-${i})`)
+    .text((d) => d.data.name);
+
+  leafLabels.each(function (d) {
+    const self = select(this);
+    const nodeWidth = d.x1 - d.x0;
+    const nodeHeight = d.y1 - d.y0;
+    const textNode = self.node()!;
+
+    const padding = 4;
+    const availableWidth = nodeWidth - 2 * padding;
+    const availableHeight = nodeHeight - 2 * padding;
+
+    if (availableWidth < 10 || availableHeight < 10) {
+      self.style('display', 'none');
+      return;
+    }
+
+    let currentLabelFontSize = parseInt(self.style('font-size'), 10);
+    const minLabelFontSize = 8;
+    const originalValueRelFontSize = 28; // Original font size of value, for max cap
+    const valueScaleFactor = 0.6; // Value font size as a factor of label font size
+    const minValueFontSize = 6;
+    const spacingBetweenLabelAndValue = 2;
+
+    // 1. Adjust label font size to fit width
+    while (
+      textNode.getComputedTextLength() > availableWidth &&
+      currentLabelFontSize > minLabelFontSize
+    ) {
+      currentLabelFontSize--;
+      self.style('font-size', `${currentLabelFontSize}px`);
+    }
+
+    // 2. Adjust both label and prospective value font size to fit combined height
+    let prospectiveValueFontSize = Math.max(
+      minValueFontSize,
+      Math.min(originalValueRelFontSize, Math.round(currentLabelFontSize * valueScaleFactor))
+    );
+    let combinedHeight =
+      currentLabelFontSize + spacingBetweenLabelAndValue + prospectiveValueFontSize;
+
+    while (combinedHeight > availableHeight && currentLabelFontSize > minLabelFontSize) {
+      currentLabelFontSize--;
+      prospectiveValueFontSize = Math.max(
+        minValueFontSize,
+        Math.min(originalValueRelFontSize, Math.round(currentLabelFontSize * valueScaleFactor))
+      );
+      if (
+        prospectiveValueFontSize < minValueFontSize &&
+        currentLabelFontSize === minLabelFontSize
+      ) {
+        break;
+      } // Avoid shrinking label if value is already at min
+      self.style('font-size', `${currentLabelFontSize}px`);
+      combinedHeight =
+        currentLabelFontSize + spacingBetweenLabelAndValue + prospectiveValueFontSize;
+      if (prospectiveValueFontSize <= minValueFontSize && combinedHeight > availableHeight) {
+        // If value is at min and still doesn't fit, label might need to shrink more alone
+        // This might lead to label being too small for its own text, checked next
+      }
+    }
+
+    // Update label font size based on height adjustment
+    self.style('font-size', `${currentLabelFontSize}px`);
+
+    // 3. Final visibility check for the label
+    if (
+      textNode.getComputedTextLength() > availableWidth ||
+      currentLabelFontSize < minLabelFontSize ||
+      availableHeight < currentLabelFontSize
+    ) {
+      self.style('display', 'none');
+      // If label is hidden, value will be hidden by its own .each() loop
+    }
+  });
+
+  // Add node values with clipping
+  if (config.showValues !== false) {
+    const leafValues = cell
+      .append('text')
+      .attr('class', 'treemapValue')
+      .attr('x', (d) => (d.x1 - d.x0) / 2)
+      .attr('y', function (d) {
+        // Y position calculated dynamically in leafValues.each based on final label metrics
+        return (d.y1 - d.y0) / 2; // Placeholder, will be overwritten
+      })
+      .attr('style', (d) => {
+        const labelStyles =
+          'text-anchor: middle; dominant-baseline: hanging; font-size: 28px;fill:' +
+          colorScaleLabel(d.data.name) +
+          ';';
+        const styles = styles2String({ cssCompiledStyles: d.data.cssCompiledStyles } as Node);
+        return labelStyles + styles.labelStyles.replace('color:', 'fill:');
+      })
+
+      .attr('clip-path', (_d, i) => `url(#clip-${id}-${i})`)
+      .text((d) => (d.value ? valueFormat(d.value) : ''));
+
+    leafValues.each(function (d) {
+      const valueTextElement = select(this);
+      const parentCellNode = this.parentNode as SVGGElement | null;
+
+      if (!parentCellNode) {
+        valueTextElement.style('display', 'none');
+        return;
+      }
+
+      const labelElement = select(parentCellNode).select<SVGTextElement>('.treemapLabel');
+
+      if (labelElement.empty() || labelElement.style('display') === 'none') {
+        valueTextElement.style('display', 'none');
+        return;
+      }
+
+      const finalLabelFontSize = parseFloat(labelElement.style('font-size'));
+      const originalValueFontSize = 28; // From initial style setting
+      const valueScaleFactor = 0.6;
+      const minValueFontSize = 6;
+      const spacingBetweenLabelAndValue = 2;
+
+      const actualValueFontSize = Math.max(
+        minValueFontSize,
+        Math.min(originalValueFontSize, Math.round(finalLabelFontSize * valueScaleFactor))
+      );
+      valueTextElement.style('font-size', `${actualValueFontSize}px`);
+
+      const labelCenterY = (d.y1 - d.y0) / 2;
+      const valueTopActualY = labelCenterY + finalLabelFontSize / 2 + spacingBetweenLabelAndValue;
+      valueTextElement.attr('y', valueTopActualY);
+
+      const nodeWidth = d.x1 - d.x0;
+      const nodeTotalHeight = d.y1 - d.y0;
+      const cellBottomPadding = 4;
+      const maxValueBottomY = nodeTotalHeight - cellBottomPadding;
+      const availableWidthForValue = nodeWidth - 2 * 4; // padding for value text
+
+      if (
+        valueTextElement.node()!.getComputedTextLength() > availableWidthForValue ||
+        valueTopActualY + actualValueFontSize > maxValueBottomY ||
+        actualValueFontSize < minValueFontSize
+      ) {
+        valueTextElement.style('display', 'none');
+      } else {
+        valueTextElement.style('display', null);
+      }
+    });
+  }
+  const diagramPadding = config.diagramPadding ?? 8;
+  setupViewPortForSVG(svg, diagramPadding, 'flowchart', config?.useMaxWidth || false);
+};
+
+const getClasses = function (
+  _text: string,
+  diagramObj: Pick<Diagram, 'db'>
+): Map<string, DiagramStyleClassDef> {
+  return (diagramObj.db as TreemapDB).getClasses();
+};
+export const renderer: DiagramRenderer = { draw, getClasses };
--- a/packages/mermaid/src/diagrams/treemap/styles.ts
+++ b/packages/mermaid/src/diagrams/treemap/styles.ts
@@ -0,0 +1,51 @@
+import type { DiagramStylesProvider } from '../../diagram-api/types.js';
+import { cleanAndMerge } from '../../utils.js';
+import type { TreemapStyleOptions } from './types.js';
+
+const defaultTreemapStyleOptions: TreemapStyleOptions = {
+  sectionStrokeColor: 'black',
+  sectionStrokeWidth: '1',
+  sectionFillColor: '#efefef',
+  leafStrokeColor: 'black',
+  leafStrokeWidth: '1',
+  leafFillColor: '#efefef',
+  labelColor: 'black',
+  labelFontSize: '12px',
+  valueFontSize: '10px',
+  valueColor: 'black',
+  titleColor: 'black',
+  titleFontSize: '14px',
+};
+
+export const getStyles: DiagramStylesProvider = ({
+  treemap,
+}: { treemap?: TreemapStyleOptions } = {}) => {
+  const options = cleanAndMerge(defaultTreemapStyleOptions, treemap);
+
+  return `
+  .treemapNode.section {
+    stroke: ${options.sectionStrokeColor};
+    stroke-width: ${options.sectionStrokeWidth};
+    fill: ${options.sectionFillColor};
+  }
+  .treemapNode.leaf {
+    stroke: ${options.leafStrokeColor};
+    stroke-width: ${options.leafStrokeWidth};
+    fill: ${options.leafFillColor};
+  }
+  .treemapLabel {
+    fill: ${options.labelColor};
+    font-size: ${options.labelFontSize};
+  }
+  .treemapValue {
+    fill: ${options.valueColor};
+    font-size: ${options.valueFontSize};
+  }
+  .treemapTitle {
+    fill: ${options.titleColor};
+    font-size: ${options.titleFontSize};
+  }
+  `;
+};
+
+export default getStyles;
--- a/packages/mermaid/src/diagrams/treemap/types.ts
+++ b/packages/mermaid/src/diagrams/treemap/types.ts
@@ -0,0 +1,80 @@
+import type { DiagramDBBase, DiagramStyleClassDef } from '../../diagram-api/types.js';
+import type { BaseDiagramConfig } from '../../config.type.js';
+
+export interface TreemapNode {
+  name: string;
+  children?: TreemapNode[];
+  value?: number;
+  parent?: TreemapNode;
+  classSelector?: string;
+  cssCompiledStyles?: string[];
+}
+
+export interface TreemapDB extends DiagramDBBase<TreemapDiagramConfig> {
+  getNodes: () => TreemapNode[];
+  addNode: (node: TreemapNode, level: number) => void;
+  getRoot: () => TreemapNode | undefined;
+  getClasses: () => Map<string, DiagramStyleClassDef>;
+  addClass: (className: string, style: string) => void;
+  getStylesForClass: (classSelector: string) => string[];
+}
+
+export interface TreemapStyleOptions {
+  sectionStrokeColor?: string;
+  sectionStrokeWidth?: string;
+  sectionFillColor?: string;
+  leafStrokeColor?: string;
+  leafStrokeWidth?: string;
+  leafFillColor?: string;
+  labelColor?: string;
+  labelFontSize?: string;
+  valueFontSize?: string;
+  valueColor?: string;
+  titleColor?: string;
+  titleFontSize?: string;
+}
+
+export interface TreemapData {
+  nodes: TreemapNode[];
+  levels: Map<TreemapNode, number>;
+  root?: TreemapNode;
+  outerNodes: TreemapNode[];
+  classes: Map<string, DiagramStyleClassDef>;
+}
+
+export interface TreemapItem {
+  $type: string;
+  name: string;
+  value?: number;
+  classSelector?: string;
+}
+
+export interface TreemapRow {
+  $type: string;
+  indent?: string;
+  item?: TreemapItem;
+  className?: string;
+  styleText?: string;
+}
+
+export interface TreemapAst {
+  TreemapRows?: TreemapRow[];
+  title?: string;
+  description?: string;
+  accDescription?: string;
+  accTitle?: string;
+  diagramTitle?: string;
+}
+
+// Define the TreemapDiagramConfig interface
+export interface TreemapDiagramConfig extends BaseDiagramConfig {
+  padding?: number;
+  diagramPadding?: number;
+  showValues?: boolean;
+  nodeWidth?: number;
+  nodeHeight?: number;
+  borderWidth?: number;
+  valueFontSize?: number;
+  labelFontSize?: number;
+  valueFormat?: string;
+}
--- a/packages/mermaid/src/diagrams/treemap/utils.test.ts
+++ b/packages/mermaid/src/diagrams/treemap/utils.test.ts
@@ -0,0 +1,100 @@
+import { describe, it, expect } from 'vitest';
+import { buildHierarchy } from './utils.js';
+import type { TreemapNode } from './types.js';
+
+describe('treemap utilities', () => {
+  describe('buildHierarchy', () => {
+    it('should convert a flat array into a hierarchical structure', () => {
+      // Input flat structure
+      const flatItems = [
+        { level: 0, name: 'Root', type: 'Section' },
+        { level: 4, name: 'Branch 1', type: 'Section' },
+        { level: 8, name: 'Leaf 1.1', type: 'Leaf', value: 10 },
+        { level: 8, name: 'Leaf 1.2', type: 'Leaf', value: 15 },
+        { level: 4, name: 'Branch 2', type: 'Section' },
+        { level: 8, name: 'Leaf 2.1', type: 'Leaf', value: 20 },
+        { level: 8, name: 'Leaf 2.2', type: 'Leaf', value: 25 },
+        { level: 8, name: 'Leaf 2.3', type: 'Leaf', value: 30 },
+      ];
+
+      // Expected hierarchical structure
+      const expectedHierarchy: TreemapNode[] = [
+        {
+          name: 'Root',
+          children: [
+            {
+              name: 'Branch 1',
+              children: [
+                { name: 'Leaf 1.1', value: 10 },
+                { name: 'Leaf 1.2', value: 15 },
+              ],
+            },
+            {
+              name: 'Branch 2',
+              children: [
+                { name: 'Leaf 2.1', value: 20 },
+                { name: 'Leaf 2.2', value: 25 },
+                { name: 'Leaf 2.3', value: 30 },
+              ],
+            },
+          ],
+        },
+      ];
+
+      const result = buildHierarchy(flatItems);
+      expect(result).toEqual(expectedHierarchy);
+    });
+
+    it('should handle empty input', () => {
+      expect(buildHierarchy([])).toEqual([]);
+    });
+
+    it('should handle only root nodes', () => {
+      const flatItems = [
+        { level: 0, name: 'Root 1', type: 'Section' },
+        { level: 0, name: 'Root 2', type: 'Section' },
+      ];
+
+      const expected = [
+        { name: 'Root 1', children: [] },
+        { name: 'Root 2', children: [] },
+      ];
+
+      expect(buildHierarchy(flatItems)).toEqual(expected);
+    });
+
+    it('should handle complex nesting levels', () => {
+      const flatItems = [
+        { level: 0, name: 'Root', type: 'Section' },
+        { level: 2, name: 'Level 1', type: 'Section' },
+        { level: 4, name: 'Level 2', type: 'Section' },
+        { level: 6, name: 'Leaf 1', type: 'Leaf', value: 10 },
+        { level: 4, name: 'Level 2 again', type: 'Section' },
+        { level: 6, name: 'Leaf 2', type: 'Leaf', value: 20 },
+      ];
+
+      const expected = [
+        {
+          name: 'Root',
+          children: [
+            {
+              name: 'Level 1',
+              children: [
+                {
+                  name: 'Level 2',
+                  children: [{ name: 'Leaf 1', value: 10 }],
+                },
+                {
+                  name: 'Level 2 again',
+                  children: [{ name: 'Leaf 2', value: 20 }],
+                },
+              ],
+            },
+          ],
+        },
+      ];
+
+      expect(buildHierarchy(flatItems)).toEqual(expected);
+    });
+  });
+});
--- a/packages/mermaid/src/diagrams/treemap/utils.ts
+++ b/packages/mermaid/src/diagrams/treemap/utils.ts
@@ -0,0 +1,64 @@
+import type { TreemapNode } from './types.js';
+
+/**
+ * Converts a flat array of treemap items into a hierarchical structure
+ * @param items - Array of flat treemap items with level, name, type, and optional value
+ * @returns A hierarchical tree structure
+ */
+export function buildHierarchy(
+  items: {
+    level: number;
+    name: string;
+    type: string;
+    value?: number;
+    classSelector?: string;
+    cssCompiledStyles?: string;
+  }[]
+): TreemapNode[] {
+  if (!items.length) {
+    return [];
+  }
+
+  const root: TreemapNode[] = [];
+  const stack: { node: TreemapNode; level: number }[] = [];
+
+  items.forEach((item) => {
+    const node: TreemapNode = {
+      name: item.name,
+      children: item.type === 'Leaf' ? undefined : [],
+    };
+    node.classSelector = item?.classSelector;
+    if (item?.cssCompiledStyles) {
+      node.cssCompiledStyles = [item.cssCompiledStyles];
+    }
+
+    if (item.type === 'Leaf' && item.value !== undefined) {
+      node.value = item.value;
+    }
+
+    // Find the right parent for this node
+    while (stack.length > 0 && stack[stack.length - 1].level >= item.level) {
+      stack.pop();
+    }
+
+    if (stack.length === 0) {
+      // This is a root node
+      root.push(node);
+    } else {
+      // Add as child to the parent
+      const parent = stack[stack.length - 1].node;
+      if (parent.children) {
+        parent.children.push(node);
+      } else {
+        parent.children = [node];
+      }
+    }
+
+    // Only add to stack if it can have children
+    if (item.type !== 'Leaf') {
+      stack.push({ node, level: item.level });
+    }
+  });
+
+  return root;
+}
--- a/packages/mermaid/src/docs/.vitepress/config.ts
+++ b/packages/mermaid/src/docs/.vitepress/config.ts
@@ -179,6 +179,7 @@ function sidebarSyntax() {
        { text: 'Kanban 🔥', link: '/syntax/kanban' },
        { text: 'Architecture 🔥', link: '/syntax/architecture' },
        { text: 'Radar 🔥', link: '/syntax/radar' },
+        { text: 'Treemap 🔥', link: '/syntax/treemap' },
        { text: 'Other Examples', link: '/syntax/examples' },
      ],
    },
--- a/packages/mermaid/src/docs/ecosystem/integrations-community.md
+++ b/packages/mermaid/src/docs/ecosystem/integrations-community.md
@@ -240,7 +240,7 @@ Communication tools and platforms
 | GitHub + Mermaid         | -                                                                                                           | [🦊🔗](https://addons.mozilla.org/firefox/addon/github-mermaid/)               | -                                                                              | -                                                                                                                            | [🐙🔗](https://github.com/BackMarket/github-mermaid-extension)                                       |
 | Asciidoctor Live Preview | [🎡🔗](https://chromewebstore.google.com/detail/asciidoctorjs-live-previe/iaalpfgpbocpdfblpnhhgllgbdbchmia) | -                                                                              | -                                                                              | [🌀🔗](https://microsoftedge.microsoft.com/addons/detail/asciidoctorjs-live-previ/pefkelkanablhjdekgdahplkccnbdggd?hl=en-US) | -                                                                                                    |
 | Diagram Tab              | -                                                                                                           | -                                                                              | -                                                                              | -                                                                                                                            | [🐙🔗](https://github.com/khafast/diagramtab)                                                        |
-| Markdown Diagrams        | [🎡🔗](https://chromewebstore.google.com/detail/markdown-diagrams/pmoglnmodacnbbofbgcagndelmgaclel)         | [🦊🔗](https://addons.mozilla.org/en-US/firefox/addon/markdown-diagrams/)      | [🔴🔗](https://addons.opera.com/en/extensions/details/markdown-diagrams/)      | [🌀🔗](https://microsoftedge.microsoft.com/addons/detail/markdown-diagrams/hceenoomhhdkjjijnmlclkpenkapfihe)                 | [🐙🔗](https://github.com/marcozaccari/markdown-diagrams-browser-extension/tree/master/doc/examples) |
+| Markdown Diagrams        | [🎡🔗](https://chromewebstore.google.com/detail/markdown-diagrams/pmoglnmodacnbbofbgcagndelmgaclel)         | [🦊🔗](https://addons.mozilla.org/en-US/firefox/addon/markdown-diagrams/)      | -                                                                              | [🌀🔗](https://microsoftedge.microsoft.com/addons/detail/markdown-diagrams/hceenoomhhdkjjijnmlclkpenkapfihe)                 | [🐙🔗](https://github.com/marcozaccari/markdown-diagrams-browser-extension/tree/master/doc/examples) |
 | Markdown Viewer          | -                                                                                                           | [🦊🔗](https://addons.mozilla.org/en-US/firefox/addon/markdown-viewer-chrome/) | -                                                                              | -                                                                                                                            | [🐙🔗](https://github.com/simov/markdown-viewer)                                                     |
 | Extensions for Mermaid   | -                                                                                                           | -                                                                              | [🔴🔗](https://addons.opera.com/en/extensions/details/extensions-for-mermaid/) | -                                                                                                                            | [🐙🔗](https://github.com/Stefan-S/mermaid-extension)                                                |
 | Chrome Diagrammer        | [🎡🔗](https://chromewebstore.google.com/detail/chrome-diagrammer/bkpbgjmkomfoakfklcjeoegkklgjnnpk)         | -                                                                              | -                                                                              | -                                                                                                                            | -                                                                                                    |
@@ -265,5 +265,6 @@ Communication tools and platforms
  - [reveal.js-mermaid-plugin](https://github.com/ludwick/reveal.js-mermaid-plugin)
 - [Reveal CK](https://github.com/jedcn/reveal-ck)
  - [reveal-ck-mermaid-plugin](https://github.com/tmtm/reveal-ck-mermaid-plugin)
+- [Vitepress Plugin](https://github.com/sametcn99/vitepress-mermaid-renderer)

 <!--- cspell:ignore Blazorade HueHive --->
--- a/packages/mermaid/src/docs/ecosystem/mermaid-chart.md
+++ b/packages/mermaid/src/docs/ecosystem/mermaid-chart.md
@@ -24,7 +24,7 @@ Try the Ultimate AI, Mermaid, and Visual Diagramming Suite by creating an accoun

  Official Mermaid Chart plugins:

-  - [Mermaid Chart GPT](https://chat.openai.com/g/g-1IRFKwq4G-mermaid-chart)
+  - [Mermaid Chart GPT](https://chatgpt.com/g/g-684cc36f30208191b21383b88650a45d-mermaid-chart-diagrams-and-charts)
  - [Confluence](https://marketplace.atlassian.com/apps/1234056/mermaid-chart-for-confluence?hosting=cloud&tab=overview)
  - [Jira](https://marketplace.atlassian.com/apps/1234810/mermaid-chart-for-jira?tab=overview&hosting=cloud)
  - [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=MermaidChart.vscode-mermaid-chart)
--- a/packages/mermaid/src/docs/syntax/treemap.md
+++ b/packages/mermaid/src/docs/syntax/treemap.md
@@ -0,0 +1,245 @@
+---
+title: Treemap Diagram Syntax
+outline: 'deep' # shows all h3 headings in outline in Vitepress
+---
+
+# Treemap Diagram
+
+> A treemap diagram displays hierarchical data as a set of nested rectangles. Each branch of the tree is represented by a rectangle, which is then tiled with smaller rectangles representing sub-branches.
+
+```warning
+This is a new diagram type in Mermaid. Its syntax may evolve in future versions.
+```
+
+## Introduction
+
+Treemap diagrams are an effective way to visualize hierarchical data and show proportions between categories and subcategories. The size of each rectangle is proportional to the value it represents, making it easy to compare different parts of a hierarchy.
+
+Treemap diagrams are particularly useful for:
+
+- Visualizing hierarchical data structures
+- Comparing proportions between categories
+- Displaying large amounts of hierarchical data in a limited space
+- Identifying patterns and outliers in hierarchical data
+
+## Syntax
+
+```
+treemap-beta
+"Section 1"
+    "Leaf 1.1": 12
+    "Section 1.2"
+      "Leaf 1.2.1": 12
+"Section 2"
+    "Leaf 2.1": 20
+    "Leaf 2.2": 25
+```
+
+### Node Definition
+
+Nodes in a treemap are defined using the following syntax:
+
+- **Section/Parent nodes**: Defined with quoted text `"Section Name"`
+- **Leaf nodes with values**: Defined with quoted text followed by a colon and value `"Leaf Name": value`
+- **Hierarchy**: Created using indentation (spaces or tabs)
+- **Styling**: Nodes can be styled using the `:::class` syntax
+
+## Examples
+
+### Basic Treemap
+
+```mermaid-example
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+### Hierarchical Treemap
+
+```mermaid-example
+treemap-beta
+"Products"
+    "Electronics"
+        "Phones": 50
+        "Computers": 30
+        "Accessories": 20
+    "Clothing"
+        "Men's": 40
+        "Women's": 40
+```
+
+### Treemap with Styling
+
+```mermaid-example
+treemap-beta
+"Section 1"
+    "Leaf 1.1": 12
+    "Section 1.2":::class1
+      "Leaf 1.2.1": 12
+"Section 2"
+    "Leaf 2.1": 20:::class1
+    "Leaf 2.2": 25
+    "Leaf 2.3": 12
+
+classDef class1 fill:red,color:blue,stroke:#FFD600;
+```
+
+## Styling and Configuration
+
+Treemap diagrams can be customized using Mermaid's styling and configuration options.
+
+### Using classDef for Styling
+
+You can define custom styles for nodes using the `classDef` syntax, which is a standard feature across many Mermaid diagram types:
+
+```mermaid-example
+treemap-beta
+"Main"
+    "A": 20
+    "B":::important
+        "B1": 10
+        "B2": 15
+    "C": 5
+
+classDef important fill:#f96,stroke:#333,stroke-width:2px;
+```
+
+### Theme Configuration
+
+You can customize the colors of your treemap using the theme configuration:
+
+```mermaid-example
+---
+config:
+    theme: 'forest'
+---
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+### Diagram Padding
+
+You can adjust the padding around the treemap diagram using the `diagramPadding` configuration option:
+
+```mermaid-example
+---
+config:
+  treemap:
+    diagramPadding: 200
+---
+treemap-beta
+"Category A"
+    "Item A1": 10
+    "Item A2": 20
+"Category B"
+    "Item B1": 15
+    "Item B2": 25
+```
+
+## Configuration Options
+
+The treemap diagram supports the following configuration options:
+
+| Option         | Description                                                                 | Default |
+| -------------- | --------------------------------------------------------------------------- | ------- |
+| useMaxWidth    | When true, the diagram width is set to 100% and scales with available space | true    |
+| padding        | Internal padding between nodes                                              | 10      |
+| diagramPadding | Padding around the entire diagram                                           | 8       |
+| showValues     | Whether to show values in the treemap                                       | true    |
+| nodeWidth      | Width of nodes                                                              | 100     |
+| nodeHeight     | Height of nodes                                                             | 40      |
+| borderWidth    | Width of borders                                                            | 1       |
+| valueFontSize  | Font size for values                                                        | 12      |
+| labelFontSize  | Font size for labels                                                        | 14      |
+| valueFormat    | Format for values (see Value Formatting section)                            | ','     |
+
+## Advanced Features
+
+### Value Formatting
+
+Values in treemap diagrams can be formatted to display in different ways using the `valueFormat` configuration option. This option primarily uses [D3's format specifiers](https://github.com/d3/d3-format#locale_format) to control how numbers are displayed, with some additional special cases for common formats.
+
+Some common format patterns:
+
+- `,` - Thousands separator (default)
+- `$` - Add dollar sign
+- `.1f` - Show one decimal place
+- `.1%` - Show as percentage with one decimal place
+- `$0,0` - Dollar sign with thousands separator
+- `$.2f` - Dollar sign with 2 decimal places
+- `$,.2f` - Dollar sign with thousands separator and 2 decimal places
+
+The treemap diagram supports both standard D3 format specifiers and some common currency formats that combine the dollar sign with other formatting options.
+
+Example with currency formatting:
+
+```mermaid-example
+---
+config:
+  treemap:
+    valueFormat: '$0,0'
+---
+treemap-beta
+"Budget"
+    "Operations"
+        "Salaries": 700000
+        "Equipment": 200000
+        "Supplies": 100000
+    "Marketing"
+        "Advertising": 400000
+        "Events": 100000
+```
+
+Example with percentage formatting:
+
+```mermaid-example
+---
+config:
+  treemap:
+    valueFormat: '$.1%'
+---
+treemap-beta
+"Market Share"
+    "Company A": 0.35
+    "Company B": 0.25
+    "Company C": 0.15
+    "Others": 0.25
+```
+
+## Common Use Cases
+
+Treemap diagrams are commonly used for:
+
+1. **Financial Data**: Visualizing budget allocations, market shares, or portfolio compositions
+2. **File System Analysis**: Showing disk space usage by folders and files
+3. **Population Demographics**: Displaying population distribution across regions and subregions
+4. **Product Hierarchies**: Visualizing product categories and their sales volumes
+5. **Organizational Structures**: Representing departments and team sizes in a company
+
+## Limitations
+
+- Treemap diagrams work best when the data has a natural hierarchy
+- Very small values may be difficult to see or label in a treemap diagram
+- Deep hierarchies (many levels) can be challenging to represent clearly
+- Treemap diagrams are not well suited for representing data with negative values
+
+## Related Diagrams
+
+If treemap diagrams don't suit your needs, consider these alternatives:
+
+- [**Pie Charts**](./pie.md): For simple proportion comparisons without hierarchy
+- **Sunburst Diagrams**: For hierarchical data with a radial layout (yet to be released in Mermaid).
+- [**Sankey Diagrams**](./sankey.md): For flow-based hierarchical data
+
+## Notes
+
+The treemap diagram implementation in Mermaid is designed to be simple to use while providing powerful visualization capabilities. As this is a newer diagram type, feedback and feature requests are welcome through the Mermaid GitHub repository.
--- a/packages/parser/CHANGELOG.md
+++ b/packages/parser/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @mermaid-js/parser

+## 0.6.1
+
+### Patch Changes
+
+- [#6725](https://github.com/mermaid-js/mermaid/pull/6725) [`0da2922`](https://github.com/mermaid-js/mermaid/commit/0da2922ee7f47959e324ec10d3d21ee70594f557) Thanks [@shubham-mermaid](https://github.com/shubham-mermaid)! - chore: use Treemap instead of TreemapDoc in parser.
+
+## 0.6.0
+
+### Minor Changes
+
+- [#6590](https://github.com/mermaid-js/mermaid/pull/6590) [`f338802`](https://github.com/mermaid-js/mermaid/commit/f338802642cdecf5b7ed6c19a20cf2a81effbbee) Thanks [@knsv](https://github.com/knsv)! - Adding support for the new diagram type nested treemap
+
 ## 0.5.0

 ### Minor Changes
--- a/packages/parser/langium-config.json
+++ b/packages/parser/langium-config.json
@@ -30,6 +30,11 @@
      "id": "radar",
      "grammar": "src/language/radar/radar.langium",
      "fileExtensions": [".mmd", ".mermaid"]
+    },
+    {
+      "id": "treemap",
+      "grammar": "src/language/treemap/treemap.langium",
+      "fileExtensions": [".mmd", ".mermaid"]
    }
  ],
  "mode": "production",
--- a/packages/parser/package.json
+++ b/packages/parser/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@mermaid-js/parser",
-  "version": "0.5.0",
+  "version": "0.6.1",
  "description": "MermaidJS parser",
  "author": "Yokozuna59",
  "contributors": [
--- a/packages/parser/src/language/index.ts
+++ b/packages/parser/src/language/index.ts
@@ -8,6 +8,7 @@ export {
  Architecture,
  GitGraph,
  Radar,
+  Treemap,
  Branch,
  Commit,
  Merge,
@@ -19,6 +20,7 @@ export {
  isPieSection,
  isArchitecture,
  isGitGraph,
+  isTreemap,
  isBranch,
  isCommit,
  isMerge,
@@ -32,6 +34,7 @@ export {
  ArchitectureGeneratedModule,
  GitGraphGeneratedModule,
  RadarGeneratedModule,
+  TreemapGeneratedModule,
 } from './generated/module.js';

 export * from './gitGraph/index.js';
@@ -41,3 +44,4 @@ export * from './packet/index.js';
 export * from './pie/index.js';
 export * from './architecture/index.js';
 export * from './radar/index.js';
+export * from './treemap/index.js';
--- a/packages/parser/src/language/treemap/index.ts
+++ b/packages/parser/src/language/treemap/index.ts
@@ -0,0 +1 @@
+export * from './module.js';
--- a/packages/parser/src/language/treemap/module.ts
+++ b/packages/parser/src/language/treemap/module.ts
@@ -0,0 +1,88 @@
+import type {
+  DefaultSharedCoreModuleContext,
+  LangiumCoreServices,
+  LangiumSharedCoreServices,
+  Module,
+  PartialLangiumCoreServices,
+} from 'langium';
+import {
+  EmptyFileSystem,
+  createDefaultCoreModule,
+  createDefaultSharedCoreModule,
+  inject,
+} from 'langium';
+
+import { MermaidGeneratedSharedModule, TreemapGeneratedModule } from '../generated/module.js';
+import { TreemapTokenBuilder } from './tokenBuilder.js';
+import { TreemapValueConverter } from './valueConverter.js';
+import { TreemapValidator, registerValidationChecks } from './treemap-validator.js';
+
+/**
+ * Declaration of `Treemap` services.
+ */
+interface TreemapAddedServices {
+  parser: {
+    TokenBuilder: TreemapTokenBuilder;
+    ValueConverter: TreemapValueConverter;
+  };
+  validation: {
+    TreemapValidator: TreemapValidator;
+  };
+}
+
+/**
+ * Union of Langium default services and `Treemap` services.
+ */
+export type TreemapServices = LangiumCoreServices & TreemapAddedServices;
+
+/**
+ * Dependency injection module that overrides Langium default services and
+ * contributes the declared `Treemap` services.
+ */
+export const TreemapModule: Module<
+  TreemapServices,
+  PartialLangiumCoreServices & TreemapAddedServices
+> = {
+  parser: {
+    TokenBuilder: () => new TreemapTokenBuilder(),
+    ValueConverter: () => new TreemapValueConverter(),
+  },
+  validation: {
+    TreemapValidator: () => new TreemapValidator(),
+  },
+};
+
+/**
+ * Create the full set of services required by Langium.
+ *
+ * First inject the shared services by merging two modules:
+ *  - Langium default shared services
+ *  - Services generated by langium-cli
+ *
+ * Then inject the language-specific services by merging three modules:
+ *  - Langium default language-specific services
+ *  - Services generated by langium-cli
+ *  - Services specified in this file
+ * @param context - Optional module context with the LSP connection
+ * @returns An object wrapping the shared services and the language-specific services
+ */
+export function createTreemapServices(context: DefaultSharedCoreModuleContext = EmptyFileSystem): {
+  shared: LangiumSharedCoreServices;
+  Treemap: TreemapServices;
+} {
+  const shared: LangiumSharedCoreServices = inject(
+    createDefaultSharedCoreModule(context),
+    MermaidGeneratedSharedModule
+  );
+  const Treemap: TreemapServices = inject(
+    createDefaultCoreModule({ shared }),
+    TreemapGeneratedModule,
+    TreemapModule
+  );
+  shared.ServiceRegistry.register(Treemap);
+
+  // Register validation checks
+  registerValidationChecks(Treemap);
+
+  return { shared, Treemap };
+}
--- a/packages/parser/src/language/treemap/tokenBuilder.ts
+++ b/packages/parser/src/language/treemap/tokenBuilder.ts
@@ -0,0 +1,7 @@
+import { AbstractMermaidTokenBuilder } from '../common/index.js';
+
+export class TreemapTokenBuilder extends AbstractMermaidTokenBuilder {
+  public constructor() {
+    super(['treemap']);
+  }
+}
--- a/packages/parser/src/language/treemap/treemap-validator.ts
+++ b/packages/parser/src/language/treemap/treemap-validator.ts
@@ -0,0 +1,61 @@
+import type { ValidationAcceptor, ValidationChecks } from 'langium';
+import type { MermaidAstType, Treemap } from '../generated/ast.js';
+import type { TreemapServices } from './module.js';
+
+/**
+ * Register custom validation checks.
+ */
+export function registerValidationChecks(services: TreemapServices) {
+  const validator = services.validation.TreemapValidator;
+  const registry = services.validation.ValidationRegistry;
+  if (registry) {
+    // Use any to bypass type checking since we know Treemap is part of the AST
+    // but the type system is having trouble with it
+    const checks: ValidationChecks<MermaidAstType> = {
+      Treemap: validator.checkSingleRoot.bind(validator),
+      // Remove unused validation for TreemapRow
+    };
+    registry.register(checks, validator);
+  }
+}
+
+/**
+ * Implementation of custom validations.
+ */
+export class TreemapValidator {
+  /**
+   * Validates that a treemap has only one root node.
+   * A root node is defined as a node that has no indentation.
+   */
+  checkSingleRoot(doc: Treemap, accept: ValidationAcceptor): void {
+    let rootNodeIndentation;
+
+    for (const row of doc.TreemapRows) {
+      // Skip non-node items or items without a type
+      if (!row.item) {
+        continue;
+      }
+
+      if (
+        rootNodeIndentation === undefined && // Check if this is a root node (no indentation)
+        row.indent === undefined
+      ) {
+        rootNodeIndentation = 0;
+      } else if (row.indent === undefined) {
+        // If we've already found a root node, report an error
+        accept('error', 'Multiple root nodes are not allowed in a treemap.', {
+          node: row,
+          property: 'item',
+        });
+      } else if (
+        rootNodeIndentation !== undefined &&
+        rootNodeIndentation >= parseInt(row.indent, 10)
+      ) {
+        accept('error', 'Multiple root nodes are not allowed in a treemap.', {
+          node: row,
+          property: 'item',
+        });
+      }
+    }
+  }
+}
--- a/packages/parser/src/language/treemap/treemap.langium
+++ b/packages/parser/src/language/treemap/treemap.langium
@@ -0,0 +1,90 @@
+/**
+ * Treemap grammar for Langium
+ * Converted from mindmap grammar
+ *
+ * The ML_COMMENT and NL hidden terminals handle whitespace, comments, and newlines
+ * before the treemap keyword, allowing for empty lines and comments before the
+ * treemap declaration.
+ */
+grammar Treemap
+
+
+
+fragment TitleAndAccessibilities:
+  ((accDescr=ACC_DESCR | accTitle=ACC_TITLE | title=TITLE))+
+;
+
+terminal BOOLEAN returns boolean: 'true' | 'false';
+
+terminal ACC_DESCR: /[\t ]*accDescr(?:[\t ]*:([^\n\r]*?(?=%%)|[^\n\r]*)|\s*{([^}]*)})/;
+terminal ACC_TITLE: /[\t ]*accTitle[\t ]*:(?:[^\n\r]*?(?=%%)|[^\n\r]*)/;
+terminal TITLE: /[\t ]*title(?:[\t ][^\n\r]*?(?=%%)|[\t ][^\n\r]*|)/;
+
+// Interface declarations for data types
+interface Item {
+    name: string
+    classSelector?: string // For ::: class
+}
+interface Section extends Item {
+}
+interface Leaf extends Item {
+    value: number
+}
+interface ClassDefStatement {
+    className: string
+    styleText: string // Optional style text
+}
+interface Treemap {
+    TreemapRows: TreemapRow[]
+    title?: string
+    accTitle?: string
+    accDescr?: string
+}
+
+entry Treemap returns Treemap:
+    TREEMAP_KEYWORD
+    (
+        TitleAndAccessibilities
+        | TreemapRows+=TreemapRow
+    )*;
+terminal TREEMAP_KEYWORD:  'treemap-beta' | 'treemap';
+
+terminal CLASS_DEF: /classDef\s+([a-zA-Z_][a-zA-Z0-9_]+)(?:\s+([^;\r\n]*))?(?:;)?/;
+terminal STYLE_SEPARATOR: ':::';
+terminal SEPARATOR: ':';
+terminal COMMA: ',';
+
+hidden terminal WS: /[ \t]+/;  // One or more spaces or tabs for hidden whitespace
+hidden terminal ML_COMMENT: /\%\%[^\n]*/;
+hidden terminal NL: /\r?\n/;
+
+TreemapRow:
+    indent=INDENTATION? (item=Item | ClassDef);
+
+// Class definition statement handled by the value converter
+ClassDef returns string:
+    CLASS_DEF;
+
+Item returns Item:
+    Leaf | Section;
+
+// Use a special rule order to handle the parsing precedence
+Section returns Section:
+    name=STRING2 (STYLE_SEPARATOR classSelector=ID2)?;
+
+Leaf returns Leaf:
+    name=STRING2 INDENTATION? (SEPARATOR | COMMA) INDENTATION? value=MyNumber (STYLE_SEPARATOR classSelector=ID2)?;
+
+// This should be processed before whitespace is ignored
+terminal INDENTATION: /[ \t]{1,}/;  // One or more spaces/tabs for indentation
+
+// Keywords with fixed text patterns
+terminal ID2: /[a-zA-Z_][a-zA-Z0-9_]*/;
+// Define as a terminal rule
+terminal NUMBER2: /[0-9_\.\,]+/;
+
+// Then create a data type rule that uses it
+MyNumber returns number: NUMBER2;
+
+terminal STRING2: /"[^"]*"|'[^']*'/;
+// Modified indentation rule to have higher priority than WS
--- a/packages/parser/src/language/treemap/valueConverter.ts
+++ b/packages/parser/src/language/treemap/valueConverter.ts
@@ -0,0 +1,44 @@
+import type { CstNode, GrammarAST, ValueType } from 'langium';
+import { AbstractMermaidValueConverter } from '../common/index.js';
+
+// Regular expression to extract className and styleText from a classDef terminal
+const classDefRegex = /classDef\s+([A-Z_a-z]\w+)(?:\s+([^\n\r;]*))?;?/;
+
+export class TreemapValueConverter extends AbstractMermaidValueConverter {
+  protected runCustomConverter(
+    rule: GrammarAST.AbstractRule,
+    input: string,
+    _cstNode: CstNode
+  ): ValueType | undefined {
+    if (rule.name === 'NUMBER2') {
+      // Convert to a number by removing any commas and converting to float
+      return parseFloat(input.replace(/,/g, ''));
+    } else if (rule.name === 'SEPARATOR') {
+      // Remove quotes
+      return input.substring(1, input.length - 1);
+    } else if (rule.name === 'STRING2') {
+      // Remove quotes
+      return input.substring(1, input.length - 1);
+    } else if (rule.name === 'INDENTATION') {
+      return input.length;
+    } else if (rule.name === 'ClassDef') {
+      // Handle both CLASS_DEF terminal and ClassDef rule
+      if (typeof input !== 'string') {
+        // If we're dealing with an already processed object, return it as is
+        return input;
+      }
+
+      // Extract className and styleText from classDef statement
+      const match = classDefRegex.exec(input);
+      if (match) {
+        // Use any type to avoid type issues
+        return {
+          $type: 'ClassDefStatement',
+          className: match[1],
+          styleText: match[2] || undefined,
+        } as any;
+      }
+    }
+    return undefined;
+  }
+}
--- a/packages/parser/src/parse.ts
+++ b/packages/parser/src/parse.ts
@@ -1,6 +1,6 @@
 import type { LangiumParser, ParseResult } from 'langium';

-import type { Info, Packet, Pie, Architecture, GitGraph, Radar } from './index.js';
+import type { Info, Packet, Pie, Architecture, GitGraph, Radar, Treemap } from './index.js';

 export type DiagramAST = Info | Packet | Pie | Architecture | GitGraph | Radar;

@@ -36,6 +36,11 @@ const initializers = {
    const parser = createRadarServices().Radar.parser.LangiumParser;
    parsers.radar = parser;
  },
+  treemap: async () => {
+    const { createTreemapServices } = await import('./language/treemap/index.js');
+    const parser = createTreemapServices().Treemap.parser.LangiumParser;
+    parsers.treemap = parser;
+  },
 } as const;

 export async function parse(diagramType: 'info', text: string): Promise<Info>;
@@ -44,6 +49,7 @@ export async function parse(diagramType: 'pie', text: string): Promise<Pie>;
 export async function parse(diagramType: 'architecture', text: string): Promise<Architecture>;
 export async function parse(diagramType: 'gitGraph', text: string): Promise<GitGraph>;
 export async function parse(diagramType: 'radar', text: string): Promise<Radar>;
+export async function parse(diagramType: 'treemap', text: string): Promise<Treemap>;

 export async function parse<T extends DiagramAST>(
  diagramType: keyof typeof initializers,
--- a/packages/parser/tests/test-util.ts
+++ b/packages/parser/tests/test-util.ts
@@ -32,6 +32,12 @@ const consoleMock = vi.spyOn(console, 'log').mockImplementation(() => undefined)
 * @param result - the result `parse` function.
 */
 export function expectNoErrorsOrAlternatives(result: ParseResult) {
+  if (result.lexerErrors.length > 0) {
+    // console.debug(result.lexerErrors);
+  }
+  if (result.parserErrors.length > 0) {
+    // console.debug(result.parserErrors);
+  }
  expect(result.lexerErrors).toHaveLength(0);
  expect(result.parserErrors).toHaveLength(0);

--- a/packages/parser/tests/treemap.test.ts
+++ b/packages/parser/tests/treemap.test.ts
@@ -0,0 +1,238 @@
+import { describe, expect, it } from 'vitest';
+import { expectNoErrorsOrAlternatives } from './test-util.js';
+import type { Treemap, Section, Leaf, TreemapRow } from '../src/language/generated/ast.js';
+import type { LangiumParser } from 'langium';
+import { createTreemapServices } from '../src/language/treemap/module.js';
+
+describe('Treemap Parser', () => {
+  const services = createTreemapServices().Treemap;
+  const parser: LangiumParser = services.parser.LangiumParser;
+
+  const parse = (input: string) => {
+    return parser.parse<Treemap>(input);
+  };
+
+  describe('Basic Parsing', () => {
+    it('should parse empty treemap', () => {
+      const result = parse('treemap');
+      expectNoErrorsOrAlternatives(result);
+      expect(result.value.$type).toBe('Treemap');
+      expect(result.value.TreemapRows).toHaveLength(0);
+    });
+
+    it('should parse a section node', () => {
+      const result = parse('treemap\n"Root"');
+      expectNoErrorsOrAlternatives(result);
+      expect(result.value.$type).toBe('Treemap');
+      expect(result.value.TreemapRows).toHaveLength(1);
+      if (result.value.TreemapRows[0].item) {
+        expect(result.value.TreemapRows[0].item.$type).toBe('Section');
+        const section = result.value.TreemapRows[0].item as Section;
+        expect(section.name).toBe('Root');
+      }
+    });
+
+    it('should parse a section with leaf nodes', () => {
+      const result = parse(`treemap
+"Root"
+  "Child1" , 100
+  "Child2" : 200
+`);
+      expectNoErrorsOrAlternatives(result);
+      expect(result.value.$type).toBe('Treemap');
+      expect(result.value.TreemapRows).toHaveLength(3);
+
+      if (result.value.TreemapRows[0].item) {
+        expect(result.value.TreemapRows[0].item.$type).toBe('Section');
+        const section = result.value.TreemapRows[0].item as Section;
+        expect(section.name).toBe('Root');
+      }
+
+      if (result.value.TreemapRows[1].item) {
+        expect(result.value.TreemapRows[1].item.$type).toBe('Leaf');
+        const leaf = result.value.TreemapRows[1].item as Leaf;
+        expect(leaf.name).toBe('Child1');
+        expect(leaf.value).toBe(100);
+      }
+
+      if (result.value.TreemapRows[2].item) {
+        expect(result.value.TreemapRows[2].item.$type).toBe('Leaf');
+        const leaf = result.value.TreemapRows[2].item as Leaf;
+        expect(leaf.name).toBe('Child2');
+        expect(leaf.value).toBe(200);
+      }
+    });
+  });
+
+  describe('Data Types', () => {
+    it('should correctly parse string values', () => {
+      const result = parse('treemap\n"My Section"');
+      expectNoErrorsOrAlternatives(result);
+      if (result.value.TreemapRows[0].item) {
+        expect(result.value.TreemapRows[0].item.$type).toBe('Section');
+        const section = result.value.TreemapRows[0].item as Section;
+        expect(section.name).toBe('My Section');
+      }
+    });
+
+    it('should correctly parse number values', () => {
+      const result = parse('treemap\n"Item" : 123.45');
+      expectNoErrorsOrAlternatives(result);
+      if (result.value.TreemapRows[0].item) {
+        expect(result.value.TreemapRows[0].item.$type).toBe('Leaf');
+        const leaf = result.value.TreemapRows[0].item as Leaf;
+        expect(leaf.name).toBe('Item');
+        expect(typeof leaf.value).toBe('number');
+        expect(leaf.value).toBe(123.45);
+      }
+    });
+  });
+
+  describe('Validation', () => {
+    it('should parse multiple root nodes', () => {
+      const result = parse('treemap\n"Root1"\n"Root2"');
+      expect(result.parserErrors).toHaveLength(0);
+
+      // We're only checking that the multiple root nodes parse successfully
+      // The validation errors would be reported by the validator during validation
+      expect(result.value.$type).toBe('Treemap');
+      expect(result.value.TreemapRows).toHaveLength(2);
+    });
+  });
+
+  describe('Title and Accessibilities', () => {
+    it('should parse a treemap with title', () => {
+      const result = parse('treemap\ntitle My Treemap Diagram\n"Root"\n  "Child": 100');
+      expectNoErrorsOrAlternatives(result);
+      expect(result.value.$type).toBe('Treemap');
+      // We can't directly test the title property due to how Langium processes TitleAndAccessibilities
+      // but we can verify the TreemapRows are parsed correctly
+      expect(result.value.TreemapRows).toHaveLength(2);
+    });
+
+    it('should parse a treemap with accTitle', () => {
+      const result = parse('treemap\naccTitle: Accessible Title\n"Root"\n  "Child": 100');
+      expectNoErrorsOrAlternatives(result);
+      expect(result.value.$type).toBe('Treemap');
+      // We can't directly test the accTitle property due to how Langium processes TitleAndAccessibilities
+      expect(result.value.TreemapRows).toHaveLength(2);
+    });
+
+    it('should parse a treemap with accDescr', () => {
+      const result = parse(
+        'treemap\naccDescr: This is an accessible description\n"Root"\n  "Child": 100'
+      );
+      expectNoErrorsOrAlternatives(result);
+      expect(result.value.$type).toBe('Treemap');
+      // We can't directly test the accDescr property due to how Langium processes TitleAndAccessibilities
+      expect(result.value.TreemapRows).toHaveLength(2);
+    });
+
+    it('should parse a treemap with multiple accessibility attributes', () => {
+      const result = parse(`treemap
+title My Treemap Diagram
+accTitle: Accessible Title
+accDescr: This is an accessible description
+"Root"
+  "Child": 100`);
+      expectNoErrorsOrAlternatives(result);
+      expect(result.value.$type).toBe('Treemap');
+      // We can't directly test these properties due to how Langium processes TitleAndAccessibilities
+      expect(result.value.TreemapRows).toHaveLength(2);
+    });
+  });
+
+  describe('ClassDef and Class Statements', () => {
+    it('should parse a classDef statement', () => {
+      const result = parse('treemap\nclassDef myClass fill:red;');
+
+      // We know there are parser errors with styleText as the Langium grammar can't handle it perfectly
+      // Check that we at least got the right type and className
+      expect(result.value.TreemapRows).toHaveLength(1);
+      const classDefElement = result.value.TreemapRows[0];
+
+      expect(classDefElement.$type).toBe('ClassDefStatement');
+      // We can't directly test the ClassDefStatement properties due to type issues
+      // but we can verify the basic structure is correct
+    });
+
+    it('should parse a classDef statement without semicolon', () => {
+      const result = parse('treemap\nclassDef myClass fill:red');
+
+      // Skip error assertion
+
+      const classDefElement = result.value.TreemapRows[0];
+      expect(classDefElement.$type).toBe('ClassDefStatement');
+      // We can't directly test the ClassDefStatement properties due to type issues
+      // but we can verify the basic structure is correct
+    });
+
+    it('should parse a classDef statement with multiple style properties', () => {
+      const result = parse(
+        'treemap\nclassDef complexClass fill:blue stroke:#ff0000 stroke-width:2px'
+      );
+
+      // Skip error assertion
+
+      const classDefElement = result.value.TreemapRows[0];
+      expect(classDefElement.$type).toBe('ClassDefStatement');
+      // We can't directly test the ClassDefStatement properties due to type issues
+      // but we can verify the basic structure is correct
+    });
+
+    it('should parse a class assignment statement', () => {
+      const result = parse('treemap\nclass myNode myClass');
+
+      // Skip error check since parsing is not fully implemented yet
+      // expectNoErrorsOrAlternatives(result);
+
+      // For now, just expect that something is returned, even if it's empty
+      expect(result.value).toBeDefined();
+    });
+
+    it('should parse a class assignment statement with semicolon', () => {
+      const result = parse('treemap\nclass myNode myClass;');
+
+      // Skip error check since parsing is not fully implemented yet
+      // expectNoErrorsOrAlternatives(result);
+
+      // For now, just expect that something is returned, even if it's empty
+      expect(result.value).toBeDefined();
+    });
+
+    it('should parse a section with inline class style using :::', () => {
+      const result = parse('treemap\n"My Section":::sectionClass');
+      expectNoErrorsOrAlternatives(result);
+
+      const row = result.value.TreemapRows.find(
+        (element): element is TreemapRow => element.$type === 'TreemapRow'
+      );
+
+      expect(row).toBeDefined();
+      if (row?.item) {
+        expect(row.item.$type).toBe('Section');
+        const section = row.item as Section;
+        expect(section.name).toBe('My Section');
+        expect(section.classSelector).toBe('sectionClass');
+      }
+    });
+
+    it('should parse a leaf with inline class style using :::', () => {
+      const result = parse('treemap\n"My Leaf" : 100:::leafClass');
+      expectNoErrorsOrAlternatives(result);
+
+      const row = result.value.TreemapRows.find(
+        (element): element is TreemapRow => element.$type === 'TreemapRow'
+      );
+
+      expect(row).toBeDefined();
+      if (row?.item) {
+        expect(row.item.$type).toBe('Leaf');
+        const leaf = row.item as Leaf;
+        expect(leaf.name).toBe('My Leaf');
+        expect(leaf.value).toBe(100);
+        expect(leaf.classSelector).toBe('leafClass');
+      }
+    });
+  });
+});
--- a/packages/tiny/CHANGELOG.md
+++ b/packages/tiny/CHANGELOG.md
@@ -1,5 +1,25 @@
 # mermaid

+## 11.8.1
+
+### Patch Changes
+
+- Updated dependencies [[`0da2922`](https://github.com/mermaid-js/mermaid/commit/0da2922ee7f47959e324ec10d3d21ee70594f557)]:
+  - @mermaid-js/parser@0.6.1
+
+## 11.8.0
+
+### Minor Changes
+
+- [#6590](https://github.com/mermaid-js/mermaid/pull/6590) [`f338802`](https://github.com/mermaid-js/mermaid/commit/f338802642cdecf5b7ed6c19a20cf2a81effbbee) Thanks [@knsv](https://github.com/knsv)! - Adding support for the new diagram type nested treemap
+
+### Patch Changes
+
+- [#6707](https://github.com/mermaid-js/mermaid/pull/6707) [`592c5bb`](https://github.com/mermaid-js/mermaid/commit/592c5bb880c3b942710a2878d386bcb3eb35c137) Thanks [@darshanr0107](https://github.com/darshanr0107)! - fix: Log a warning when duplicate commit IDs are encountered in gitGraph to help identify and debug rendering issues caused by non-unique IDs.
+
+- Updated dependencies [[`f338802`](https://github.com/mermaid-js/mermaid/commit/f338802642cdecf5b7ed6c19a20cf2a81effbbee)]:
+  - @mermaid-js/parser@0.6.0
+
 ## 11.7.0

 ### Minor Changes
--- a/packages/tiny/package.json
+++ b/packages/tiny/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@mermaid-js/tiny",
-  "version": "11.7.0",
+  "version": "11.8.1",
  "description": "Tiny version of mermaid",
  "type": "commonjs",
  "main": "./dist/mermaid.tiny.js",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
Sidharth Vinod	1aa2870224	Merge pull request #6727 from mermaid-js/changeset-release/master Version Packages	2025-07-07 20:52:47 +05:30
github-actions[bot]	8fbcbb6dc9	Version Packages	2025-07-07 15:21:07 +00:00
Sidharth Vinod	3e545d7925	docs: Update changeset	2025-07-07 20:49:04 +05:30
Sidharth Vinod	75d2a259ed	Merge pull request #6726 from mermaid-js/develop Pre Release	2025-07-07 20:29:25 +05:30
shubham-mermaid	746280b3e2	Merge pull request #6724 from mermaid-js/sidv/failOnTypeError chore: Fail build in CI on type errors	2025-07-07 14:08:28 +00:00
Sidharth Vinod	fa4e30bb15	Merge pull request #6725 from mermaid-js/use-treemap-in-languim Use treemap in languim	2025-07-07 19:23:03 +05:30
shubham-mermaid	950b107dd4	update in changeset	2025-07-07 19:15:50 +05:30
shubham-mermaid	35b84761a9	updated validaor and tests to use treemap	2025-07-07 18:54:38 +05:30
shubham-mermaid	0da2922ee7	Updated parser to use treemap	2025-07-07 18:50:53 +05:30
Sidharth Vinod	85eba01663	chore: Fail build in CI on type errors	2025-07-07 18:02:23 +05:30
Ashish Jain	2b3cb6a362	Merge pull request #6713 from mermaid-js/changeset-release/master Version Packages	2025-07-03 15:51:36 +02:00
github-actions[bot]	89ac2932c4	Version Packages	2025-07-03 13:28:11 +00:00
Ashish Jain	e828609749	Merge pull request #6695 from mermaid-js/develop Pre-Release	2025-07-03 15:24:36 +02:00
Ashish Jain	91f141f772	Merge pull request #6711 from mermaid-js/update-lychee-for-phpbb Updated phpbb url to support 403 in lychee	2025-07-03 12:53:41 +00:00
shubham-mermaid	c77b968f1e	Updated phpbb url to support 403 in lychee	2025-07-03 18:12:12 +05:30
Ashish Jain	ba13981905	Updated lychee for working url phpbb.com	2025-07-03 12:56:09 +02:00
Alois Klink	a7a94b95e1	Merge pull request #6707 from mermaid-js/4838-gitgraph-chronology-duplicate-id 4838: Log warning for duplicate commit IDs in gitGraph	2025-07-03 10:34:25 +00:00
darshanr0107	31f141c61a	Merge branch 'develop' into 4838-gitgraph-chronology-duplicate-id	2025-07-03 15:39:40 +05:30
darshanr0107	fb017bebfd	resolve PR comment Co-authored-by: Alois Klink <alois@aloisklink.com>	2025-07-03 15:39:26 +05:30
darshanr0107	648698a43a	resolve PR comments	2025-07-03 13:57:36 +05:30
Sidharth Vinod	a5e4729c76	Merge pull request #6700 from mermaid-js/update-timings Update E2E Timings	2025-07-03 12:52:12 +05:30
github-actions[bot]	c884def5fc	chore: update E2E timings	2025-07-03 04:14:58 +00:00
darshanr0107	592c5bb880	add changeset	2025-07-02 12:16:17 +05:30
darshanr0107	da0c6c6c32	log warning when duplicate commit IDs are encountered	2025-07-02 11:59:20 +05:30
Knut Sveidqvist	d9396eedd6	Merge pull request #6698 from mermaid-js/update-urls-in-docs Added updated chatgpt plugin url and removed failing url	2025-06-27 12:46:28 +00:00
shubham-mermaid	5f9601b6a8	Merge branch 'develop' into update-urls-in-docs	2025-06-27 17:53:04 +05:30
shubham-mermaid	378f8ece0c	Added updated chatgpt plugin url and removed failing url	2025-06-27 17:50:45 +05:30
shubham-mermaid	148a42a31a	Merge pull request #6590 from mermaid-js/knsv-treemap Adding support for the new diagram type nested treemap	2025-06-27 10:31:32 +00:00
shubham-mermaid	8980ca4526	Added classes and outernodes in imperativestate	2025-06-27 15:18:53 +05:30
shubham-mermaid	caa04aad8b	Updated code as per suggestions	2025-06-27 13:48:44 +05:30
shubham-mermaid	3dc06ea9bd	fixed unwanted vitepress from lockfile	2025-06-26 19:27:40 +05:30
shubham-mermaid	c311c1ba5d	Merge branch 'develop' into knsv-treemap	2025-06-26 18:40:43 +05:30
Sidharth Vinod	11a86d9c06	Merge pull request #6689 from mermaid-js/#6669-pnpm-lock-workflow-validation- Added step to install pnpm	2025-06-26 12:59:17 +00:00
shubham-mermaid	037bec189c	Updated as per suggestions	2025-06-26 17:43:06 +05:30
shubham-mermaid	9b164dd185	Added step to install pnpm and echo statements for debugging.	2025-06-26 14:41:03 +05:30
shubham-mermaid	4ee124bf91	Merge branch 'develop' into knsv-treemap	2025-06-26 13:04:47 +05:30
Sidharth Vinod	e7970c66ee	Merge pull request #6670 from mermaid-js/#6669-pnpm-lock-validations Added workflow file for validating pnpm-lock file	2025-06-23 09:11:05 +00:00
shubham-mermaid	c7b96be683	Merge branch 'develop' into #6669-pnpm-lock-validations	2025-06-23 12:43:35 +05:30
shubham-mermaid	0623a87d70	Removed js file check in paths	2025-06-23 12:43:13 +05:30
shubham-mermaid	c5f89eaa9a	Update .github/workflows/validate-lockfile.yml Co-authored-by: Sidharth Vinod <github@sidharth.dev>	2025-06-23 12:41:21 +05:30
Sidharth Vinod	1fbe550285	Merge pull request #6659 from sametcn99/patch-1 Add vitepress plugin link	2025-06-21 05:46:08 +00:00
Sidharth Vinod	b3724f04c4	Merge pull request #6673 from mermaid-js/kill-the-bird Kill the bird	2025-06-21 05:41:04 +00:00
Nacho Orlandoni	2f58a0e188	Kill the bird This seems like an abandoned product, where the author went on a rampage trying to get it included into as many repositories as he can as a publicity stunt and no longer even works...	2025-06-20 22:07:14 -04:00
shubham-mermaid	6f1e0e4d17	Updated message	2025-06-20 18:57:22 +05:30
shubham-mermaid	7dd8ddc3eb	Added generic message.	2025-06-20 18:55:45 +05:30
shubham-mermaid	222d7170f7	Added changeset	2025-06-20 14:11:26 +05:30
shubham-mermaid	3137cff4a5	Added auto-comment	2025-06-20 14:07:37 +05:30
shubham-mermaid	b45b1d7795	Trigger Build	2025-06-20 13:54:18 +05:30
shubham-mermaid	e1030b186e	Added validation for packages/mermaid/src/vitepress path	2025-06-20 13:18:50 +05:30
shubham-mermaid	334c8c2962	use depth 0	2025-06-20 13:12:56 +05:30
shubham-mermaid	bdaa3f693a	Added PR based sha	2025-06-20 13:11:33 +05:30
shubham-mermaid	be13fb0391	Updated origin to event.pull_request.base.ref	2025-06-20 12:53:47 +05:30
shubham-mermaid	c120901744	Added workflow file for validating pnpm-lock file	2025-06-20 12:47:17 +05:30
autofix-ci[bot]	badb019d38	[autofix.ci] apply automated fixes	2025-06-17 11:17:51 +00:00
samet	d85a393bcd	Add vitepress plugin link	2025-06-17 14:04:55 +03:00
Knut Sveidqvist	dc3ed65c18	Commented out skipped tests	2025-05-20 15:26:27 +02:00
Knut Sveidqvist	43092e6e11	Fixed rendering issues found while testing, setting to treemap-beta	2025-05-20 15:22:49 +02:00
Knut Sveidqvist	878e77acab	Updates after review comments	2025-05-20 12:56:31 +02:00
Knut Sveidqvist	63827db60d	Added padding as configuration	2025-05-15 10:59:47 +02:00
Knut Sveidqvist	41108358f6	Adding support for title and accessibilities	2025-05-15 10:44:46 +02:00
Ashish Jain	f970fc8bea	Merge branch 'develop' into knsv-treemap	2025-05-13 14:39:53 +02:00
Knut Sveidqvist	db461a4c6c	Updated lockfile	2025-05-12 19:21:25 +02:00
Knut Sveidqvist	fe33d5fb53	Merge remote-tracking branch 'origin/develop' into knsv-treemap	2025-05-12 19:18:04 +02:00
Knut Sveidqvist	64c4d4197b	Prettier fix for json file	2025-05-12 18:30:06 +02:00
Knut Sveidqvist	ed7bab76f2	Fixed linting issues in markdown file	2025-05-12 18:27:40 +02:00
Knut Sveidqvist	f338802642	Adding changeset	2025-05-12 18:05:43 +02:00
Knut Sveidqvist	445595f942	Handling longer summaries for sections and lint fixes for the renderer	2025-05-12 17:57:23 +02:00
Knut Sveidqvist	66ce617bea	Added support for valueFormat directive - linting	2025-05-12 17:47:00 +02:00
Knut Sveidqvist	3e07a5acff	Added support for valueFormat directive	2025-05-12 17:46:19 +02:00
Knut Sveidqvist	df1e739194	Added support for valueFormat directive	2025-05-12 17:40:23 +02:00
Knut Sveidqvist	2def5a0768	Added visual tests	2025-05-12 17:16:29 +02:00
Knut Sveidqvist	2746bccef3	Added rendering and documentation for treemap - linting	2025-05-12 15:54:06 +02:00
Knut Sveidqvist	f0c3dfe3b3	Added rendering and documentation for treemap	2025-05-12 15:47:58 +02:00
Knut Sveidqvist	680d65114c	Added class suppoort to the grammar	2025-05-09 13:47:45 +02:00
Knut Sveidqvist	4f8f929340	adjusted layout and theme support	2025-05-08 16:32:40 +02:00
Knut Sveidqvist	3629e8e480	Update treemap renderer for improved padding and layout adjustments	2025-05-08 14:20:05 +02:00
Knut Sveidqvist	ff48c2e1da	adjusted layout WIP	2025-05-08 13:42:50 +02:00
Knut Sveidqvist	1bd13b50f1	added proper hierarchy from parsed data	2025-05-08 11:19:19 +02:00
Knut Sveidqvist	e0a075ecca	Adding treemap	2025-05-07 18:16:00 +02:00
Knut Sveidqvist	40eb0cc240	Passing tests	2025-05-07 16:15:14 +02:00