@visactor/vrender-core 0.17.0-alpha.7 → 0.17.0

package/es/common/inversify-lite/resolution/resolver.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/inversify-lite/resolution/resolver.ts"],"names":[],"mappings":"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","file":"resolver.js","sourcesContent":["import * as ERROR_MSGS from '../constants/error_msgs';\nimport { BindingTypeEnum } from '../constants/literal_types';\nimport type { interfaces } from '../interfaces/interfaces';\n// import { getBindingDictionary } from '../planning/planner';\nimport { saveToScope, tryGetFromScope } from '../scope/scope';\n// import { isPromise } from '../utils/async';\nimport { getFactoryDetails, ensureFullyBound } from '../utils/binding_utils';\nimport { tryAndThrowErrorIfStackOverflow } from '../utils/exceptions';\nimport { resolveInstance } from './instantiation';\n\nconst _resolveRequest =\n  <T>(requestScope: interfaces.RequestScope) =>\n  (request: interfaces.Request): undefined | T | Promise<T> | (T | Promise<T>)[] => {\n    request.parentContext.setCurrentRequest(request);\n\n    const bindings = request.bindings;\n    const childRequests = request.childRequests;\n\n    const targetIsAnArray = request.target && request.target.isArray();\n\n    const targetParentIsNotAnArray =\n      !request.parentRequest ||\n      !request.parentRequest.target ||\n      !request.target ||\n      !request.parentRequest.target.matchesArray(request.target.serviceIdentifier);\n\n    if (targetIsAnArray && targetParentIsNotAnArray) {\n      // Create an array instead of creating an instance\n      return childRequests.map((childRequest: interfaces.Request) => {\n        const _f = _resolveRequest(requestScope);\n        return _f(childRequest) as T | Promise<T>;\n      });\n    }\n    if (request.target.isOptional() && bindings.length === 0) {\n      return undefined;\n    }\n\n    const binding = bindings[0];\n\n    return _resolveBinding<T>(requestScope, request, binding as unknown as interfaces.Binding<T>);\n  };\n\nconst _resolveFactoryFromBinding = <T>(binding: interfaces.Binding<T>, context: interfaces.Context): T | Promise<T> => {\n  const factoryDetails = getFactoryDetails(binding);\n  return tryAndThrowErrorIfStackOverflow(\n    () => (factoryDetails.factory as interfaces.FactoryTypeFunction<T>).bind(binding)(context),\n    () =>\n      new Error(\n        ERROR_MSGS.CIRCULAR_DEPENDENCY_IN_FACTORY(\n          factoryDetails.factoryType,\n          context.currentRequest.serviceIdentifier.toString()\n        )\n      )\n  );\n};\n\nconst _getResolvedFromBinding = <T = unknown>(\n  requestScope: interfaces.RequestScope,\n  request: interfaces.Request,\n  binding: interfaces.Binding<T>\n): T | Promise<T> => {\n  let result: T | Promise<T> | undefined;\n  const childRequests = request.childRequests;\n\n  ensureFullyBound(binding);\n\n  switch (binding.type) {\n    case BindingTypeEnum.ConstantValue:\n    case BindingTypeEnum.Function:\n      result = binding.cache as T | Promise<T>;\n      break;\n    case BindingTypeEnum.Constructor:\n      result = binding.implementationType as T;\n      break;\n    case BindingTypeEnum.Instance:\n      result = resolveInstance<T>(\n        binding,\n        binding.implementationType as interfaces.Newable<T>,\n        childRequests,\n        _resolveRequest<T>(requestScope)\n      );\n      break;\n    default:\n      result = _resolveFactoryFromBinding(binding, request.parentContext);\n  }\n\n  return result as T | Promise<T>;\n};\n\nconst _resolveInScope = <T>(\n  requestScope: interfaces.RequestScope,\n  binding: interfaces.Binding<T>,\n  resolveFromBinding: () => T | Promise<T>\n): T | Promise<T> => {\n  let result = tryGetFromScope<T>(requestScope, binding);\n  if (result !== null) {\n    return result;\n  }\n  result = resolveFromBinding();\n  saveToScope(requestScope, binding, result);\n  return result;\n};\n\nconst _resolveBinding = <T>(\n  requestScope: interfaces.RequestScope,\n  request: interfaces.Request,\n  binding: interfaces.Binding<T>\n): T | Promise<T> => {\n  return _resolveInScope<T>(requestScope, binding, () => {\n    const result = _getResolvedFromBinding(requestScope, request, binding);\n    // if (isPromise(result)) {\n    //   result = result.then(resolved => _onActivation(request, binding, resolved));\n    // } else {\n    //   result = _onActivation<T>(request, binding, result);\n    // }\n    return result;\n  });\n};\n\n// function _onActivation<T>(request: interfaces.Request, binding: interfaces.Binding<T>, resolved: T): T | Promise<T> {\n//   let result = _bindingActivation(request.parentContext, binding, resolved);\n\n//   const containersIterator = _getContainersIterator(request.parentContext.container);\n\n//   let container: interfaces.Container;\n//   let containersIteratorResult = containersIterator.next();\n\n//   do {\n//     container = containersIteratorResult.value;\n//     // const context = request.parentContext;\n//     // const serviceIdentifier = request.serviceIdentifier;\n//     // const activationsIterator = _getContainerActivationsForService(container, serviceIdentifier);\n\n//     // if (isPromise(result)) {\n//     //   result = _activateContainerAsync<T>(\n//     //     activationsIterator as Iterator<interfaces.BindingActivation<T>>,\n//     //     context,\n//     //     result\n//     //   );\n//     // } else {\n//     //   result = _activateContainer<T>(activationsIterator as Iterator<interfaces.BindingActivation<T>>, context, result);\n//     // }\n\n//     containersIteratorResult = containersIterator.next();\n\n//     // make sure if we are currently on the container that owns the binding, not to keep looping down to child containers\n//   } while (\n//     containersIteratorResult.done !== true &&\n//     !getBindingDictionary(container).hasKey(request.serviceIdentifier)\n//   );\n\n//   return result;\n// }\n\n// const _bindingActivation = <T>(\n//   context: interfaces.Context,\n//   binding: interfaces.Binding<T>,\n//   previousResult: T\n// ): T | Promise<T> => {\n//   let result: T | Promise<T>;\n\n//   // use activation handler if available\n//   if (typeof binding.onActivation === 'function') {\n//     result = binding.onActivation(context, previousResult);\n//   } else {\n//     result = previousResult;\n//   }\n\n//   return result;\n// };\n\n// const _activateContainer = <T>(\n//   activationsIterator: Iterator<interfaces.BindingActivation<T>>,\n//   context: interfaces.Context,\n//   result: T\n// ): T | Promise<T> => {\n//   let activation = activationsIterator.next();\n\n//   while (!activation.done) {\n//     result = activation.value(context, result) as T;\n\n//     if (isPromise<T>(result)) {\n//       return _activateContainerAsync(activationsIterator, context, result);\n//     }\n\n//     activation = activationsIterator.next();\n//   }\n\n//   return result;\n// };\n\n// const _activateContainerAsync = async <T>(\n//   activationsIterator: Iterator<interfaces.BindingActivation<T>>,\n//   context: interfaces.Context,\n//   resultPromise: Promise<T>\n// ): Promise<T> => {\n//   let result = await resultPromise;\n//   let activation = activationsIterator.next();\n\n//   while (!activation.done) {\n//     result = await activation.value(context, result);\n\n//     activation = activationsIterator.next();\n//   }\n\n//   return result;\n// };\n\n// const _getContainerActivationsForService = <T>(\n//   container: interfaces.Container,\n//   serviceIdentifier: interfaces.ServiceIdentifier<T>\n// ) => {\n//   // smell accessing _activations, but similar pattern is done in planner.getBindingDictionary()\n//   const activations = (\n//     container as unknown as { _activations: interfaces.Lookup<interfaces.BindingActivation<unknown>> }\n//   )._activations;\n\n//   return activations.hasKey(serviceIdentifier) ? activations.get(serviceIdentifier).values() : [].values();\n// };\n\n// const _getContainersIterator = (container: interfaces.Container): Iterator<interfaces.Container> => {\n//   const containersStack: interfaces.Container[] = [container];\n\n//   let parent = container.parent;\n\n//   while (parent !== null) {\n//     containersStack.push(parent);\n\n//     parent = parent.parent;\n//   }\n\n//   const getNextContainer: () => IteratorResult<interfaces.Container> = () => {\n//     const nextContainer = containersStack.pop();\n\n//     if (nextContainer !== undefined) {\n//       return { done: false, value: nextContainer };\n//     } else {\n//       return { done: true, value: undefined };\n//     }\n//   };\n\n//   const containersIterator: Iterator<interfaces.Container> = {\n//     next: getNextContainer\n//   };\n\n//   return containersIterator;\n// };\n\nfunction resolve<T>(context: interfaces.Context): T | Promise<T> | (T | Promise<T>)[] {\n  const _f = _resolveRequest<T>(context.plan.rootRequest.requestScope as interfaces.RequestScope);\n  return _f(context.plan.rootRequest) as T | Promise<T> | (T | Promise<T>)[];\n}\n\nexport { resolve };\n"]}
+{"version":3,"sources":["../src/common/inversify-lite/resolution/resolver.ts"],"names":[],"mappings":"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","file":"resolver.js","sourcesContent":["import * as ERROR_MSGS from '../constants/error_msgs';\nimport { BindingTypeEnum } from '../constants/literal_types';\nimport type { interfaces } from '../interfaces/interfaces';\n// import { getBindingDictionary } from '../planning/planner';\nimport { saveToScope, tryGetFromScope } from '../scope/scope';\n// import { isPromise } from '../utils/async';\nimport { getFactoryDetails, ensureFullyBound } from '../utils/binding_utils';\nimport { tryAndThrowErrorIfStackOverflow } from '../utils/exceptions';\nimport { resolveInstance } from './instantiation';\n\nconst _resolveRequest =\n  <T>(requestScope: interfaces.RequestScope) =>\n  (request: interfaces.Request): undefined | T | Promise<T> | (T | Promise<T>)[] => {\n    request.parentContext.setCurrentRequest(request);\n\n    const bindings = request.bindings;\n    const childRequests = request.childRequests;\n\n    const targetIsAnArray = request.target && request.target.isArray();\n\n    const targetParentIsNotAnArray =\n      !request.parentRequest ||\n      !request.parentRequest.target ||\n      !request.target ||\n      !request.parentRequest.target.matchesArray(request.target.serviceIdentifier);\n\n    if (targetIsAnArray && targetParentIsNotAnArray) {\n      // Create an array instead of creating an instance\n      return childRequests.map((childRequest: interfaces.Request) => {\n        const _f = _resolveRequest(requestScope);\n        return _f(childRequest) as T | Promise<T>;\n      });\n    }\n    if (request.target.isOptional() && bindings.length === 0) {\n      return undefined;\n    }\n\n    const binding = bindings[0];\n\n    return _resolveBinding<T>(requestScope, request, binding as unknown as interfaces.Binding<T>);\n  };\n\nconst _resolveFactoryFromBinding = <T>(binding: interfaces.Binding<T>, context: interfaces.Context): T | Promise<T> => {\n  // console.count('_resolveFactoryFromBinding');\n  const factoryDetails = getFactoryDetails(binding);\n  return tryAndThrowErrorIfStackOverflow(\n    () => (factoryDetails.factory as interfaces.FactoryTypeFunction<T>).bind(binding)(context),\n    () =>\n      new Error(\n        ERROR_MSGS.CIRCULAR_DEPENDENCY_IN_FACTORY(\n          factoryDetails.factoryType,\n          context.currentRequest.serviceIdentifier.toString()\n        )\n      )\n  );\n};\n\nconst _getResolvedFromBinding = <T = unknown>(\n  requestScope: interfaces.RequestScope,\n  request: interfaces.Request,\n  binding: interfaces.Binding<T>\n): T | Promise<T> => {\n  // console.count('_getResolvedFromBinding');\n  // console.log('_getResolvedFromBinding', binding);\n  // if (!(window as any).map) {\n  //   (window as any).map = new Map();\n  // }\n  // const d = (window as any).map.get(binding.serviceIdentifier) || [];\n  // (window as any).map.set(binding.serviceIdentifier, [...d, binding]);\n  let result: T | Promise<T> | undefined;\n  const childRequests = request.childRequests;\n\n  ensureFullyBound(binding);\n\n  switch (binding.type) {\n    case BindingTypeEnum.ConstantValue:\n    case BindingTypeEnum.Function:\n      result = binding.cache as T | Promise<T>;\n      break;\n    case BindingTypeEnum.Constructor:\n      result = binding.implementationType as T;\n      break;\n    case BindingTypeEnum.Instance:\n      result = resolveInstance<T>(\n        binding,\n        binding.implementationType as interfaces.Newable<T>,\n        childRequests,\n        _resolveRequest<T>(requestScope)\n      );\n      break;\n    default:\n      result = _resolveFactoryFromBinding(binding, request.parentContext);\n  }\n\n  return result as T | Promise<T>;\n};\n\nconst _resolveInScope = <T>(\n  requestScope: interfaces.RequestScope,\n  binding: interfaces.Binding<T>,\n  resolveFromBinding: () => T | Promise<T>\n): T | Promise<T> => {\n  let result = tryGetFromScope<T>(requestScope, binding);\n  if (result !== null) {\n    return result;\n  }\n  result = resolveFromBinding();\n  saveToScope(requestScope, binding, result);\n  return result;\n};\n\nconst _resolveBinding = <T>(\n  requestScope: interfaces.RequestScope,\n  request: interfaces.Request,\n  binding: interfaces.Binding<T>\n): T | Promise<T> => {\n  return _resolveInScope<T>(requestScope, binding, () => {\n    const result = _getResolvedFromBinding(requestScope, request, binding);\n    // if (isPromise(result)) {\n    //   result = result.then(resolved => _onActivation(request, binding, resolved));\n    // } else {\n    //   result = _onActivation<T>(request, binding, result);\n    // }\n    return result;\n  });\n};\n\n// function _onActivation<T>(request: interfaces.Request, binding: interfaces.Binding<T>, resolved: T): T | Promise<T> {\n//   let result = _bindingActivation(request.parentContext, binding, resolved);\n\n//   const containersIterator = _getContainersIterator(request.parentContext.container);\n\n//   let container: interfaces.Container;\n//   let containersIteratorResult = containersIterator.next();\n\n//   do {\n//     container = containersIteratorResult.value;\n//     // const context = request.parentContext;\n//     // const serviceIdentifier = request.serviceIdentifier;\n//     // const activationsIterator = _getContainerActivationsForService(container, serviceIdentifier);\n\n//     // if (isPromise(result)) {\n//     //   result = _activateContainerAsync<T>(\n//     //     activationsIterator as Iterator<interfaces.BindingActivation<T>>,\n//     //     context,\n//     //     result\n//     //   );\n//     // } else {\n//     //   result = _activateContainer<T>(activationsIterator as Iterator<interfaces.BindingActivation<T>>, context, result);\n//     // }\n\n//     containersIteratorResult = containersIterator.next();\n\n//     // make sure if we are currently on the container that owns the binding, not to keep looping down to child containers\n//   } while (\n//     containersIteratorResult.done !== true &&\n//     !getBindingDictionary(container).hasKey(request.serviceIdentifier)\n//   );\n\n//   return result;\n// }\n\n// const _bindingActivation = <T>(\n//   context: interfaces.Context,\n//   binding: interfaces.Binding<T>,\n//   previousResult: T\n// ): T | Promise<T> => {\n//   let result: T | Promise<T>;\n\n//   // use activation handler if available\n//   if (typeof binding.onActivation === 'function') {\n//     result = binding.onActivation(context, previousResult);\n//   } else {\n//     result = previousResult;\n//   }\n\n//   return result;\n// };\n\n// const _activateContainer = <T>(\n//   activationsIterator: Iterator<interfaces.BindingActivation<T>>,\n//   context: interfaces.Context,\n//   result: T\n// ): T | Promise<T> => {\n//   let activation = activationsIterator.next();\n\n//   while (!activation.done) {\n//     result = activation.value(context, result) as T;\n\n//     if (isPromise<T>(result)) {\n//       return _activateContainerAsync(activationsIterator, context, result);\n//     }\n\n//     activation = activationsIterator.next();\n//   }\n\n//   return result;\n// };\n\n// const _activateContainerAsync = async <T>(\n//   activationsIterator: Iterator<interfaces.BindingActivation<T>>,\n//   context: interfaces.Context,\n//   resultPromise: Promise<T>\n// ): Promise<T> => {\n//   let result = await resultPromise;\n//   let activation = activationsIterator.next();\n\n//   while (!activation.done) {\n//     result = await activation.value(context, result);\n\n//     activation = activationsIterator.next();\n//   }\n\n//   return result;\n// };\n\n// const _getContainerActivationsForService = <T>(\n//   container: interfaces.Container,\n//   serviceIdentifier: interfaces.ServiceIdentifier<T>\n// ) => {\n//   // smell accessing _activations, but similar pattern is done in planner.getBindingDictionary()\n//   const activations = (\n//     container as unknown as { _activations: interfaces.Lookup<interfaces.BindingActivation<unknown>> }\n//   )._activations;\n\n//   return activations.hasKey(serviceIdentifier) ? activations.get(serviceIdentifier).values() : [].values();\n// };\n\n// const _getContainersIterator = (container: interfaces.Container): Iterator<interfaces.Container> => {\n//   const containersStack: interfaces.Container[] = [container];\n\n//   let parent = container.parent;\n\n//   while (parent !== null) {\n//     containersStack.push(parent);\n\n//     parent = parent.parent;\n//   }\n\n//   const getNextContainer: () => IteratorResult<interfaces.Container> = () => {\n//     const nextContainer = containersStack.pop();\n\n//     if (nextContainer !== undefined) {\n//       return { done: false, value: nextContainer };\n//     } else {\n//       return { done: true, value: undefined };\n//     }\n//   };\n\n//   const containersIterator: Iterator<interfaces.Container> = {\n//     next: getNextContainer\n//   };\n\n//   return containersIterator;\n// };\n\nfunction resolve<T>(context: interfaces.Context): T | Promise<T> | (T | Promise<T>)[] {\n  const _f = _resolveRequest<T>(context.plan.rootRequest.requestScope as interfaces.RequestScope);\n  return _f(context.plan.rootRequest) as T | Promise<T> | (T | Promise<T>)[];\n}\n\nexport { resolve };\n"]}

