diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte index 25ae2f9b33..26633d7171 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte @@ -1,13 +1,7 @@
-
- - handleMouseenter("column")} - on:mouseleave={handleMouseleave} - href={tableHref} - text={columnName} - /> - - is a - - - . -
-
- - handleMouseenter("support")} - on:mouseleave={handleMouseleave} - href={tableHref} - icon={support.icon} - color={support.iconColor} - text={support.text} - /> - - with - - - . -
+ + {#if support?.warnings?.includes(warnings.stringAsNumber)} -
- - Any - - handleMouseenter("stringsAndNumbers")} - on:mouseleave={handleMouseleave} - text="non-number values" + - - - will be ignored - - . -
{/if} {#if support?.warnings?.includes(warnings.notRequired)} -
- - No - - handleMouseenter("required")} - on:mouseleave={handleMouseleave} - text="required" + - - - , - - so values may be missing - - . -
{/if}
@@ -158,10 +62,6 @@ {/if} diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/index.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/index.svelte index c1cdb8be18..f587d51d19 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/index.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/index.svelte @@ -4,7 +4,7 @@ import { selectedScreen } from "stores/builder" import { createEventDispatcher } from "svelte" import Property from './Property.svelte' - import InfoWord from '../InfoWord.svelte' + import { InfoWord } from '../typography' export let anchor export let schema diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/lines/Column.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/lines/Column.svelte index b3bf785afc..b00d414613 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/lines/Column.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/Column.svelte @@ -1,9 +1,53 @@ - -
-
- - + + setExplanationSubject("column")} + on:mouseleave={() => setExplanationSubject(null)} + href={tableHref} + text={columnName} + /> + + is a + + + + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/lines/NotRequired.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/lines/NotRequired.svelte index b3bf785afc..8fd1e4acfa 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/lines/NotRequired.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/NotRequired.svelte @@ -1,9 +1,30 @@ - -
-
+ + + No + + setExplanationSubject("required")} + on:mouseleave={() => setExplanationSubject(null)} + text="required" + /> + + + + + so values may be missing + + + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/lines/StringNumber.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/lines/StringNumber.svelte index b3bf785afc..ee304e32cc 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/lines/StringNumber.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/StringNumber.svelte @@ -1,9 +1,17 @@ - -
-
- - + + Any + + setExplanationSubject("stringsAndNumbers")} + on:mouseleave={() => setExplanationSubject(null)} + text="non-number values" +/> + + will be ignored + + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/lines/Support.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/lines/Support.svelte index 2e58e2fcca..92f817af09 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/lines/Support.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/Support.svelte @@ -1,8 +1,25 @@ -
-
- - + + setExplanationSubject("support")} + on:mouseleave={() => setExplanationSubject(null)} + icon={support.icon} + color={support.iconColor} + text={support.text} + /> + + with + + + + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/typography/Text.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Text.svelte new file mode 100644 index 0000000000..1527651a9c --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Text.svelte @@ -0,0 +1,7 @@ + + + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/typography/index.js b/packages/builder/src/components/design/settings/controls/FieldContext/typography/index.js index 6c5a1b1866..102b65190d 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/typography/index.js +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/index.js @@ -1,5 +1,7 @@ export { default as Space } from "./Space.svelte" export { default as Comma } from "./Comma.svelte" export { default as Period } from "./Period.svelte" +export { default as Text } from "./Text.svelte" export { default as InfoWord } from "./InfoWord.svelte" export { default as DocumentationLink } from "./DocumentationLink.svelte" +export { default as Line } from "./Line.svelte"