From f915d021ca1c189271bc7bffdbe94632fd014595 Mon Sep 17 00:00:00 2001 From: MiniPear Date: Wed, 24 May 2023 17:36:49 +0800 Subject: [PATCH] fix(legend): pass legend.style (#5084) --- .../static/athletesRectBinLegendStyle.png | Bin 0 -> 20277 bytes .../static/athletes-rect-bin-legend-style.ts | 31 ++++++++++++++++++ __tests__/plots/static/index.ts | 1 + src/component/utils.ts | 13 +++++--- 4 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 __tests__/integration/snapshots/static/athletesRectBinLegendStyle.png create mode 100644 __tests__/plots/static/athletes-rect-bin-legend-style.ts diff --git a/__tests__/integration/snapshots/static/athletesRectBinLegendStyle.png b/__tests__/integration/snapshots/static/athletesRectBinLegendStyle.png new file mode 100644 index 0000000000000000000000000000000000000000..960a065a93a7ff9fde4f67d12a9d4887ff72b48c GIT binary patch literal 20277 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: T) { 'title', 'trunc', ]; + // @ts-ignore + const { style: styles, ...rest } = style; const finalStyle = {}; - Object.entries(style).forEach(([key, value]) => { - if (reservedKeys.includes(key)) + Object.entries(rest).forEach(([key, value]) => { + if (reservedKeys.includes(key)) { finalStyle[`show${upperFirst(key)}`] = value; - else finalStyle[key] = value; + } else finalStyle[key] = value; }); - return finalStyle as T; + return { + ...finalStyle, + ...styles, + }; }