Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions packages/bbui/src/Form/Core/CheckboxGroup.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
export let readonly = false
export let getOptionLabel = (option: O) => `${option}`
export let getOptionValue = (option: O) => option as unknown as V
export let showSelectAll = false
export let selectAllText = "Select all"

const dispatch = createEventDispatcher<{ change: V[] }>()

Expand All @@ -29,9 +31,55 @@
)
}
}

$: allSelected =
options.length > 0 &&
options.every(option => value.includes(getOptionValue(option)))
$: noneSelected =
options.length === 0 ||
options.every(option => !value.includes(getOptionValue(option)))
$: indeterminate = !allSelected && !noneSelected

const toggleSelectAll = () => {
if (allSelected) {
dispatch("change", [])
} else {
const allValues = options.map(option => getOptionValue(option))
dispatch("change", allValues)
}
}
</script>

<div class={`spectrum-FieldGroup spectrum-FieldGroup--${direction}`}>
{#if showSelectAll && options?.length > 0}
<div
title={selectAllText}
class="spectrum-Checkbox spectrum-FieldGroup-item select-all-checkbox"
class:readonly
>
<label
class="spectrum-Checkbox spectrum-Checkbox--sizeM spectrum-FieldGroup-item"
>
<input
on:change={toggleSelectAll}
type="checkbox"
class="spectrum-Checkbox-input"
checked={allSelected}
{disabled}
/>
<span class="spectrum-Checkbox-box">
<span class="icon" class:checked={allSelected || indeterminate}>
<Icon
name={indeterminate ? "minus" : "check"}
weight="bold"
color="var(--spectrum-global-color-gray-50)"
/>
</span>
</span>
<span class="spectrum-Checkbox-label">{selectAllText}</span>
</label>
</div>
{/if}
{#if options && Array.isArray(options)}
{#each options as option}
{@const optionValue = getOptionValue(option)}
Expand Down Expand Up @@ -87,4 +135,21 @@
.icon :global(i) {
font-size: 14px;
}
.select-all-checkbox {
margin-bottom: 8px;
padding: 0;
}
.select-all-checkbox .spectrum-Checkbox {
padding: 0;
}
.select-all-checkbox .spectrum-Checkbox-input {
margin: 0;
}
.spectrum-FieldGroup .select-all-checkbox,
.spectrum-FieldGroup .select-all-checkbox:hover,
.spectrum-FieldGroup .select-all-checkbox:focus-within,
.spectrum-FieldGroup .select-all-checkbox .spectrum-Checkbox,
.spectrum-FieldGroup .select-all-checkbox label {
background: none !important;
}
</style>
23 changes: 23 additions & 0 deletions packages/bbui/src/Form/Core/Multiselect.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,21 @@
export let loading: boolean = false
export let onOptionMouseenter = () => {}
export let onOptionMouseleave = () => {}
export let showSelectAll = false
export let selectAllText = "Select all"

const dispatch = createEventDispatcher()

$: arrayValue = Array.isArray(value) ? value : [value].filter(x => !!x)
$: selectedLookupMap = getSelectedLookupMap(arrayValue)
$: optionLookupMap = getOptionLookupMap(options)
$: allSelected =
options.length > 0 &&
options.every(option => arrayValue.includes(getOptionValue(option)))
$: noneSelected =
options.length === 0 ||
options.every(option => !arrayValue.includes(getOptionValue(option)))
$: indeterminate = !allSelected && !noneSelected

$: fieldText = getFieldText(arrayValue, optionLookupMap, placeholder)
$: isOptionSelected = (optionValue: string) =>
Expand Down Expand Up @@ -101,6 +110,15 @@
}
}
}

const toggleSelectAll = () => {
if (allSelected) {
dispatch("change", [])
} else {
const allValues = options.map(option => getOptionValue(option))
dispatch("change", allValues)
}
}
</script>

<Picker
Expand All @@ -124,4 +142,9 @@
{loading}
{onOptionMouseenter}
{onOptionMouseleave}
{showSelectAll}
{selectAllText}
{indeterminate}
{allSelected}
{toggleSelectAll}
/>
34 changes: 34 additions & 0 deletions packages/bbui/src/Form/Core/Picker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
_e: MouseEvent,
_option: any
) => void = () => {}
export let showSelectAll: boolean = false
export let selectAllText: string = "Select all"
export let indeterminate: boolean = false
export let allSelected: boolean = false
export let toggleSelectAll: () => void = () => {}

const dispatch = createEventDispatcher()

