Merge pull request #20324 from jonoshearman/fix-boxplot-category-enco…

…de-20319 fix(boxplot) correctly handle series.encode with category axis
apache · Sep 25, 2024 · 2c6ecb0 · 2c6ecb0
2 parents 5cb2a72 + 399fb2f
commit 2c6ecb0
Show file tree

Hide file tree

Showing 2 changed files with 151 additions and 3 deletions.
diff --git a/src/chart/helper/whiskerBoxCommon.ts b/src/chart/helper/whiskerBoxCommon.ts
@@ -52,6 +52,17 @@ class WhiskerBoxCommonMixin<Opts extends CommonOption> {
 
     defaultValueDimensions: CoordDimensionDefinition['dimsDef'];
 
+    /**
+     * @private
+     */
+    _hasEncodeRule(key: string) {
+        const encodeRules = this.getEncode();
+        if (encodeRules && encodeRules.data && encodeRules.data.has(key)) {
+            return encodeRules.data.get(key) != null;
+        }
+        return false;
+    }
+
     /**
      * @override
      */
@@ -74,12 +85,12 @@ class WhiskerBoxCommonMixin<Opts extends CommonOption> {
         if (xAxisType === 'category') {
             option.layout = 'horizontal';
             ordinalMeta = xAxisModel.getOrdinalMeta();
-            addOrdinal = true;
+            addOrdinal = !this._hasEncodeRule('x');
         }
         else if (yAxisType === 'category') {
             option.layout = 'vertical';
             ordinalMeta = yAxisModel.getOrdinalMeta();
-            addOrdinal = true;
+            addOrdinal = !this._hasEncodeRule('y');
         }
         else {
             option.layout = option.layout || 'horizontal';
@@ -161,4 +172,4 @@ class WhiskerBoxCommonMixin<Opts extends CommonOption> {
 };
 
 
-export {WhiskerBoxCommonMixin};
+export {WhiskerBoxCommonMixin};
diff --git a/test/boxplot-category.html b/test/boxplot-category.html