@visactor/vrender-core 0.17.0-alpha.8 → 0.17.1-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (814) hide show
  1. package/cjs/allocator/bounds-allocate.d.ts +13 -0
  2. package/cjs/allocator/bounds-allocate.js +38 -0
  3. package/cjs/allocator/bounds-allocate.js.map +1 -0
  4. package/cjs/allocator/canvas-allocate.d.ts +4 -0
  5. package/cjs/allocator/canvas-allocate.js +19 -6
  6. package/cjs/allocator/canvas-allocate.js.map +1 -1
  7. package/cjs/allocator/graphic-allocate.d.ts +56 -1
  8. package/cjs/allocator/graphic-allocate.js +163 -1
  9. package/cjs/allocator/graphic-allocate.js.map +1 -1
  10. package/cjs/animate/Ticker/default-ticker.js +3 -3
  11. package/cjs/animate/Ticker/default-ticker.js.map +1 -1
  12. package/cjs/animate/animate.js +2 -2
  13. package/cjs/animate/animate.js.map +1 -1
  14. package/cjs/animate/config.js +1 -2
  15. package/cjs/animate/custom-animate.d.ts +14 -3
  16. package/cjs/animate/custom-animate.js +100 -5
  17. package/cjs/animate/custom-animate.js.map +1 -1
  18. package/cjs/animate/default-ticker.js +2 -1
  19. package/cjs/canvas/contributions/base-canvas.js +4 -2
  20. package/cjs/canvas/contributions/base-canvas.js.map +1 -1
  21. package/cjs/common/Reflect-metadata.js +349 -359
  22. package/cjs/common/Reflect-metadata.js.map +1 -1
  23. package/cjs/common/bounds-context.js +2 -1
  24. package/cjs/common/inversify/annotation/inject.d.ts +1 -0
  25. package/cjs/common/inversify/annotation/inject.js +10 -0
  26. package/cjs/common/inversify/annotation/inject.js.map +1 -0
  27. package/cjs/common/inversify/annotation/inject_base.d.ts +14 -0
  28. package/cjs/common/inversify/annotation/inject_base.js +39 -0
  29. package/cjs/common/inversify/annotation/inject_base.js.map +1 -0
  30. package/cjs/common/inversify/annotation/injectable.d.ts +1 -0
  31. package/cjs/common/{inversify-lite/annotation/post_construct.js → inversify/annotation/injectable.js} +15 -5
  32. package/cjs/common/inversify/annotation/injectable.js.map +1 -0
  33. package/cjs/common/inversify/annotation/multi_inject.d.ts +1 -0
  34. package/cjs/common/inversify/annotation/multi_inject.js +10 -0
  35. package/cjs/common/inversify/annotation/multi_inject.js.map +1 -0
  36. package/cjs/common/inversify/annotation/named.d.ts +1 -0
  37. package/cjs/common/inversify/annotation/named.js +14 -0
  38. package/cjs/common/inversify/annotation/named.js.map +1 -0
  39. package/cjs/common/inversify/binding.d.ts +18 -0
  40. package/cjs/common/inversify/binding.js +26 -0
  41. package/cjs/common/inversify/binding.js.map +1 -0
  42. package/cjs/common/inversify/container.d.ts +28 -0
  43. package/cjs/common/inversify/container.js +155 -0
  44. package/cjs/common/inversify/container.js.map +1 -0
  45. package/cjs/common/inversify/cotainer-module.d.ts +6 -0
  46. package/cjs/common/inversify/cotainer-module.js +16 -0
  47. package/cjs/common/inversify/cotainer-module.js.map +1 -0
  48. package/cjs/common/inversify/index.d.ts +7 -0
  49. package/cjs/common/inversify/index.js +75 -0
  50. package/cjs/common/inversify/index.js.map +1 -0
  51. package/cjs/common/inversify/interfaces.d.ts +218 -0
  52. package/cjs/common/inversify/interfaces.js +6 -0
  53. package/cjs/common/inversify/interfaces.js.map +1 -0
  54. package/cjs/common/inversify/literal_types.d.ts +5 -0
  55. package/cjs/common/inversify/literal_types.js +34 -0
  56. package/cjs/common/inversify/literal_types.js.map +1 -0
  57. package/cjs/common/inversify/meta-data.d.ts +6 -0
  58. package/cjs/common/inversify/meta-data.js +19 -0
  59. package/cjs/common/inversify/meta-data.js.map +1 -0
  60. package/cjs/common/inversify/metadata_keys.d.ts +12 -0
  61. package/cjs/common/inversify/metadata_keys.js +15 -0
  62. package/cjs/common/inversify/metadata_keys.js.map +1 -0
  63. package/cjs/common/inversify/metadata_reader.d.ts +6 -0
  64. package/cjs/common/inversify/metadata_reader.js +28 -0
  65. package/cjs/common/inversify/metadata_reader.js.map +1 -0
  66. package/cjs/common/inversify/syntax/binding_in_syntax.d.ts +10 -0
  67. package/cjs/common/inversify/syntax/binding_in_syntax.js +29 -0
  68. package/cjs/common/inversify/syntax/binding_in_syntax.js.map +1 -0
  69. package/cjs/common/inversify/syntax/binding_to_syntax.d.ts +12 -0
  70. package/cjs/common/inversify/syntax/binding_to_syntax.js +40 -0
  71. package/cjs/common/inversify/syntax/binding_to_syntax.js.map +1 -0
  72. package/cjs/common/inversify/syntax/constraint_helpers.d.ts +2 -0
  73. package/cjs/common/inversify/syntax/constraint_helpers.js +20 -0
  74. package/cjs/common/inversify/syntax/constraint_helpers.js.map +1 -0
  75. package/cjs/common/inversify-lite/container/container.js +1 -3
  76. package/cjs/common/inversify-lite/container/container.js.map +1 -1
  77. package/cjs/common/inversify-lite/index.d.ts +1 -8
  78. package/cjs/common/inversify-lite/index.js +1 -64
  79. package/cjs/common/inversify-lite/index.js.map +1 -1
  80. package/cjs/common/inversify-lite/interfaces/interfaces.d.ts +0 -2
  81. package/cjs/common/inversify-lite/interfaces/interfaces.js.map +1 -1
  82. package/cjs/common/inversify-lite/planning/queryable_string.d.ts +0 -2
  83. package/cjs/common/inversify-lite/planning/queryable_string.js +0 -10
  84. package/cjs/common/inversify-lite/planning/queryable_string.js.map +1 -1
  85. package/cjs/common/inversify-lite/resolution/resolver.js.map +1 -1
  86. package/cjs/common/segment/monotone.js +2 -2
  87. package/cjs/common/segment/monotone.js.map +1 -1
  88. package/cjs/common/shape/rect.js +2 -1
  89. package/cjs/common/shape/rect.js.map +1 -1
  90. package/cjs/common/sort.js +1 -2
  91. package/cjs/common/store.js +2 -1
  92. package/cjs/common/utils.d.ts +1 -0
  93. package/cjs/common/utils.js +10 -1
  94. package/cjs/common/utils.js.map +1 -1
  95. package/cjs/common/xml/OrderedObjParser.js +2 -2
  96. package/cjs/common/xml/OrderedObjParser.js.map +1 -1
  97. package/cjs/core/contributions/layerHandler/canvas2d-contribution.d.ts +2 -2
  98. package/cjs/core/contributions/layerHandler/canvas2d-contribution.js +4 -9
  99. package/cjs/core/contributions/layerHandler/canvas2d-contribution.js.map +1 -1
  100. package/cjs/core/contributions/layerHandler/empty-contribution.d.ts +2 -2
  101. package/cjs/core/contributions/layerHandler/empty-contribution.js +4 -9
  102. package/cjs/core/contributions/layerHandler/empty-contribution.js.map +1 -1
  103. package/cjs/core/contributions/layerHandler/offscreen2d-contribution.d.ts +2 -2
  104. package/cjs/core/contributions/layerHandler/offscreen2d-contribution.js +4 -9
  105. package/cjs/core/contributions/layerHandler/offscreen2d-contribution.js.map +1 -1
  106. package/cjs/core/contributions/textMeasure/AtextMeasure.d.ts +14 -2
  107. package/cjs/core/contributions/textMeasure/AtextMeasure.js +99 -13
  108. package/cjs/core/contributions/textMeasure/AtextMeasure.js.map +1 -1
  109. package/cjs/core/contributions/textMeasure/layout.d.ts +2 -2
  110. package/cjs/core/contributions/textMeasure/layout.js +4 -4
  111. package/cjs/core/contributions/textMeasure/layout.js.map +1 -1
  112. package/cjs/core/contributions/textMeasure/modules.js +1 -2
  113. package/cjs/core/contributions/textMeasure/modules.js.map +1 -1
  114. package/cjs/core/core-modules.js +5 -6
  115. package/cjs/core/core-modules.js.map +1 -1
  116. package/cjs/core/global-module.js +2 -0
  117. package/cjs/core/global.d.ts +9 -0
  118. package/cjs/core/global.js +23 -5
  119. package/cjs/core/global.js.map +1 -1
  120. package/cjs/core/graphic-utils.d.ts +7 -4
  121. package/cjs/core/graphic-utils.js +18 -14
  122. package/cjs/core/graphic-utils.js.map +1 -1
  123. package/cjs/core/layer-service.d.ts +5 -2
  124. package/cjs/core/layer-service.js +17 -15
  125. package/cjs/core/layer-service.js.map +1 -1
  126. package/cjs/core/stage.d.ts +8 -4
  127. package/cjs/core/stage.js +42 -27
  128. package/cjs/core/stage.js.map +1 -1
  129. package/cjs/core/window.d.ts +2 -2
  130. package/cjs/core/window.js +7 -12
  131. package/cjs/core/window.js.map +1 -1
  132. package/cjs/env-check.d.ts +3 -0
  133. package/cjs/env-check.js +19 -0
  134. package/cjs/env-check.js.map +1 -0
  135. package/cjs/event/event-manager.d.ts +5 -1
  136. package/cjs/event/event-manager.js +31 -25
  137. package/cjs/event/event-manager.js.map +1 -1
  138. package/cjs/event/event-system.js +12 -11
  139. package/cjs/event/event-system.js.map +1 -1
  140. package/cjs/event/federated-event/base-event.d.ts +5 -6
  141. package/cjs/event/federated-event/base-event.js +15 -5
  142. package/cjs/event/federated-event/base-event.js.map +1 -1
  143. package/cjs/event/federated-event/mouse-event.d.ts +6 -6
  144. package/cjs/event/federated-event/mouse-event.js +17 -3
  145. package/cjs/event/federated-event/mouse-event.js.map +1 -1
  146. package/cjs/graphic/area.js +1 -0
  147. package/cjs/graphic/area.js.map +1 -1
  148. package/cjs/graphic/bounds.d.ts +2 -2
  149. package/cjs/graphic/bounds.js +8 -10
  150. package/cjs/graphic/bounds.js.map +1 -1
  151. package/cjs/graphic/builtin-symbol/index.d.ts +1 -0
  152. package/cjs/graphic/builtin-symbol/index.js +7 -2
  153. package/cjs/graphic/builtin-symbol/index.js.map +1 -1
  154. package/cjs/graphic/builtin-symbol/rect.d.ts +2 -1
  155. package/cjs/graphic/builtin-symbol/rect.js +11 -6
  156. package/cjs/graphic/builtin-symbol/rect.js.map +1 -1
  157. package/cjs/graphic/config.js +11 -3
  158. package/cjs/graphic/config.js.map +1 -1
  159. package/cjs/graphic/graphic-creator.d.ts +24 -36
  160. package/cjs/graphic/graphic-creator.js +16 -99
  161. package/cjs/graphic/graphic-creator.js.map +1 -1
  162. package/cjs/graphic/graphic-service/arc-contribution.d.ts +1 -5
  163. package/cjs/graphic/graphic-service/arc-contribution.js +0 -18
  164. package/cjs/graphic/graphic-service/arc-contribution.js.map +1 -1
  165. package/cjs/graphic/graphic-service/area-contribution.d.ts +1 -1
  166. package/cjs/graphic/graphic-service/area-contribution.js +1 -4
  167. package/cjs/graphic/graphic-service/area-contribution.js.map +1 -1
  168. package/cjs/graphic/graphic-service/circle-contribution.d.ts +1 -5
  169. package/cjs/graphic/graphic-service/circle-contribution.js +0 -18
  170. package/cjs/graphic/graphic-service/circle-contribution.js.map +1 -1
  171. package/cjs/graphic/graphic-service/common-contribution.js +2 -11
  172. package/cjs/graphic/graphic-service/common-contribution.js.map +1 -1
  173. package/cjs/graphic/graphic-service/graphic-module.js +2 -17
  174. package/cjs/graphic/graphic-service/graphic-module.js.map +1 -1
  175. package/cjs/graphic/graphic-service/graphic-service.d.ts +5 -9
  176. package/cjs/graphic/graphic-service/graphic-service.js +43 -32
  177. package/cjs/graphic/graphic-service/graphic-service.js.map +1 -1
  178. package/cjs/graphic/graphic-service/path-contribution.d.ts +1 -5
  179. package/cjs/graphic/graphic-service/path-contribution.js +0 -18
  180. package/cjs/graphic/graphic-service/path-contribution.js.map +1 -1
  181. package/cjs/graphic/graphic-service/rect-contribution.d.ts +1 -5
  182. package/cjs/graphic/graphic-service/rect-contribution.js +0 -18
  183. package/cjs/graphic/graphic-service/rect-contribution.js.map +1 -1
  184. package/cjs/graphic/graphic-service/symbol-contribution.d.ts +0 -1
  185. package/cjs/graphic/graphic-service/symbol-contribution.js +4 -13
  186. package/cjs/graphic/graphic-service/symbol-contribution.js.map +1 -1
  187. package/cjs/graphic/graphic.js +9 -7
  188. package/cjs/graphic/graphic.js.map +1 -1
  189. package/cjs/graphic/group.d.ts +1 -0
  190. package/cjs/graphic/group.js +7 -3
  191. package/cjs/graphic/group.js.map +1 -1
  192. package/cjs/graphic/index.d.ts +1 -0
  193. package/cjs/graphic/index.js +6 -5
  194. package/cjs/graphic/index.js.map +1 -1
  195. package/cjs/graphic/line.js +1 -0
  196. package/cjs/graphic/line.js.map +1 -1
  197. package/cjs/graphic/node-tree.js +1 -1
  198. package/cjs/graphic/node-tree.js.map +1 -1
  199. package/cjs/graphic/rect.d.ts +2 -3
  200. package/cjs/graphic/rect.js +3 -5
  201. package/cjs/graphic/rect.js.map +1 -1
  202. package/cjs/graphic/richtext/line.d.ts +1 -0
  203. package/cjs/graphic/richtext/line.js +6 -3
  204. package/cjs/graphic/richtext/line.js.map +1 -1
  205. package/cjs/graphic/richtext/paragraph.js +12 -11
  206. package/cjs/graphic/richtext/paragraph.js.map +1 -1
  207. package/cjs/graphic/richtext/utils.js +2 -1
  208. package/cjs/graphic/richtext/utils.js.map +1 -1
  209. package/cjs/graphic/richtext.d.ts +3 -3
  210. package/cjs/graphic/richtext.js +12 -3
  211. package/cjs/graphic/richtext.js.map +1 -1
  212. package/cjs/graphic/symbol.js +11 -9
  213. package/cjs/graphic/symbol.js.map +1 -1
  214. package/cjs/graphic/text.d.ts +1 -0
  215. package/cjs/graphic/text.js +97 -11
  216. package/cjs/graphic/text.js.map +1 -1
  217. package/cjs/graphic/theme.d.ts +4 -4
  218. package/cjs/graphic/theme.js +26 -27
  219. package/cjs/graphic/theme.js.map +1 -1
  220. package/cjs/graphic/tools.js +1 -1
  221. package/cjs/graphic/tools.js.map +1 -1
  222. package/cjs/graphic/wrap-text.js +6 -5
  223. package/cjs/graphic/wrap-text.js.map +1 -1
  224. package/cjs/index.d.ts +18 -0
  225. package/cjs/index.js +10 -1
  226. package/cjs/index.js.map +1 -1
  227. package/cjs/interface/allocator.d.ts +1 -0
  228. package/cjs/interface/allocator.js.map +1 -1
  229. package/cjs/interface/event.d.ts +15 -44
  230. package/cjs/interface/event.js.map +1 -1
  231. package/cjs/interface/global.d.ts +1 -0
  232. package/cjs/interface/global.js.map +1 -1
  233. package/cjs/interface/graphic/rect.d.ts +2 -0
  234. package/cjs/interface/graphic/rect.js.map +1 -1
  235. package/cjs/interface/graphic/richText.d.ts +1 -1
  236. package/cjs/interface/graphic/richText.js.map +1 -1
  237. package/cjs/interface/graphic/text.d.ts +5 -1
  238. package/cjs/interface/graphic/text.js.map +1 -1
  239. package/cjs/interface/graphic.d.ts +3 -2
  240. package/cjs/interface/graphic.js.map +1 -1
  241. package/cjs/interface/render.d.ts +2 -2
  242. package/cjs/interface/render.js.map +1 -1
  243. package/cjs/interface/stage.d.ts +8 -1
  244. package/cjs/interface/stage.js.map +1 -1
  245. package/cjs/interface/text.d.ts +2 -2
  246. package/cjs/interface/text.js.map +1 -1
  247. package/cjs/modules.d.ts +1 -2
  248. package/cjs/modules.js +8 -8
  249. package/cjs/modules.js.map +1 -1
  250. package/cjs/picker/global-picker-service.d.ts +2 -2
  251. package/cjs/picker/global-picker-service.js +4 -9
  252. package/cjs/picker/global-picker-service.js.map +1 -1
  253. package/cjs/picker/pick-interceptor.js +2 -1
  254. package/cjs/picker/pick-interceptor.js.map +1 -1
  255. package/cjs/picker/pick-modules.js +2 -4
  256. package/cjs/picker/pick-modules.js.map +1 -1
  257. package/cjs/picker/picker-service.d.ts +2 -2
  258. package/cjs/picker/picker-service.js +11 -7
  259. package/cjs/picker/picker-service.js.map +1 -1
  260. package/cjs/plugins/builtin-plugin/flex-layout-plugin.js +9 -5
  261. package/cjs/plugins/builtin-plugin/flex-layout-plugin.js.map +1 -1
  262. package/cjs/plugins/builtin-plugin/html-attribute-plugin.js +1 -1
  263. package/cjs/plugins/builtin-plugin/html-attribute-plugin.js.map +1 -1
  264. package/cjs/plugins/plugin-modules.js +1 -2
  265. package/cjs/plugins/plugin-modules.js.map +1 -1
  266. package/cjs/render/contributions/render/arc-module.d.ts +2 -0
  267. package/cjs/render/contributions/render/arc-module.js +17 -0
  268. package/cjs/render/contributions/render/arc-module.js.map +1 -0
  269. package/cjs/render/contributions/render/arc-render.js +2 -1
  270. package/cjs/render/contributions/render/arc-render.js.map +1 -1
  271. package/cjs/render/contributions/render/arc3d-module.d.ts +2 -0
  272. package/cjs/render/contributions/render/arc3d-module.js +15 -0
  273. package/cjs/render/contributions/render/arc3d-module.js.map +1 -0
  274. package/cjs/render/contributions/render/area-module.d.ts +2 -0
  275. package/cjs/render/contributions/render/area-module.js +18 -0
  276. package/cjs/render/contributions/render/area-module.js.map +1 -0
  277. package/cjs/render/contributions/render/area-render.d.ts +1 -0
  278. package/cjs/render/contributions/render/area-render.js +44 -6
  279. package/cjs/render/contributions/render/area-render.js.map +1 -1
  280. package/cjs/render/contributions/render/base-render.d.ts +1 -1
  281. package/cjs/render/contributions/render/base-render.js +15 -18
  282. package/cjs/render/contributions/render/base-render.js.map +1 -1
  283. package/cjs/render/contributions/render/circle-module.d.ts +2 -0
  284. package/cjs/render/contributions/render/circle-module.js +17 -0
  285. package/cjs/render/contributions/render/circle-module.js.map +1 -0
  286. package/cjs/render/contributions/render/circle-render.js +2 -1
  287. package/cjs/render/contributions/render/circle-render.js.map +1 -1
  288. package/cjs/render/contributions/render/contributions/arc-contribution-render.d.ts +3 -7
  289. package/cjs/render/contributions/render/contributions/arc-contribution-render.js +7 -30
  290. package/cjs/render/contributions/render/contributions/arc-contribution-render.js.map +1 -1
  291. package/cjs/render/contributions/render/contributions/area-contribution-render.d.ts +3 -4
  292. package/cjs/render/contributions/render/contributions/area-contribution-render.js +7 -21
  293. package/cjs/render/contributions/render/contributions/area-contribution-render.js.map +1 -1
  294. package/cjs/render/contributions/render/contributions/base-contribution-render.d.ts +4 -0
  295. package/cjs/render/contributions/render/contributions/base-contribution-render.js +24 -15
  296. package/cjs/render/contributions/render/contributions/base-contribution-render.js.map +1 -1
  297. package/cjs/render/contributions/render/contributions/circle-contribution-render.d.ts +3 -7
  298. package/cjs/render/contributions/render/contributions/circle-contribution-render.js +7 -30
  299. package/cjs/render/contributions/render/contributions/circle-contribution-render.js.map +1 -1
  300. package/cjs/render/contributions/render/contributions/constants.d.ts +1 -0
  301. package/cjs/render/contributions/render/contributions/constants.js +2 -2
  302. package/cjs/render/contributions/render/contributions/constants.js.map +1 -1
  303. package/cjs/render/contributions/render/contributions/group-contribution-render.d.ts +1 -0
  304. package/cjs/render/contributions/render/contributions/group-contribution-render.js +8 -14
  305. package/cjs/render/contributions/render/contributions/group-contribution-render.js.map +1 -1
  306. package/cjs/render/contributions/render/contributions/image-contribution-render.d.ts +1 -0
  307. package/cjs/render/contributions/render/contributions/image-contribution-render.js +8 -15
  308. package/cjs/render/contributions/render/contributions/image-contribution-render.js.map +1 -1
  309. package/cjs/render/contributions/render/contributions/path-contribution-render.d.ts +2 -9
  310. package/cjs/render/contributions/render/contributions/path-contribution-render.js +4 -25
  311. package/cjs/render/contributions/render/contributions/path-contribution-render.js.map +1 -1
  312. package/cjs/render/contributions/render/contributions/polygon-contribution-render.d.ts +2 -9
  313. package/cjs/render/contributions/render/contributions/polygon-contribution-render.js +4 -25
  314. package/cjs/render/contributions/render/contributions/polygon-contribution-render.js.map +1 -1
  315. package/cjs/render/contributions/render/contributions/rect-contribution-render.d.ts +5 -7
  316. package/cjs/render/contributions/render/contributions/rect-contribution-render.js +17 -37
  317. package/cjs/render/contributions/render/contributions/rect-contribution-render.js.map +1 -1
  318. package/cjs/render/contributions/render/contributions/symbol-contribution-render.d.ts +3 -7
  319. package/cjs/render/contributions/render/contributions/symbol-contribution-render.js +6 -27
  320. package/cjs/render/contributions/render/contributions/symbol-contribution-render.js.map +1 -1
  321. package/cjs/render/contributions/render/contributions/text-contribution-render.d.ts +8 -1
  322. package/cjs/render/contributions/render/contributions/text-contribution-render.js +25 -1
  323. package/cjs/render/contributions/render/contributions/text-contribution-render.js.map +1 -1
  324. package/cjs/render/contributions/render/draw-contribution.d.ts +7 -6
  325. package/cjs/render/contributions/render/draw-contribution.js +44 -26
  326. package/cjs/render/contributions/render/draw-contribution.js.map +1 -1
  327. package/cjs/render/contributions/render/draw-interceptor.d.ts +7 -1
  328. package/cjs/render/contributions/render/draw-interceptor.js +43 -28
  329. package/cjs/render/contributions/render/draw-interceptor.js.map +1 -1
  330. package/cjs/render/contributions/render/glyph-module.d.ts +2 -0
  331. package/cjs/render/contributions/render/glyph-module.js +15 -0
  332. package/cjs/render/contributions/render/glyph-module.js.map +1 -0
  333. package/cjs/render/contributions/render/glyph-render.d.ts +1 -2
  334. package/cjs/render/contributions/render/glyph-render.js +13 -8
  335. package/cjs/render/contributions/render/glyph-render.js.map +1 -1
  336. package/cjs/render/contributions/render/group-render.js +3 -2
  337. package/cjs/render/contributions/render/group-render.js.map +1 -1
  338. package/cjs/render/contributions/render/image-module.d.ts +2 -0
  339. package/cjs/render/contributions/render/image-module.js +16 -0
  340. package/cjs/render/contributions/render/image-module.js.map +1 -0
  341. package/cjs/render/contributions/render/image-render.js +4 -2
  342. package/cjs/render/contributions/render/image-render.js.map +1 -1
  343. package/cjs/render/contributions/render/incremental-draw-contribution.d.ts +2 -6
  344. package/cjs/render/contributions/render/incremental-draw-contribution.js +8 -11
  345. package/cjs/render/contributions/render/incremental-draw-contribution.js.map +1 -1
  346. package/cjs/render/contributions/render/line-module.d.ts +2 -0
  347. package/cjs/render/contributions/render/line-module.js +17 -0
  348. package/cjs/render/contributions/render/line-module.js.map +1 -0
  349. package/cjs/render/contributions/render/line-render.d.ts +1 -0
  350. package/cjs/render/contributions/render/line-render.js +21 -6
  351. package/cjs/render/contributions/render/line-render.js.map +1 -1
  352. package/cjs/render/contributions/render/module.js +8 -98
  353. package/cjs/render/contributions/render/module.js.map +1 -1
  354. package/cjs/render/contributions/render/path-module.d.ts +2 -0
  355. package/cjs/render/contributions/render/path-module.js +17 -0
  356. package/cjs/render/contributions/render/path-module.js.map +1 -0
  357. package/cjs/render/contributions/render/path-render.d.ts +2 -1
  358. package/cjs/render/contributions/render/path-render.js +8 -5
  359. package/cjs/render/contributions/render/path-render.js.map +1 -1
  360. package/cjs/render/contributions/render/polygon-module.d.ts +2 -0
  361. package/cjs/render/contributions/render/polygon-module.js +16 -0
  362. package/cjs/render/contributions/render/polygon-module.js.map +1 -0
  363. package/cjs/render/contributions/render/polygon-render.js +2 -1
  364. package/cjs/render/contributions/render/polygon-render.js.map +1 -1
  365. package/cjs/render/contributions/render/pyramid3d-module.d.ts +2 -0
  366. package/cjs/render/contributions/render/pyramid3d-module.js +15 -0
  367. package/cjs/render/contributions/render/pyramid3d-module.js.map +1 -0
  368. package/cjs/render/contributions/render/rect-module.d.ts +2 -0
  369. package/cjs/render/contributions/render/rect-module.js +17 -0
  370. package/cjs/render/contributions/render/rect-module.js.map +1 -0
  371. package/cjs/render/contributions/render/rect-render.d.ts +2 -1
  372. package/cjs/render/contributions/render/rect-render.js +11 -5
  373. package/cjs/render/contributions/render/rect-render.js.map +1 -1
  374. package/cjs/render/contributions/render/rect3d-module.d.ts +2 -0
  375. package/cjs/render/contributions/render/rect3d-module.js +15 -0
  376. package/cjs/render/contributions/render/rect3d-module.js.map +1 -0
  377. package/cjs/render/contributions/render/render-slector.d.ts +1 -4
  378. package/cjs/render/contributions/render/render-slector.js +0 -20
  379. package/cjs/render/contributions/render/render-slector.js.map +1 -1
  380. package/cjs/render/contributions/render/richtext-module.d.ts +2 -0
  381. package/cjs/render/contributions/render/richtext-module.js +15 -0
  382. package/cjs/render/contributions/render/richtext-module.js.map +1 -0
  383. package/cjs/render/contributions/render/richtext-render.d.ts +1 -0
  384. package/cjs/render/contributions/render/richtext-render.js +12 -7
  385. package/cjs/render/contributions/render/richtext-render.js.map +1 -1
  386. package/cjs/render/contributions/render/symbol-module.d.ts +2 -0
  387. package/cjs/render/contributions/render/symbol-module.js +17 -0
  388. package/cjs/render/contributions/render/symbol-module.js.map +1 -0
  389. package/cjs/render/contributions/render/symbol-render.js +22 -5
  390. package/cjs/render/contributions/render/symbol-render.js.map +1 -1
  391. package/cjs/render/contributions/render/text-module.d.ts +2 -0
  392. package/cjs/render/contributions/render/text-module.js +16 -0
  393. package/cjs/render/contributions/render/text-module.js.map +1 -0
  394. package/cjs/render/contributions/render/text-render.js +13 -10
  395. package/cjs/render/contributions/render/text-render.js.map +1 -1
  396. package/cjs/render/contributions/render/utils.js +2 -2
  397. package/cjs/render/contributions/render/utils.js.map +1 -1
  398. package/cjs/render/render-modules.js +1 -1
  399. package/cjs/render/render-modules.js.map +1 -1
  400. package/cjs/render/render-service.js +1 -1
  401. package/cjs/render/render-service.js.map +1 -1
  402. package/cjs/resource-loader/loader.js +1 -3
  403. package/cjs/resource-loader/loader.js.map +1 -1
  404. package/dist/index.js +8931 -9097
  405. package/dist/index.min.js +1 -1
  406. package/es/allocator/bounds-allocate.d.ts +13 -0
  407. package/es/allocator/bounds-allocate.js +32 -0
  408. package/es/allocator/bounds-allocate.js.map +1 -0
  409. package/es/allocator/canvas-allocate.d.ts +4 -0
  410. package/es/allocator/canvas-allocate.js +19 -6
  411. package/es/allocator/canvas-allocate.js.map +1 -1
  412. package/es/allocator/graphic-allocate.d.ts +56 -1
  413. package/es/allocator/graphic-allocate.js +155 -1
  414. package/es/allocator/graphic-allocate.js.map +1 -1
  415. package/es/animate/Ticker/default-ticker.js +4 -2
  416. package/es/animate/Ticker/default-ticker.js.map +1 -1
  417. package/es/animate/animate.js +3 -3
  418. package/es/animate/animate.js.map +1 -1
  419. package/es/animate/config.js +1 -2
  420. package/es/animate/custom-animate.d.ts +14 -3
  421. package/es/animate/custom-animate.js +103 -5
  422. package/es/animate/custom-animate.js.map +1 -1
  423. package/es/animate/default-ticker.js +2 -1
  424. package/es/canvas/contributions/base-canvas.js +4 -2
  425. package/es/canvas/contributions/base-canvas.js.map +1 -1
  426. package/es/common/Reflect-metadata.js +349 -359
  427. package/es/common/Reflect-metadata.js.map +1 -1
  428. package/es/common/bounds-context.js +2 -1
  429. package/es/common/inversify/annotation/inject.d.ts +1 -0
  430. package/es/common/inversify/annotation/inject.js +6 -0
  431. package/es/common/inversify/annotation/inject.js.map +1 -0
  432. package/es/common/inversify/annotation/inject_base.d.ts +14 -0
  433. package/es/common/inversify/annotation/inject_base.js +29 -0
  434. package/es/common/inversify/annotation/inject_base.js.map +1 -0
  435. package/es/common/inversify/annotation/injectable.d.ts +1 -0
  436. package/es/common/inversify/annotation/injectable.js +10 -0
  437. package/es/common/inversify/annotation/injectable.js.map +1 -0
  438. package/es/common/inversify/annotation/multi_inject.d.ts +1 -0
  439. package/es/common/inversify/annotation/multi_inject.js +6 -0
  440. package/es/common/inversify/annotation/multi_inject.js.map +1 -0
  441. package/es/common/inversify/annotation/named.d.ts +1 -0
  442. package/es/common/inversify/annotation/named.js +10 -0
  443. package/es/common/inversify/annotation/named.js.map +1 -0
  444. package/es/common/inversify/binding.d.ts +18 -0
  445. package/es/common/inversify/binding.js +22 -0
  446. package/es/common/inversify/binding.js.map +1 -0
  447. package/es/common/inversify/container.d.ts +28 -0
  448. package/es/common/inversify/container.js +155 -0
  449. package/es/common/inversify/container.js.map +1 -0
  450. package/es/common/inversify/cotainer-module.d.ts +6 -0
  451. package/es/common/inversify/cotainer-module.js +8 -0
  452. package/es/common/inversify/cotainer-module.js.map +1 -0
  453. package/es/common/inversify/index.d.ts +7 -0
  454. package/es/common/inversify/index.js +14 -0
  455. package/es/common/inversify/index.js.map +1 -0
  456. package/es/common/inversify/interfaces.d.ts +218 -0
  457. package/es/common/inversify/interfaces.js +2 -0
  458. package/es/common/inversify/interfaces.js.map +1 -0
  459. package/es/common/inversify/literal_types.d.ts +5 -0
  460. package/es/common/inversify/literal_types.js +20 -0
  461. package/es/common/inversify/literal_types.js.map +1 -0
  462. package/es/common/inversify/meta-data.d.ts +6 -0
  463. package/es/common/inversify/meta-data.js +11 -0
  464. package/es/common/inversify/meta-data.js.map +1 -0
  465. package/es/common/inversify/metadata_keys.d.ts +12 -0
  466. package/es/common/inversify/metadata_keys.js +28 -0
  467. package/es/common/inversify/metadata_keys.js.map +1 -0
  468. package/es/common/inversify/metadata_reader.d.ts +6 -0
  469. package/es/common/inversify/metadata_reader.js +18 -0
  470. package/es/common/inversify/metadata_reader.js.map +1 -0
  471. package/es/common/inversify/syntax/binding_in_syntax.d.ts +10 -0
  472. package/es/common/inversify/syntax/binding_in_syntax.js +24 -0
  473. package/es/common/inversify/syntax/binding_in_syntax.js.map +1 -0
  474. package/es/common/inversify/syntax/binding_to_syntax.d.ts +12 -0
  475. package/es/common/inversify/syntax/binding_to_syntax.js +36 -0
  476. package/es/common/inversify/syntax/binding_to_syntax.js.map +1 -0
  477. package/es/common/inversify/syntax/constraint_helpers.d.ts +2 -0
  478. package/es/common/inversify/syntax/constraint_helpers.js +18 -0
  479. package/es/common/inversify/syntax/constraint_helpers.js.map +1 -0
  480. package/es/common/inversify-lite/container/container.js +2 -4
  481. package/es/common/inversify-lite/container/container.js.map +1 -1
  482. package/es/common/inversify-lite/index.d.ts +1 -8
  483. package/es/common/inversify-lite/index.js +1 -15
  484. package/es/common/inversify-lite/index.js.map +1 -1
  485. package/es/common/inversify-lite/interfaces/interfaces.d.ts +0 -2
  486. package/es/common/inversify-lite/interfaces/interfaces.js.map +1 -1
  487. package/es/common/inversify-lite/planning/queryable_string.d.ts +0 -2
  488. package/es/common/inversify-lite/planning/queryable_string.js +0 -10
  489. package/es/common/inversify-lite/planning/queryable_string.js.map +1 -1
  490. package/es/common/inversify-lite/resolution/resolver.js.map +1 -1
  491. package/es/common/segment/monotone.js +2 -2
  492. package/es/common/segment/monotone.js.map +1 -1
  493. package/es/common/shape/rect.js +2 -1
  494. package/es/common/shape/rect.js.map +1 -1
  495. package/es/common/sort.js +1 -2
  496. package/es/common/store.js +2 -1
  497. package/es/common/utils.d.ts +1 -0
  498. package/es/common/utils.js +8 -1
  499. package/es/common/utils.js.map +1 -1
  500. package/es/common/xml/OrderedObjParser.js +2 -2
  501. package/es/common/xml/OrderedObjParser.js.map +1 -1
  502. package/es/core/contributions/layerHandler/canvas2d-contribution.d.ts +2 -2
  503. package/es/core/contributions/layerHandler/canvas2d-contribution.js +5 -9
  504. package/es/core/contributions/layerHandler/canvas2d-contribution.js.map +1 -1
  505. package/es/core/contributions/layerHandler/empty-contribution.d.ts +2 -2
  506. package/es/core/contributions/layerHandler/empty-contribution.js +5 -9
  507. package/es/core/contributions/layerHandler/empty-contribution.js.map +1 -1
  508. package/es/core/contributions/layerHandler/offscreen2d-contribution.d.ts +2 -2
  509. package/es/core/contributions/layerHandler/offscreen2d-contribution.js +5 -9
  510. package/es/core/contributions/layerHandler/offscreen2d-contribution.js.map +1 -1
  511. package/es/core/contributions/textMeasure/AtextMeasure.d.ts +14 -2
  512. package/es/core/contributions/textMeasure/AtextMeasure.js +99 -13
  513. package/es/core/contributions/textMeasure/AtextMeasure.js.map +1 -1
  514. package/es/core/contributions/textMeasure/layout.d.ts +2 -2
  515. package/es/core/contributions/textMeasure/layout.js +4 -4
  516. package/es/core/contributions/textMeasure/layout.js.map +1 -1
  517. package/es/core/contributions/textMeasure/modules.js +1 -1
  518. package/es/core/contributions/textMeasure/modules.js.map +1 -1
  519. package/es/core/core-modules.js +4 -6
  520. package/es/core/core-modules.js.map +1 -1
  521. package/es/core/global-module.js +2 -0
  522. package/es/core/global.d.ts +9 -0
  523. package/es/core/global.js +23 -4
  524. package/es/core/global.js.map +1 -1
  525. package/es/core/graphic-utils.d.ts +7 -4
  526. package/es/core/graphic-utils.js +20 -15
  527. package/es/core/graphic-utils.js.map +1 -1
  528. package/es/core/layer-service.d.ts +5 -2
  529. package/es/core/layer-service.js +18 -15
  530. package/es/core/layer-service.js.map +1 -1
  531. package/es/core/stage.d.ts +8 -4
  532. package/es/core/stage.js +47 -30
  533. package/es/core/stage.js.map +1 -1
  534. package/es/core/window.d.ts +2 -2
  535. package/es/core/window.js +8 -12
  536. package/es/core/window.js.map +1 -1
  537. package/es/env-check.d.ts +3 -0
  538. package/es/env-check.js +12 -0
  539. package/es/env-check.js.map +1 -0
  540. package/es/event/event-manager.d.ts +5 -1
  541. package/es/event/event-manager.js +32 -26
  542. package/es/event/event-manager.js.map +1 -1
  543. package/es/event/event-system.js +8 -6
  544. package/es/event/event-system.js.map +1 -1
  545. package/es/event/federated-event/base-event.d.ts +5 -6
  546. package/es/event/federated-event/base-event.js +15 -5
  547. package/es/event/federated-event/base-event.js.map +1 -1
  548. package/es/event/federated-event/mouse-event.d.ts +6 -6
  549. package/es/event/federated-event/mouse-event.js +16 -4
  550. package/es/event/federated-event/mouse-event.js.map +1 -1
  551. package/es/graphic/area.js +1 -0
  552. package/es/graphic/area.js.map +1 -1
  553. package/es/graphic/bounds.d.ts +2 -2
  554. package/es/graphic/bounds.js +6 -8
  555. package/es/graphic/bounds.js.map +1 -1
  556. package/es/graphic/builtin-symbol/index.d.ts +1 -0
  557. package/es/graphic/builtin-symbol/index.js +7 -0
  558. package/es/graphic/builtin-symbol/index.js.map +1 -1
  559. package/es/graphic/builtin-symbol/rect.d.ts +2 -1
  560. package/es/graphic/builtin-symbol/rect.js +9 -4
  561. package/es/graphic/builtin-symbol/rect.js.map +1 -1
  562. package/es/graphic/config.js +12 -4
  563. package/es/graphic/config.js.map +1 -1
  564. package/es/graphic/graphic-creator.d.ts +24 -36
  565. package/es/graphic/graphic-creator.js +14 -125
  566. package/es/graphic/graphic-creator.js.map +1 -1
  567. package/es/graphic/graphic-service/arc-contribution.d.ts +1 -5
  568. package/es/graphic/graphic-service/arc-contribution.js +0 -15
  569. package/es/graphic/graphic-service/arc-contribution.js.map +1 -1
  570. package/es/graphic/graphic-service/area-contribution.d.ts +1 -1
  571. package/es/graphic/graphic-service/area-contribution.js +2 -1
  572. package/es/graphic/graphic-service/area-contribution.js.map +1 -1
  573. package/es/graphic/graphic-service/circle-contribution.d.ts +1 -5
  574. package/es/graphic/graphic-service/circle-contribution.js +0 -15
  575. package/es/graphic/graphic-service/circle-contribution.js.map +1 -1
  576. package/es/graphic/graphic-service/common-contribution.js +2 -14
  577. package/es/graphic/graphic-service/common-contribution.js.map +1 -1
  578. package/es/graphic/graphic-service/graphic-module.js +1 -23
  579. package/es/graphic/graphic-service/graphic-module.js.map +1 -1
  580. package/es/graphic/graphic-service/graphic-service.d.ts +5 -9
  581. package/es/graphic/graphic-service/graphic-service.js +44 -34
  582. package/es/graphic/graphic-service/graphic-service.js.map +1 -1
  583. package/es/graphic/graphic-service/path-contribution.d.ts +1 -5
  584. package/es/graphic/graphic-service/path-contribution.js +0 -15
  585. package/es/graphic/graphic-service/path-contribution.js.map +1 -1
  586. package/es/graphic/graphic-service/rect-contribution.d.ts +1 -5
  587. package/es/graphic/graphic-service/rect-contribution.js +0 -15
  588. package/es/graphic/graphic-service/rect-contribution.js.map +1 -1
  589. package/es/graphic/graphic-service/symbol-contribution.d.ts +0 -1
  590. package/es/graphic/graphic-service/symbol-contribution.js +2 -16
  591. package/es/graphic/graphic-service/symbol-contribution.js.map +1 -1
  592. package/es/graphic/graphic.js +8 -6
  593. package/es/graphic/graphic.js.map +1 -1
  594. package/es/graphic/group.d.ts +1 -0
  595. package/es/graphic/group.js +8 -1
  596. package/es/graphic/group.js.map +1 -1
  597. package/es/graphic/index.d.ts +1 -0
  598. package/es/graphic/index.js +2 -0
  599. package/es/graphic/index.js.map +1 -1
  600. package/es/graphic/line.js +1 -0
  601. package/es/graphic/line.js.map +1 -1
  602. package/es/graphic/node-tree.js +2 -2
  603. package/es/graphic/node-tree.js.map +1 -1
  604. package/es/graphic/rect.d.ts +2 -3
  605. package/es/graphic/rect.js +3 -7
  606. package/es/graphic/rect.js.map +1 -1
  607. package/es/graphic/richtext/line.d.ts +1 -0
  608. package/es/graphic/richtext/line.js +6 -4
  609. package/es/graphic/richtext/line.js.map +1 -1
  610. package/es/graphic/richtext/paragraph.js +5 -2
  611. package/es/graphic/richtext/paragraph.js.map +1 -1
  612. package/es/graphic/richtext/utils.js +2 -1
  613. package/es/graphic/richtext/utils.js.map +1 -1
  614. package/es/graphic/richtext.d.ts +3 -3
  615. package/es/graphic/richtext.js +12 -3
  616. package/es/graphic/richtext.js.map +1 -1
  617. package/es/graphic/symbol.js +11 -10
  618. package/es/graphic/symbol.js.map +1 -1
  619. package/es/graphic/text.d.ts +1 -0
  620. package/es/graphic/text.js +94 -13
  621. package/es/graphic/text.js.map +1 -1
  622. package/es/graphic/theme.d.ts +4 -4
  623. package/es/graphic/theme.js +27 -28
  624. package/es/graphic/theme.js.map +1 -1
  625. package/es/graphic/tools.js +1 -1
  626. package/es/graphic/tools.js.map +1 -1
  627. package/es/graphic/wrap-text.js +6 -4
  628. package/es/graphic/wrap-text.js.map +1 -1
  629. package/es/index.d.ts +18 -0
  630. package/es/index.js +36 -0
  631. package/es/index.js.map +1 -1
  632. package/es/interface/allocator.d.ts +1 -0
  633. package/es/interface/allocator.js.map +1 -1
  634. package/es/interface/event.d.ts +15 -44
  635. package/es/interface/event.js.map +1 -1
  636. package/es/interface/global.d.ts +1 -0
  637. package/es/interface/global.js.map +1 -1
  638. package/es/interface/graphic/rect.d.ts +2 -0
  639. package/es/interface/graphic/rect.js.map +1 -1
  640. package/es/interface/graphic/richText.d.ts +1 -1
  641. package/es/interface/graphic/richText.js.map +1 -1
  642. package/es/interface/graphic/text.d.ts +5 -1
  643. package/es/interface/graphic/text.js.map +1 -1
  644. package/es/interface/graphic.d.ts +3 -2
  645. package/es/interface/graphic.js.map +1 -1
  646. package/es/interface/render.d.ts +2 -2
  647. package/es/interface/render.js.map +1 -1
  648. package/es/interface/stage.d.ts +8 -1
  649. package/es/interface/stage.js.map +1 -1
  650. package/es/interface/text.d.ts +2 -2
  651. package/es/interface/text.js.map +1 -1
  652. package/es/modules.d.ts +1 -2
  653. package/es/modules.js +0 -4
  654. package/es/modules.js.map +1 -1
  655. package/es/picker/global-picker-service.d.ts +2 -2
  656. package/es/picker/global-picker-service.js +5 -9
  657. package/es/picker/global-picker-service.js.map +1 -1
  658. package/es/picker/pick-interceptor.js +2 -1
  659. package/es/picker/pick-interceptor.js.map +1 -1
  660. package/es/picker/pick-modules.js +1 -4
  661. package/es/picker/pick-modules.js.map +1 -1
  662. package/es/picker/picker-service.d.ts +2 -2
  663. package/es/picker/picker-service.js +10 -6
  664. package/es/picker/picker-service.js.map +1 -1
  665. package/es/plugins/builtin-plugin/flex-layout-plugin.js +12 -6
  666. package/es/plugins/builtin-plugin/flex-layout-plugin.js.map +1 -1
  667. package/es/plugins/builtin-plugin/html-attribute-plugin.js +1 -1
  668. package/es/plugins/builtin-plugin/html-attribute-plugin.js.map +1 -1
  669. package/es/plugins/plugin-modules.js +1 -2
  670. package/es/plugins/plugin-modules.js.map +1 -1
  671. package/es/render/contributions/render/arc-module.d.ts +2 -0
  672. package/es/render/contributions/render/arc-module.js +21 -0
  673. package/es/render/contributions/render/arc-module.js.map +1 -0
  674. package/es/render/contributions/render/arc-render.js +3 -0
  675. package/es/render/contributions/render/arc-render.js.map +1 -1
  676. package/es/render/contributions/render/arc3d-module.d.ts +2 -0
  677. package/es/render/contributions/render/arc3d-module.js +13 -0
  678. package/es/render/contributions/render/arc3d-module.js.map +1 -0
  679. package/es/render/contributions/render/area-module.d.ts +2 -0
  680. package/es/render/contributions/render/area-module.js +23 -0
  681. package/es/render/contributions/render/area-module.js.map +1 -0
  682. package/es/render/contributions/render/area-render.d.ts +1 -0
  683. package/es/render/contributions/render/area-render.js +45 -5
  684. package/es/render/contributions/render/area-render.js.map +1 -1
  685. package/es/render/contributions/render/base-render.d.ts +1 -1
  686. package/es/render/contributions/render/base-render.js +15 -22
  687. package/es/render/contributions/render/base-render.js.map +1 -1
  688. package/es/render/contributions/render/circle-module.d.ts +2 -0
  689. package/es/render/contributions/render/circle-module.js +21 -0
  690. package/es/render/contributions/render/circle-module.js.map +1 -0
  691. package/es/render/contributions/render/circle-render.js +3 -0
  692. package/es/render/contributions/render/circle-render.js.map +1 -1
  693. package/es/render/contributions/render/contributions/arc-contribution-render.d.ts +3 -7
  694. package/es/render/contributions/render/contributions/arc-contribution-render.js +6 -32
  695. package/es/render/contributions/render/contributions/arc-contribution-render.js.map +1 -1
  696. package/es/render/contributions/render/contributions/area-contribution-render.d.ts +3 -4
  697. package/es/render/contributions/render/contributions/area-contribution-render.js +5 -23
  698. package/es/render/contributions/render/contributions/area-contribution-render.js.map +1 -1
  699. package/es/render/contributions/render/contributions/base-contribution-render.d.ts +4 -0
  700. package/es/render/contributions/render/contributions/base-contribution-render.js +21 -16
  701. package/es/render/contributions/render/contributions/base-contribution-render.js.map +1 -1
  702. package/es/render/contributions/render/contributions/circle-contribution-render.d.ts +3 -7
  703. package/es/render/contributions/render/contributions/circle-contribution-render.js +6 -32
  704. package/es/render/contributions/render/contributions/circle-contribution-render.js.map +1 -1
  705. package/es/render/contributions/render/contributions/constants.d.ts +1 -0
  706. package/es/render/contributions/render/contributions/constants.js +2 -0
  707. package/es/render/contributions/render/contributions/constants.js.map +1 -1
  708. package/es/render/contributions/render/contributions/group-contribution-render.d.ts +1 -0
  709. package/es/render/contributions/render/contributions/group-contribution-render.js +5 -15
  710. package/es/render/contributions/render/contributions/group-contribution-render.js.map +1 -1
  711. package/es/render/contributions/render/contributions/image-contribution-render.d.ts +1 -0
  712. package/es/render/contributions/render/contributions/image-contribution-render.js +6 -17
  713. package/es/render/contributions/render/contributions/image-contribution-render.js.map +1 -1
  714. package/es/render/contributions/render/contributions/path-contribution-render.d.ts +2 -9
  715. package/es/render/contributions/render/contributions/path-contribution-render.js +3 -29
  716. package/es/render/contributions/render/contributions/path-contribution-render.js.map +1 -1
  717. package/es/render/contributions/render/contributions/polygon-contribution-render.d.ts +2 -9
  718. package/es/render/contributions/render/contributions/polygon-contribution-render.js +3 -29
  719. package/es/render/contributions/render/contributions/polygon-contribution-render.js.map +1 -1
  720. package/es/render/contributions/render/contributions/rect-contribution-render.d.ts +5 -7
  721. package/es/render/contributions/render/contributions/rect-contribution-render.js +19 -46
  722. package/es/render/contributions/render/contributions/rect-contribution-render.js.map +1 -1
  723. package/es/render/contributions/render/contributions/symbol-contribution-render.d.ts +3 -7
  724. package/es/render/contributions/render/contributions/symbol-contribution-render.js +6 -24
  725. package/es/render/contributions/render/contributions/symbol-contribution-render.js.map +1 -1
  726. package/es/render/contributions/render/contributions/text-contribution-render.d.ts +8 -1
  727. package/es/render/contributions/render/contributions/text-contribution-render.js +24 -1
  728. package/es/render/contributions/render/contributions/text-contribution-render.js.map +1 -1
  729. package/es/render/contributions/render/draw-contribution.d.ts +7 -6
  730. package/es/render/contributions/render/draw-contribution.js +49 -29
  731. package/es/render/contributions/render/draw-contribution.js.map +1 -1
  732. package/es/render/contributions/render/draw-interceptor.d.ts +7 -1
  733. package/es/render/contributions/render/draw-interceptor.js +42 -38
  734. package/es/render/contributions/render/draw-interceptor.js.map +1 -1
  735. package/es/render/contributions/render/glyph-module.d.ts +2 -0
  736. package/es/render/contributions/render/glyph-module.js +13 -0
  737. package/es/render/contributions/render/glyph-module.js.map +1 -0
  738. package/es/render/contributions/render/glyph-render.d.ts +1 -2
  739. package/es/render/contributions/render/glyph-render.js +12 -9
  740. package/es/render/contributions/render/glyph-render.js.map +1 -1
  741. package/es/render/contributions/render/group-render.js +4 -1
  742. package/es/render/contributions/render/group-render.js.map +1 -1
  743. package/es/render/contributions/render/image-module.d.ts +2 -0
  744. package/es/render/contributions/render/image-module.js +20 -0
  745. package/es/render/contributions/render/image-module.js.map +1 -0
  746. package/es/render/contributions/render/image-render.js +5 -2
  747. package/es/render/contributions/render/image-render.js.map +1 -1
  748. package/es/render/contributions/render/incremental-draw-contribution.d.ts +2 -6
  749. package/es/render/contributions/render/incremental-draw-contribution.js +5 -11
  750. package/es/render/contributions/render/incremental-draw-contribution.js.map +1 -1
  751. package/es/render/contributions/render/line-module.d.ts +2 -0
  752. package/es/render/contributions/render/line-module.js +16 -0
  753. package/es/render/contributions/render/line-module.js.map +1 -0
  754. package/es/render/contributions/render/line-render.d.ts +1 -0
  755. package/es/render/contributions/render/line-render.js +21 -6
  756. package/es/render/contributions/render/line-render.js.map +1 -1
  757. package/es/render/contributions/render/module.js +8 -129
  758. package/es/render/contributions/render/module.js.map +1 -1
  759. package/es/render/contributions/render/path-module.d.ts +2 -0
  760. package/es/render/contributions/render/path-module.js +21 -0
  761. package/es/render/contributions/render/path-module.js.map +1 -0
  762. package/es/render/contributions/render/path-render.d.ts +2 -1
  763. package/es/render/contributions/render/path-render.js +8 -4
  764. package/es/render/contributions/render/path-render.js.map +1 -1
  765. package/es/render/contributions/render/polygon-module.d.ts +2 -0
  766. package/es/render/contributions/render/polygon-module.js +20 -0
  767. package/es/render/contributions/render/polygon-module.js.map +1 -0
  768. package/es/render/contributions/render/polygon-render.js +3 -0
  769. package/es/render/contributions/render/polygon-render.js.map +1 -1
  770. package/es/render/contributions/render/pyramid3d-module.d.ts +2 -0
  771. package/es/render/contributions/render/pyramid3d-module.js +13 -0
  772. package/es/render/contributions/render/pyramid3d-module.js.map +1 -0
  773. package/es/render/contributions/render/rect-module.d.ts +2 -0
  774. package/es/render/contributions/render/rect-module.js +21 -0
  775. package/es/render/contributions/render/rect-module.js.map +1 -0
  776. package/es/render/contributions/render/rect-render.d.ts +2 -1
  777. package/es/render/contributions/render/rect-render.js +11 -3
  778. package/es/render/contributions/render/rect-render.js.map +1 -1
  779. package/es/render/contributions/render/rect3d-module.d.ts +2 -0
  780. package/es/render/contributions/render/rect3d-module.js +13 -0
  781. package/es/render/contributions/render/rect3d-module.js.map +1 -0
  782. package/es/render/contributions/render/render-slector.d.ts +1 -4
  783. package/es/render/contributions/render/render-slector.js +0 -15
  784. package/es/render/contributions/render/render-slector.js.map +1 -1
  785. package/es/render/contributions/render/richtext-module.d.ts +2 -0
  786. package/es/render/contributions/render/richtext-module.js +13 -0
  787. package/es/render/contributions/render/richtext-module.js.map +1 -0
  788. package/es/render/contributions/render/richtext-render.d.ts +1 -0
  789. package/es/render/contributions/render/richtext-render.js +12 -6
  790. package/es/render/contributions/render/richtext-render.js.map +1 -1
  791. package/es/render/contributions/render/symbol-module.d.ts +2 -0
  792. package/es/render/contributions/render/symbol-module.js +21 -0
  793. package/es/render/contributions/render/symbol-module.js.map +1 -0
  794. package/es/render/contributions/render/symbol-render.js +23 -4
  795. package/es/render/contributions/render/symbol-render.js.map +1 -1
  796. package/es/render/contributions/render/text-module.d.ts +2 -0
  797. package/es/render/contributions/render/text-module.js +20 -0
  798. package/es/render/contributions/render/text-module.js.map +1 -0
  799. package/es/render/contributions/render/text-render.js +16 -10
  800. package/es/render/contributions/render/text-render.js.map +1 -1
  801. package/es/render/contributions/render/utils.js +2 -2
  802. package/es/render/contributions/render/utils.js.map +1 -1
  803. package/es/render/render-modules.js +1 -1
  804. package/es/render/render-modules.js.map +1 -1
  805. package/es/render/render-service.js +1 -1
  806. package/es/render/render-service.js.map +1 -1
  807. package/es/resource-loader/loader.js +1 -3
  808. package/es/resource-loader/loader.js.map +1 -1
  809. package/package.json +7 -3
  810. package/cjs/common/inversify-lite/annotation/post_construct.d.ts +0 -4
  811. package/cjs/common/inversify-lite/annotation/post_construct.js.map +0 -1
  812. package/es/common/inversify-lite/annotation/post_construct.d.ts +0 -4
  813. package/es/common/inversify-lite/annotation/post_construct.js +0 -10
  814. package/es/common/inversify-lite/annotation/post_construct.js.map +0 -1
