tvcharts 0.7.93 → 0.7.95

package/lib/chart/boxes/util.js

@@ -69,6 +69,9 @@ var boxFontSizeMapping = {
 };
 function getFontSize(size, text, maxWidth, font) {
   // const tolerance = Math.min(maxWidth / 5, 4);
+  if (typeof size === 'number') {
+    return size;
+  }
   return boxFontSizeMapping[size] || findFontSize(text, maxWidth, font, 2);
 }
 export { findFontSize, getFontSize };

package/lib/chart/labels/labelsLayout.js

@@ -206,7 +206,8 @@ var labelsLayout = {
             //     font: labelModel.getFont(),
             // });
             // textRect = computedText.getBoundingRect();
-            textRect = getTextRect(text, (fontSize || gfontSize) + " " + (labelModel.fontFamily || gfontFamily));
+            var textSize = fontSize ? fontSize + 'px' : gfontSize;
+            textRect = getTextRect(text, textSize + " " + (labelModel.fontFamily || gfontFamily));
             if (isLabel) {
               symbolSize = [textRect.width + HPadding, textRect.height + VPadding];
             }

package/lib/util/symbolSize.js

@@ -709,6 +709,9 @@ var labelFontSizeMapping = {
 };
 function getSymbolLabelFontSize(size, width) {
   var _a;
+  if (typeof size === 'number') {
+    return size;
+  }
   if (size === 'auto' && width) {
     return Math.max(8, width / 2);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.7.93",
+  "version": "0.7.95",
   "description": "基于echarts5.5.0二次开发",
   "license": "Apache-2.0",
   "keywords": [
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "tslib": "2.3.0",
-    "tvrender": "^5.6.89"
+    "tvrender": "^5.6.90"
   },
   "devDependencies": {
     "@babel/code-frame": "7.10.4",

package/types/dist/echarts.d.ts

@@ -918,7 +918,7 @@ declare function hasOwn(own: object, prop: string): boolean;
 declare function noop(): void;
 declare const RADIAN_TO_DEGREE: number;
 declare type Color = number[] | Float32Array;
-declare function parseRgbaStringFast(str: string): Color;
+declare function parseRgbaStringFast(str: string): Float32Array;
 declare function colorToRgba(color?: string): Color;
 
 declare const util_d_curry: typeof curry;
@@ -1229,7 +1229,7 @@ declare type ElementSSRData = HashMap<unknown>;
 declare type ElementSSRDataGetter<T> = (el: Element) => HashMap<T>;
 declare function getElementSSRData(el: Element): ElementSSRData;
 declare function registerSSRDataGetter<T>(getter: ElementSSRDataGetter<T>): void;
-declare const version = "5.6.89";
+declare const version = "5.6.90";
 interface ZRenderType extends ZRender {
 }
 

package/types/dist/shared.d.ts

@@ -918,7 +918,7 @@ declare function hasOwn(own: object, prop: string): boolean;
 declare function noop(): void;
 declare const RADIAN_TO_DEGREE: number;
 declare type Color = number[] | Float32Array;
-declare function parseRgbaStringFast(str: string): Color;
+declare function parseRgbaStringFast(str: string): Float32Array;
 declare function colorToRgba(color?: string): Color;
 
 declare const util_d_curry: typeof curry;
@@ -1229,7 +1229,7 @@ declare type ElementSSRData = HashMap<unknown>;
 declare type ElementSSRDataGetter<T> = (el: Element) => HashMap<T>;
 declare function getElementSSRData(el: Element): ElementSSRData;
 declare function registerSSRDataGetter<T>(getter: ElementSSRDataGetter<T>): void;
-declare const version = "5.6.89";
+declare const version = "5.6.90";
 interface ZRenderType extends ZRender {
 }
 

package/types/src/chart/boxes/util.d.ts

@@ -1,4 +1,4 @@
 import { ISize } from './BoxesSeries.js';
 declare function findFontSize(text: string, maxWidth: number, font?: string, tolerance?: number, minSize?: number, maxSize?: number): number;
-declare function getFontSize(size: ISize, text: string, maxWidth: number, font: string): number;
+declare function getFontSize(size: ISize | number, text: string, maxWidth: number, font: string): number;
 export { findFontSize, getFontSize };

package/types/src/util/symbolSize.d.ts

@@ -8,5 +8,5 @@ declare function getSymbolSize(type: string, size: string, width: number, isShap
         offsetWidth?: number;
     };
 };
-declare function getSymbolLabelFontSize(size: string, width?: number): number;
+declare function getSymbolLabelFontSize(size: string | number, width?: number): number;
 export { getSymbolSize, getSymbolLabelFontSize, };