Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): bump the non-majors group in /dashboard with 12 updates #955

Merged
merged 5 commits into from
Sep 3, 2024
Merged

build(deps): bump the non-majors group in /dashboard with 12 updates #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9fe2946
build(deps): bump the non-majors group in /dashboard with 12 updates
dependabot[bot] Sep 1, 2024
1802077
revert @macaron-css/solid to v1.5.1
pirosiki197 Sep 2, 2024
30c758f
update valibot to v0.41.0
pirosiki197 Sep 2, 2024
927c3fa
fix: add null check in 'onChange' property of 'Select'
pirosiki197 Sep 2, 2024
51aed92
revert @solidjs/router to v0.14.2
pirosiki197 Sep 2, 2024
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
22 changes: 11 additions & 11 deletions dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,41 +23,41 @@
"@macaron-css/core": "1.5.2",
"@macaron-css/solid": "1.5.1",
"@macaron-css/vite": "1.5.1",
"@tanstack/virtual-core": "3.8.4",
"@types/node": "22.1.0",
"@tanstack/virtual-core": "3.10.6",
"@types/node": "22.5.2",
"jsdom": "24.1.1",
"rollup-plugin-visualizer": "5.12.0",
"typescript": "5.5.4",
"unplugin-fonts": "1.1.1",
"vite": "5.3.5",
"vite": "5.4.2",
"vite-plugin-compression": "0.5.1",
"vite-plugin-solid": "2.10.2",
"vite-plugin-solid-svg": "0.8.1",
"vitest": "2.0.3"
"vitest": "2.0.5"
},
"dependencies": {
"@bufbuild/protobuf": "1.10.0",
"@connectrpc/connect": "1.4.0",
"@connectrpc/connect-web": "1.4.0",
"@kobalte/core": "0.13.4",
"@kobalte/core": "0.13.6",
"@modular-forms/solid": "0.22.1",
"@solid-primitives/refs": "1.0.8",
"@solidjs/meta": "0.29.4",
"@solidjs/router": "0.14.1",
"@tanstack/solid-virtual": "3.8.4",
"@solidjs/router": "0.14.2",
"@tanstack/solid-virtual": "3.10.6",
"@types/async-lock": "1.4.2",
"ansi-to-html": "0.7.2",
"async-lock": "1.4.1",
"chart.js": "4.4.3",
"chart.js": "4.4.4",
"fuse.js": "7.0.0",
"solid-chartjs": "1.3.11",
"solid-icons": "1.1.0",
"solid-js": "1.8.19",
"solid-js": "1.8.22",
"solid-tippy": "0.2.1",
"solid-toast": "0.5.0",
"tippy.js": "6.3.7",
"ts-pattern": "5.2.0",
"valibot": "0.36.0"
"ts-pattern": "5.3.1",
"valibot": "0.41.0"
},
"packageManager": "[email protected]+sha512.ec40d0639bb307441b945d9467139cbb88d14394baac760b52eca038b330d16542d66fef61574271534ace5a200518dabf3b53a85f1f9e4bfa37141b538a9590"
}
30 changes: 11 additions & 19 deletions dashboard/src/components/templates/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ type SelectProps<T extends string | number> = {

export type SingleSelectProps<T extends string | number> = SelectProps<T> & {
value: T | undefined
setValue?: (v: T) => void
setValue?: (v: T | undefined) => void
}

export const SingleSelect = <T extends string | number>(props: SingleSelectProps<T>): JSX.Element => {
Expand All @@ -176,16 +176,12 @@ export const SingleSelect = <T extends string | number>(props: SingleSelectProps

// const selectedOption = () => props.options.find((o) => o.value === props.value)
const [selectedOption, setSelectedOption] = createSignal<SelectOption<T>>()
// KobalteのSelect/Comboboxではundefinedを使用できないため、空文字列を指定している
const defaultOption = { label: '', value: '' as T }

createEffect(() => {
const found = props.options.find((o) => o.value === props.value)
// KobalteのSelect/Comboboxではundefinedを使用できないため、空文字列を指定している
setSelectedOption(
found ?? {
label: '',
value: '' as T,
},
)
setSelectedOption(found ?? defaultOption)
})

return (
Expand All @@ -196,8 +192,8 @@ export const SingleSelect = <T extends string | number>(props: SingleSelectProps
disallowEmptySelection
value={selectedOption()}
onChange={(v) => {
props.setValue?.(v.value)
setSelectedOption(v)
props.setValue?.(v?.value)
setSelectedOption(v ?? defaultOption)
}}
optionValue="value"
optionTextValue="label"
Expand Down Expand Up @@ -372,16 +368,12 @@ export const ComboBox = <T extends string | number>(props: ComboBoxProps<T>): JS
)

const [selectedOption, setSelectedOption] = createSignal<SelectOption<T>>()
// KobalteのSelect/Comboboxではundefinedを使用できないため、空文字列を指定している
const defaultOption = { label: '', value: '' as T }

createEffect(() => {
const found = props.options.find((o) => o.value === props.value)
// KobalteのSelect/Comboboxではundefinedを使用できないため、空文字列を指定している
setSelectedOption(
found ?? {
label: '',
value: '' as T,
},
)
setSelectedOption(found ?? defaultOption)
})

return (
Expand All @@ -391,8 +383,8 @@ export const ComboBox = <T extends string | number>(props: ComboBoxProps<T>): JS
allowDuplicateSelectionEvents
value={selectedOption()}
onChange={(v) => {
props.setValue?.(v.value)
setSelectedOption(v)
props.setValue?.(v?.value)
setSelectedOption(v ?? defaultOption)
}}
optionValue="value"
optionTextValue="label"
Expand Down
Loading
Loading