@visactor/vrender-components 0.18.0-alpha.0 → 0.18.0-alpha.1

package/es/util/text.js

@@ -1,6 +1,6 @@
 import { getTextBounds } from "@visactor/vrender-core";
 
-import { TextMeasure } from "@visactor/vutils";
+import { TextMeasure, isObject } from "@visactor/vutils";
 
 import { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from "../constant";
 
@@ -13,18 +13,18 @@ export const initTextMeasure = (textSpec, option, useNaiveCanvas) => new TextMea
     specialCharSet: "-/: .,@%'\"~" + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase()
 }, null != option ? option : {}), textSpec);
 
-export function measureTextSize(text, textSpec) {
-    var _a;
+export function measureTextSize(text, textSpec, fontFamily = DEFAULT_TEXT_FONT_FAMILY) {
+    var _a, _b;
     if (!text) return {
         width: 0,
         height: 0
     };
     const bounds = getTextBounds({
         text: text,
-        fontFamily: textSpec.fontFamily,
+        fontFamily: null !== (_a = textSpec.fontFamily) && void 0 !== _a ? _a : fontFamily,
         fontSize: textSpec.fontSize || 12,
         fontWeight: textSpec.fontWeight,
-        textAlign: null !== (_a = textSpec.textAlign) && void 0 !== _a ? _a : "center",
+        textAlign: null !== (_b = textSpec.textAlign) && void 0 !== _b ? _b : "center",
         textBaseline: textSpec.textBaseline,
         ellipsis: !!textSpec.ellipsis,
         maxLineWidth: textSpec.maxLineWidth || 1 / 0,
@@ -35,4 +35,16 @@ export function measureTextSize(text, textSpec) {
         height: bounds.height()
     };
 }
+
+export function isRichText(attributes, typeKey = "type") {
+    return typeKey in attributes && "rich" === attributes[typeKey] || isObject(attributes.text) && "rich" === attributes.text.type;
+}
+
+export function richTextAttributeTransform(attributes) {
+    var _a, _b;
+    return attributes.width = null !== (_a = attributes.width) && void 0 !== _a ? _a : 0, 
+    attributes.height = null !== (_b = attributes.height) && void 0 !== _b ? _b : 0, 
+    attributes.maxWidth = attributes.maxLineWidth, attributes.textConfig = attributes.text.text || attributes.text, 
+    attributes;
+}
 //# sourceMappingURL=text.js.map

package/es/util/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/E,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACY,EAAE;IACtC,OAAO,IAAI,WAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,wBAAwB;YACpC,QAAQ,EAAE,sBAAsB;SACjC,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EACzD,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAGF,MAAM,UAAU,eAAe,CAAC,IAA2C,EAAE,QAAwC;;IACnH,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;KAChC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC;QAC3B,IAAI;QACJ,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,EAAE;QACjC,UAAU,EAAE,QAAQ,CAAC,UAAiB;QACtC,SAAS,EAAE,MAAA,QAAQ,CAAC,SAAS,mCAAI,QAAQ;QACzC,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ;QAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,QAAQ;QAC/C,UAAU,EAAE,QAAQ,CAAC,QAAQ,IAAI,EAAE;KACpC,CAAC,CAAC;IAEH,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;AAC5D,CAAC","file":"text.js","sourcesContent":["import type { ITextGraphicAttribute } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { getTextBounds } from '@visactor/vrender-core';\nimport type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure } from '@visactor/vutils';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../constant';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextGraphicAttribute> => {\n  return new TextMeasure<ITextGraphicAttribute>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n// FIXME: 和上一个方法统一，使用 TextMeasure 类\nexport function measureTextSize(text: string | number | string[] | number[], textSpec: Partial<ITextGraphicAttribute>) {\n  if (!text) {\n    return { width: 0, height: 0 };\n  }\n  const bounds = getTextBounds({\n    text,\n    fontFamily: textSpec.fontFamily,\n    fontSize: textSpec.fontSize || 12,\n    fontWeight: textSpec.fontWeight as any,\n    textAlign: textSpec.textAlign ?? 'center',\n    textBaseline: textSpec.textBaseline,\n    ellipsis: !!textSpec.ellipsis,\n    maxLineWidth: textSpec.maxLineWidth || Infinity,\n    lineHeight: textSpec.fontSize || 12\n  });\n\n  return { width: bounds.width(), height: bounds.height() };\n}\n"]}
+{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG/E,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACY,EAAE;IACtC,OAAO,IAAI,WAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,wBAAwB;YACpC,QAAQ,EAAE,sBAAsB;SACjC,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EACzD,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAGF,MAAM,UAAU,eAAe,CAC7B,IAA2C,EAC3C,QAAwC,EACxC,aAAqB,wBAAwB;;IAE7C,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;KAChC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC;QAC3B,IAAI;QACJ,UAAU,EAAE,MAAA,QAAQ,CAAC,UAAU,mCAAI,UAAU;QAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,EAAE;QACjC,UAAU,EAAE,QAAQ,CAAC,UAAiB;QACtC,SAAS,EAAE,MAAA,QAAQ,CAAC,SAAS,mCAAI,QAAQ;QACzC,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ;QAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,QAAQ;QAC/C,UAAU,EAAE,QAAQ,CAAC,QAAQ,IAAI,EAAE;KACpC,CAAC,CAAC;IAEH,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,UAAuB,EAAE,OAAO,GAAG,MAAM;IAClE,OAAO,CACL,CAAC,OAAO,IAAI,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC;QACzD,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAK,UAAU,CAAC,IAAoB,CAAC,IAAI,KAAK,MAAM,CAAC,CAChF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,UAAoE;;IAC7G,UAAU,CAAC,KAAK,GAAG,MAAA,UAAU,CAAC,KAAK,mCAAI,CAAC,CAAC;IACzC,UAAU,CAAC,MAAM,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,CAAC,CAAC;IAC3C,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,YAAY,CAAC;IAC9C,UAAU,CAAC,UAAU,GAAI,UAAU,CAAC,IAAuB,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC;IACpF,OAAO,UAAU,CAAC;AACpB,CAAC","file":"text.js","sourcesContent":["import type { IRichTextAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { getTextBounds } from '@visactor/vrender-core';\nimport type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, isObject } from '@visactor/vutils';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../constant';\nimport type { TextContent } from '../core/type';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextGraphicAttribute> => {\n  return new TextMeasure<ITextGraphicAttribute>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n// FIXME: 和上一个方法统一，使用 TextMeasure 类\nexport function measureTextSize(\n  text: string | number | string[] | number[],\n  textSpec: Partial<ITextGraphicAttribute>,\n  fontFamily: string = DEFAULT_TEXT_FONT_FAMILY\n) {\n  if (!text) {\n    return { width: 0, height: 0 };\n  }\n  const bounds = getTextBounds({\n    text,\n    fontFamily: textSpec.fontFamily ?? fontFamily,\n    fontSize: textSpec.fontSize || 12,\n    fontWeight: textSpec.fontWeight as any,\n    textAlign: textSpec.textAlign ?? 'center',\n    textBaseline: textSpec.textBaseline,\n    ellipsis: !!textSpec.ellipsis,\n    maxLineWidth: textSpec.maxLineWidth || Infinity,\n    lineHeight: textSpec.fontSize || 12\n  });\n\n  return { width: bounds.width(), height: bounds.height() };\n}\n\nexport function isRichText(attributes: TextContent, typeKey = 'type') {\n  return (\n    (typeKey in attributes && attributes[typeKey] === 'rich') ||\n    (isObject(attributes.text) && (attributes.text as TextContent).type === 'rich')\n  );\n}\n\nexport function richTextAttributeTransform(attributes: ITextGraphicAttribute & IRichTextAttribute & TextContent) {\n  attributes.width = attributes.width ?? 0;\n  attributes.height = attributes.height ?? 0;\n  attributes.maxWidth = attributes.maxLineWidth;\n  attributes.textConfig = (attributes.text as unknown as any).text || attributes.text;\n  return attributes;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-components",
-  "version": "0.18.0-alpha.0",
+  "version": "0.18.0-alpha.1",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -12,8 +12,8 @@
     "dist"
   ],
   "dependencies": {
-    "@visactor/vrender-core": "0.18.0-alpha.0",
-    "@visactor/vrender-kits": "0.18.0-alpha.0",
+    "@visactor/vrender-core": "0.18.0-alpha.1",
+    "@visactor/vrender-kits": "0.18.0-alpha.1",
     "@visactor/vutils": "~0.17.3",
     "@visactor/vscale": "~0.17.3"
   },
@@ -28,9 +28,9 @@
     "eslint": "~8.18.0",
     "vite": "3.2.6",
     "typescript": "4.9.5",
-    "@internal/bundler": "0.0.1",
     "@internal/eslint-config": "0.0.1",
-    "@internal/ts-config": "0.0.1"
+    "@internal/ts-config": "0.0.1",
+    "@internal/bundler": "0.0.1"
   },
   "keywords": [
     "VisActor",