Fixed review comment

mermaid-js · May 11, 2023 · b083ae1 · b083ae1
1 parent 4cbcfa0
commit b083ae1
Show file tree

Hide file tree

Showing 13 changed files with 434 additions and 246 deletions.
diff --git a/demos/quadrantchart.html b/demos/quadrantchart.html
@@ -27,9 +27,10 @@ <h1>Quadrant chart demos</h1>
     </pre>
 
     <pre class="mermaid">
-    %%{init: {"quadrantChart": {"xAxisPosition": "bottom", "chartWidth": 600, "chartHeight": 600} } }%%
+    %%{init: {"quadrantChart": {"chartWidth": 600, "chartHeight": 600} } }%%
     quadrantChart
-      x-axis "Completeness of Vision ❤"
+      title Analytics and Business Intelligence Platforms
+      x-axis "Completeness of Vision ❤" -->
       y-axis Ability to Execute
       quadrant-1 Leaders
       quadrant-2 Challengers
@@ -46,7 +47,7 @@ <h1>Quadrant chart demos</h1>
       import mermaid from './mermaid.esm.mjs';
       mermaid.initialize({
         theme: 'default',
-        logLevel: 1,
+        logLevel: 3,
         securityLevel: 'loose',
       });
     </script>

diff --git a/docs/config/setup/modules/defaultConfig.md b/docs/config/setup/modules/defaultConfig.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[defaultConfig.ts:2257](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/defaultConfig.ts#L2257)
+[defaultConfig.ts:2293](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/defaultConfig.ts#L2293)
 
 ---
 

diff --git a/packages/mermaid/src/config.type.ts b/packages/mermaid/src/config.type.ts
@@ -230,6 +230,8 @@ export interface PieDiagramConfig extends BaseDiagramConfig {
 export interface QuadrantChartConfig extends BaseDiagramConfig {
   chartWidth: number;
   chartHeight: number;
+  titleFontSize: number;
+  titlePadding: number;
   quadrantPadding: number;
   xAxisLabelPadding: number;
   yAxisLabelPadding: number;
@@ -242,6 +244,8 @@ export interface QuadrantChartConfig extends BaseDiagramConfig {
   pointRadius: number;
   xAxisPosition: 'top' | 'bottom';
   yAxisPosition: 'left' | 'right';
+  quadrantInternalBorderStrokeWidth: number;
+  quadrantExternalBorderStrokeWidth: number;
 }
 
 export interface ErDiagramConfig extends BaseDiagramConfig {

diff --git a/packages/mermaid/src/defaultConfig.ts b/packages/mermaid/src/defaultConfig.ts
@@ -1326,6 +1326,24 @@ const config: Partial<MermaidConfig> = {
      * Default value: 5
      */
     yAxisLabelPadding: 5,
+    /**
+     * | Parameter          | Description                        | Type    | Required | Values              |
+     * | ------------------ | ---------------------------------- | ------- | -------- | ------------------- |
+     * | titlePadding       | Chart title top and bottom padding | number  | Optional | Any positive number |
+     *
+     * **Notes:**
+     * Default value: 5
+     */
+    titlePadding: 5,
+    /**
+     * | Parameter          | Description                        | Type    | Required | Values              |
+     * | ------------------ | ---------------------------------- | ------- | -------- | ------------------- |
+     * | titleFontSize      | Chart title font size              | number  | Optional | Any positive number |
+     *
+     * **Notes:**
+     * Default value: 20
+     */
+    titleFontSize: 20,
     /**
      * | Parameter          | Description                        | Type    | Required | Values              |
      * | ------------------ | ---------------------------------- | ------- | -------- | ------------------- |
@@ -1407,6 +1425,24 @@ const config: Partial<MermaidConfig> = {
      * Default value: left
      */
     yAxisPosition: 'left',
+    /**
+     * | Parameter                         | Description                                                   | Type    | Required | Values              |
+     * | --------------------------------- | ------------------------------------------------------------- | ------- | -------- | ------------------- |
+     * | quadrantInternalBorderStrokeWidth | stroke width of edges of the box that are inside the quadrant | number  | Optional | Any positive number |
+     *
+     * **Notes:**
+     * Default value: 1
+     */
+    quadrantInternalBorderStrokeWidth: 1,
+    /**
+     * | Parameter                         | Description                                                    | Type    | Required | Values              |
+     * | --------------------------------- | -------------------------------------------------------------- | ------- | -------- | ------------------- |
+     * | quadrantExternalBorderStrokeWidth | stroke width of edges of the box that are outside the quadrant | number  | Optional | Any positive number |
+     *
+     * **Notes:**
+     * Default value: 2
+     */
+    quadrantExternalBorderStrokeWidth: 2,
     /**
      * | Parameter   | Description | Type    | Required | Values      |
      * | ----------- | ----------- | ------- | -------- | ----------- |

diff --git a/packages/mermaid/src/diagrams/quadrant-chart/parser/quadrant.jison b/packages/mermaid/src/diagrams/quadrant-chart/parser/quadrant.jison
@@ -44,7 +44,7 @@ accDescr\s*"{"\s*                        { this.begin("acc_descr_multiline");}
 
 \s*"x-axis"\s*                           return 'X-AXIS';
 \s*"y-axis"\s*                           return 'Y-AXIS';
-\s*\-\-\>\s*                             return 'AXIS-TEXT-DELIMITER'
+\s*\-\-+\>[^(\r?\n)\s]*                  return 'AXIS-TEXT-DELIMITER'
 \s*"quadrant-1"\s*                       return 'QUADRANT_1';
 \s*"quadrant-2"\s*                       return 'QUADRANT_2';
 \s*"quadrant-3"\s*                       return 'QUADRANT_3';
@@ -118,12 +118,14 @@ statement
 	;
 
 points
-  : text point_start point_x point_y {yy.addPoints($1, $3, $4);};
+  : text point_start point_x point_y {yy.addPoint($1, $3, $4);};
 
 axisDetails
   : X-AXIS text AXIS-TEXT-DELIMITER text {yy.setXAxisLeftText($2); yy.setXAxisRightText($4);}
+  | X-AXIS text AXIS-TEXT-DELIMITER {$2.text += $3; yy.setXAxisLeftText($2);}
   | X-AXIS text {yy.setXAxisLeftText($2);}
   | Y-AXIS text AXIS-TEXT-DELIMITER text {yy.setYAxisBottomText($2); yy.setYAxisTopText($4);}
+  | Y-AXIS text AXIS-TEXT-DELIMITER {$2.text += $3; yy.setYAxisBottomText($2);}
   | Y-AXIS text {yy.setYAxisBottomText($2);}
   ;