@visactor/vrender 0.9.0-alpha.1 → 0.9.0-fillstroke.0

package/es/render/contributions/render/utils.d.ts

@@ -1,8 +1,8 @@
 import { IDrawContext } from '../../../render/render-service';
-import { IGraphicAttribute, IContext2d, IGraphic, IMarkAttribute, IThemeAttribute } from '../../../interface';
+import { IGraphicAttribute, IContext2d, IGraphic, IMarkAttribute, IThemeAttribute, IFillType, IStrokeType } from '../../../interface';
 import { IGraphicRenderDrawParams } from './graphic-render';
-export declare function runFill(fill: boolean): boolean;
-export declare function runStroke(stroke: number | boolean | boolean[], lineWidth: number): boolean;
+export declare function runFill(fill: IFillType): boolean;
+export declare function runStroke(stroke: IStrokeType | IStrokeType[], lineWidth: number): boolean;
 export declare function fillVisible(opacity: number, fillOpacity: number): boolean;
 export declare function rectFillVisible(opacity: number, fillOpacity: number, width: number, height: number): boolean;
 export declare function strokeVisible(opacity: number, strokeOpacity: number): boolean;

package/es/render/contributions/render/utils.js

@@ -5,12 +5,13 @@ import { renderCommandList } from "../../../common";
 import { getTheme } from "../../../graphic/theme";
 
 export function runFill(fill) {
-    return fill;
+    return !!fill;
 }
 
 export function runStroke(stroke, lineWidth) {
     let s;
-    return s = isArray(stroke) ? stroke.some((item => item)) : stroke, s && lineWidth > 0;
+    return s = isArray(stroke) ? stroke.some((item => item || void 0 === item)) : !!stroke, 
+    s && lineWidth > 0;
 }
 
 export function fillVisible(opacity, fillOpacity) {
@@ -31,7 +32,7 @@ export function rectStrokeVisible(opacity, strokeOpacity, width, height) {
 
 export function drawPathProxy(graphic, context, x, y, drawContext, params, fillCb, strokeCb) {
     if (!graphic.pathProxy) return !1;
-    const themeAttributes = getTheme(graphic, null == params ? void 0 : params.theme)[graphic.type], {fill: fill = (null == themeAttributes.fill ? !!graphic.attribute.fillColor : themeAttributes.fill), stroke: stroke = (null == themeAttributes.stroke ? !!graphic.attribute.strokeColor : themeAttributes.stroke), opacity: opacity = themeAttributes.opacity, fillOpacity: fillOpacity = themeAttributes.fillOpacity, lineWidth: lineWidth = themeAttributes.lineWidth, strokeOpacity: strokeOpacity = themeAttributes.strokeOpacity, visible: visible = themeAttributes.visible} = graphic.attribute, fVisible = fillVisible(opacity, fillOpacity), sVisible = strokeVisible(opacity, strokeOpacity), doFill = runFill(fill), doStroke = runStroke(stroke, lineWidth);
+    const themeAttributes = getTheme(graphic, null == params ? void 0 : params.theme)[graphic.type], {fill: fill = themeAttributes.fill, stroke: stroke = themeAttributes.stroke, opacity: opacity = themeAttributes.opacity, fillOpacity: fillOpacity = themeAttributes.fillOpacity, lineWidth: lineWidth = themeAttributes.lineWidth, strokeOpacity: strokeOpacity = themeAttributes.strokeOpacity, visible: visible = themeAttributes.visible} = graphic.attribute, fVisible = fillVisible(opacity, fillOpacity), sVisible = strokeVisible(opacity, strokeOpacity), doFill = runFill(fill), doStroke = runStroke(stroke, lineWidth);
     if (!visible) return !0;
     if (!doFill && !doStroke) return !0;
     if (!(fVisible || sVisible || fillCb || strokeCb)) return !0;

package/es/render/contributions/render/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { renderCommandList } from '../../../common';\nimport { IDrawContext } from '../../../render/render-service';\nimport { getTheme } from '../../../graphic/theme';\nimport { IGraphicAttribute, IContext2d, IGraphic, IMarkAttribute, IThemeAttribute } from '../../../interface';\nimport { IGraphicRenderDrawParams } from './graphic-render';\n\n/**\n * 是否需要执行fill逻辑\n * @param fill\n * @returns\n */\nexport function runFill(fill: boolean) {\n  return fill;\n}\n\n/**\n * 是否需要执行stroke逻辑\n * @param stroke\n * @returns\n */\nexport function runStroke(stroke: number | boolean | boolean[], lineWidth: number) {\n  let s: boolean | number;\n  if (isArray(stroke)) {\n    s = stroke.some(item => item);\n  } else {\n    s = stroke;\n  }\n  return s && lineWidth > 0;\n}\n\n/**\n * 是否fill部分可见\n * @param opacity\n * @param fillOpacity\n * @returns\n */\nexport function fillVisible(opacity: number, fillOpacity: number) {\n  return opacity * fillOpacity > 0;\n}\n\nexport function rectFillVisible(opacity: number, fillOpacity: number, width: number, height: number) {\n  return opacity * fillOpacity > 0 && width > 0 && height > 0;\n}\n\n/**\n * 是否stroke部分可见\n * @param opacity\n * @param strokeOpacity\n * @param lineWidth\n * @returns\n */\nexport function strokeVisible(opacity: number, strokeOpacity: number) {\n  return opacity * strokeOpacity > 0;\n}\n\nexport function rectStrokeVisible(opacity: number, strokeOpacity: number, width: number, height: number) {\n  return opacity * strokeOpacity > 0 && width > 0 && height > 0;\n}\n\nexport function drawPathProxy(\n  graphic: IGraphic,\n  context: IContext2d,\n  x: number,\n  y: number,\n  drawContext: IDrawContext,\n  params?: IGraphicRenderDrawParams,\n  fillCb?: (\n    ctx: IContext2d,\n    markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n    themeAttribute: IThemeAttribute\n  ) => boolean,\n  strokeCb?: (\n    ctx: IContext2d,\n    markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n    themeAttribute: IThemeAttribute\n  ) => boolean\n) {\n  if (!graphic.pathProxy) {\n    return false;\n  }\n\n  const themeAttributes = getTheme(graphic, params?.theme)[graphic.type];\n\n  const {\n    fill = themeAttributes.fill == null ? !!graphic.attribute.fillColor : themeAttributes.fill,\n    stroke = themeAttributes.stroke == null ? !!graphic.attribute.strokeColor : themeAttributes.stroke,\n    opacity = themeAttributes.opacity,\n    fillOpacity = themeAttributes.fillOpacity,\n    lineWidth = themeAttributes.lineWidth,\n    strokeOpacity = themeAttributes.strokeOpacity,\n    visible = themeAttributes.visible\n  } = graphic.attribute;\n  // 不绘制或者透明\n  const fVisible = fillVisible(opacity, fillOpacity);\n  const sVisible = strokeVisible(opacity, strokeOpacity);\n  const doFill = runFill(fill);\n  const doStroke = runStroke(stroke, lineWidth);\n\n  if (!visible) {\n    return true;\n  }\n\n  if (!(doFill || doStroke)) {\n    return true;\n  }\n\n  // 如果存在fillCb和strokeCb，那就不直接跳过\n  if (!(fVisible || sVisible || fillCb || strokeCb)) {\n    return true;\n  }\n\n  context.beginPath();\n  const path = typeof graphic.pathProxy === 'function' ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;\n  renderCommandList(path.commandList, context, x, y);\n\n  // shadow\n  context.setShadowStyle && context.setShadowStyle(graphic, graphic.attribute, themeAttributes);\n\n  if (doStroke) {\n    if (strokeCb) {\n      strokeCb(context, graphic.attribute, themeAttributes);\n    } else if (sVisible) {\n      context.setStrokeStyle(graphic, graphic.attribute, x, y, themeAttributes);\n      context.stroke();\n    }\n  }\n  if (doFill) {\n    if (fillCb) {\n      fillCb(context, graphic.attribute, themeAttributes);\n    } else if (fVisible) {\n      context.setCommonStyle(graphic, graphic.attribute, x, y, themeAttributes);\n      context.fill();\n    }\n  }\n  return true;\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { renderCommandList } from '../../../common';\nimport { IDrawContext } from '../../../render/render-service';\nimport { getTheme } from '../../../graphic/theme';\nimport {\n  IGraphicAttribute,\n  IContext2d,\n  IGraphic,\n  IMarkAttribute,\n  IThemeAttribute,\n  IFillType,\n  IStrokeType\n} from '../../../interface';\nimport { IGraphicRenderDrawParams } from './graphic-render';\n\n/**\n * 是否需要执行fill逻辑\n * @param fill\n * @returns\n */\nexport function runFill(fill: IFillType) {\n  return !!fill;\n}\n/**\n * 是否需要执行stroke逻辑\n * @param stroke\n * @returns\n */\nexport function runStroke(stroke: IStrokeType | IStrokeType[], lineWidth: number) {\n  let s: boolean | number;\n  if (isArray(stroke)) {\n    s = stroke.some(item => item || item === undefined);\n  } else {\n    s = !!stroke;\n  }\n  return s && lineWidth > 0;\n}\n\n/**\n * 是否fill部分可见\n * @param opacity\n * @param fillOpacity\n * @returns\n */\nexport function fillVisible(opacity: number, fillOpacity: number) {\n  return opacity * fillOpacity > 0;\n}\n\nexport function rectFillVisible(opacity: number, fillOpacity: number, width: number, height: number) {\n  return opacity * fillOpacity > 0 && width > 0 && height > 0;\n}\n\n/**\n * 是否stroke部分可见\n * @param opacity\n * @param strokeOpacity\n * @param lineWidth\n * @returns\n */\nexport function strokeVisible(opacity: number, strokeOpacity: number) {\n  return opacity * strokeOpacity > 0;\n}\n\nexport function rectStrokeVisible(opacity: number, strokeOpacity: number, width: number, height: number) {\n  return opacity * strokeOpacity > 0 && width > 0 && height > 0;\n}\n\nexport function drawPathProxy(\n  graphic: IGraphic,\n  context: IContext2d,\n  x: number,\n  y: number,\n  drawContext: IDrawContext,\n  params?: IGraphicRenderDrawParams,\n  fillCb?: (\n    ctx: IContext2d,\n    markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n    themeAttribute: IThemeAttribute\n  ) => boolean,\n  strokeCb?: (\n    ctx: IContext2d,\n    markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n    themeAttribute: IThemeAttribute\n  ) => boolean\n) {\n  if (!graphic.pathProxy) {\n    return false;\n  }\n\n  const themeAttributes = getTheme(graphic, params?.theme)[graphic.type];\n\n  const {\n    fill = themeAttributes.fill,\n    stroke = themeAttributes.stroke,\n    opacity = themeAttributes.opacity,\n    fillOpacity = themeAttributes.fillOpacity,\n    lineWidth = themeAttributes.lineWidth,\n    strokeOpacity = themeAttributes.strokeOpacity,\n    visible = themeAttributes.visible\n  } = graphic.attribute;\n  // 不绘制或者透明\n  const fVisible = fillVisible(opacity, fillOpacity);\n  const sVisible = strokeVisible(opacity, strokeOpacity);\n  const doFill = runFill(fill);\n  const doStroke = runStroke(stroke, lineWidth);\n\n  if (!visible) {\n    return true;\n  }\n\n  if (!(doFill || doStroke)) {\n    return true;\n  }\n\n  // 如果存在fillCb和strokeCb，那就不直接跳过\n  if (!(fVisible || sVisible || fillCb || strokeCb)) {\n    return true;\n  }\n\n  context.beginPath();\n  const path = typeof graphic.pathProxy === 'function' ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;\n  renderCommandList(path.commandList, context, x, y);\n\n  // shadow\n  context.setShadowStyle && context.setShadowStyle(graphic, graphic.attribute, themeAttributes);\n\n  if (doStroke) {\n    if (strokeCb) {\n      strokeCb(context, graphic.attribute, themeAttributes);\n    } else if (sVisible) {\n      context.setStrokeStyle(graphic, graphic.attribute, x, y, themeAttributes);\n      context.stroke();\n    }\n  }\n  if (doFill) {\n    if (fillCb) {\n      fillCb(context, graphic.attribute, themeAttributes);\n    } else if (fVisible) {\n      context.setCommonStyle(graphic, graphic.attribute, x, y, themeAttributes);\n      context.fill();\n    }\n  }\n  return true;\n}\n"]}

package/es/resource-loader/loader.d.ts

@@ -20,7 +20,7 @@ export declare class ResourceLoader {
     private static cache;
     static GetImage(url: string, mark: ImagePayload): void;
     static GetSvg(svgStr: string, mark: IImage): void;
-    static GetFile(url: string, type: 'json' | 'arrayBuffer' | 'blob'): Promise<ImageData | HTMLImageElement | ImageBitmap | Blob | ArrayBuffer | OffscreenCanvas | {
+    static GetFile(url: string, type: 'json' | 'arrayBuffer' | 'blob'): Promise<HTMLImageElement | ImageData | ImageBitmap | Blob | OffscreenCanvas | ArrayBuffer | {
         [id: string]: any;
     }>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender",
-  "version": "0.9.0-alpha.1",
+  "version": "0.9.0-fillstroke.0",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -11,6 +11,7 @@
     "es",
     "dist"
   ],
+  "license": "MIT",
   "dependencies": {
     "@visactor/vutils": "0.9.0-alpha.2",
     "color-convert": "2.0.1",
@@ -33,8 +34,8 @@
     "vite": "3.2.6",
     "typescript": "4.9.5",
     "@internal/bundler": "0.0.1",
-    "@internal/ts-config": "0.0.1",
-    "@internal/eslint-config": "0.0.1"
+    "@internal/eslint-config": "0.0.1",
+    "@internal/ts-config": "0.0.1"
   },
   "publishConfig": {
     "access": "public"