Merge branch 'master' into BUDI-9016/design-errors-popup

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

packages/bbui/src/Form/Core/Picker.svelte

@@ -34,12 +34,12 @@
   export let getOptionValue = (option: O, _index?: number) =>
     option as unknown as V
   export let getOptionIcon = (option: O, _index?: number) =>
-    option as unknown as O
-  export let useOptionIconImage = false
+    option?.icon ?? undefined
   export let getOptionColour = (option: O, _index?: number) =>
-    option as unknown as O
+    option?.colour ?? undefined
   export let getOptionSubtitle = (option: O, _index?: number) =>
-    option as unknown as O
+    option?.subtitle ?? undefined
+  export let useOptionIconImage = false
   export let open: boolean = false
   export let readonly: boolean = false
   export let quiet: boolean = false

packages/bbui/src/Form/Core/Select.svelte

@@ -17,11 +17,11 @@
   export let getOptionValue = (option: O, _index?: number) =>
     option as unknown as V
   export let getOptionIcon = (option: O, _index?: number) =>
-    option as unknown as string
+    option?.icon ?? undefined
   export let getOptionColour = (option: O, _index?: number) =>
-    option as unknown as string
+    option?.colour ?? undefined
   export let getOptionSubtitle = (option: O, _index?: number) =>
-    option as unknown as string
+    option?.subtitle ?? undefined
   export let compare = (option: O, value: V) => option === value
   export let useOptionIconImage = false
   export let isOptionEnabled = (option: O, _index?: number) =>