Expand Down Expand Up @@ -198,6 +203,27 @@
/>
{/if}
<ul class="spectrum-Menu" role="listbox" bind:this={component}>
{#if showSelectAll && filteredOptions.length > 0}
<li
class="spectrum-Menu-item select-all-item"
role="option"
aria-selected="true"
tabindex="0"
on:click={toggleSelectAll}
>
<span class="spectrum-Menu-itemLabel">{selectAllText}</span>
{#if indeterminate || allSelected}
<div class="check select-all-check">
<Icon
name={indeterminate ? "minus" : "check"}
size="S"
weight="bold"
color="var(--spectrum-global-color-blue-500)"
/>
</div>
{/if}
</li>
{/if}
{#if placeholderOption}
<li
class="spectrum-Menu-item placeholder"
Expand Down Expand Up @@ -417,4 +443,12 @@
display: block;
margin-top: var(--spacing-s);
}

.select-all-item {
border-bottom: 1px solid var(--spectrum-global-color-gray-200);
margin-bottom: 4px;
}
.select-all-item .select-all-check {
display: block;
}
</style>
16 changes: 16 additions & 0 deletions packages/client/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4111,6 +4111,22 @@
"value": "checkbox"
}
},
{
"type": "boolean",
"label": "Show Select All",
"key": "showSelectAll",
"defaultValue": false
},
{
"type": "text",
"label": "Select All Text",
"key": "selectAllText",
"defaultValue": "Select all",
"dependsOn": {
"setting": "showSelectAll",
"value": true
}
},
{
"type": "select",
"label": "Options source",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
export let direction: "horizontal" | "vertical" = "vertical"
export let span: number | undefined = undefined
export let helpText: string | undefined = undefined
export let showSelectAll: boolean = false
export let selectAllText: string = "Select all"

let fieldState: FieldState | undefined
let fieldApi: FieldApi | undefined
Expand Down Expand Up @@ -94,6 +96,8 @@
{placeholder}
{options}
{autocomplete}
{showSelectAll}
{selectAllText}
/>
{:else if optionsType === "checkbox"}
<CoreCheckboxGroup
Expand All @@ -105,6 +109,8 @@
on:change={handleChange}
getOptionLabel={flatOptions ? x => x : x => getProp("label", x)}
getOptionValue={flatOptions ? x => x : x => getProp("value", x)}
{showSelectAll}
{selectAllText}
/>
{/if}
{/if}
Expand Down
66 changes: 14 additions & 52 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2811,29 +2811,6 @@
pouchdb-promise "^6.0.4"
through2 "^2.0.0"

"@budibase/pro@*":
version "3.21.2"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-3.21.2.tgz#500e8bbcf09afb285159e7feb41a63f0d16349c4"
integrity sha512-vwcPgtqn5UhoD1FIpkJA5Ks6f1Oq/rRTCY0LRBcvC7JLXLekbKUwp3FPtpDvqu/UBzE3ONAKn8SI/6uqH/G+/w==
dependencies:
"@anthropic-ai/sdk" "^0.27.3"
"@budibase/backend-core" "*"
"@budibase/shared-core" "*"
"@budibase/string-templates" "*"
"@budibase/types" "*"
"@koa/router" "13.1.0"
bull "4.10.1"
dd-trace "5.56.0"
joi "17.6.0"
jsonwebtoken "9.0.2"
lru-cache "^7.14.1"
memorystream "^0.3.1"
node-fetch "2.6.7"
openai "5.12.1"
scim-patch "^0.8.1"
scim2-parse-filter "^0.2.8"
zod "^3.23.8"

"@budibase/vm-browserify@^1.1.4":
version "1.1.4"
resolved "https://registry.yarnpkg.com/@budibase/vm-browserify/-/vm-browserify-1.1.4.tgz#eecb001bd9521cb7647e26fb4d2d29d0a4dce262"
Expand Down Expand Up @@ -21528,16 +21505,7 @@ string-length@^4.0.2:
char-regex "^1.0.2"
strip-ansi "^6.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -21624,14 +21592,7 @@ stringify-object@^3.2.1:
is-obj "^1.0.1"
is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -22263,6 +22224,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/timekeeper/-/timekeeper-2.2.0.tgz#9645731fce9e3280a18614a57a9d1b72af3ca368"
integrity sha512-W3AmPTJWZkRwu+iSNxPIsLZ2ByADsOLbbLxe46UJyWj3mlYLlwucKiq+/dPm0l9wTzqoF3/2PH0AGFCebjq23A==

timekeeper@^2.2.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/timekeeper/-/timekeeper-2.3.1.tgz#2deb6e0b95d93625fda84c18d47f84a99e4eba01"
integrity sha512-LeQRS7/4JcC0PgdSFnfUiStQEdiuySlCj/5SJ18D+T1n9BoY7PxKFfCwLulpHXoLUFr67HxBddQdEX47lDGx1g==

tiny-glob@^0.2.9:
version "0.2.9"
resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
Expand Down Expand Up @@ -22495,7 +22461,7 @@ tsconfig-paths@^3.10.1, tsconfig-paths@^3.15.0:
minimist "^1.2.6"
strip-bom "^3.0.0"

tsconfig-paths@^4.1.2:
tsconfig-paths@^4.1.2, tsconfig-paths@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
Expand Down Expand Up @@ -22803,6 +22769,11 @@ undici@^5.28.4:
dependencies:
"@fastify/busboy" "^2.0.0"

undici@^6.0.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/undici/-/undici-6.22.0.tgz#281adbc157af41da8e75393c9d75a1b788811bc3"
integrity sha512-hU/10obOIu62MGYjdskASR3CUAiYaFTtC9Pa6vHyf//mAipSvSQg6od2CnJswq7fvzNS3zJhxoRkgNVaHurWKw==

undici@^7.12.0:
version "7.15.0"
resolved "https://registry.yarnpkg.com/undici/-/undici-7.15.0.tgz#7485007549ad1782b7cab2abfaa1c1aa7b75e106"
Expand Down Expand Up @@ -23545,7 +23516,7 @@ [email protected]:
dependencies:
errno "~0.1.7"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -23563,15 +23534,6 @@ wrap-ansi@^6.0.1:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down
Loading