From 82294c55ce46bd4372fdba329ba4328646c6c300 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Mon, 8 Apr 2024 13:34:25 +0100 Subject: [PATCH] part reafactor, probs not wroking --- .../controls/FieldContext/Chart.svelte | 9 ++++---- .../controls/FieldContext/lines/Column.svelte | 9 ++++++++ .../FieldContext/lines/NotRequired.svelte | 9 ++++++++ .../FieldContext/lines/StringNumber.svelte | 9 ++++++++ .../FieldContext/lines/Support.svelte | 8 +++++++ .../controls/FieldContext/lines/index.js | 4 ++++ .../FieldContext/typography/Comma.svelte | 11 ++++++++++ .../{ => typography}/DocumentationLink.svelte | 0 .../{ => typography}/InfoWord.svelte | 0 .../FieldContext/typography/Line.svelte | 22 +++++++++++++++++++ .../FieldContext/typography/Period.svelte | 10 +++++++++ .../FieldContext/typography/Space.svelte | 7 ++++++ .../controls/FieldContext/typography/index.js | 5 +++++ .../settings/controls/MultiFieldSelect.svelte | 5 ----- 14 files changed, 99 insertions(+), 9 deletions(-) create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/lines/Column.svelte create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/lines/NotRequired.svelte create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/lines/StringNumber.svelte create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/lines/Support.svelte create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/lines/index.js create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/typography/Comma.svelte rename packages/builder/src/components/design/settings/controls/FieldContext/{ => typography}/DocumentationLink.svelte (100%) rename packages/builder/src/components/design/settings/controls/FieldContext/{ => typography}/InfoWord.svelte (100%) create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/typography/Line.svelte create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/typography/Period.svelte create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/typography/Space.svelte create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/typography/index.js 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 01454081af..25ae2f9b33 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte @@ -72,7 +72,7 @@ handleMouseenter("column")} - on:mouseleave={() => handleMouseleave("column")} + on:mouseleave={handleMouseleave} href={tableHref} text={columnName} /> @@ -90,7 +90,8 @@ handleMouseenter("support")} - on:mouseleave={() => handleMouseleave("support")} + on:mouseleave={handleMouseleave} + href={tableHref} icon={support.icon} color={support.iconColor} text={support.text} @@ -112,7 +113,7 @@ handleMouseenter("stringsAndNumbers")} - on:mouseleave={() => handleMouseleave("stringsAndNumbers")} + on:mouseleave={handleMouseleave} text="non-number values" /> @@ -129,7 +130,7 @@ handleMouseenter("required")} - on:mouseleave={() => handleMouseleave("required")} + on:mouseleave={handleMouseleave} text="required" /> 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 new file mode 100644 index 0000000000..b3bf785afc --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/Column.svelte @@ -0,0 +1,9 @@ + + + +
+
+ + 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 new file mode 100644 index 0000000000..b3bf785afc --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/NotRequired.svelte @@ -0,0 +1,9 @@ + + + +
+
+ + 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 new file mode 100644 index 0000000000..b3bf785afc --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/StringNumber.svelte @@ -0,0 +1,9 @@ + + + +
+
+ + 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 new file mode 100644 index 0000000000..2e58e2fcca --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/Support.svelte @@ -0,0 +1,8 @@ + + +
+
+ + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/lines/index.js b/packages/builder/src/components/design/settings/controls/FieldContext/lines/index.js new file mode 100644 index 0000000000..bd010a820e --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/lines/index.js @@ -0,0 +1,4 @@ +export { default as Column } from "./Column.svelte" +export { default as NotRequired } from "./NotRequired.svelte" +export { default as StringNumber } from "./StringNumber.svelte" +export { default as Support } from "./Support.svelte" diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/typography/Comma.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Comma.svelte new file mode 100644 index 0000000000..f160ea6e50 --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Comma.svelte @@ -0,0 +1,11 @@ +, + + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/DocumentationLink.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/DocumentationLink.svelte similarity index 100% rename from packages/builder/src/components/design/settings/controls/FieldContext/DocumentationLink.svelte rename to packages/builder/src/components/design/settings/controls/FieldContext/typography/DocumentationLink.svelte diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/InfoWord.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/InfoWord.svelte similarity index 100% rename from packages/builder/src/components/design/settings/controls/FieldContext/InfoWord.svelte rename to packages/builder/src/components/design/settings/controls/FieldContext/typography/InfoWord.svelte diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/typography/Line.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Line.svelte new file mode 100644 index 0000000000..c15dd6c3ef --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Line.svelte @@ -0,0 +1,22 @@ +
+ + +
+ + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/typography/Period.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Period.svelte new file mode 100644 index 0000000000..6697e278a0 --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Period.svelte @@ -0,0 +1,10 @@ +. + + diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/typography/Space.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Space.svelte new file mode 100644 index 0000000000..ba72455d92 --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/Space.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 new file mode 100644 index 0000000000..6c5a1b1866 --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/typography/index.js @@ -0,0 +1,5 @@ +export { default as Space } from "./Space.svelte" +export { default as Comma } from "./Comma.svelte" +export { default as Period } from "./Period.svelte" +export { default as InfoWord } from "./InfoWord.svelte" +export { default as DocumentationLink } from "./DocumentationLink.svelte" diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte index b2b7765e86..92d5dd298c 100644 --- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte @@ -18,9 +18,6 @@ let currentOption = null let previousOption = null let contextTooltipVisible = false - let currentOptionSupport = {} - let previousOptionSupport = {} - const TypeIconMap = { text: "Text", @@ -42,7 +39,6 @@ }, } - const getFieldSupport = (schema, fieldValidator) => { if (fieldValidator == null) { return {} @@ -60,7 +56,6 @@ const dispatch = createEventDispatcher() $: datasource = getDatasourceForProvider($selectedScreen, componentInstance) - $: console.log(datasource) $: schema = getSchemaForDatasource($selectedScreen, datasource).schema $: options = Object.keys(schema || {}) $: fieldSupport = getFieldSupport(schema, fieldValidator);