package/es/common/shape/rect.js

@@ -4,7 +4,8 @@ const halfPi = pi / 2;
 
 export function createRectPath(path, x, y, width, height, rectCornerRadius) {
     let cornerRadius;
-    if (isNumber(rectCornerRadius, !0)) cornerRadius = [ rectCornerRadius, rectCornerRadius, rectCornerRadius, rectCornerRadius ]; else if (Array.isArray(rectCornerRadius)) {
+    if (width < 0 && (x += width, width = -width), height < 0 && (y += height, height = -height), 
+    isNumber(rectCornerRadius, !0)) cornerRadius = [ rectCornerRadius, rectCornerRadius, rectCornerRadius, rectCornerRadius ]; else if (Array.isArray(rectCornerRadius)) {
         const cornerRadiusArr = rectCornerRadius;
         switch (cornerRadiusArr.length) {
           case 0:

package/es/common/shape/rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/shape/rect.ts"],"names":[],"mappings":"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","file":"rect.js","sourcesContent":["import type { vec2, vec4 } from '@visactor/vutils';\nimport { isNumber, arrayEqual, pi } from '@visactor/vutils';\nimport type { IContext2d, ICustomPath2D } from '../../interface';\n\nconst halfPi = pi / 2;\n\nexport function createRectPath(\n  path: ICustomPath2D | IContext2d,\n  x: number,\n  y: number,\n  width: number,\n  height: number,\n  rectCornerRadius: number | number[]\n) {\n  // 匹配cornerRadius\n  let cornerRadius: vec4;\n  if (isNumber(rectCornerRadius, true)) {\n    cornerRadius = [\n      <number>rectCornerRadius,\n      <number>rectCornerRadius,\n      <number>rectCornerRadius,\n      <number>rectCornerRadius\n    ];\n  } else if (Array.isArray(rectCornerRadius)) {\n    const cornerRadiusArr: number[] = rectCornerRadius as number[];\n    switch (cornerRadiusArr.length) {\n      case 0:\n        cornerRadius = [0, 0, 0, 0];\n        break;\n      case 1:\n        cornerRadius = [cornerRadiusArr[0], cornerRadiusArr[0], cornerRadiusArr[0], cornerRadiusArr[0]];\n        break;\n      case 2:\n      case 3:\n        cornerRadius = [cornerRadiusArr[0], cornerRadiusArr[1], cornerRadiusArr[0], cornerRadiusArr[1]];\n        break;\n      default:\n        cornerRadius = cornerRadiusArr.slice(0, 5) as [number, number, number, number];\n        break;\n    }\n  } else {\n    cornerRadius = [0, 0, 0, 0];\n  }\n\n  // 当宽度小于0 或者 cornerRadius 极小时，不绘制 cornerRadius\n  if (\n    width < 0 ||\n    Math.abs(cornerRadius[0]) + Math.abs(cornerRadius[1]) + Math.abs(cornerRadius[2]) + Math.abs(cornerRadius[3]) <\n      1e-12\n  ) {\n    return path.rect(x, y, width, height);\n  }\n\n  const [leftTop, rightTop, rightBottom, leftBottom]: [vec2, vec2, vec2, vec2] = [\n    [x, y],\n    [x + width, y],\n    [x + width, y + height],\n    [x, y + height]\n  ];\n  //\n  // *(leftTopPoint1)******************(rightTopPoint1)\n  // (leftTopPoint2)                  (rightTopPoint2)\n  // *                                *\n  // *                                *\n  // (leftBottomPoint2)               (rightBottomPoint2)\n  // *(leftBottomPoint1)***************(rightBottomPoint1)\n  //\n  const maxCornerRadius = Math.min(width / 2, height / 2);\n  const _cornerRadius: vec4 = [\n    Math.min(maxCornerRadius, cornerRadius[0]),\n    Math.min(maxCornerRadius, cornerRadius[1]),\n    Math.min(maxCornerRadius, cornerRadius[2]),\n    Math.min(maxCornerRadius, cornerRadius[3])\n  ];\n  const leftTopPoint1: vec2 = [leftTop[0] + _cornerRadius[0], leftTop[1]];\n  const leftTopPoint2: vec2 = [leftTop[0], leftTop[1] + _cornerRadius[0]];\n  const rightTopPoint1: vec2 = [rightTop[0] - _cornerRadius[1], rightTop[1]];\n  const rightTopPoint2: vec2 = [rightTop[0], rightTop[1] + _cornerRadius[1]];\n  const rightBottomPoint1: vec2 = [rightBottom[0] - _cornerRadius[2], rightBottom[1]];\n  const rightBottomPoint2: vec2 = [rightBottom[0], rightBottom[1] - _cornerRadius[2]];\n  const leftBottomPoint1: vec2 = [leftBottom[0] + _cornerRadius[3], leftBottom[1]];\n  const leftBottomPoint2: vec2 = [leftBottom[0], leftBottom[1] - _cornerRadius[3]];\n\n  path.moveTo(leftTopPoint1[0], leftTopPoint1[1]);\n  path.lineTo(rightTopPoint1[0], rightTopPoint1[1]);\n  if (!arrayEqual(rightTopPoint1, rightTopPoint2)) {\n    const centerX = rightTopPoint1[0];\n    const centerY = rightTopPoint1[1] + _cornerRadius[1];\n    path.arc(\n      centerX,\n      centerY,\n      _cornerRadius[1],\n      -halfPi,\n      0,\n      // Math.atan2(rightTopPoint1[1] - centerY, rightTopPoint1[0] - centerX),\n      // Math.atan2(rightTopPoint2[1] - centerY, rightTopPoint2[0] - centerX),\n      false\n    );\n    // path.arcTo(rightTop[0], rightTop[1], rightTopPoint2[0], rightTopPoint2[1], _cornerRadius[1]);\n  }\n\n  path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]);\n  if (!arrayEqual(rightBottomPoint1, rightBottomPoint2)) {\n    const centerX = rightBottomPoint2[0] - _cornerRadius[2];\n    const centerY = rightBottomPoint2[1];\n    path.arc(\n      centerX,\n      centerY,\n      _cornerRadius[2],\n      0,\n      halfPi,\n      // Math.atan2(rightBottomPoint2[1] - centerY, rightBottomPoint2[0] - centerX),\n      // Math.atan2(rightBottomPoint1[1] - centerY, rightBottomPoint1[0] - centerX),\n      false\n    );\n    // path.arcTo(rightBottom[0], rightBottom[1], rightBottomPoint1[0], rightBottomPoint1[1], _cornerRadius[2]);\n  }\n\n  path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]);\n  if (!arrayEqual(leftBottomPoint1, leftBottomPoint2)) {\n    const centerX = leftBottomPoint1[0];\n    const centerY = leftBottomPoint1[1] - _cornerRadius[3];\n    path.arc(\n      centerX,\n      centerY,\n      _cornerRadius[3],\n      halfPi,\n      pi,\n      // Math.atan2(leftBottomPoint1[1] - centerY, leftBottomPoint1[0] - centerX),\n      // Math.atan2(leftBottomPoint2[1] - centerY, leftBottomPoint2[0] - centerX),\n      false\n    );\n    // path.arcTo(leftBottom[0], leftBottom[1], leftBottomPoint2[0], leftBottomPoint2[1], _cornerRadius[3]);\n  }\n\n  path.lineTo(leftTopPoint2[0], leftTopPoint2[1]);\n  if (!arrayEqual(leftTopPoint1, leftTopPoint2)) {\n    const centerX = leftTopPoint1[0];\n    const centerY = leftTopPoint1[1] + _cornerRadius[0];\n    path.arc(\n      centerX,\n      centerY,\n      _cornerRadius[0],\n      pi,\n      pi + halfPi,\n      // Math.atan2(leftTopPoint2[1] - centerY, leftTopPoint2[0] - centerX),\n      // Math.atan2(leftTopPoint1[1] - centerY, leftTopPoint1[0] - centerX) + Math.PI * 2,\n      false\n    );\n    // path.arcTo(leftTop[0], leftTop[1], leftTopPoint1[0], leftTopPoint1[1], _cornerRadius[0]);\n  }\n  path.closePath();\n  return path;\n}\n"]}
+{"version":3,"sources":["../src/common/shape/rect.ts"],"names":[],"mappings":"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","file":"rect.js","sourcesContent":["import type { vec2, vec4 } from '@visactor/vutils';\nimport { isNumber, arrayEqual, pi } from '@visactor/vutils';\nimport type { IContext2d, ICustomPath2D } from '../../interface';\n\nconst halfPi = pi / 2;\n\nexport function createRectPath(\n  path: ICustomPath2D | IContext2d,\n  x: number,\n  y: number,\n  width: number,\n  height: number,\n  rectCornerRadius: number | number[]\n) {\n  if (width < 0) {\n    x += width;\n    width = -width;\n  }\n  if (height < 0) {\n    y += height;\n    height = -height;\n  }\n  // 匹配cornerRadius\n  let cornerRadius: vec4;\n  if (isNumber(rectCornerRadius, true)) {\n    cornerRadius = [\n      <number>rectCornerRadius,\n      <number>rectCornerRadius,\n      <number>rectCornerRadius,\n      <number>rectCornerRadius\n    ];\n  } else if (Array.isArray(rectCornerRadius)) {\n    const cornerRadiusArr: number[] = rectCornerRadius as number[];\n    switch (cornerRadiusArr.length) {\n      case 0:\n        cornerRadius = [0, 0, 0, 0];\n        break;\n      case 1:\n        cornerRadius = [cornerRadiusArr[0], cornerRadiusArr[0], cornerRadiusArr[0], cornerRadiusArr[0]];\n        break;\n      case 2:\n      case 3:\n        cornerRadius = [cornerRadiusArr[0], cornerRadiusArr[1], cornerRadiusArr[0], cornerRadiusArr[1]];\n        break;\n      default:\n        cornerRadius = cornerRadiusArr.slice(0, 5) as [number, number, number, number];\n        break;\n    }\n  } else {\n    cornerRadius = [0, 0, 0, 0];\n  }\n\n  // 当宽度小于0 或者 cornerRadius 极小时，不绘制 cornerRadius\n  if (\n    width < 0 ||\n    Math.abs(cornerRadius[0]) + Math.abs(cornerRadius[1]) + Math.abs(cornerRadius[2]) + Math.abs(cornerRadius[3]) <\n      1e-12\n  ) {\n    return path.rect(x, y, width, height);\n  }\n\n  const [leftTop, rightTop, rightBottom, leftBottom]: [vec2, vec2, vec2, vec2] = [\n    [x, y],\n    [x + width, y],\n    [x + width, y + height],\n    [x, y + height]\n  ];\n  //\n  // *(leftTopPoint1)******************(rightTopPoint1)\n  // (leftTopPoint2)                  (rightTopPoint2)\n  // *                                *\n  // *                                *\n  // (leftBottomPoint2)               (rightBottomPoint2)\n  // *(leftBottomPoint1)***************(rightBottomPoint1)\n  //\n  const maxCornerRadius = Math.min(width / 2, height / 2);\n  const _cornerRadius: vec4 = [\n    Math.min(maxCornerRadius, cornerRadius[0]),\n    Math.min(maxCornerRadius, cornerRadius[1]),\n    Math.min(maxCornerRadius, cornerRadius[2]),\n    Math.min(maxCornerRadius, cornerRadius[3])\n  ];\n  const leftTopPoint1: vec2 = [leftTop[0] + _cornerRadius[0], leftTop[1]];\n  const leftTopPoint2: vec2 = [leftTop[0], leftTop[1] + _cornerRadius[0]];\n  const rightTopPoint1: vec2 = [rightTop[0] - _cornerRadius[1], rightTop[1]];\n  const rightTopPoint2: vec2 = [rightTop[0], rightTop[1] + _cornerRadius[1]];\n  const rightBottomPoint1: vec2 = [rightBottom[0] - _cornerRadius[2], rightBottom[1]];\n  const rightBottomPoint2: vec2 = [rightBottom[0], rightBottom[1] - _cornerRadius[2]];\n  const leftBottomPoint1: vec2 = [leftBottom[0] + _cornerRadius[3], leftBottom[1]];\n  const leftBottomPoint2: vec2 = [leftBottom[0], leftBottom[1] - _cornerRadius[3]];\n\n  path.moveTo(leftTopPoint1[0], leftTopPoint1[1]);\n  path.lineTo(rightTopPoint1[0], rightTopPoint1[1]);\n  if (!arrayEqual(rightTopPoint1, rightTopPoint2)) {\n    const centerX = rightTopPoint1[0];\n    const centerY = rightTopPoint1[1] + _cornerRadius[1];\n    path.arc(\n      centerX,\n      centerY,\n      _cornerRadius[1],\n      -halfPi,\n      0,\n      // Math.atan2(rightTopPoint1[1] - centerY, rightTopPoint1[0] - centerX),\n      // Math.atan2(rightTopPoint2[1] - centerY, rightTopPoint2[0] - centerX),\n      false\n    );\n    // path.arcTo(rightTop[0], rightTop[1], rightTopPoint2[0], rightTopPoint2[1], _cornerRadius[1]);\n  }\n\n  path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]);\n  if (!arrayEqual(rightBottomPoint1, rightBottomPoint2)) {\n    const centerX = rightBottomPoint2[0] - _cornerRadius[2];\n    const centerY = rightBottomPoint2[1];\n    path.arc(\n      centerX,\n      centerY,\n      _cornerRadius[2],\n      0,\n      halfPi,\n      // Math.atan2(rightBottomPoint2[1] - centerY, rightBottomPoint2[0] - centerX),\n      // Math.atan2(rightBottomPoint1[1] - centerY, rightBottomPoint1[0] - centerX),\n      false\n    );\n    // path.arcTo(rightBottom[0], rightBottom[1], rightBottomPoint1[0], rightBottomPoint1[1], _cornerRadius[2]);\n  }\n\n  path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]);\n  if (!arrayEqual(leftBottomPoint1, leftBottomPoint2)) {\n    const centerX = leftBottomPoint1[0];\n    const centerY = leftBottomPoint1[1] - _cornerRadius[3];\n    path.arc(\n      centerX,\n      centerY,\n      _cornerRadius[3],\n      halfPi,\n      pi,\n      // Math.atan2(leftBottomPoint1[1] - centerY, leftBottomPoint1[0] - centerX),\n      // Math.atan2(leftBottomPoint2[1] - centerY, leftBottomPoint2[0] - centerX),\n      false\n    );\n    // path.arcTo(leftBottom[0], leftBottom[1], leftBottomPoint2[0], leftBottomPoint2[1], _cornerRadius[3]);\n  }\n\n  path.lineTo(leftTopPoint2[0], leftTopPoint2[1]);\n  if (!arrayEqual(leftTopPoint1, leftTopPoint2)) {\n    const centerX = leftTopPoint1[0];\n    const centerY = leftTopPoint1[1] + _cornerRadius[0];\n    path.arc(\n      centerX,\n      centerY,\n      _cornerRadius[0],\n      pi,\n      pi + halfPi,\n      // Math.atan2(leftTopPoint2[1] - centerY, leftTopPoint2[0] - centerX),\n      // Math.atan2(leftTopPoint1[1] - centerY, leftTopPoint1[0] - centerX) + Math.PI * 2,\n      false\n    );\n    // path.arcTo(leftTop[0], leftTop[1], leftTopPoint1[0], leftTopPoint1[1], _cornerRadius[0]);\n  }\n  path.closePath();\n  return path;\n}\n"]}

package/es/common/sort.js

@@ -90,5 +90,4 @@ export function findNextGraphic(graphic, id, defaultZIndex, reverse = !1) {
     } else graphic.forEachChildren((item => next ? (result = item, !0) : (item._uid === id && (next = !0), 
     !1)), reverse);
     return result;
-}
-//# sourceMappingURL=sort.js.map
+}

package/es/common/split-path.js

@@ -245,4 +245,5 @@ export const splitPath = (path, count) => {
         remain -= stepCount;
     }
     return res;
-};
+};
+//# sourceMappingURL=split-path.js.map

package/es/core/contributions/layerHandler/canvas2d-contribution.d.ts

@@ -1,7 +1,6 @@
 import type { IGlobal, ICanvas, IContext2d, IDrawToParams, IGroup, ILayer, ILayerHandlerContribution, IWindow, ILayerHandlerInitParams, ILayerHandlerDrawParams, IDrawContext, LayerMode } from '../../../interface';
 import type { IBounds } from '@visactor/vutils';
 export declare class CanvasLayerHandlerContribution implements ILayerHandlerContribution {
-    readonly global: IGlobal;
     layer: ILayer;
     canvas: ICanvas;
     context: IContext2d;
@@ -9,8 +8,9 @@ export declare class CanvasLayerHandlerContribution implements ILayerHandlerCont
     main: boolean;
     window: IWindow;
     type: LayerMode;
+    global: IGlobal;
     secondaryHandlers: ILayerHandlerContribution[];
-    constructor(global: IGlobal);
+    constructor();
     setDpr(dpr: number): void;
     init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void;
     resize(w: number, h: number): void;

package/es/core/contributions/layerHandler/canvas2d-contribution.js

@@ -4,21 +4,17 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }, __metadata = this && this.__metadata || function(k, v) {
     if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
 };
 
-import { inject, injectable } from "../../../common/inversify-lite";
+import { injectable } from "../../../common/inversify-lite";
 
 import { wrapCanvas } from "../../../canvas/util";
 
-import { VGlobal } from "../../../constants";
+import { application } from "../../../application";
 
 let CanvasLayerHandlerContribution = class {
-    constructor(global) {
-        this.global = global, this.type = "static", this.offscreen = !1;
+    constructor() {
+        this.type = "static", this.offscreen = !1, this.global = application.global;
     }
     setDpr(dpr) {
         this.canvas.dpr = dpr;
@@ -84,7 +80,7 @@ let CanvasLayerHandlerContribution = class {
     }
 };
 
-CanvasLayerHandlerContribution = __decorate([ injectable(), __param(0, inject(VGlobal)), __metadata("design:paramtypes", [ Object ]) ], CanvasLayerHandlerContribution);
+CanvasLayerHandlerContribution = __decorate([ injectable(), __metadata("design:paramtypes", []) ], CanvasLayerHandlerContribution);
 
 export { CanvasLayerHandlerContribution };
 //# sourceMappingURL=canvas2d-contribution.js.map

package/es/core/contributions/layerHandler/canvas2d-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/contributions/layerHandler/canvas2d-contribution.ts"],"names":[],"mappings":"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","file":"canvas2d-contribution.js","sourcesContent":["import { inject, injectable } from '../../../common/inversify-lite';\nimport { wrapCanvas } from '../../../canvas/util';\nimport type {\n  IGlobal,\n  ICanvas,\n  IContext2d,\n  IDrawToParams,\n  IGroup,\n  ILayer,\n  ILayerHandlerContribution,\n  IWindow,\n  ILayerHandlerInitParams,\n  ILayerHandlerDrawParams,\n  IDrawContext,\n  LayerMode\n} from '../../../interface';\nimport type { IBounds } from '@visactor/vutils';\nimport { VGlobal } from '../../../constants';\n\n@injectable()\nexport class CanvasLayerHandlerContribution implements ILayerHandlerContribution {\n  layer: ILayer;\n  canvas: ICanvas;\n  context: IContext2d;\n  offscreen: boolean;\n  main: boolean;\n  window: IWindow;\n  type: LayerMode = 'static';\n  // 所绑定的副layer handler\n  secondaryHandlers: ILayerHandlerContribution[];\n\n  constructor(@inject(VGlobal) public readonly global: IGlobal) {\n    this.offscreen = false;\n  }\n\n  setDpr(dpr: number) {\n    this.canvas.dpr = dpr;\n    return;\n  }\n\n  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void {\n    this.layer = layer;\n    this.window = window;\n    // 默认图层，那么直接拿window上的上下文和canvas即可\n    if (params.main) {\n      this.main = true;\n      this.context = window.getContext();\n      this.canvas = this.context.getCanvas();\n    } else {\n      this.main = false;\n      let nativeCanvas: HTMLElement;\n      if (params.canvasId) {\n        nativeCanvas = this.global.getElementById(params.canvasId);\n      } else {\n        nativeCanvas = this.global.createCanvas({\n          width: window.width,\n          height: window.height\n        });\n      }\n      // 不是main的话，就穿透点击事件\n      if (nativeCanvas.style) {\n        nativeCanvas.style['pointer-events'] = 'none';\n      }\n      const windowContext = window.getContext();\n      const windowCanvas = windowContext.getCanvas().nativeCanvas;\n      const canvas = wrapCanvas({\n        nativeCanvas,\n        width: window.width,\n        height: window.height,\n        dpr: window.dpr,\n        canvasControled: true,\n        container: window.getContainer(),\n        x: windowCanvas.offsetLeft,\n        y: windowCanvas.offsetTop\n      });\n      canvas.applyPosition();\n      this.canvas = canvas;\n      this.context = canvas.getContext();\n    }\n  }\n\n  resize(w: number, h: number) {\n    this.canvas.resize(w, h);\n    return;\n  }\n  resizeView(w: number, h: number) {\n    return;\n  }\n\n  render(group: IGroup[], params: ILayerHandlerDrawParams, userParams?: Partial<IDrawContext>): void {\n    // 调整位置\n    if (!this.main) {\n      const windowContext = this.window.getContext();\n      const windowCanvas = windowContext.getCanvas().nativeCanvas;\n      if (windowCanvas && (this.canvas.x !== windowCanvas.offsetLeft || this.canvas.y !== windowCanvas.offsetTop)) {\n        this.canvas.x = windowCanvas.offsetLeft;\n        this.canvas.y = windowCanvas.offsetTop;\n        this.canvas.applyPosition();\n      }\n    }\n    params.renderService.render(group, {\n      context: this.context,\n      clear: params.background ?? '#ffffff',\n      ...params,\n      ...userParams\n    });\n  }\n\n  merge(layerHandlers: ILayerHandlerContribution[]) {\n    layerHandlers.forEach(l => {\n      const ctx = l.getContext();\n      const canvas = ctx.canvas.nativeCanvas;\n      this.context.drawImage(canvas, 0, 0);\n    });\n  }\n\n  prepare(dirtyBounds: IBounds, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  drawTo(target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) {\n    const context = target.getContext();\n    params.renderService.render(group, {\n      context,\n      ...params,\n      clear: params.clear ? params.background ?? '#fff' : undefined\n    });\n    return;\n  }\n\n  getContext(): IContext2d {\n    return this.context;\n  }\n\n  release() {\n    this.canvas.release();\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/contributions/layerHandler/canvas2d-contribution.ts"],"names":[],"mappings":"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","file":"canvas2d-contribution.js","sourcesContent":["import { inject, injectable } from '../../../common/inversify-lite';\nimport { wrapCanvas } from '../../../canvas/util';\nimport type {\n  IGlobal,\n  ICanvas,\n  IContext2d,\n  IDrawToParams,\n  IGroup,\n  ILayer,\n  ILayerHandlerContribution,\n  IWindow,\n  ILayerHandlerInitParams,\n  ILayerHandlerDrawParams,\n  IDrawContext,\n  LayerMode\n} from '../../../interface';\nimport type { IBounds } from '@visactor/vutils';\nimport { application } from '../../../application';\n\n@injectable()\nexport class CanvasLayerHandlerContribution implements ILayerHandlerContribution {\n  layer: ILayer;\n  canvas: ICanvas;\n  context: IContext2d;\n  offscreen: boolean;\n  main: boolean;\n  window: IWindow;\n  type: LayerMode = 'static';\n  global: IGlobal;\n  // 所绑定的副layer handler\n  secondaryHandlers: ILayerHandlerContribution[];\n\n  constructor() {\n    this.offscreen = false;\n    this.global = application.global;\n  }\n\n  setDpr(dpr: number) {\n    this.canvas.dpr = dpr;\n    return;\n  }\n\n  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void {\n    this.layer = layer;\n    this.window = window;\n    // 默认图层，那么直接拿window上的上下文和canvas即可\n    if (params.main) {\n      this.main = true;\n      this.context = window.getContext();\n      this.canvas = this.context.getCanvas();\n    } else {\n      this.main = false;\n      let nativeCanvas: HTMLElement;\n      if (params.canvasId) {\n        nativeCanvas = this.global.getElementById(params.canvasId);\n      } else {\n        nativeCanvas = this.global.createCanvas({\n          width: window.width,\n          height: window.height\n        });\n      }\n      // 不是main的话，就穿透点击事件\n      if (nativeCanvas.style) {\n        nativeCanvas.style['pointer-events'] = 'none';\n      }\n      const windowContext = window.getContext();\n      const windowCanvas = windowContext.getCanvas().nativeCanvas;\n      const canvas = wrapCanvas({\n        nativeCanvas,\n        width: window.width,\n        height: window.height,\n        dpr: window.dpr,\n        canvasControled: true,\n        container: window.getContainer(),\n        x: windowCanvas.offsetLeft,\n        y: windowCanvas.offsetTop\n      });\n      canvas.applyPosition();\n      this.canvas = canvas;\n      this.context = canvas.getContext();\n    }\n  }\n\n  resize(w: number, h: number) {\n    this.canvas.resize(w, h);\n    return;\n  }\n  resizeView(w: number, h: number) {\n    return;\n  }\n\n  render(group: IGroup[], params: ILayerHandlerDrawParams, userParams?: Partial<IDrawContext>): void {\n    // 调整位置\n    if (!this.main) {\n      const windowContext = this.window.getContext();\n      const windowCanvas = windowContext.getCanvas().nativeCanvas;\n      if (windowCanvas && (this.canvas.x !== windowCanvas.offsetLeft || this.canvas.y !== windowCanvas.offsetTop)) {\n        this.canvas.x = windowCanvas.offsetLeft;\n        this.canvas.y = windowCanvas.offsetTop;\n        this.canvas.applyPosition();\n      }\n    }\n    params.renderService.render(group, {\n      context: this.context,\n      clear: params.background ?? '#ffffff',\n      ...params,\n      ...userParams\n    });\n  }\n\n  merge(layerHandlers: ILayerHandlerContribution[]) {\n    layerHandlers.forEach(l => {\n      const ctx = l.getContext();\n      const canvas = ctx.canvas.nativeCanvas;\n      this.context.drawImage(canvas, 0, 0);\n    });\n  }\n\n  prepare(dirtyBounds: IBounds, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  drawTo(target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) {\n    const context = target.getContext();\n    params.renderService.render(group, {\n      context,\n      ...params,\n      clear: params.clear ? params.background ?? '#fff' : undefined\n    });\n    return;\n  }\n\n  getContext(): IContext2d {\n    return this.context;\n  }\n\n  release() {\n    this.canvas.release();\n  }\n}\n"]}

package/es/core/contributions/layerHandler/empty-contribution.d.ts

@@ -1,7 +1,6 @@
 import type { IGlobal, IDrawToParams, IGroup, ILayer, ILayerHandlerContribution, IWindow, ILayerHandlerInitParams, ILayerHandlerDrawParams, IDrawContext, LayerMode } from '../../../interface';
 import type { IBounds } from '@visactor/vutils';
 export declare class EmptyLayerHandlerContribution implements ILayerHandlerContribution {
-    readonly global: IGlobal;
     layer: ILayer;
     canvas: null;
     context: null;
@@ -10,7 +9,8 @@ export declare class EmptyLayerHandlerContribution implements ILayerHandlerContr
     window: IWindow;
     type: LayerMode;
     mainHandler: ILayerHandlerContribution;
-    constructor(global: IGlobal);
+    global: IGlobal;
+    constructor();
     setDpr(dpr: number): void;
     init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void;
     resize(w: number, h: number): void;

package/es/core/contributions/layerHandler/empty-contribution.js

@@ -4,19 +4,15 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }, __metadata = this && this.__metadata || function(k, v) {
     if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
 };
 
-import { inject, injectable } from "../../../common/inversify-lite";
+import { injectable } from "../../../common/inversify-lite";
 
-import { VGlobal } from "../../../constants";
+import { application } from "../../../application";
 
 let EmptyLayerHandlerContribution = class {
-    constructor(global) {
-        this.global = global, this.type = "virtual", this.offscreen = !1;
+    constructor() {
+        this.offscreen = !1, this.type = "virtual", this.global = application.global;
     }
     setDpr(dpr) {}
     init(layer, window, params) {
@@ -47,7 +43,7 @@ let EmptyLayerHandlerContribution = class {
     release() {}
 };
 
-EmptyLayerHandlerContribution = __decorate([ injectable(), __param(0, inject(VGlobal)), __metadata("design:paramtypes", [ Object ]) ], EmptyLayerHandlerContribution);
+EmptyLayerHandlerContribution = __decorate([ injectable(), __metadata("design:paramtypes", []) ], EmptyLayerHandlerContribution);
 
 export { EmptyLayerHandlerContribution };
 //# sourceMappingURL=empty-contribution.js.map

package/es/core/contributions/layerHandler/empty-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/contributions/layerHandler/empty-contribution.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAcpE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGtC,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAWxC,YAA6C,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;QAJ5D,SAAI,GAAc,SAAS,CAAC;QAK1B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,OAAO;IACT,CAAC;IAED,IAAI,CAAC,KAAa,EAAE,MAAe,EAAE,MAA+B;QAClE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;QACD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,CAAS,EAAE,CAAS;QACzB,OAAO;IACT,CAAC;IACD,UAAU,CAAC,CAAS,EAAE,CAAS;QAC7B,OAAO;IACT,CAAC;IAED,MAAM,CAAC,KAAe,EAAE,MAA+B,EAAE,UAAkC;QACzF,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,kCAAO,UAAU,KAAE,KAAK,EAAE,KAAK,IAAG,CAAC;QACxE,OAAO;IACT,CAAC;IAED,KAAK,CAAC,aAA0C;QAC9C,OAAO;IACT,CAAC;IAED,OAAO,CAAC,WAAoB,EAAE,MAA+B;QAC3D,OAAO;IACT,CAAC;IAED,MAAM,CAAC,MAAe,EAAE,KAAe,EAAE,MAA+C;;QACtF,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,gCAC/B,OAAO,IACJ,MAAM,KACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,MAAM,CAAC,CAAC,CAAC,SAAS,IAC7D,CAAC;QACH,OAAO;IACT,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO;IACT,CAAC;CACF,CAAA;AAnEY,6BAA6B;IADzC,UAAU,EAAE;IAYE,WAAA,MAAM,CAAC,OAAO,CAAC,CAAA;;GAXjB,6BAA6B,CAmEzC;SAnEY,6BAA6B","file":"empty-contribution.js","sourcesContent":["import { inject, injectable } from '../../../common/inversify-lite';\nimport type {\n  IGlobal,\n  IDrawToParams,\n  IGroup,\n  ILayer,\n  ILayerHandlerContribution,\n  IWindow,\n  ILayerHandlerInitParams,\n  ILayerHandlerDrawParams,\n  IDrawContext,\n  LayerMode\n} from '../../../interface';\nimport type { IBounds } from '@visactor/vutils';\nimport { VGlobal } from '../../../constants';\n\n@injectable()\nexport class EmptyLayerHandlerContribution implements ILayerHandlerContribution {\n  layer: ILayer;\n  canvas: null;\n  context: null;\n  offscreen: boolean;\n  main: boolean;\n  window: IWindow;\n  type: LayerMode = 'virtual';\n  // 所依赖的主layer handler\n  mainHandler: ILayerHandlerContribution;\n\n  constructor(@inject(VGlobal) public readonly global: IGlobal) {\n    this.offscreen = false;\n  }\n\n  setDpr(dpr: number) {\n    return;\n  }\n\n  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void {\n    this.layer = layer;\n    this.window = window;\n    if (params.main) {\n      throw new Error('virtual layer不能作为main layer');\n    }\n    this.main = false;\n    this.canvas = null;\n    this.context = null;\n  }\n\n  resize(w: number, h: number) {\n    return;\n  }\n  resizeView(w: number, h: number) {\n    return;\n  }\n\n  render(group: IGroup[], params: ILayerHandlerDrawParams, userParams?: Partial<IDrawContext>): void {\n    this.mainHandler.render(group, params, { ...userParams, clear: false });\n    return;\n  }\n\n  merge(layerHandlers: ILayerHandlerContribution[]) {\n    return;\n  }\n\n  prepare(dirtyBounds: IBounds, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  drawTo(target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) {\n    const context = target.getContext();\n    params.renderService.render(group, {\n      context,\n      ...params,\n      clear: params.clear ? params.background ?? '#fff' : undefined\n    });\n    return;\n  }\n\n  getContext(): null {\n    return null;\n  }\n\n  release() {\n    return;\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/contributions/layerHandler/empty-contribution.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAU,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAcpE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAG5C,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAYxC;QACE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,OAAO;IACT,CAAC;IAED,IAAI,CAAC,KAAa,EAAE,MAAe,EAAE,MAA+B;QAClE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;QACD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,CAAS,EAAE,CAAS;QACzB,OAAO;IACT,CAAC;IACD,UAAU,CAAC,CAAS,EAAE,CAAS;QAC7B,OAAO;IACT,CAAC;IAED,MAAM,CAAC,KAAe,EAAE,MAA+B,EAAE,UAAkC;QACzF,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,kCAAO,UAAU,KAAE,KAAK,EAAE,KAAK,IAAG,CAAC;QACxE,OAAO;IACT,CAAC;IAED,KAAK,CAAC,aAA0C;QAC9C,OAAO;IACT,CAAC;IAED,OAAO,CAAC,WAAoB,EAAE,MAA+B;QAC3D,OAAO;IACT,CAAC;IAED,MAAM,CAAC,MAAe,EAAE,KAAe,EAAE,MAA+C;;QACtF,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,gCAC/B,OAAO,IACJ,MAAM,KACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,MAAM,CAAC,CAAC,CAAC,SAAS,IAC7D,CAAC;QACH,OAAO;IACT,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO;IACT,CAAC;CACF,CAAA;AAtEY,6BAA6B;IADzC,UAAU,EAAE;;GACA,6BAA6B,CAsEzC;SAtEY,6BAA6B","file":"empty-contribution.js","sourcesContent":["import { inject, injectable } from '../../../common/inversify-lite';\nimport type {\n  IGlobal,\n  IDrawToParams,\n  IGroup,\n  ILayer,\n  ILayerHandlerContribution,\n  IWindow,\n  ILayerHandlerInitParams,\n  ILayerHandlerDrawParams,\n  IDrawContext,\n  LayerMode\n} from '../../../interface';\nimport type { IBounds } from '@visactor/vutils';\nimport { application } from '../../../application';\n\n@injectable()\nexport class EmptyLayerHandlerContribution implements ILayerHandlerContribution {\n  declare layer: ILayer;\n  declare canvas: null;\n  declare context: null;\n  declare offscreen: boolean;\n  declare main: boolean;\n  declare window: IWindow;\n  declare type: LayerMode;\n  // 所依赖的主layer handler\n  declare mainHandler: ILayerHandlerContribution;\n  declare global: IGlobal;\n\n  constructor() {\n    this.offscreen = false;\n    this.type = 'virtual';\n    this.global = application.global;\n  }\n\n  setDpr(dpr: number) {\n    return;\n  }\n\n  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void {\n    this.layer = layer;\n    this.window = window;\n    if (params.main) {\n      throw new Error('virtual layer不能作为main layer');\n    }\n    this.main = false;\n    this.canvas = null;\n    this.context = null;\n  }\n\n  resize(w: number, h: number) {\n    return;\n  }\n  resizeView(w: number, h: number) {\n    return;\n  }\n\n  render(group: IGroup[], params: ILayerHandlerDrawParams, userParams?: Partial<IDrawContext>): void {\n    this.mainHandler.render(group, params, { ...userParams, clear: false });\n    return;\n  }\n\n  merge(layerHandlers: ILayerHandlerContribution[]) {\n    return;\n  }\n\n  prepare(dirtyBounds: IBounds, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  drawTo(target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) {\n    const context = target.getContext();\n    params.renderService.render(group, {\n      context,\n      ...params,\n      clear: params.clear ? params.background ?? '#fff' : undefined\n    });\n    return;\n  }\n\n  getContext(): null {\n    return null;\n  }\n\n  release() {\n    return;\n  }\n}\n"]}

package/es/core/contributions/layerHandler/offscreen2d-contribution.d.ts

@@ -1,14 +1,14 @@
 import type { IGlobal, ICanvas, IContext2d, IDrawToParams, IGroup, ILayer, ILayerHandlerContribution, ILayerHandlerInitParams, IWindow, ILayerHandlerDrawParams, LayerMode } from '../../../interface';
 import type { IBoundsLike } from '@visactor/vutils';
 export declare class OffscreenLayerHandlerContribution implements ILayerHandlerContribution {
-    readonly global: IGlobal;
     layer: ILayer;
     canvas: ICanvas;
     context: IContext2d;
     offscreen: boolean;
     type: LayerMode;
     secondaryHandlers: ILayerHandlerContribution[];
-    constructor(global: IGlobal);
+    global: IGlobal;
+    constructor();
     setDpr(dpr: number): void;
     init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void;
     resize(w: number, h: number): void;

package/es/core/contributions/layerHandler/offscreen2d-contribution.js

@@ -4,21 +4,17 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }, __metadata = this && this.__metadata || function(k, v) {
     if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
 };
 
-import { inject, injectable } from "../../../common/inversify-lite";
+import { injectable } from "../../../common/inversify-lite";
 
 import { wrapCanvas } from "../../../canvas/util";
 
-import { VGlobal } from "../../../constants";
+import { application } from "../../../application";
 
 let OffscreenLayerHandlerContribution = class {
-    constructor(global) {
-        this.global = global, this.type = "dynamic", this.offscreen = !0;
+    constructor() {
+        this.offscreen = !0, this.type = "dynamic", this.global = application.global;
     }
     setDpr(dpr) {
         this.canvas.dpr = dpr;
@@ -70,7 +66,7 @@ let OffscreenLayerHandlerContribution = class {
     merge(layerHandlers) {}
 };
 
-OffscreenLayerHandlerContribution = __decorate([ injectable(), __param(0, inject(VGlobal)), __metadata("design:paramtypes", [ Object ]) ], OffscreenLayerHandlerContribution);
+OffscreenLayerHandlerContribution = __decorate([ injectable(), __metadata("design:paramtypes", []) ], OffscreenLayerHandlerContribution);
 
 export { OffscreenLayerHandlerContribution };
 //# sourceMappingURL=offscreen2d-contribution.js.map

package/es/core/contributions/layerHandler/offscreen2d-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/contributions/layerHandler/offscreen2d-contribution.ts"],"names":[],"mappings":"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","file":"offscreen2d-contribution.js","sourcesContent":["import { inject, injectable } from '../../../common/inversify-lite';\nimport { wrapCanvas } from '../../../canvas/util';\nimport type {\n  IGlobal,\n  ICanvas,\n  IContext2d,\n  IDrawToParams,\n  IGroup,\n  ILayer,\n  ILayerHandlerContribution,\n  ILayerHandlerInitParams,\n  IWindow,\n  ILayerHandlerDrawParams,\n  LayerMode\n} from '../../../interface';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport { VGlobal } from '../../../constants';\n\n@injectable()\nexport class OffscreenLayerHandlerContribution implements ILayerHandlerContribution {\n  layer: ILayer;\n  canvas: ICanvas;\n  context: IContext2d;\n  offscreen: boolean;\n  type: LayerMode = 'dynamic';\n  // 所绑定的副layer handler\n  secondaryHandlers: ILayerHandlerContribution[];\n\n  constructor(@inject(VGlobal) public readonly global: IGlobal) {\n    this.offscreen = true;\n  }\n\n  setDpr(dpr: number) {\n    this.canvas.dpr = dpr;\n    return;\n  }\n\n  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void {\n    this.layer = layer;\n    const nativeCanvas = this.global.createOffscreenCanvas({\n      width: params.width,\n      height: params.height,\n      dpr: window.dpr\n    });\n    const canvas = wrapCanvas({\n      nativeCanvas,\n      width: params.width,\n      height: params.height,\n      dpr: window.dpr,\n      canvasControled: true\n    });\n\n    this.canvas = canvas;\n    this.context = canvas.getContext();\n  }\n\n  resize(w: number, h: number) {\n    this.canvas.resize(w, h);\n    return;\n  }\n  resizeView(w: number, h: number) {\n    this.canvas.resize(w, h);\n    return;\n  }\n\n  render(group: IGroup[], params: ILayerHandlerDrawParams): void {\n    params.renderService.render(group, {\n      context: this.context,\n      ...params,\n      x: 0,\n      y: 0,\n      clear: params.background ?? '#ffffff'\n    });\n  }\n\n  prepare(dirtyBounds: IBoundsLike, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  release() {\n    this.canvas.release();\n  }\n\n  getContext(): IContext2d {\n    return this.context;\n  }\n\n  drawTo(target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) {\n    const context = target.getContext();\n    const targetDpr = target.dpr;\n\n    const { x = 0, y = 0, width = this.layer.viewWidth, height = this.layer.viewHeight } = params;\n    // 这个context可能是外部的，不要使用内置的状态，直接用原生的context\n    context.nativeContext.save();\n    context.nativeContext.setTransform(targetDpr, 0, 0, targetDpr, 0, 0);\n    if (params.clear) {\n      context.clearRect(x, y, width, height);\n    }\n    context.drawImage(this.canvas.nativeCanvas, 0, 0, this.canvas.width, this.canvas.height, x, y, width, height);\n    context.nativeContext.restore();\n  }\n\n  merge(layerHandlers: ILayerHandlerContribution[]) {\n    return;\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/contributions/layerHandler/offscreen2d-contribution.ts"],"names":[],"mappings":"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","file":"offscreen2d-contribution.js","sourcesContent":["import { inject, injectable } from '../../../common/inversify-lite';\nimport { wrapCanvas } from '../../../canvas/util';\nimport type {\n  IGlobal,\n  ICanvas,\n  IContext2d,\n  IDrawToParams,\n  IGroup,\n  ILayer,\n  ILayerHandlerContribution,\n  ILayerHandlerInitParams,\n  IWindow,\n  ILayerHandlerDrawParams,\n  LayerMode\n} from '../../../interface';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport { application } from '../../../application';\n\n@injectable()\nexport class OffscreenLayerHandlerContribution implements ILayerHandlerContribution {\n  declare layer: ILayer;\n  declare canvas: ICanvas;\n  declare context: IContext2d;\n  declare offscreen: boolean;\n  declare type: LayerMode;\n  // 所绑定的副layer handler\n  declare secondaryHandlers: ILayerHandlerContribution[];\n  declare global: IGlobal;\n\n  constructor() {\n    this.offscreen = true;\n    this.type = 'dynamic';\n    this.global = application.global;\n  }\n\n  setDpr(dpr: number) {\n    this.canvas.dpr = dpr;\n    return;\n  }\n\n  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void {\n    this.layer = layer;\n    const nativeCanvas = this.global.createOffscreenCanvas({\n      width: params.width,\n      height: params.height,\n      dpr: window.dpr\n    });\n    const canvas = wrapCanvas({\n      nativeCanvas,\n      width: params.width,\n      height: params.height,\n      dpr: window.dpr,\n      canvasControled: true\n    });\n\n    this.canvas = canvas;\n    this.context = canvas.getContext();\n  }\n\n  resize(w: number, h: number) {\n    this.canvas.resize(w, h);\n    return;\n  }\n  resizeView(w: number, h: number) {\n    this.canvas.resize(w, h);\n    return;\n  }\n\n  render(group: IGroup[], params: ILayerHandlerDrawParams): void {\n    params.renderService.render(group, {\n      context: this.context,\n      ...params,\n      x: 0,\n      y: 0,\n      clear: params.background ?? '#ffffff'\n    });\n  }\n\n  prepare(dirtyBounds: IBoundsLike, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  release() {\n    this.canvas.release();\n  }\n\n  getContext(): IContext2d {\n    return this.context;\n  }\n\n  drawTo(target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) {\n    const context = target.getContext();\n    const targetDpr = target.dpr;\n\n    const { x = 0, y = 0, width = this.layer.viewWidth, height = this.layer.viewHeight } = params;\n    // 这个context可能是外部的，不要使用内置的状态，直接用原生的context\n    context.nativeContext.save();\n    context.nativeContext.setTransform(targetDpr, 0, 0, targetDpr, 0, 0);\n    if (params.clear) {\n      context.clearRect(x, y, width, height);\n    }\n    context.drawImage(this.canvas.nativeCanvas, 0, 0, this.canvas.width, this.canvas.height, x, y, width, height);\n    context.nativeContext.restore();\n  }\n\n  merge(layerHandlers: ILayerHandlerContribution[]) {\n    return;\n  }\n}\n"]}

package/es/core/contributions/textMeasure/AtextMeasure.d.ts

@@ -33,11 +33,14 @@ export declare class ATextMeasure implements ITextMeasure {
         width: number;
     };
     private _clipText;
+    private _clipTextEnd;
+    private _clipTextStart;
+    private _clipTextMiddle;
     clipTextWithSuffixVertical(verticalList: {
         text: string;
         width?: number;
         direction: number;
-    }[], options: TextOptionsType, width: number, suffix: string, wordBreak: boolean): {
+    }[], options: TextOptionsType, width: number, suffix: string, wordBreak: boolean, suffixPosition: 'start' | 'end' | 'middle'): {
         verticalList: {
             text: string;
             width?: number;
@@ -45,7 +48,16 @@ export declare class ATextMeasure implements ITextMeasure {
         }[];
         width: number;
     };
-    clipTextWithSuffix(text: string, options: TextOptionsType, width: number, suffix: string, wordBreak: boolean): {
+    revertVerticalList(verticalList: {
+        text: string;
+        width?: number;
+        direction: number;
+    }[]): {
+        text: string;
+        width?: number;
+        direction: number;
+    }[];
+    clipTextWithSuffix(text: string, options: TextOptionsType, width: number, suffix: string, wordBreak: boolean, position: 'start' | 'end' | 'middle'): {
         str: string;
         width: number;
     };

package/es/core/contributions/textMeasure/AtextMeasure.js

@@ -58,7 +58,7 @@ let ATextMeasure = class {
         for (;i < verticalList.length && length + verticalList[i].width < width; i++) length += verticalList[i].width, 
         out.push(verticalList[i]);
         if (verticalList[i] && verticalList[i].text.length > 1) {
-            const clipedData = this._clipText(verticalList[i].text, options, width - length, 0, verticalList[i].text.length - 1);
+            const clipedData = this._clipText(verticalList[i].text, options, width - length, 0, verticalList[i].text.length - 1, "end", !1);
             if (wordBreak && clipedData.str !== verticalList[i].text) {
                 let text = "", length = 0;
                 for (let j = 0; j < i; j++) {
@@ -95,14 +95,28 @@ let ATextMeasure = class {
             str: "",
             width: 0
         };
-        const data = this._clipText(text, options, width, 0, text.length - 1);
+        const data = this._clipText(text, options, width, 0, text.length - 1, "end", !1);
         if (wordBreak && data.str !== text) {
             const index = testLetter(text, data.str.length);
             index !== data.str.length && (data.str = text.substring(0, index), data.width = this.measureTextWidth(data.str, options));
         }
         return data;
     }
-    _clipText(text, options, width, leftIdx, rightIdx) {
+    _clipText(text, options, width, leftIdx, rightIdx, position, suffix) {
+        let data;
+        if ("end" === position) data = this._clipTextEnd(text, options, width, leftIdx, rightIdx), 
+        suffix && (data.result = data.str + suffix); else if ("start" === position) data = this._clipTextStart(text, options, width, leftIdx, rightIdx), 
+        suffix && (data.result = suffix + data.str); else if ("middle" === position) {
+            const d = this._clipTextMiddle(text, options, width, "", "", 0, 0, 1);
+            data = {
+                str: "none",
+                width: d.width,
+                result: d.left + suffix + d.right
+            };
+        }
+        return data;
+    }
+    _clipTextEnd(text, options, width, leftIdx, rightIdx) {
         const middleIdx = Math.floor((leftIdx + rightIdx) / 2), subText = text.substring(0, middleIdx + 1), strWidth = this.measureTextWidth(subText, options);
         let length;
         if (strWidth > width) {
@@ -114,7 +128,7 @@ let ATextMeasure = class {
             return length = this.measureTextWidth(str, options), length <= width ? {
                 str: str,
                 width: length
-            } : this._clipText(text, options, width, leftIdx, middleIdx);
+            } : this._clipTextEnd(text, options, width, leftIdx, middleIdx);
         }
         if (strWidth < width) {
             if (middleIdx >= text.length - 1) return {
@@ -125,14 +139,58 @@ let ATextMeasure = class {
             return length = this.measureTextWidth(str, options), length >= width ? {
                 str: subText,
                 width: strWidth
-            } : this._clipText(text, options, width, middleIdx, rightIdx);
+            } : this._clipTextEnd(text, options, width, middleIdx, rightIdx);
         }
         return {
             str: subText,
             width: strWidth
         };
     }
-    clipTextWithSuffixVertical(verticalList, options, width, suffix, wordBreak) {
+    _clipTextStart(text, options, width, leftIdx, rightIdx) {
+        const middleIdx = Math.ceil((leftIdx + rightIdx) / 2), subText = text.substring(middleIdx - 1, text.length - 1), strWidth = this.measureTextWidth(subText, options);
+        let length;
+        if (strWidth > width) {
+            if (subText.length <= 1) return {
+                str: "",
+                width: 0
+            };
+            const str = text.substring(middleIdx, text.length - 1);
+            return length = this.measureTextWidth(str, options), length <= width ? {
+                str: str,
+                width: length
+            } : this._clipTextStart(text, options, width, middleIdx, text.length - 1);
+        }
+        if (strWidth < width) {
+            if (middleIdx <= 0) return {
+                str: text,
+                width: this.measureTextWidth(text, options)
+            };
+            const str = text.substring(middleIdx - 2, text.length - 1);
+            return length = this.measureTextWidth(str, options), length >= width ? {
+                str: subText,
+                width: strWidth
+            } : this._clipTextStart(text, options, width, leftIdx, middleIdx);
+        }
+        return {
+            str: subText,
+            width: strWidth
+        };
+    }
+    _clipTextMiddle(text, options, width, left, right, leftW, rightW, buffer) {
+        const subLeftText = text.substring(0, buffer), strLeftWidth = this.measureTextWidth(subLeftText, options);
+        if (strLeftWidth + rightW > width) return {
+            left: left,
+            right: right,
+            width: leftW + rightW
+        };
+        const subRightText = text.substring(text.length - buffer, text.length), strRightWidth = this.measureTextWidth(subRightText, options);
+        return strLeftWidth + strRightWidth > width ? {
+            left: subLeftText,
+            right: right,
+            width: strLeftWidth + rightW
+        } : this._clipTextMiddle(text, options, width, subLeftText, subRightText, strLeftWidth, strRightWidth, buffer + 1);
+    }
+    clipTextWithSuffixVertical(verticalList, options, width, suffix, wordBreak, suffixPosition) {
         if ("" === suffix) return this.clipTextVertical(verticalList, options, width, wordBreak);
         if (0 === verticalList.length) return {
             verticalList: verticalList,
@@ -142,15 +200,43 @@ let ATextMeasure = class {
         if (output.verticalList.length === verticalList.length && output.verticalList[output.verticalList.length - 1].width === verticalList[verticalList.length - 1].width) return output;
         const suffixWidth = this.measureTextWidth(suffix, options);
         if (suffixWidth > width) return output;
-        width -= suffixWidth;
-        const out = this.clipTextVertical(verticalList, options, width, wordBreak);
-        return out.width += suffixWidth, out.verticalList.push({
+        let out;
+        if (width -= suffixWidth, "start" === suffixPosition) {
+            const nextVerticalList = this.revertVerticalList(verticalList);
+            out = this.clipTextVertical(nextVerticalList, options, width, wordBreak);
+            const v = this.revertVerticalList(out.verticalList);
+            v.unshift({
+                text: suffix,
+                direction: 1,
+                width: suffixWidth
+            }), out.verticalList = v;
+        } else if ("middle" === suffixPosition) {
+            const leftOut = this.clipTextVertical(verticalList, options, width / 2, wordBreak), nextVerticalList = this.revertVerticalList(verticalList), rightOut = this.clipTextVertical(nextVerticalList, options, width / 2, wordBreak);
+            leftOut.verticalList.push({
+                text: suffix,
+                direction: 1,
+                width: suffixWidth
+            }), this.revertVerticalList(rightOut.verticalList).forEach((v => leftOut.verticalList.push(v))), 
+            out = {
+                verticalList: leftOut.verticalList,
+                width: leftOut.width + rightOut.width
+            };
+        } else out = this.clipTextVertical(verticalList, options, width, wordBreak), out.verticalList.push({
             text: suffix,
             direction: 1,
             width: suffixWidth
-        }), out;
+        });
+        return out.width += suffixWidth, out;
+    }
+    revertVerticalList(verticalList) {
+        return verticalList.reverse().map((l => {
+            const t = l.text.split("").reverse().join("");
+            return Object.assign(Object.assign({}, l), {
+                text: t
+            });
+        }));
     }
-    clipTextWithSuffix(text, options, width, suffix, wordBreak) {
+    clipTextWithSuffix(text, options, width, suffix, wordBreak, position) {
         if ("" === suffix) return this.clipText(text, options, width, wordBreak);
         if (0 === text.length) return {
             str: "",
@@ -167,12 +253,12 @@ let ATextMeasure = class {
             width: 0
         };
         width -= suffixWidth;
-        const data = this._clipText(text, options, width, 0, text.length - 1);
+        const data = this._clipText(text, options, width, 0, text.length - 1, position, suffix);
         if (wordBreak && data.str !== text) {
             const index = testLetter(text, data.str.length);
             index !== data.str.length && (data.str = text.substring(0, index), data.width = this.measureTextWidth(data.str, options));
         }
-        return data.str += suffix, data.width += suffixWidth, data;
+        return data.str = data.result, data.width += suffixWidth, data;
     }
 };