@@ -6,21 +6,17 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  }, __metadata = this && this.__metadata || function(k, v) {
8
8
  if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
9
- }, __param = this && this.__param || function(paramIndex, decorator) {
10
- return function(target, key) {
11
- decorator(target, key, paramIndex);
12
- };
13
9
  };
14
10
 
15
11
  Object.defineProperty(exports, "__esModule", {
16
12
  value: !0
17
13
  }), exports.CanvasLayerHandlerContribution = void 0;
18
14
 
19
- const inversify_lite_1 = require("../../../common/inversify-lite"), util_1 = require("../../../canvas/util"), constants_1 = require("../../../constants");
15
+ const inversify_lite_1 = require("../../../common/inversify-lite"), util_1 = require("../../../canvas/util"), application_1 = require("../../../application");
20
16
 
21
17
  let CanvasLayerHandlerContribution = class {
22
- constructor(global) {
23
- this.global = global, this.type = "static", this.offscreen = !1;
18
+ constructor() {
19
+ this.type = "static", this.offscreen = !1, this.global = application_1.application.global;
24
20
  }
25
21
  setDpr(dpr) {
26
22
  this.canvas.dpr = dpr;
@@ -87,7 +83,6 @@ let CanvasLayerHandlerContribution = class {
87
83
  }
88
84
  };
89
85
 
90
- CanvasLayerHandlerContribution = __decorate([ (0, inversify_lite_1.injectable)(), __param(0, (0,
91
- inversify_lite_1.inject)(constants_1.VGlobal)), __metadata("design:paramtypes", [ Object ]) ], CanvasLayerHandlerContribution),
86
+ CanvasLayerHandlerContribution = __decorate([ (0, inversify_lite_1.injectable)(), __metadata("design:paramtypes", []) ], CanvasLayerHandlerContribution),
92
87
  exports.CanvasLayerHandlerContribution = CanvasLayerHandlerContribution;
93
88
  //# sourceMappingURL=canvas2d-contribution.js.map
@@ -1 +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"]}
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 { 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"]}
@@ -1,7 +1,6 @@
1
1
  import type { IGlobal, IDrawToParams, IGroup, ILayer, ILayerHandlerContribution, IWindow, ILayerHandlerInitParams, ILayerHandlerDrawParams, IDrawContext, LayerMode } from '../../../interface';
2
2
  import type { IBounds } from '@visactor/vutils';
3
3
  export declare class EmptyLayerHandlerContribution implements ILayerHandlerContribution {
4
- readonly global: IGlobal;
5
4
  layer: ILayer;
6
5
  canvas: null;
7
6
  context: null;
@@ -10,7 +9,8 @@ export declare class EmptyLayerHandlerContribution implements ILayerHandlerContr
10
9
  window: IWindow;
11
10
  type: LayerMode;
12
11
  mainHandler: ILayerHandlerContribution;
13
- constructor(global: IGlobal);
12
+ global: IGlobal;
13
+ constructor();
14
14
  setDpr(dpr: number): void;
15
15
  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void;
16
16
  resize(w: number, h: number): void;
@@ -6,21 +6,17 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  }, __metadata = this && this.__metadata || function(k, v) {
8
8
  if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
9
- }, __param = this && this.__param || function(paramIndex, decorator) {
10
- return function(target, key) {
11
- decorator(target, key, paramIndex);
12
- };
13
9
  };
14
10
 
15
11
  Object.defineProperty(exports, "__esModule", {
16
12
  value: !0
17
13
  }), exports.EmptyLayerHandlerContribution = void 0;
18
14
 
19
- const inversify_lite_1 = require("../../../common/inversify-lite"), constants_1 = require("../../../constants");
15
+ const inversify_lite_1 = require("../../../common/inversify-lite"), application_1 = require("../../../application");
20
16
 
21
17
  let EmptyLayerHandlerContribution = class {
22
- constructor(global) {
23
- this.global = global, this.type = "virtual", this.offscreen = !1;
18
+ constructor() {
19
+ this.offscreen = !1, this.type = "virtual", this.global = application_1.application.global;
24
20
  }
25
21
  setDpr(dpr) {}
26
22
  init(layer, window, params) {
@@ -51,7 +47,6 @@ let EmptyLayerHandlerContribution = class {
51
47
  release() {}
52
48
  };
53
49
 
54
- EmptyLayerHandlerContribution = __decorate([ (0, inversify_lite_1.injectable)(), __param(0, (0,
55
- inversify_lite_1.inject)(constants_1.VGlobal)), __metadata("design:paramtypes", [ Object ]) ], EmptyLayerHandlerContribution),
50
+ EmptyLayerHandlerContribution = __decorate([ (0, inversify_lite_1.injectable)(), __metadata("design:paramtypes", []) ], EmptyLayerHandlerContribution),
56
51
  exports.EmptyLayerHandlerContribution = EmptyLayerHandlerContribution;
57
52
  //# sourceMappingURL=empty-contribution.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/core/contributions/layerHandler/empty-contribution.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mEAAoE;AAcpE,kDAA6C;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,IAAA,2BAAU,GAAE;IAYE,WAAA,IAAA,uBAAM,EAAC,mBAAO,CAAC,CAAA;;GAXjB,6BAA6B,CAmEzC;AAnEY,sEAA6B","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"]}
1
+ {"version":3,"sources":["../src/core/contributions/layerHandler/empty-contribution.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAoE;AAcpE,sDAAmD;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,yBAAW,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,IAAA,2BAAU,GAAE;;GACA,6BAA6B,CAsEzC;AAtEY,sEAA6B","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"]}
@@ -1,14 +1,14 @@
1
1
  import type { IGlobal, ICanvas, IContext2d, IDrawToParams, IGroup, ILayer, ILayerHandlerContribution, ILayerHandlerInitParams, IWindow, ILayerHandlerDrawParams, LayerMode } from '../../../interface';
2
2
  import type { IBoundsLike } from '@visactor/vutils';
3
3
  export declare class OffscreenLayerHandlerContribution implements ILayerHandlerContribution {
4
- readonly global: IGlobal;
5
4
  layer: ILayer;
6
5
  canvas: ICanvas;
7
6
  context: IContext2d;
8
7
  offscreen: boolean;
9
8
  type: LayerMode;
10
9
  secondaryHandlers: ILayerHandlerContribution[];
11
- constructor(global: IGlobal);
10
+ global: IGlobal;
11
+ constructor();
12
12
  setDpr(dpr: number): void;
13
13
  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void;
14
14
  resize(w: number, h: number): void;
@@ -6,21 +6,17 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  }, __metadata = this && this.__metadata || function(k, v) {
8
8
  if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
9
- }, __param = this && this.__param || function(paramIndex, decorator) {
10
- return function(target, key) {
11
- decorator(target, key, paramIndex);
12
- };
13
9
  };
14
10
 
15
11
  Object.defineProperty(exports, "__esModule", {
16
12
  value: !0
17
13
  }), exports.OffscreenLayerHandlerContribution = void 0;
18
14
 
19
- const inversify_lite_1 = require("../../../common/inversify-lite"), util_1 = require("../../../canvas/util"), constants_1 = require("../../../constants");
15
+ const inversify_lite_1 = require("../../../common/inversify-lite"), util_1 = require("../../../canvas/util"), application_1 = require("../../../application");
20
16
 
21
17
  let OffscreenLayerHandlerContribution = class {
22
- constructor(global) {
23
- this.global = global, this.type = "dynamic", this.offscreen = !0;
18
+ constructor() {
19
+ this.offscreen = !0, this.type = "dynamic", this.global = application_1.application.global;
24
20
  }
25
21
  setDpr(dpr) {
26
22
  this.canvas.dpr = dpr;
@@ -72,7 +68,6 @@ let OffscreenLayerHandlerContribution = class {
72
68
  merge(layerHandlers) {}
73
69
  };
74
70
 
75
- OffscreenLayerHandlerContribution = __decorate([ (0, inversify_lite_1.injectable)(), __param(0, (0,
76
- inversify_lite_1.inject)(constants_1.VGlobal)), __metadata("design:paramtypes", [ Object ]) ], OffscreenLayerHandlerContribution),
71
+ OffscreenLayerHandlerContribution = __decorate([ (0, inversify_lite_1.injectable)(), __metadata("design:paramtypes", []) ], OffscreenLayerHandlerContribution),
77
72
  exports.OffscreenLayerHandlerContribution = OffscreenLayerHandlerContribution;
78
73
  //# sourceMappingURL=offscreen2d-contribution.js.map
@@ -1 +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"]}
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 { 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"]}
@@ -33,11 +33,14 @@ export declare class ATextMeasure implements ITextMeasure {
33
33
  width: number;
34
34
  };
35
35
  private _clipText;
36
+ private _clipTextEnd;
37
+ private _clipTextStart;
38
+ private _clipTextMiddle;
36
39
  clipTextWithSuffixVertical(verticalList: {
37
40
  text: string;
38
41
  width?: number;
39
42
  direction: number;
40
- }[], options: TextOptionsType, width: number, suffix: string, wordBreak: boolean): {
43
+ }[], options: TextOptionsType, width: number, suffix: string, wordBreak: boolean, suffixPosition: 'start' | 'end' | 'middle'): {
41
44
  verticalList: {
42
45
  text: string;
43
46
  width?: number;
@@ -45,7 +48,16 @@ export declare class ATextMeasure implements ITextMeasure {
45
48
  }[];
46
49
  width: number;
47
50
  };
48
- clipTextWithSuffix(text: string, options: TextOptionsType, width: number, suffix: string, wordBreak: boolean): {
51
+ revertVerticalList(verticalList: {
52
+ text: string;
53
+ width?: number;
54
+ direction: number;
55
+ }[]): {
56
+ text: string;
57
+ width?: number;
58
+ direction: number;
59
+ }[];
60
+ clipTextWithSuffix(text: string, options: TextOptionsType, width: number, suffix: string, wordBreak: boolean, position: 'start' | 'end' | 'middle'): {
49
61
  str: string;
50
62
  width: number;
51
63
  };
@@ -60,7 +60,7 @@ let ATextMeasure = class {
60
60
  for (;i < verticalList.length && length + verticalList[i].width < width; i++) length += verticalList[i].width,
61
61
  out.push(verticalList[i]);
62
62
  if (verticalList[i] && verticalList[i].text.length > 1) {
63
- const clipedData = this._clipText(verticalList[i].text, options, width - length, 0, verticalList[i].text.length - 1);
63
+ const clipedData = this._clipText(verticalList[i].text, options, width - length, 0, verticalList[i].text.length - 1, "end", !1);
64
64
  if (wordBreak && clipedData.str !== verticalList[i].text) {
65
65
  let text = "", length = 0;
66
66
  for (let j = 0; j < i; j++) {
@@ -97,14 +97,28 @@ let ATextMeasure = class {
97
97
  str: "",
98
98
  width: 0
99
99
  };
100
- const data = this._clipText(text, options, width, 0, text.length - 1);
100
+ const data = this._clipText(text, options, width, 0, text.length - 1, "end", !1);
101
101
  if (wordBreak && data.str !== text) {
102
102
  const index = (0, utils_1.testLetter)(text, data.str.length);
103
103
  index !== data.str.length && (data.str = text.substring(0, index), data.width = this.measureTextWidth(data.str, options));
104
104
  }
105
105
  return data;
106
106
  }
107
- _clipText(text, options, width, leftIdx, rightIdx) {
107
+ _clipText(text, options, width, leftIdx, rightIdx, position, suffix) {
108
+ let data;
109
+ if ("end" === position) data = this._clipTextEnd(text, options, width, leftIdx, rightIdx),
110
+ suffix && (data.result = data.str + suffix); else if ("start" === position) data = this._clipTextStart(text, options, width, leftIdx, rightIdx),
111
+ suffix && (data.result = suffix + data.str); else if ("middle" === position) {
112
+ const d = this._clipTextMiddle(text, options, width, "", "", 0, 0, 1);
113
+ data = {
114
+ str: "none",
115
+ width: d.width,
116
+ result: d.left + suffix + d.right
117
+ };
118
+ }
119
+ return data;
120
+ }
121
+ _clipTextEnd(text, options, width, leftIdx, rightIdx) {
108
122
  const middleIdx = Math.floor((leftIdx + rightIdx) / 2), subText = text.substring(0, middleIdx + 1), strWidth = this.measureTextWidth(subText, options);
109
123
  let length;
110
124
  if (strWidth > width) {
@@ -116,7 +130,7 @@ let ATextMeasure = class {
116
130
  return length = this.measureTextWidth(str, options), length <= width ? {
117
131
  str: str,
118
132
  width: length
119
- } : this._clipText(text, options, width, leftIdx, middleIdx);
133
+ } : this._clipTextEnd(text, options, width, leftIdx, middleIdx);
120
134
  }
121
135
  if (strWidth < width) {
122
136
  if (middleIdx >= text.length - 1) return {
@@ -127,14 +141,58 @@ let ATextMeasure = class {
127
141
  return length = this.measureTextWidth(str, options), length >= width ? {
128
142
  str: subText,
129
143
  width: strWidth
130
- } : this._clipText(text, options, width, middleIdx, rightIdx);
144
+ } : this._clipTextEnd(text, options, width, middleIdx, rightIdx);
131
145
  }
132
146
  return {
133
147
  str: subText,
134
148
  width: strWidth
135
149
  };
136
150
  }
137
- clipTextWithSuffixVertical(verticalList, options, width, suffix, wordBreak) {
151
+ _clipTextStart(text, options, width, leftIdx, rightIdx) {
152
+ const middleIdx = Math.ceil((leftIdx + rightIdx) / 2), subText = text.substring(middleIdx - 1, text.length - 1), strWidth = this.measureTextWidth(subText, options);
153
+ let length;
154
+ if (strWidth > width) {
155
+ if (subText.length <= 1) return {
156
+ str: "",
157
+ width: 0
158
+ };
159
+ const str = text.substring(middleIdx, text.length - 1);
160
+ return length = this.measureTextWidth(str, options), length <= width ? {
161
+ str: str,
162
+ width: length
163
+ } : this._clipTextStart(text, options, width, middleIdx, text.length - 1);
164
+ }
165
+ if (strWidth < width) {
166
+ if (middleIdx <= 0) return {
167
+ str: text,
168
+ width: this.measureTextWidth(text, options)
169
+ };
170
+ const str = text.substring(middleIdx - 2, text.length - 1);
171
+ return length = this.measureTextWidth(str, options), length >= width ? {
172
+ str: subText,
173
+ width: strWidth
174
+ } : this._clipTextStart(text, options, width, leftIdx, middleIdx);
175
+ }
176
+ return {
177
+ str: subText,
178
+ width: strWidth
179
+ };
180
+ }
181
+ _clipTextMiddle(text, options, width, left, right, leftW, rightW, buffer) {
182
+ const subLeftText = text.substring(0, buffer), strLeftWidth = this.measureTextWidth(subLeftText, options);
183
+ if (strLeftWidth + rightW > width) return {
184
+ left: left,
185
+ right: right,
186
+ width: leftW + rightW
187
+ };
188
+ const subRightText = text.substring(text.length - buffer, text.length), strRightWidth = this.measureTextWidth(subRightText, options);
189
+ return strLeftWidth + strRightWidth > width ? {
190
+ left: subLeftText,
191
+ right: right,
192
+ width: strLeftWidth + rightW
193
+ } : this._clipTextMiddle(text, options, width, subLeftText, subRightText, strLeftWidth, strRightWidth, buffer + 1);
194
+ }
195
+ clipTextWithSuffixVertical(verticalList, options, width, suffix, wordBreak, suffixPosition) {
138
196
  if ("" === suffix) return this.clipTextVertical(verticalList, options, width, wordBreak);
139
197
  if (0 === verticalList.length) return {
140
198
  verticalList: verticalList,
@@ -144,15 +202,43 @@ let ATextMeasure = class {
144
202
  if (output.verticalList.length === verticalList.length && output.verticalList[output.verticalList.length - 1].width === verticalList[verticalList.length - 1].width) return output;
145
203
  const suffixWidth = this.measureTextWidth(suffix, options);
146
204
  if (suffixWidth > width) return output;
147
- width -= suffixWidth;
148
- const out = this.clipTextVertical(verticalList, options, width, wordBreak);
149
- return out.width += suffixWidth, out.verticalList.push({
205
+ let out;
206
+ if (width -= suffixWidth, "start" === suffixPosition) {
207
+ const nextVerticalList = this.revertVerticalList(verticalList);
208
+ out = this.clipTextVertical(nextVerticalList, options, width, wordBreak);
209
+ const v = this.revertVerticalList(out.verticalList);
210
+ v.unshift({
211
+ text: suffix,
212
+ direction: 1,
213
+ width: suffixWidth
214
+ }), out.verticalList = v;
215
+ } else if ("middle" === suffixPosition) {
216
+ const leftOut = this.clipTextVertical(verticalList, options, width / 2, wordBreak), nextVerticalList = this.revertVerticalList(verticalList), rightOut = this.clipTextVertical(nextVerticalList, options, width / 2, wordBreak);
217
+ leftOut.verticalList.push({
218
+ text: suffix,
219
+ direction: 1,
220
+ width: suffixWidth
221
+ }), this.revertVerticalList(rightOut.verticalList).forEach((v => leftOut.verticalList.push(v))),
222
+ out = {
223
+ verticalList: leftOut.verticalList,
224
+ width: leftOut.width + rightOut.width
225
+ };
226
+ } else out = this.clipTextVertical(verticalList, options, width, wordBreak), out.verticalList.push({
150
227
  text: suffix,
151
228
  direction: 1,
152
229
  width: suffixWidth
153
- }), out;
230
+ });
231
+ return out.width += suffixWidth, out;
232
+ }
233
+ revertVerticalList(verticalList) {
234
+ return verticalList.reverse().map((l => {
235
+ const t = l.text.split("").reverse().join("");
236
+ return Object.assign(Object.assign({}, l), {
237
+ text: t
238
+ });
239
+ }));
154
240
  }
155
- clipTextWithSuffix(text, options, width, suffix, wordBreak) {
241
+ clipTextWithSuffix(text, options, width, suffix, wordBreak, position) {
156
242
  if ("" === suffix) return this.clipText(text, options, width, wordBreak);
157
243
  if (0 === text.length) return {
158
244
  str: "",
@@ -169,12 +255,12 @@ let ATextMeasure = class {
169
255
  width: 0
170
256
  };
171
257
  width -= suffixWidth;
172
- const data = this._clipText(text, options, width, 0, text.length - 1);
258
+ const data = this._clipText(text, options, width, 0, text.length - 1, position, suffix);
173
259
  if (wordBreak && data.str !== text) {
174
260
  const index = (0, utils_1.testLetter)(text, data.str.length);
175
261
  index !== data.str.length && (data.str = text.substring(0, index), data.width = this.measureTextWidth(data.str, options));
176
262
  }
177
- return data.str += suffix, data.width += suffixWidth, data;
263
+ return data.str = data.result, data.width += suffixWidth, data;
178
264
  }
179
265
  };
180
266
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/core/contributions/textMeasure/AtextMeasure.ts"],"names":[],"mappings":"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","file":"AtextMeasure.js","sourcesContent":["import { injectable } from '../../../common/inversify-lite';\nimport type { IGraphicUtil } from '../../../interface/core';\nimport type { ICanvas, IContext2d, EnvType } from '../../../interface';\nimport type { TextOptionsType, ITextMeasure } from '../../../interface/text';\nimport { DefaultTextAttribute, DefaultTextStyle } from '../../../graphic/config';\nimport { testLetter } from '../../../graphic/richtext/utils';\n\n@injectable()\nexport class ATextMeasure implements ITextMeasure {\n release: (...params: any) => void;\n protected canvas?: ICanvas;\n protected context?: IContext2d | null;\n\n configure(service: IGraphicUtil, env: EnvType): void {\n this.canvas = service.canvas;\n this.context = service.context;\n service.bindTextMeasure(this);\n }\n\n /**\n * 获取text宽度,measureText.width\n * @param text\n * @param options\n */\n measureTextWidth(text: string, options: TextOptionsType): number {\n if (!this.context) {\n return this.estimate(text, options).width;\n }\n this.context.setTextStyleWithoutAlignBaseline(options);\n const textMeasure = this.context.measureText(text);\n return textMeasure.width;\n }\n\n // 估算文字长度\n estimate(\n text: string,\n { fontSize = DefaultTextAttribute.fontSize }: TextOptionsType\n ): { width: number; height: number } {\n // 假设只有英文和中文字符\n let eCharLen = 0; // 英文字符\n let cCharLen = 0; // 中文字符\n // 判断ascii码,如果是\n for (let i = 0; i < text.length; i++) {\n text.charCodeAt(i) < 128 ? eCharLen++ : cCharLen++;\n }\n return {\n width: ~~(0.8 * eCharLen * fontSize + cCharLen * fontSize),\n height: fontSize\n };\n }\n\n /**\n * 获取text像素高度,基于actualBoundingBoxAscent和actualBoundingBoxDescent\n * @param text\n * @param options\n */\n measureTextPixelHeight(text: string, options: TextOptionsType): number {\n if (!this.context) {\n return options.fontSize ?? DefaultTextStyle.fontSize;\n }\n this.context.setTextStyleWithoutAlignBaseline(options);\n const textMeasure = this.context.measureText(text);\n return Math.abs((textMeasure as any).actualBoundingBoxAscent - (textMeasure as any).actualBoundingBoxDescent);\n }\n\n /**\n * 获取text包围盒的高度,基于fontBoundingBoxAscent和fontBoundingBoxDescent\n * @param text\n * @param options\n */\n measureTextBoundHieght(text: string, options: TextOptionsType): number {\n if (!this.context) {\n return options.fontSize ?? DefaultTextStyle.fontSize;\n }\n this.context.setTextStyleWithoutAlignBaseline(options);\n const textMeasure = this.context.measureText(text);\n return Math.abs((textMeasure as any).fontBoundingBoxAscent - (textMeasure as any).fontBoundingBoxDescent);\n }\n\n /**\n * 获取text测量对象\n * @param text\n * @param options\n */\n measureText(text: string, options: TextOptionsType): TextMetrics | { width: number } {\n if (!this.context) {\n return this.estimate(text, options);\n }\n this.context.setTextStyleWithoutAlignBaseline(options);\n return this.context.measureText(text);\n }\n\n clipTextVertical(\n verticalList: { text: string; width?: number; direction: number }[],\n options: TextOptionsType,\n width: number,\n wordBreak: boolean\n ): {\n verticalList: { text: string; width?: number; direction: number }[];\n width: number;\n } {\n if (verticalList.length === 0) {\n return { verticalList, width: 0 };\n }\n const { fontSize = 12 } = options;\n // 计算每一个区域的width\n verticalList.forEach(item => {\n item.width = item.direction === 0 ? fontSize : this.measureTextWidth(item.text, options);\n });\n const out: { text: string; width?: number; direction: number }[] = [];\n let length = 0;\n let i = 0;\n for (; i < verticalList.length; i++) {\n if (length + verticalList[i].width < width) {\n length += verticalList[i].width;\n out.push(verticalList[i]);\n } else {\n break;\n }\n }\n if (verticalList[i] && verticalList[i].text.length > 1) {\n const clipedData = this._clipText(\n verticalList[i].text,\n options,\n width - length,\n 0,\n verticalList[i].text.length - 1\n );\n if (wordBreak && clipedData.str !== verticalList[i].text) {\n let text = '';\n let length = 0;\n for (let j = 0; j < i; j++) {\n const item = verticalList[j];\n text += item.text;\n length += item.text.length;\n }\n text += verticalList[i].text;\n const totalLength = length + clipedData.str.length;\n let index = testLetter(text, totalLength);\n index = index - length;\n if (index !== clipedData.str.length - 1) {\n clipedData.str = clipedData.str.substring(0, index);\n clipedData.width = this.measureTextWidth(clipedData.str, options);\n }\n }\n out.push({ ...verticalList[i], text: clipedData.str, width: clipedData.width });\n length += clipedData.width;\n }\n\n return {\n verticalList: out,\n width: length\n };\n }\n\n /**\n * 将文本裁剪到width宽\n * @param text\n * @param options\n * @param width\n */\n clipText(\n text: string,\n options: TextOptionsType,\n width: number,\n wordBreak: boolean\n ): {\n str: string;\n width: number;\n } {\n if (text.length === 0) {\n return { str: '', width: 0 };\n }\n let length = this.measureTextWidth(text, options);\n if (length <= width) {\n return { str: text, width: length };\n }\n length = this.measureTextWidth(text[0], options);\n if (length > width) {\n return { str: '', width: 0 };\n }\n const data = this._clipText(text, options, width, 0, text.length - 1);\n // 如果需要文字截断\n if (wordBreak && data.str !== text) {\n const index = testLetter(text, data.str.length);\n if (index !== data.str.length) {\n data.str = text.substring(0, index);\n data.width = this.measureTextWidth(data.str, options);\n }\n }\n return data;\n }\n\n // 二分法找到最佳宽\n private _clipText(\n text: string,\n options: TextOptionsType,\n width: number,\n leftIdx: number,\n rightIdx: number\n ): { str: string; width: number } {\n const middleIdx = Math.floor((leftIdx + rightIdx) / 2);\n const subText = text.substring(0, middleIdx + 1);\n const strWidth = this.measureTextWidth(subText, options);\n let length: number;\n if (strWidth > width) {\n // 如果字符串的宽度大于限制宽度\n if (subText.length <= 1) {\n return { str: '', width: 0 };\n } // 如果子字符串长度小于1,而且大于给定宽的话,返回空字符串\n // 先判断是不是左侧的那个字符\n const str = text.substring(0, middleIdx);\n // 如果到左侧的字符小于或等于width,那么说明就是左侧的字符\n length = this.measureTextWidth(str, options);\n if (length <= width) {\n return { str, width: length };\n }\n // 返回leftIdx到middleIdx\n return this._clipText(text, options, width, leftIdx, middleIdx);\n } else if (strWidth < width) {\n // 如果字符串的宽度小于限制宽度\n if (middleIdx >= text.length - 1) {\n return { str: text, width: this.measureTextWidth(text, options) };\n } // 如果已经到结尾了,返回text\n // 先判断是不是右侧的那个字符\n const str = text.substring(0, middleIdx + 2);\n // 如果到右侧的字符大于或等于width,那么说明就是这个字符串\n length = this.measureTextWidth(str, options);\n if (length >= width) {\n return { str: subText, width: strWidth };\n }\n // 返回middleIdx到rightIdx\n return this._clipText(text, options, width, middleIdx, rightIdx);\n }\n // 如果相同,那么就找到text\n return { str: subText, width: strWidth };\n }\n\n clipTextWithSuffixVertical(\n verticalList: { text: string; width?: number; direction: number }[],\n options: TextOptionsType,\n width: number,\n suffix: string,\n wordBreak: boolean\n ): {\n verticalList: { text: string; width?: number; direction: number }[];\n width: number;\n } {\n if (suffix === '') {\n return this.clipTextVertical(verticalList, options, width, wordBreak);\n }\n if (verticalList.length === 0) {\n return { verticalList, width: 0 };\n }\n\n const output = this.clipTextVertical(verticalList, options, width, wordBreak);\n if (\n output.verticalList.length === verticalList.length &&\n output.verticalList[output.verticalList.length - 1].width === verticalList[verticalList.length - 1].width\n ) {\n return output;\n }\n\n const suffixWidth = this.measureTextWidth(suffix, options);\n if (suffixWidth > width) {\n return output;\n }\n\n width -= suffixWidth;\n\n const out = this.clipTextVertical(verticalList, options, width, wordBreak);\n out.width += suffixWidth;\n out.verticalList.push({\n text: suffix,\n direction: 1,\n width: suffixWidth\n });\n return out;\n }\n clipTextWithSuffix(\n text: string,\n options: TextOptionsType,\n width: number,\n suffix: string,\n wordBreak: boolean\n ): {\n str: string;\n width: number;\n } {\n if (suffix === '') {\n return this.clipText(text, options, width, wordBreak);\n }\n if (text.length === 0) {\n return { str: '', width: 0 };\n }\n const length = this.measureTextWidth(text, options);\n if (length <= width) {\n return { str: text, width: length };\n }\n const suffixWidth = this.measureTextWidth(suffix, options);\n if (suffixWidth > width) {\n return { str: '', width: 0 };\n }\n width -= suffixWidth;\n const data = this._clipText(text, options, width, 0, text.length - 1);\n\n // 如果需要文字截断\n if (wordBreak && data.str !== text) {\n const index = testLetter(text, data.str.length);\n if (index !== data.str.length) {\n data.str = text.substring(0, index);\n data.width = this.measureTextWidth(data.str, options);\n }\n }\n data.str += suffix;\n data.width += suffixWidth;\n return data;\n }\n}\n"]}
1
+ {"version":3,"sources":["../src/core/contributions/textMeasure/AtextMeasure.ts"],"names":[],"mappings":"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","file":"AtextMeasure.js","sourcesContent":["import { injectable } from '../../../common/inversify-lite';\nimport type { IGraphicUtil } from '../../../interface/core';\nimport type { ICanvas, IContext2d, EnvType } from '../../../interface';\nimport type { TextOptionsType, ITextMeasure } from '../../../interface/text';\nimport { DefaultTextAttribute, DefaultTextStyle } from '../../../graphic/config';\nimport { testLetter } from '../../../graphic/richtext/utils';\n\n@injectable()\nexport class ATextMeasure implements ITextMeasure {\n release: (...params: any) => void;\n protected canvas?: ICanvas;\n protected context?: IContext2d | null;\n\n configure(service: IGraphicUtil, env: EnvType): void {\n this.canvas = service.canvas;\n this.context = service.context;\n service.bindTextMeasure(this);\n }\n\n /**\n * 获取text宽度,measureText.width\n * @param text\n * @param options\n */\n measureTextWidth(text: string, options: TextOptionsType): number {\n if (!this.context) {\n return this.estimate(text, options).width;\n }\n this.context.setTextStyleWithoutAlignBaseline(options);\n const textMeasure = this.context.measureText(text);\n return textMeasure.width;\n }\n\n // 估算文字长度\n estimate(\n text: string,\n { fontSize = DefaultTextAttribute.fontSize }: TextOptionsType\n ): { width: number; height: number } {\n // 假设只有英文和中文字符\n let eCharLen = 0; // 英文字符\n let cCharLen = 0; // 中文字符\n // 判断ascii码,如果是\n for (let i = 0; i < text.length; i++) {\n text.charCodeAt(i) < 128 ? eCharLen++ : cCharLen++;\n }\n return {\n width: ~~(0.8 * eCharLen * fontSize + cCharLen * fontSize),\n height: fontSize\n };\n }\n\n /**\n * 获取text像素高度,基于actualBoundingBoxAscent和actualBoundingBoxDescent\n * @param text\n * @param options\n */\n measureTextPixelHeight(text: string, options: TextOptionsType): number {\n if (!this.context) {\n return options.fontSize ?? DefaultTextStyle.fontSize;\n }\n this.context.setTextStyleWithoutAlignBaseline(options);\n const textMeasure = this.context.measureText(text);\n return Math.abs((textMeasure as any).actualBoundingBoxAscent - (textMeasure as any).actualBoundingBoxDescent);\n }\n\n /**\n * 获取text包围盒的高度,基于fontBoundingBoxAscent和fontBoundingBoxDescent\n * @param text\n * @param options\n */\n measureTextBoundHieght(text: string, options: TextOptionsType): number {\n if (!this.context) {\n return options.fontSize ?? DefaultTextStyle.fontSize;\n }\n this.context.setTextStyleWithoutAlignBaseline(options);\n const textMeasure = this.context.measureText(text);\n return Math.abs((textMeasure as any).fontBoundingBoxAscent - (textMeasure as any).fontBoundingBoxDescent);\n }\n\n /**\n * 获取text测量对象\n * @param text\n * @param options\n */\n measureText(text: string, options: TextOptionsType): TextMetrics | { width: number } {\n if (!this.context) {\n return this.estimate(text, options);\n }\n this.context.setTextStyleWithoutAlignBaseline(options);\n return this.context.measureText(text);\n }\n\n clipTextVertical(\n verticalList: { text: string; width?: number; direction: number }[],\n options: TextOptionsType,\n width: number,\n wordBreak: boolean\n ): {\n verticalList: { text: string; width?: number; direction: number }[];\n width: number;\n } {\n if (verticalList.length === 0) {\n return { verticalList, width: 0 };\n }\n const { fontSize = 12 } = options;\n // 计算每一个区域的width\n verticalList.forEach(item => {\n item.width = item.direction === 0 ? fontSize : this.measureTextWidth(item.text, options);\n });\n const out: { text: string; width?: number; direction: number }[] = [];\n let length = 0;\n let i = 0;\n for (; i < verticalList.length; i++) {\n if (length + verticalList[i].width < width) {\n length += verticalList[i].width;\n out.push(verticalList[i]);\n } else {\n break;\n }\n }\n if (verticalList[i] && verticalList[i].text.length > 1) {\n const clipedData = this._clipText(\n verticalList[i].text,\n options,\n width - length,\n 0,\n verticalList[i].text.length - 1,\n 'end',\n false\n );\n if (wordBreak && clipedData.str !== verticalList[i].text) {\n let text = '';\n let length = 0;\n for (let j = 0; j < i; j++) {\n const item = verticalList[j];\n text += item.text;\n length += item.text.length;\n }\n text += verticalList[i].text;\n const totalLength = length + clipedData.str.length;\n let index = testLetter(text, totalLength);\n index = index - length;\n if (index !== clipedData.str.length - 1) {\n clipedData.str = clipedData.str.substring(0, index);\n clipedData.width = this.measureTextWidth(clipedData.str, options);\n }\n }\n out.push({ ...verticalList[i], text: clipedData.str, width: clipedData.width });\n length += clipedData.width;\n }\n\n return {\n verticalList: out,\n width: length\n };\n }\n\n /**\n * 将文本裁剪到width宽\n * @param text\n * @param options\n * @param width\n */\n clipText(\n text: string,\n options: TextOptionsType,\n width: number,\n wordBreak: boolean\n ): {\n str: string;\n width: number;\n } {\n if (text.length === 0) {\n return { str: '', width: 0 };\n }\n let length = this.measureTextWidth(text, options);\n if (length <= width) {\n return { str: text, width: length };\n }\n length = this.measureTextWidth(text[0], options);\n if (length > width) {\n return { str: '', width: 0 };\n }\n const data = this._clipText(text, options, width, 0, text.length - 1, 'end', false);\n // 如果需要文字截断\n if (wordBreak && data.str !== text) {\n const index = testLetter(text, data.str.length);\n if (index !== data.str.length) {\n data.str = text.substring(0, index);\n data.width = this.measureTextWidth(data.str, options);\n }\n }\n return data;\n }\n\n // 二分法找到最佳宽\n // TODO: 后续考虑代码合并\n private _clipText(\n text: string,\n options: TextOptionsType,\n width: number,\n leftIdx: number,\n rightIdx: number,\n position: 'start' | 'end' | 'middle',\n suffix: string | false\n ): { str: string; width: number; result?: string } {\n let data: { str: string; width: number; result?: string };\n if (position === 'end') {\n data = this._clipTextEnd(text, options, width, leftIdx, rightIdx);\n suffix && (data.result = data.str + suffix);\n } else if (position === 'start') {\n data = this._clipTextStart(text, options, width, leftIdx, rightIdx);\n suffix && (data.result = suffix + data.str);\n } else if (position === 'middle') {\n const d = this._clipTextMiddle(text, options, width, '', '', 0, 0, 1);\n data = { str: 'none', width: d.width, result: d.left + suffix + d.right };\n }\n return data;\n }\n\n private _clipTextEnd(\n text: string,\n options: TextOptionsType,\n width: number,\n leftIdx: number,\n rightIdx: number\n ): { str: string; width: number } {\n const middleIdx = Math.floor((leftIdx + rightIdx) / 2);\n const subText = text.substring(0, middleIdx + 1);\n const strWidth = this.measureTextWidth(subText, options);\n let length: number;\n if (strWidth > width) {\n // 如果字符串的宽度大于限制宽度\n if (subText.length <= 1) {\n return { str: '', width: 0 };\n } // 如果子字符串长度小于1,而且大于给定宽的话,返回空字符串\n // 先判断是不是左侧的那个字符\n const str = text.substring(0, middleIdx);\n // 如果到左侧的字符小于或等于width,那么说明就是左侧的字符\n length = this.measureTextWidth(str, options);\n if (length <= width) {\n return { str, width: length };\n }\n // 返回leftIdx到middleIdx\n return this._clipTextEnd(text, options, width, leftIdx, middleIdx);\n } else if (strWidth < width) {\n // 如果字符串的宽度小于限制宽度\n if (middleIdx >= text.length - 1) {\n return { str: text, width: this.measureTextWidth(text, options) };\n } // 如果已经到结尾了,返回text\n // 先判断是不是右侧的那个字符\n const str = text.substring(0, middleIdx + 2);\n // 如果到右侧的字符大于或等于width,那么说明就是这个字符串\n length = this.measureTextWidth(str, options);\n if (length >= width) {\n return { str: subText, width: strWidth };\n }\n // 返回middleIdx到rightIdx\n return this._clipTextEnd(text, options, width, middleIdx, rightIdx);\n }\n // 如果相同,那么就找到text\n return { str: subText, width: strWidth };\n }\n\n private _clipTextStart(\n text: string,\n options: TextOptionsType,\n width: number,\n leftIdx: number,\n rightIdx: number\n ): { str: string; width: number } {\n const middleIdx = Math.ceil((leftIdx + rightIdx) / 2);\n const subText = text.substring(middleIdx - 1, text.length - 1);\n const strWidth = this.measureTextWidth(subText, options);\n let length: number;\n if (strWidth > width) {\n // 如果字符串的宽度大于限制宽度\n if (subText.length <= 1) {\n return { str: '', width: 0 };\n } // 如果子字符串长度小于1,而且大于给定宽的话,返回空字符串\n // 先判断是不是左侧的那个字符\n const str = text.substring(middleIdx, text.length - 1);\n // 如果到左侧的字符小于或等于width,那么说明就是左侧的字符\n length = this.measureTextWidth(str, options);\n if (length <= width) {\n return { str, width: length };\n }\n // 返回leftIdx到middleIdx\n return this._clipTextStart(text, options, width, middleIdx, text.length - 1);\n } else if (strWidth < width) {\n // 如果字符串的宽度小于限制宽度\n if (middleIdx <= 0) {\n return { str: text, width: this.measureTextWidth(text, options) };\n } // 如果已经到结尾了,返回text\n // 先判断是不是右侧的那个字符\n const str = text.substring(middleIdx - 2, text.length - 1);\n // 如果到右侧的字符大于或等于width,那么说明就是这个字符串\n length = this.measureTextWidth(str, options);\n if (length >= width) {\n return { str: subText, width: strWidth };\n }\n // 返回middleIdx到rightIdx\n return this._clipTextStart(text, options, width, leftIdx, middleIdx);\n }\n // 如果相同,那么就找到text\n return { str: subText, width: strWidth };\n }\n\n private _clipTextMiddle(\n text: string,\n options: TextOptionsType,\n width: number,\n left: string,\n right: string,\n leftW: number,\n rightW: number,\n buffer: number\n ): { left: string; right: string; width: number } {\n const subLeftText = text.substring(0, buffer);\n const strLeftWidth = this.measureTextWidth(subLeftText, options);\n if (strLeftWidth + rightW > width) {\n return { left, right, width: leftW + rightW };\n }\n const subRightText = text.substring(text.length - buffer, text.length);\n const strRightWidth = this.measureTextWidth(subRightText, options);\n if (strLeftWidth + strRightWidth > width) {\n return { left: subLeftText, right, width: strLeftWidth + rightW };\n }\n return this._clipTextMiddle(\n text,\n options,\n width,\n subLeftText,\n subRightText,\n strLeftWidth,\n strRightWidth,\n buffer + 1\n );\n }\n\n clipTextWithSuffixVertical(\n verticalList: { text: string; width?: number; direction: number }[],\n options: TextOptionsType,\n width: number,\n suffix: string,\n wordBreak: boolean,\n suffixPosition: 'start' | 'end' | 'middle'\n ): {\n verticalList: { text: string; width?: number; direction: number }[];\n width: number;\n } {\n if (suffix === '') {\n return this.clipTextVertical(verticalList, options, width, wordBreak);\n }\n if (verticalList.length === 0) {\n return { verticalList, width: 0 };\n }\n\n const output = this.clipTextVertical(verticalList, options, width, wordBreak);\n if (\n output.verticalList.length === verticalList.length &&\n output.verticalList[output.verticalList.length - 1].width === verticalList[verticalList.length - 1].width\n ) {\n return output;\n }\n\n const suffixWidth = this.measureTextWidth(suffix, options);\n if (suffixWidth > width) {\n return output;\n }\n\n width -= suffixWidth;\n\n let out;\n if (suffixPosition === 'start') {\n const nextVerticalList = this.revertVerticalList(verticalList);\n out = this.clipTextVertical(nextVerticalList, options, width, wordBreak);\n const v = this.revertVerticalList(out.verticalList);\n v.unshift({\n text: suffix,\n direction: 1,\n width: suffixWidth\n });\n out.verticalList = v;\n } else if (suffixPosition === 'middle') {\n const leftOut = this.clipTextVertical(verticalList, options, width / 2, wordBreak);\n const nextVerticalList = this.revertVerticalList(verticalList);\n const rightOut = this.clipTextVertical(nextVerticalList, options, width / 2, wordBreak);\n // 添加suffix\n leftOut.verticalList.push({\n text: suffix,\n direction: 1,\n width: suffixWidth\n });\n this.revertVerticalList(rightOut.verticalList).forEach(v => leftOut.verticalList.push(v));\n out = {\n verticalList: leftOut.verticalList,\n width: leftOut.width + rightOut.width\n };\n } else {\n out = this.clipTextVertical(verticalList, options, width, wordBreak);\n out.verticalList.push({\n text: suffix,\n direction: 1,\n width: suffixWidth\n });\n }\n out.width += suffixWidth;\n return out;\n }\n\n revertVerticalList(\n verticalList: {\n text: string;\n width?: number;\n direction: number;\n }[]\n ) {\n return verticalList.reverse().map(l => {\n const t = l.text.split('').reverse().join('');\n return {\n ...l,\n text: t\n };\n });\n }\n\n clipTextWithSuffix(\n text: string,\n options: TextOptionsType,\n width: number,\n suffix: string,\n wordBreak: boolean,\n position: 'start' | 'end' | 'middle'\n ): {\n str: string;\n width: number;\n } {\n if (suffix === '') {\n return this.clipText(text, options, width, wordBreak);\n }\n if (text.length === 0) {\n return { str: '', width: 0 };\n }\n const length = this.measureTextWidth(text, options);\n if (length <= width) {\n return { str: text, width: length };\n }\n const suffixWidth = this.measureTextWidth(suffix, options);\n if (suffixWidth > width) {\n return { str: '', width: 0 };\n }\n width -= suffixWidth;\n const data = this._clipText(text, options, width, 0, text.length - 1, position, suffix);\n\n // 如果需要文字截断\n if (wordBreak && data.str !== text) {\n const index = testLetter(text, data.str.length);\n if (index !== data.str.length) {\n data.str = text.substring(0, index);\n data.width = this.measureTextWidth(data.str, options);\n }\n }\n data.str = data.result!;\n data.width += suffixWidth;\n return data;\n }\n}\n"]}
@@ -6,8 +6,8 @@ export declare class CanvasTextLayout {
6
6
  private textMeasure;
7
7
  constructor(fontFamily: string, options: TextOptionsType, textMeasure: ITextMeasure);
8
8
  LayoutBBox(bbox: TextLayoutBBox, textAlign: TextAlignType, textBaseline: TextBaselineType): TextLayoutBBox;
9
- GetLayout(str: string, width: number, height: number, textAlign: TextAlignType, textBaseline: TextBaselineType, lineHeight: number, suffix: string, wordBreak: boolean, miniApp: boolean): LayoutType;
10
- GetLayoutByLines(lines: (string | number)[], textAlign: TextAlignType, textBaseline: TextBaselineType, lineHeight: number, suffix: string, wordBreak: boolean, lineWidth?: number): LayoutType;
9
+ GetLayout(str: string, width: number, height: number, textAlign: TextAlignType, textBaseline: TextBaselineType, lineHeight: number, suffix: string, wordBreak: boolean, suffixPosition: 'start' | 'end' | 'middle'): LayoutType;
10
+ GetLayoutByLines(lines: (string | number)[], textAlign: TextAlignType, textBaseline: TextBaselineType, lineHeight: number, suffix: string, wordBreak: boolean, lineWidth?: number, suffixPosition?: 'start' | 'end' | 'middle'): LayoutType;
11
11
  layoutWithBBox(bbox: TextLayoutBBox, lines: LayoutItemType[], textAlign: TextAlignType, textBaseline: TextBaselineType, lineHeight: number): LayoutType;
12
12
  private lineOffset;
13
13
  }
@@ -16,10 +16,10 @@ class CanvasTextLayout {
16
16
  return bbox.yOffset = "top" === textBaseline ? 0 : "middle" === textBaseline ? bbox.height / -2 : "alphabetic" === textBaseline ? -.79 * bbox.height : -bbox.height,
17
17
  bbox;
18
18
  }
19
- GetLayout(str, width, height, textAlign, textBaseline, lineHeight, suffix, wordBreak, miniApp) {
19
+ GetLayout(str, width, height, textAlign, textBaseline, lineHeight, suffix, wordBreak, suffixPosition) {
20
20
  const linesLayout = [], bboxWH = [ width, height ], bboxOffset = [ 0, 0 ];
21
21
  for (;str.length > 0; ) {
22
- const {str: clipText} = this.textMeasure.clipTextWithSuffix(str, this.textOptions, width, suffix, wordBreak);
22
+ const {str: clipText} = this.textMeasure.clipTextWithSuffix(str, this.textOptions, width, suffix, wordBreak, suffixPosition);
23
23
  linesLayout.push({
24
24
  str: clipText,
25
25
  width: this.textMeasure.measureTextWidth(clipText, this.textOptions)
@@ -35,14 +35,14 @@ class CanvasTextLayout {
35
35
  };
36
36
  return this.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline, lineHeight);
37
37
  }
38
- GetLayoutByLines(lines, textAlign, textBaseline, lineHeight, suffix = "", wordBreak, lineWidth) {
38
+ GetLayoutByLines(lines, textAlign, textBaseline, lineHeight, suffix = "", wordBreak, lineWidth, suffixPosition = "end") {
39
39
  lines = lines.map((l => l.toString()));
40
40
  const linesLayout = [], bboxWH = [ 0, 0 ];
41
41
  if ("number" == typeof lineWidth && lineWidth !== 1 / 0) {
42
42
  let width;
43
43
  for (let i = 0, len = lines.length; i < len; i++) width = Math.min(this.textMeasure.measureTextWidth(lines[i], this.textOptions), lineWidth),
44
44
  linesLayout.push({
45
- str: this.textMeasure.clipTextWithSuffix(lines[i], this.textOptions, width, suffix, wordBreak).str,
45
+ str: this.textMeasure.clipTextWithSuffix(lines[i], this.textOptions, width, suffix, wordBreak, suffixPosition).str,
46
46
  width: width
47
47
  });
48
48
  bboxWH[0] = lineWidth;