You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2025/06/23 08:04:18 UTC
(echarts) 01/02: Merge branch 'master' into next-merge
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch next-merge
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 2f3bafb2558fe5e490311db27aa98f1a0cc511ba
Merge: d172a358c fccb3f3bb
Author: Ovilia <zw...@gmail.com>
AuthorDate: Mon Jun 23 16:01:45 2025 +0800
Merge branch 'master' into next-merge
src/component/legend/LegendView.ts | 19 ++--
src/component/legend/ScrollableLegendView.ts | 5 +-
test/legend-overflow.html | 147 +++++++++++++++++++++++++++
3 files changed, 162 insertions(+), 9 deletions(-)
diff --cc src/component/legend/LegendView.ts
index 2dc195fca,4c1e69e04..2761025fd
--- a/src/component/legend/LegendView.ts
+++ b/src/component/legend/LegendView.ts
@@@ -132,15 -130,15 +132,15 @@@ class LegendView extends ComponentView
selectorPosition = orient === 'horizontal' ? 'end' : 'start';
}
- this.renderInner(itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition);
-
// Perform layout.
+ const refContainer = layoutUtil.createBoxLayoutReference(legendModel, api).refContainer;
const positionInfo = legendModel.getBoxLayoutParams();
- const viewportSize = {width: api.getWidth(), height: api.getHeight()};
const padding = legendModel.get('padding');
- const maxSize = layoutUtil.getLayoutRect(positionInfo, viewportSize, padding);
+ const maxSize = layoutUtil.getLayoutRect(positionInfo, refContainer, padding);
+ this.renderInner(itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition, maxSize);
+
const mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition);
// Place mainGroup, based on the calculated `mainRect`.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org