From 77a53185ca0d819bd40d603b73e62831fb0199c3 Mon Sep 17 00:00:00 2001 From: cmack Date: Wed, 5 Aug 2020 17:05:06 +0100 Subject: [PATCH] Tidyup --- .../userInterface/temporaryPanelStructure.js | 14 ++++---------- .../standard-components/src/Chart/Legend.svelte | 9 ++++----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js index 4d40fe8144..cd95e29c42 100644 --- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js +++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js @@ -498,14 +498,14 @@ export default { control: ModelSelect, }, { - label: "Keep Last Hover", - key: "hasLastHoverSliceHighlighted", + label: "Animate Chart", + key: "isAnimated", valueKey: "checked", control: Checkbox, }, { - label: "Is Animated", - key: "isAnimated", + label: "Keep Last Hover", + key: "hasLastHoverSliceHighlighted", valueKey: "checked", control: Checkbox, }, @@ -553,12 +553,6 @@ export default { valueKey: "checked", control: Checkbox, }, - { - label: "Show Legend", - key: "useLegend", - valueKey: "checked", - control: Checkbox, - }, { label: "Horizontal Legend", key: "horizontalLegend", diff --git a/packages/standard-components/src/Chart/Legend.svelte b/packages/standard-components/src/Chart/Legend.svelte index eb01b9475e..f42e714507 100644 --- a/packages/standard-components/src/Chart/Legend.svelte +++ b/packages/standard-components/src/Chart/Legend.svelte @@ -47,6 +47,10 @@ legend.highlightByEntryId(highlightByEntryId) } + if (notNull(isHorizontal)) { + legend.isHorizontal(isHorizontal) + } + if (notNull(margin)) { legend.margin(margin) } @@ -70,11 +74,6 @@ } } - $: if (notNull(isHorizontal)) { - debugger - legend.isHorizontal(isHorizontal) - } - const legendClass = `legend-container`