From 9ef69b1725057cf1edce2fae76f589cb82dda755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 16:18:52 +0200 Subject: [PATCH 01/13] convert ActionButton to new interface --- .../bbui/src/ActionButton/ActionButton.svelte | 18 +++--------------- .../bbui/src/Table/SelectEditRenderer.svelte | 2 +- .../AutomationBuilder/BlockList.svelte | 2 +- .../AppPreview/ComponentSelectionList.svelte | 2 +- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index 688d3bf7e4..9dd5c68f43 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -10,11 +10,7 @@ export let disabled = false export let icon = "" - export let xl = false - export let l = false - export let m = false - export let s = false - $: useDefault = ![xl, l, m, s].includes(true) + export let size = "M" function longPress(element) { if (!longPressable) return @@ -42,11 +38,7 @@ class:spectrum-ActionButton--quiet={quiet} class:spectrum-ActionButton--emphasized={emphasized} class:is-selected={selected} - class:spectrum-ActionButton--sizeS={s} - class:spectrum-ActionButton--sizeM={m || useDefault} - class:spectrum-ActionButton--sizeL={l} - class:spectrum-ActionButton--sizeXL={xl} - class="spectrum-ActionButton" + class="spectrum-ActionButton spectrum-ActionButton--size{size}" {disabled} on:longPress on:click|preventDefault @@ -62,11 +54,7 @@ {/if} {#if icon} {/if} {#if allowEditRows} - Edit + Edit {/if} diff --git a/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte b/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte index 2c37e97956..4e6a0d9c18 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte @@ -66,7 +66,7 @@
onChangeTab(idx)}> diff --git a/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte b/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte index 4163e87104..49261e2f73 100644 --- a/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte +++ b/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte @@ -46,7 +46,7 @@ {#each enrichedStructure as item, idx} - onItemChosen(item, idx)}> + onItemChosen(item, idx)}> {item.name} {#each item.children || [] as item} From a1ef5acd0ce6bf485b6f8b5d24254ab0bcbd032c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 16:22:33 +0200 Subject: [PATCH 02/13] remove old unsused close component from bbui --- packages/bbui/src/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 842c88ef14..312d87b436 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -29,7 +29,6 @@ export { default as ProgressCircle } from "./ProgressCircle/ProgressCircle.svelt export { default as Label } from "./Styleguide/Label.svelte" export { default as Layout } from "./Layout/Layout.svelte" export { default as Link } from "./Link/Link.svelte" -export { default as Close } from "./Button/Close.svelte" export { default as Menu } from "./Menu/Menu.svelte" export { default as MenuSection } from "./Menu/Section.svelte" export { default as MenuSeparator } from "./Menu/Separator.svelte" From 39f89d0946de03afc889b63c018be94a09a0f1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 16:22:43 +0200 Subject: [PATCH 03/13] actually remove it --- packages/bbui/src/Button/Close.svelte | 59 --------------------------- packages/bbui/src/Button/Close.svench | 36 ---------------- 2 files changed, 95 deletions(-) delete mode 100644 packages/bbui/src/Button/Close.svelte delete mode 100644 packages/bbui/src/Button/Close.svench diff --git a/packages/bbui/src/Button/Close.svelte b/packages/bbui/src/Button/Close.svelte deleted file mode 100644 index f2b76cdb38..0000000000 --- a/packages/bbui/src/Button/Close.svelte +++ /dev/null @@ -1,59 +0,0 @@ - - - - - diff --git a/packages/bbui/src/Button/Close.svench b/packages/bbui/src/Button/Close.svench deleted file mode 100644 index 5bb7542b11..0000000000 --- a/packages/bbui/src/Button/Close.svench +++ /dev/null @@ -1,36 +0,0 @@ - - - - - -
- -
- - -
- -
- - -
- -
- - -
- -
- From b55a653ab21ab394768a28dcf31f5c5506fee107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 16:23:42 +0200 Subject: [PATCH 04/13] rework ClearButton --- .../bbui/src/ClearButton/ClearButton.svelte | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/packages/bbui/src/ClearButton/ClearButton.svelte b/packages/bbui/src/ClearButton/ClearButton.svelte index e6457d4857..5a2f6bc04c 100644 --- a/packages/bbui/src/ClearButton/ClearButton.svelte +++ b/packages/bbui/src/ClearButton/ClearButton.svelte @@ -1,10 +1,19 @@ - \ No newline at end of file + From b635aad8aebea0bc1dda2251eaac391ff5c100a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 16:25:39 +0200 Subject: [PATCH 05/13] rework Divider to use new API --- packages/bbui/src/Divider/Divider.svelte | 14 +++++--------- packages/bbui/src/Modal/ModalContent.svelte | 2 +- .../PropertyControls/DataSourceSelect.svelte | 8 ++++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/bbui/src/Divider/Divider.svelte b/packages/bbui/src/Divider/Divider.svelte index cc50225d2f..2b4de9cfb0 100644 --- a/packages/bbui/src/Divider/Divider.svelte +++ b/packages/bbui/src/Divider/Divider.svelte @@ -1,23 +1,19 @@
+ class="spectrum-Divider spectrum-Divider--{vertical + ? 'vertical' + : 'horizontal'} spectrum-Dialog-divider spectrum-Divider--size{size}" +/> diff --git a/packages/bbui/src/Links/Home.svench b/packages/bbui/src/Links/Home.svench deleted file mode 100644 index 973d7977d0..0000000000 --- a/packages/bbui/src/Links/Home.svench +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - From 6a424c7fe0f8fb92839b2c0562e15ea1fcd5f23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 16:41:31 +0200 Subject: [PATCH 08/13] remove unused import --- .../builder/src/pages/builder/_layout.svelte | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index 00d49a055b..6f88422c56 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -1,6 +1,8 @@ @@ -11,19 +13,25 @@
- - Apps - + Apps Hosting Documentation - + Community - + Raise an issue From c97fc61f77bec633102db80878f0147e9476341a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 16:41:43 +0200 Subject: [PATCH 09/13] update progressbar to use new API --- .../bbui/src/ProgressBar/ProgressBar.svelte | 83 ++++++++++++------- packages/bbui/src/index.js | 1 - 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/packages/bbui/src/ProgressBar/ProgressBar.svelte b/packages/bbui/src/ProgressBar/ProgressBar.svelte index 4b046ec81c..bca427b7ff 100644 --- a/packages/bbui/src/ProgressBar/ProgressBar.svelte +++ b/packages/bbui/src/ProgressBar/ProgressBar.svelte @@ -1,38 +1,63 @@ - -
- {#if $$slots} -
- {/if} - {#if value} -
{Math.round($progress)}%
- {/if} -
-
+
+ {#if $$slots} +
+
- + {/if} + {#if value} +
+ {Math.round($progress)}% +
+ {/if} +
+
+
+ diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 312d87b436..f0bf22f9e7 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -21,7 +21,6 @@ export { default as Icon, directions } from "./Icon/Icon.svelte" export { default as Toggle } from "./Form/Toggle.svelte" export { default as RadioGroup } from "./Form/RadioGroup.svelte" export { default as Checkbox } from "./Form/Checkbox.svelte" -export { default as Home } from "./Links/Home.svelte" export { default as DetailSummary } from "./DetailSummary/DetailSummary.svelte" export { default as Popover } from "./Popover/Popover.svelte" export { default as ProgressBar } from "./ProgressBar/ProgressBar.svelte" From e0a376dd7b980a9d95de5e3ce048cdd48343fed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 17:04:50 +0200 Subject: [PATCH 10/13] cleanup component selection list --- .../AppPreview/ComponentSelectionList.svelte | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte b/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte index 97677b3ca5..0fd334794a 100644 --- a/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte +++ b/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte @@ -32,11 +32,8 @@ return enrichedStructure } - const onItemChosen = async (item, idx) => { - if (item.isCategory) { - // Select and open this category - selectedIndex = idx - } else { + const onItemChosen = async (item) => { + if (!item.isCategory) { // Add this component await store.actions.components.create(item.component) } @@ -44,15 +41,14 @@ - {#each enrichedStructure as item, idx} + {#each enrichedStructure as item} onItemChosen(item, idx)} + slot="control" + on:click={() => onItemChosen(item)} > {item.name} From bccc47cab300b33a022ed84a73ca85f1aaa9ffd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 27 Apr 2021 17:10:25 +0200 Subject: [PATCH 11/13] rework AutomationBindingPanel to use Layout component --- .../SetupPanel/AutomationBindingPanel.svelte | 101 ++++++++---------- 1 file changed, 44 insertions(+), 57 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBindingPanel.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBindingPanel.svelte index da50ae905a..6729c502c0 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBindingPanel.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBindingPanel.svelte @@ -1,6 +1,6 @@ -
-
-
- - + + + + {#if context} Columns
    - {#each context.filter(context => + {#each context.filter((context) => context.readableBinding.match(searchRgx) ) as { readableBinding }}
  • addToText(readableBinding)}> @@ -80,7 +79,7 @@ Components
      - {#each instance.filter(instance => + {#each instance.filter((instance) => instance.readableBinding.match(searchRgx) ) as { readableBinding }}
    • addToText(readableBinding)}> @@ -93,7 +92,7 @@ Helpers
        - {#each helpers.filter(helper => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper} + {#each helpers.filter((helper) => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
      • addToText(helper.text)}>
        @@ -105,49 +104,24 @@
        • {/each}
      -
-
-