From 7fcea91ab461040b34bc430c099f2506b6312fa5 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Sat, 13 Apr 2024 11:05:08 +0100 Subject: [PATCH] stuff --- .../ExplanationModal/subjects/Column.svelte | 4 ++-- .../subjects/NotRequired.svelte | 6 +++--- .../subjects/StringsAsNumbers.svelte | 20 +++++++++++++++++-- .../subjects/components/Block.svelte | 4 ++-- .../typography/DocumentationLink.svelte | 5 +++-- .../FieldContext/typography/InfoWord.svelte | 6 +++--- .../FieldContext/typography/Text.svelte | 2 +- .../settings/controls/MultiFieldSelect.svelte | 6 ++++++ 8 files changed, 38 insertions(+), 15 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/Column.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/Column.svelte index a1c278fffb..ab43b6658a 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/Column.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/Column.svelte @@ -36,11 +36,11 @@ {:else if schema.type === "number"} {:else if schema.type === "json"} - import { Subject, Section } from './components' + import { Block, Subject, Section } from './components' - +
- A 'required' contraint can be applied to columns to ensure a value is always present. If a column doesn't have this constraint, then its value for a particular row could he missing. + A required constraint can be applied to columns to ensure a value is always present. If a column doesn't have this constraint, then its value for a particular row could he missing.
diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/StringsAsNumbers.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/StringsAsNumbers.svelte index 27e28c13e6..0accdcd197 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/StringsAsNumbers.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/StringsAsNumbers.svelte @@ -1,9 +1,25 @@
- Text can be used in place of numbers in certain scenarios, but care needs to be taken to ensure that non-numerical values aren't also present, otherwise they may be parsed incorrectly and lead to unexpected behavior. + Text can be used in place of numbers in certain scenarios, but care needs to be taken, as text that doesn't contain a strictly base-ten, non-decimal value may lead to unexpected behavior. +
+ +
+ Examples: +
+ "100"{" -> "}100 +
+ "100k"{" -> "}100 +
+ "100,000"{" -> "}100 +
+ "100 million"{" -> "}100 +
+ "100.9"{" -> "}100 +
+ "One hundred"{" -> "}Error
diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/components/Block.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/components/Block.svelte index e90bbc6bf9..b2e2d8330c 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/components/Block.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/ExplanationModal/subjects/components/Block.svelte @@ -5,10 +5,10 @@ diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/typography/DocumentationLink.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/DocumentationLink.svelte index 982745ac07..d4d9bebdc4 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/typography/DocumentationLink.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/DocumentationLink.svelte @@ -13,7 +13,7 @@ target="_blank" class="link" > - + {text} @@ -32,8 +32,9 @@ .link { display: inline-flex; box-sizing: border-box; - padding: 1px 0; + padding: 1px 0 2px; filter: brightness(100%); + align-items: center; overflow: hidden; flex-shrink: 0; diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/typography/InfoWord.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/InfoWord.svelte index 582e07f9fe..9e6dd29ba0 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/typography/InfoWord.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/InfoWord.svelte @@ -21,7 +21,7 @@ on:mouseleave > {#if icon} - + {/if} @@ -39,7 +39,7 @@ on:mouseleave > {#if icon} - + {/if} @@ -53,7 +53,7 @@ .infoWord { display: inline-flex; box-sizing: border-box; - padding: 1px 0; + padding: 1px 0 2px; filter: brightness(100%); overflow: hidden; transition: filter 300ms; 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 index 42983a1b0c..d7dc4d053d 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/typography/Text.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Text.svelte @@ -59,6 +59,6 @@ /* invisible properties to match other inline text elements that do have borders. If we don't match here we run into subpixel issues */ box-sizing: border-box; border-bottom: 1px solid transparent; - padding: 1px 0; + padding: 1px 0 2px; } diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte index 9f0f9a4561..0fd92477f3 100644 --- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte @@ -70,6 +70,10 @@ if (field) { return field.name + } else if (type === "jsonarray") { + // `jsonarray` isn't present in the above FIELDS constant + + return "JSON Array" } return "" @@ -93,6 +97,8 @@ const onOptionMouseleave = (e, option) => { updateTooltip(e, null); } + + $: console.log(schema)