gooee 0.52.0 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -3
- package/package.json +6 -2
- package/scripts/add.js +181 -42
- package/src/base.css +3 -1
- package/src/components/Accordion/Accordion.module.css +7 -5
- package/src/components/Accordion/Accordion.tsx +13 -11
- package/src/components/Accordion/Accordion.vue +16 -15
- package/src/components/Accordion/AccordionItem.vue +8 -7
- package/src/components/Alert/Alert.module.css +9 -7
- package/src/components/Alert/Alert.tsx +25 -16
- package/src/components/Alert/Alert.vue +31 -27
- package/src/components/AlertDialog/AlertDialog.module.css +2 -0
- package/src/components/AlertDialog/AlertDialog.tsx +8 -7
- package/src/components/AlertDialog/AlertDialog.vue +25 -23
- package/src/components/AnimatedNumber/AnimatedNumber.module.css +5 -3
- package/src/components/AnimatedNumber/AnimatedNumber.tsx +6 -6
- package/src/components/AnimatedNumber/AnimatedNumber.vue +5 -5
- package/src/components/AspectRatio/AspectRatio.module.css +2 -0
- package/src/components/AspectRatio/AspectRatio.tsx +3 -3
- package/src/components/AspectRatio/AspectRatio.vue +5 -8
- package/src/components/Avatar/Avatar.module.css +10 -8
- package/src/components/Avatar/Avatar.tsx +4 -3
- package/src/components/Avatar/Avatar.vue +17 -19
- package/src/components/Avatar/index.ts +0 -2
- package/src/components/AvatarGroup/AvatarGroup.module.css +11 -9
- package/src/components/AvatarGroup/AvatarGroup.tsx +4 -4
- package/src/components/AvatarGroup/AvatarGroup.vue +13 -16
- package/src/components/Badge/Badge.module.css +6 -4
- package/src/components/Badge/Badge.tsx +3 -3
- package/src/components/Badge/Badge.vue +15 -14
- package/src/components/Breadcrumb/Breadcrumb.module.css +5 -3
- package/src/components/Breadcrumb/Breadcrumb.tsx +20 -12
- package/src/components/Breadcrumb/Breadcrumb.vue +33 -25
- package/src/components/Button/Button.module.css +16 -14
- package/src/components/Button/Button.tsx +6 -4
- package/src/components/Button/Button.vue +42 -33
- package/src/components/ButtonGroup/ButtonGroup.module.css +2 -0
- package/src/components/ButtonGroup/ButtonGroup.tsx +1 -1
- package/src/components/ButtonGroup/ButtonGroup.vue +9 -12
- package/src/components/Card/Card.module.css +6 -4
- package/src/components/Card/Card.tsx +6 -6
- package/src/components/Card/Card.vue +18 -21
- package/src/components/Center/Center.module.css +2 -0
- package/src/components/Center/Center.tsx +1 -1
- package/src/components/Center/Center.vue +18 -15
- package/src/components/Checkbox/Checkbox.module.css +10 -8
- package/src/components/Checkbox/Checkbox.tsx +7 -5
- package/src/components/Checkbox/Checkbox.vue +29 -31
- package/src/components/CheckboxGroup/CheckboxGroup.module.css +3 -1
- package/src/components/CheckboxGroup/CheckboxGroup.tsx +4 -4
- package/src/components/CheckboxGroup/CheckboxGroup.vue +33 -30
- package/src/components/Cluster/Cluster.module.css +2 -0
- package/src/components/Cluster/Cluster.tsx +1 -1
- package/src/components/Cluster/Cluster.vue +21 -17
- package/src/components/CodeBlock/CodeBlock.module.css +12 -10
- package/src/components/CodeBlock/CodeBlock.tsx +18 -10
- package/src/components/CodeBlock/CodeBlock.vue +30 -27
- package/src/components/CodeBlock/highlight.ts +1 -1
- package/src/components/Collapsible/Collapsible.module.css +7 -5
- package/src/components/Collapsible/Collapsible.tsx +7 -6
- package/src/components/Collapsible/Collapsible.vue +30 -26
- package/src/components/Container/Container.module.css +2 -0
- package/src/components/Container/Container.tsx +1 -1
- package/src/components/Container/Container.vue +13 -12
- package/src/components/CopyButton/CopyButton.module.css +20 -18
- package/src/components/CopyButton/CopyButton.tsx +21 -14
- package/src/components/CopyButton/CopyButton.vue +41 -31
- package/src/components/Dial/Dial.module.css +26 -11
- package/src/components/Dial/Dial.tsx +18 -18
- package/src/components/Dial/Dial.vue +57 -60
- package/src/components/Dialog/Dialog.module.css +4 -2
- package/src/components/Dialog/Dialog.tsx +22 -13
- package/src/components/Dialog/Dialog.vue +34 -30
- package/src/components/Divider/Divider.module.css +5 -3
- package/src/components/Divider/Divider.tsx +6 -4
- package/src/components/Divider/Divider.vue +13 -16
- package/src/components/DropdownMenu/DropdownMenu.module.css +8 -6
- package/src/components/DropdownMenu/DropdownMenu.tsx +11 -8
- package/src/components/DropdownMenu/DropdownMenu.vue +24 -27
- package/src/components/EmptyState/EmptyState.module.css +6 -4
- package/src/components/EmptyState/EmptyState.tsx +6 -6
- package/src/components/EmptyState/EmptyState.vue +14 -17
- package/src/components/Fab/Fab.module.css +19 -17
- package/src/components/Fab/Fab.tsx +11 -9
- package/src/components/Fab/Fab.vue +29 -26
- package/src/components/Fieldset/Fieldset.module.css +2 -0
- package/src/components/Fieldset/Fieldset.tsx +4 -3
- package/src/components/Fieldset/Fieldset.vue +4 -4
- package/src/components/FormField/FormField.module.css +5 -3
- package/src/components/FormField/FormField.tsx +7 -7
- package/src/components/FormField/FormField.vue +4 -4
- package/src/components/Grid/Grid.module.css +2 -0
- package/src/components/Grid/Grid.tsx +1 -1
- package/src/components/Grid/Grid.vue +25 -22
- package/src/components/HoldToConfirm/HoldToConfirm.module.css +13 -11
- package/src/components/HoldToConfirm/HoldToConfirm.tsx +11 -9
- package/src/components/HoldToConfirm/HoldToConfirm.vue +37 -32
- package/src/components/IconButton/IconButton.module.css +7 -5
- package/src/components/IconButton/IconButton.tsx +2 -1
- package/src/components/IconButton/IconButton.vue +15 -14
- package/src/components/Input/Input.module.css +12 -10
- package/src/components/Input/Input.tsx +9 -7
- package/src/components/Input/Input.vue +45 -35
- package/src/components/InputGroup/InputGroup.module.css +8 -6
- package/src/components/InputGroup/InputGroup.tsx +5 -4
- package/src/components/InputGroup/InputGroup.vue +41 -36
- package/src/components/Kbd/Kbd.module.css +9 -7
- package/src/components/Kbd/Kbd.tsx +1 -1
- package/src/components/Kbd/Kbd.vue +1 -1
- package/src/components/Link/Link.module.css +4 -2
- package/src/components/Link/Link.tsx +4 -3
- package/src/components/Link/Link.vue +13 -16
- package/src/components/LivePill/LivePill.module.css +39 -37
- package/src/components/LivePill/LivePill.tsx +11 -10
- package/src/components/LivePill/LivePill.vue +38 -40
- package/src/components/Meter/Meter.module.css +5 -3
- package/src/components/Meter/Meter.tsx +9 -8
- package/src/components/Meter/Meter.vue +52 -43
- package/src/components/MorphButton/MorphButton.module.css +11 -9
- package/src/components/MorphButton/MorphButton.tsx +20 -10
- package/src/components/MorphButton/MorphButton.vue +29 -25
- package/src/components/NumberInput/NumberInput.module.css +7 -5
- package/src/components/NumberInput/NumberInput.tsx +11 -8
- package/src/components/NumberInput/NumberInput.vue +69 -57
- package/src/components/Pagination/Pagination.module.css +147 -5
- package/src/components/Pagination/Pagination.tsx +216 -41
- package/src/components/Pagination/Pagination.vue +201 -36
- package/src/components/Pagination/labels.ts +38 -0
- package/src/components/PasswordInput/PasswordInput.module.css +10 -8
- package/src/components/PasswordInput/PasswordInput.tsx +15 -7
- package/src/components/PasswordInput/PasswordInput.vue +20 -16
- package/src/components/PasswordInput/index.ts +1 -1
- package/src/components/PickerWheel/DateWheel.vue +20 -12
- package/src/components/PickerWheel/PickerWheel.module.css +15 -6
- package/src/components/PickerWheel/PickerWheel.tsx +70 -44
- package/src/components/PickerWheel/PickerWheel.vue +39 -38
- package/src/components/PickerWheel/TimeWheel.vue +23 -21
- package/src/components/PickerWheel/WheelColumn.vue +7 -5
- package/src/components/Popover/Popover.module.css +5 -3
- package/src/components/Popover/Popover.tsx +17 -8
- package/src/components/Popover/Popover.vue +26 -25
- package/src/components/ProgressBar/ProgressBar.module.css +4 -2
- package/src/components/ProgressBar/ProgressBar.tsx +6 -5
- package/src/components/ProgressBar/ProgressBar.vue +28 -25
- package/src/components/Prose/Prose.module.css +5 -3
- package/src/components/Prose/Prose.tsx +1 -1
- package/src/components/Prose/Prose.vue +5 -8
- package/src/components/Radio/Radio.module.css +10 -8
- package/src/components/Radio/Radio.tsx +10 -8
- package/src/components/Radio/Radio.vue +8 -8
- package/src/components/Radio/RadioGroup.vue +33 -35
- package/src/components/Radio/radioContext.ts +12 -0
- package/src/components/Retime/Retime.vue +25 -22
- package/src/components/RulerScrubber/RulerScrubber.module.css +11 -2
- package/src/components/RulerScrubber/RulerScrubber.tsx +19 -18
- package/src/components/RulerScrubber/RulerScrubber.vue +50 -54
- package/src/components/ScrollArea/ScrollArea.module.css +17 -15
- package/src/components/ScrollArea/ScrollArea.tsx +5 -4
- package/src/components/ScrollArea/ScrollArea.vue +15 -17
- package/src/components/SearchInput/SearchInput.module.css +6 -4
- package/src/components/SearchInput/SearchInput.tsx +15 -8
- package/src/components/SearchInput/SearchInput.vue +20 -17
- package/src/components/SearchInput/index.ts +1 -1
- package/src/components/SegmentedControl/SegmentedControl.module.css +7 -5
- package/src/components/SegmentedControl/SegmentedControl.tsx +9 -5
- package/src/components/SegmentedControl/SegmentedControl.vue +25 -29
- package/src/components/Select/Select.module.css +19 -17
- package/src/components/Select/Select.tsx +30 -17
- package/src/components/Select/Select.vue +62 -57
- package/src/components/Sheet/Sheet.module.css +6 -4
- package/src/components/Sheet/Sheet.tsx +39 -29
- package/src/components/Sheet/Sheet.vue +46 -40
- package/src/components/Skeleton/Skeleton.module.css +4 -2
- package/src/components/Skeleton/Skeleton.tsx +3 -2
- package/src/components/Skeleton/Skeleton.vue +16 -18
- package/src/components/Slider/Slider.module.css +14 -12
- package/src/components/Slider/Slider.tsx +20 -9
- package/src/components/Slider/Slider.vue +47 -37
- package/src/components/Spinner/Spinner.module.css +2 -0
- package/src/components/Spinner/Spinner.tsx +3 -3
- package/src/components/Spinner/Spinner.vue +9 -12
- package/src/components/Split/Split.module.css +2 -0
- package/src/components/Split/Split.tsx +3 -3
- package/src/components/Split/Split.vue +19 -17
- package/src/components/SplitFlap/SplitFlap.module.css +9 -7
- package/src/components/SplitFlap/SplitFlap.tsx +2 -2
- package/src/components/SplitFlap/SplitFlap.vue +24 -21
- package/src/components/Stack/Stack.module.css +2 -0
- package/src/components/Stack/Stack.tsx +1 -1
- package/src/components/Stack/Stack.vue +13 -12
- package/src/components/SwipeDeck/SwipeDeck.module.css +13 -11
- package/src/components/SwipeDeck/SwipeDeck.tsx +23 -28
- package/src/components/SwipeDeck/SwipeDeck.vue +32 -38
- package/src/components/Switch/Switch.module.css +10 -8
- package/src/components/Switch/Switch.tsx +6 -5
- package/src/components/Switch/Switch.vue +22 -24
- package/src/components/Table/Table.module.css +24 -22
- package/src/components/Table/Table.tsx +27 -30
- package/src/components/Table/Table.vue +93 -79
- package/src/components/TableOfContents/TableOfContents.module.css +9 -7
- package/src/components/TableOfContents/TableOfContents.tsx +8 -8
- package/src/components/TableOfContents/TableOfContents.vue +20 -23
- package/src/components/Tabs/Tab.vue +3 -0
- package/src/components/Tabs/TabList.vue +2 -2
- package/src/components/Tabs/TabPanel.vue +2 -0
- package/src/components/Tabs/Tabs.module.css +4 -2
- package/src/components/Tabs/Tabs.tsx +10 -5
- package/src/components/Tabs/Tabs.vue +1 -1
- package/src/components/Tag/Tag.module.css +12 -10
- package/src/components/Tag/Tag.tsx +13 -15
- package/src/components/Tag/Tag.vue +12 -14
- package/src/components/Textarea/Textarea.module.css +8 -6
- package/src/components/Textarea/Textarea.tsx +4 -3
- package/src/components/Textarea/Textarea.vue +32 -34
- package/src/components/ThemeToggle/ThemeToggle.module.css +2 -0
- package/src/components/ThemeToggle/ThemeToggle.tsx +7 -7
- package/src/components/ThemeToggle/ThemeToggle.vue +24 -22
- package/src/components/Toast/Toast.module.css +17 -15
- package/src/components/Toast/Toast.tsx +51 -34
- package/src/components/Toast/Toast.vue +35 -24
- package/src/components/Toast/ToastItem.vue +17 -16
- package/src/components/Toggle/Toggle.module.css +11 -9
- package/src/components/Toggle/Toggle.tsx +3 -2
- package/src/components/Toggle/Toggle.vue +13 -15
- package/src/components/Tooltip/Tooltip.module.css +5 -3
- package/src/components/Tooltip/Tooltip.tsx +1 -0
- package/src/components/Tooltip/Tooltip.vue +13 -18
- package/src/components/VisuallyHidden/VisuallyHidden.module.css +2 -0
- package/src/components/VisuallyHidden/VisuallyHidden.tsx +1 -1
- package/src/components/VisuallyHidden/VisuallyHidden.vue +5 -8
- package/src/{internal → icons}/icons.module.css +4 -2
- package/src/{internal → icons}/icons.tsx +15 -16
- package/src/internal/FieldMessage.module.css +5 -3
- package/src/internal/FieldMessage.tsx +2 -2
- package/src/internal/FieldMessage.vue +2 -2
- package/src/internal/Roll.module.css +5 -3
- package/src/internal/feel.ts +12 -10
- package/src/internal/fling.ts +3 -3
- package/src/internal/liquid.ts +12 -10
- package/src/internal/liquidMatter.ts +1 -1
- package/src/internal/liquidMore.ts +7 -7
- package/src/internal/motion/checkbox.ts +4 -4
- package/src/internal/motion/fling.ts +19 -9
- package/src/internal/motion/holdToConfirm.ts +3 -3
- package/src/internal/motion/index.ts +8 -6
- package/src/internal/motion/liquid.ts +16 -4
- package/src/internal/motion/liquidMatter.ts +8 -6
- package/src/internal/motion/liquidMore.ts +44 -25
- package/src/internal/motion/livePill.ts +1 -1
- package/src/internal/motion/numberInput.ts +2 -2
- package/src/internal/motion/pickerWheel.ts +7 -4
- package/src/internal/motion/ruler.ts +1 -1
- package/src/internal/motion/scrollArea.ts +3 -3
- package/src/internal/motion/scrollFrame.ts +9 -7
- package/src/internal/motion/scrubber.ts +39 -20
- package/src/internal/motion/slider.ts +38 -4
- package/src/internal/motion/softPress.ts +10 -9
- package/src/internal/motion/splitFlap.ts +4 -4
- package/src/internal/motion/swipeDeck.ts +38 -7
- package/src/internal/motion/table.ts +3 -6
- package/src/internal/motion/themeIcon.ts +1 -1
- package/src/internal/motion/themeReveal.ts +1 -1
- package/src/internal/motion/toast.ts +3 -3
- package/src/internal/motion.ts +7 -8
- package/src/internal/scrollFrame.ts +3 -3
- package/src/internal/useScrub.ts +1 -15
- package/src/internal/vue/useScrub.ts +2 -6
- package/src/tokens.css +81 -421
- package/src/{internal/vueIcons.ts → icons/vue.ts} +5 -5
|
@@ -1,30 +1,33 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
2
|
import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
|
3
|
-
import { SearchIcon, XIcon } from '../../
|
|
3
|
+
import { SearchIcon, XIcon } from '../../icons/vue'
|
|
4
4
|
import { shortcutFocus } from '../../internal/motion/keys'
|
|
5
|
-
import Input from '../Input/Input.vue'
|
|
5
|
+
import Input, { type InputLabels } from '../Input/Input.vue'
|
|
6
6
|
import Kbd from '../Kbd/Kbd.vue'
|
|
7
7
|
import styles from './SearchInput.module.css'
|
|
8
8
|
|
|
9
9
|
// The Vue SearchInput: Input with a search icon, a clear button and an optional key shortcut, like the React one.
|
|
10
10
|
// Other attributes, such as label, size or placeholder, go to the Input.
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
11
|
+
|
|
12
|
+
export type SearchInputLabels = InputLabels & {
|
|
13
|
+
/** Screen reader name for the clear button. */
|
|
14
|
+
clear: string
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
const props = defineProps<{
|
|
18
|
+
/** Always required. A placeholder is only an example, never the label. */
|
|
19
|
+
label: string
|
|
20
|
+
/** A single key, such as "/". Pressing it anywhere on the page focuses the field. */
|
|
21
|
+
shortcut?: string
|
|
22
|
+
/** Text for the label and the clear button, so you can translate it. Missing keys use the English defaults. */
|
|
23
|
+
labels?: Partial<SearchInputLabels>
|
|
24
|
+
}>()
|
|
22
25
|
/** The search text. Use v-model, or leave it out and the field keeps its own text. Also changes on clear. */
|
|
23
26
|
const model = defineModel<string>({ default: '' })
|
|
24
27
|
const emit = defineEmits<{ search: [value: string] }>()
|
|
25
28
|
|
|
26
29
|
const root = ref<InstanceType<typeof Input> | null>(null)
|
|
27
|
-
const field = () => root.value?.
|
|
30
|
+
const field = () => root.value?.el ?? null
|
|
28
31
|
|
|
29
32
|
let stop = () => {}
|
|
30
33
|
onMounted(() =>
|
|
@@ -56,13 +59,13 @@ const clear = () => {
|
|
|
56
59
|
</script>
|
|
57
60
|
|
|
58
61
|
<template>
|
|
59
|
-
<Input ref="root" v-model="model" :label="label" :class="styles.root" type="search" enterkeyhint="search" :aria-keyshortcuts="shortcut" @keydown="onKeydown">
|
|
62
|
+
<Input ref="root" v-model="model" :label="label" :labels="labels" :class="styles.root" type="search" enterkeyhint="search" :aria-keyshortcuts="shortcut" @keydown="onKeydown">
|
|
60
63
|
<template #leading><SearchIcon /></template>
|
|
61
64
|
<template v-if="model" #trailing>
|
|
62
|
-
<button type="button" :class="styles.clear" :aria-label="
|
|
65
|
+
<button type="button" :class="styles.clear" data-slot="search-input-clear" :aria-label="labels?.clear ?? 'Clear search'" @click="clear"><XIcon /></button>
|
|
63
66
|
</template>
|
|
64
67
|
<template v-else-if="shortcut" #trailing>
|
|
65
|
-
<span :class="styles.hint" aria-hidden="true">
|
|
68
|
+
<span :class="styles.hint" data-slot="search-input-shortcut" aria-hidden="true">
|
|
66
69
|
<Kbd :listen="shortcut">{{ shortcut }}</Kbd>
|
|
67
70
|
</span>
|
|
68
71
|
</template>
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { SearchInput } from './SearchInput'
|
|
2
|
-
export type { SearchInputProps } from './SearchInput'
|
|
2
|
+
export type { SearchInputLabels, SearchInputProps } from './SearchInput'
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
@layer gooee.components {
|
|
1
2
|
.root {
|
|
2
3
|
position: relative;
|
|
3
4
|
display: inline-flex;
|
|
@@ -29,8 +30,8 @@
|
|
|
29
30
|
it flows the pill hides and .liquid draws it, then the pill is back in its place, exact. */
|
|
30
31
|
.pill[data-ready] {
|
|
31
32
|
transition:
|
|
32
|
-
transform var(--gooee-motion-morph-out) var(--gooee-ease-
|
|
33
|
-
width var(--gooee-motion-morph-out) var(--gooee-ease-
|
|
33
|
+
transform var(--gooee-motion-morph-out) var(--gooee-ease-morph),
|
|
34
|
+
width var(--gooee-motion-morph-out) var(--gooee-ease-morph);
|
|
34
35
|
}
|
|
35
36
|
|
|
36
37
|
.pill[data-flowing] {
|
|
@@ -85,8 +86,8 @@
|
|
|
85
86
|
cursor: pointer;
|
|
86
87
|
-webkit-tap-highlight-color: transparent;
|
|
87
88
|
transition:
|
|
88
|
-
color var(--gooee-motion-base) var(--gooee-ease-
|
|
89
|
-
transform var(--gooee-motion-slow) var(--gooee-ease-
|
|
89
|
+
color var(--gooee-motion-base) var(--gooee-ease-morph),
|
|
90
|
+
transform var(--gooee-motion-slow) var(--gooee-ease-morph);
|
|
90
91
|
}
|
|
91
92
|
|
|
92
93
|
.item::after {
|
|
@@ -106,7 +107,7 @@
|
|
|
106
107
|
.item:hover:not(:disabled) { color: var(--gooee-color-fg); }
|
|
107
108
|
}
|
|
108
109
|
.item:active:not(:disabled) { transform: scale(var(--gooee-press-scale)); }
|
|
109
|
-
.item[data-
|
|
110
|
+
.item[data-state="active"] { color: var(--gooee-color-fg); }
|
|
110
111
|
.item:disabled { opacity: var(--gooee-disabled-opacity); cursor: not-allowed; }
|
|
111
112
|
|
|
112
113
|
.item:focus-visible {
|
|
@@ -148,3 +149,4 @@
|
|
|
148
149
|
}
|
|
149
150
|
.root[data-tight] .item { min-width: var(--gooee-hit-min); }
|
|
150
151
|
}
|
|
152
|
+
}
|
|
@@ -7,13 +7,13 @@ import { measureSegments, segmentInk, segmentKey } from '../../internal/motion/s
|
|
|
7
7
|
import { useControllable } from '../../internal/useControllable'
|
|
8
8
|
import styles from './SegmentedControl.module.css'
|
|
9
9
|
|
|
10
|
-
export type
|
|
10
|
+
export type SegmentedControlOption = { value: string; label: ReactNode; icon?: ReactNode; disabled?: boolean; ariaLabel?: string }
|
|
11
11
|
|
|
12
12
|
export type SegmentedControlProps = {
|
|
13
13
|
/** Accessible name for the group. */
|
|
14
14
|
label: string
|
|
15
15
|
/** The segments, in order. */
|
|
16
|
-
options:
|
|
16
|
+
options: SegmentedControlOption[]
|
|
17
17
|
/** Selected value, when you control it. */
|
|
18
18
|
value?: string
|
|
19
19
|
/** Starting value when you do not control it. Undefined picks the first option. */
|
|
@@ -86,12 +86,14 @@ export function SegmentedControl({
|
|
|
86
86
|
role="radiogroup"
|
|
87
87
|
aria-label={label}
|
|
88
88
|
className={cx(styles.root, styles[size], fullWidth && styles.full, className)}
|
|
89
|
+
data-slot="segmented-control"
|
|
89
90
|
onKeyDown={onKeyDown}
|
|
90
91
|
>
|
|
91
92
|
{pill && (
|
|
92
93
|
<span
|
|
93
94
|
ref={pillRef}
|
|
94
95
|
className={styles.pill}
|
|
96
|
+
data-slot="segmented-control-indicator"
|
|
95
97
|
data-ready={ready || undefined}
|
|
96
98
|
style={{ transform: `translateX(${pill.x}px)`, width: pill.w }}
|
|
97
99
|
aria-hidden="true"
|
|
@@ -112,11 +114,13 @@ export function SegmentedControl({
|
|
|
112
114
|
tabIndex={i === tabStop ? 0 : -1}
|
|
113
115
|
disabled={o.disabled}
|
|
114
116
|
className={styles.item}
|
|
115
|
-
data-
|
|
117
|
+
data-slot="segmented-control-item"
|
|
118
|
+
data-state={on ? 'active' : 'inactive'}
|
|
119
|
+
data-disabled={o.disabled || undefined}
|
|
116
120
|
onClick={() => setValue(o.value)}
|
|
117
121
|
>
|
|
118
|
-
{o.icon && <span className={styles.icon}>{o.icon}</span>}
|
|
119
|
-
{o.label && <span className={styles.text}>{o.label}</span>}
|
|
122
|
+
{o.icon && <span className={styles.icon} data-slot="segmented-control-icon">{o.icon}</span>}
|
|
123
|
+
{o.label && <span className={styles.text} data-slot="segmented-control-label">{o.label}</span>}
|
|
120
124
|
</button>
|
|
121
125
|
)
|
|
122
126
|
})}
|
|
@@ -6,25 +6,22 @@ import styles from './SegmentedControl.module.css'
|
|
|
6
6
|
|
|
7
7
|
// The Vue SegmentedControl: the same look (SegmentedControl.module.css), flowing pill and keys as the React one.
|
|
8
8
|
|
|
9
|
-
export type
|
|
9
|
+
export type SegmentedControlOption = { value: string; label: string; icon?: Component; disabled?: boolean; ariaLabel?: string }
|
|
10
10
|
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
}>(),
|
|
22
|
-
{ size: 'md' },
|
|
23
|
-
)
|
|
11
|
+
const { options, size = 'md' } = defineProps<{
|
|
12
|
+
/** Accessible name for the group. */
|
|
13
|
+
label: string
|
|
14
|
+
/** The segments, in order. */
|
|
15
|
+
options: SegmentedControlOption[]
|
|
16
|
+
/** Height and text size of the segments. */
|
|
17
|
+
size?: 'sm' | 'md'
|
|
18
|
+
/** Stretches the control to fill its container, with equal segments. */
|
|
19
|
+
fullWidth?: boolean
|
|
20
|
+
}>()
|
|
24
21
|
|
|
25
22
|
/** The selected value. Use v-model, or leave it out and the first option starts selected. */
|
|
26
23
|
const model = defineModel<string>()
|
|
27
|
-
const local = ref(
|
|
24
|
+
const local = ref(options[0]?.value ?? '')
|
|
28
25
|
const value = computed({
|
|
29
26
|
get: () => model.value ?? local.value,
|
|
30
27
|
set: (next: string) => {
|
|
@@ -38,9 +35,9 @@ const items = ref<Array<HTMLElement | null>>([])
|
|
|
38
35
|
const pillEl = ref<HTMLElement | null>(null)
|
|
39
36
|
const pill = ref<{ x: number; w: number } | null>(null)
|
|
40
37
|
const ready = ref(false)
|
|
41
|
-
const index = computed(() =>
|
|
38
|
+
const index = computed(() => options.findIndex((o) => o.value === value.value))
|
|
42
39
|
// With no match, the first enabled segment takes the tab stop.
|
|
43
|
-
const tabStop = computed(() => (index.value >= 0 && !
|
|
40
|
+
const tabStop = computed(() => (index.value >= 0 && !options[index.value].disabled ? index.value : options.findIndex((o) => !o.disabled)))
|
|
44
41
|
|
|
45
42
|
const measure = () => {
|
|
46
43
|
const place = measureSegments(root.value, items.value[index.value])
|
|
@@ -53,14 +50,10 @@ onMounted(() => {
|
|
|
53
50
|
if (root.value) ro.observe(root.value)
|
|
54
51
|
requestAnimationFrame(() => (ready.value = true))
|
|
55
52
|
})
|
|
56
|
-
watch([index, () =>
|
|
53
|
+
watch([index, () => options.length], measure, { flush: 'post' })
|
|
57
54
|
|
|
58
55
|
// The pill flows to the new choice (motion/liquidMatter.ts); the labels under it take the chosen colour.
|
|
59
|
-
const flow = createFlow(
|
|
60
|
-
() => root.value,
|
|
61
|
-
() => pillEl.value,
|
|
62
|
-
{ cls: styles.liquid, ink: segmentInk(() => root.value, () => items.value, styles.ink) },
|
|
63
|
-
)
|
|
56
|
+
const flow = createFlow(() => pillEl.value, { host: () => root.value, className: styles.liquid, ink: segmentInk(() => root.value, () => items.value, styles.ink) })
|
|
64
57
|
watch(
|
|
65
58
|
() => [index.value, pill.value?.x, pill.value?.w, ready.value] as const,
|
|
66
59
|
() => nextTick(() => flow.update(pill.value, index.value, ready.value)),
|
|
@@ -72,20 +65,21 @@ onBeforeUnmount(() => {
|
|
|
72
65
|
})
|
|
73
66
|
|
|
74
67
|
const onKeyDown = (e: KeyboardEvent) => {
|
|
75
|
-
const next = segmentKey(e.key, tabStop.value,
|
|
68
|
+
const next = segmentKey(e.key, tabStop.value, options.map((o) => !!o.disabled))
|
|
76
69
|
if (next < 0) return
|
|
77
70
|
e.preventDefault()
|
|
78
|
-
value.value =
|
|
71
|
+
value.value = options[next].value
|
|
79
72
|
items.value[next]?.focus()
|
|
80
73
|
}
|
|
81
74
|
</script>
|
|
82
75
|
|
|
83
76
|
<template>
|
|
84
|
-
<div ref="root" role="radiogroup" :aria-label="label" :class="[styles.root, styles[size], fullWidth && styles.full]" @keydown="onKeyDown">
|
|
77
|
+
<div ref="root" role="radiogroup" :aria-label="label" :class="[styles.root, styles[size], fullWidth && styles.full]" data-slot="segmented-control" @keydown="onKeyDown">
|
|
85
78
|
<span
|
|
86
79
|
v-if="pill"
|
|
87
80
|
ref="pillEl"
|
|
88
81
|
:class="styles.pill"
|
|
82
|
+
data-slot="segmented-control-indicator"
|
|
89
83
|
:data-ready="ready || undefined"
|
|
90
84
|
:style="{ transform: `translateX(${pill.x}px)`, width: `${pill.w}px` }"
|
|
91
85
|
aria-hidden="true"
|
|
@@ -101,11 +95,13 @@ const onKeyDown = (e: KeyboardEvent) => {
|
|
|
101
95
|
:tabindex="i === tabStop ? 0 : -1"
|
|
102
96
|
:disabled="o.disabled"
|
|
103
97
|
:class="styles.item"
|
|
104
|
-
|
|
98
|
+
data-slot="segmented-control-item"
|
|
99
|
+
:data-state="o.value === value ? 'active' : 'inactive'"
|
|
100
|
+
:data-disabled="o.disabled || undefined"
|
|
105
101
|
@click="value = o.value"
|
|
106
102
|
>
|
|
107
|
-
<span v-if="o.icon" :class="styles.icon"><component :is="o.icon" /></span>
|
|
108
|
-
<span v-if="o.label" :class="styles.text">{{ o.label }}</span>
|
|
103
|
+
<span v-if="o.icon" :class="styles.icon" data-slot="segmented-control-icon"><component :is="o.icon" /></span>
|
|
104
|
+
<span v-if="o.label" :class="styles.text" data-slot="segmented-control-label">{{ o.label }}</span>
|
|
109
105
|
</button>
|
|
110
106
|
</div>
|
|
111
107
|
</template>
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
@layer gooee.components {
|
|
1
2
|
.root {
|
|
2
3
|
display: flex;
|
|
3
4
|
flex-direction: column;
|
|
@@ -39,9 +40,9 @@
|
|
|
39
40
|
cursor: pointer;
|
|
40
41
|
--gooee-flow-edge: var(--gooee-color-fg);
|
|
41
42
|
transition:
|
|
42
|
-
border-color var(--gooee-motion-fast) var(--gooee-ease-
|
|
43
|
-
box-shadow var(--gooee-motion-fast) var(--gooee-ease-
|
|
44
|
-
transform var(--gooee-motion-slow) var(--gooee-ease-
|
|
43
|
+
border-color var(--gooee-motion-fast) var(--gooee-ease-morph),
|
|
44
|
+
box-shadow var(--gooee-motion-fast) var(--gooee-ease-morph),
|
|
45
|
+
transform var(--gooee-motion-slow) var(--gooee-ease-morph);
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
@media (hover: hover) {
|
|
@@ -56,8 +57,8 @@
|
|
|
56
57
|
field's focus indicator in place of the ring, so it lands at once. */
|
|
57
58
|
.trigger[data-edge] {
|
|
58
59
|
border-color: var(--gooee-flow-edge);
|
|
59
|
-
box-shadow: inset 0 0 0 calc(var(--gooee-
|
|
60
|
-
transition: transform var(--gooee-motion-slow) var(--gooee-ease-
|
|
60
|
+
box-shadow: inset 0 0 0 calc(var(--gooee-focus-width) - var(--gooee-line)) var(--gooee-flow-edge);
|
|
61
|
+
transition: transform var(--gooee-motion-slow) var(--gooee-ease-morph);
|
|
61
62
|
}
|
|
62
63
|
|
|
63
64
|
.edge {
|
|
@@ -66,7 +67,7 @@
|
|
|
66
67
|
pointer-events: none;
|
|
67
68
|
}
|
|
68
69
|
.trigger[data-invalid] { --gooee-flow-edge: var(--gooee-color-danger); border-color: var(--gooee-color-danger); --edge: var(--gooee-line-thick); }
|
|
69
|
-
.trigger[data-invalid][data-edge] { box-shadow: inset 0 0 0 calc(var(--gooee-
|
|
70
|
+
.trigger[data-invalid][data-edge] { box-shadow: inset 0 0 0 calc(var(--gooee-focus-width) - var(--gooee-line-thick)) var(--gooee-flow-edge); }
|
|
70
71
|
.trigger:disabled { opacity: var(--gooee-disabled-opacity); cursor: not-allowed; background: var(--gooee-color-surface-sunken); }
|
|
71
72
|
|
|
72
73
|
.value {
|
|
@@ -79,7 +80,7 @@
|
|
|
79
80
|
overflow: hidden;
|
|
80
81
|
text-overflow: ellipsis;
|
|
81
82
|
white-space: nowrap;
|
|
82
|
-
animation: valueIn var(--gooee-motion-base) var(--gooee-ease-
|
|
83
|
+
animation: valueIn var(--gooee-motion-base) var(--gooee-ease-morph);
|
|
83
84
|
}
|
|
84
85
|
|
|
85
86
|
.placeholder { color: var(--gooee-color-fg-subtle); }
|
|
@@ -89,10 +90,10 @@
|
|
|
89
90
|
width: var(--gooee-icon-md);
|
|
90
91
|
height: var(--gooee-icon-md);
|
|
91
92
|
color: var(--gooee-color-fg-muted);
|
|
92
|
-
transition: transform var(--gooee-motion-base) var(--gooee-ease-
|
|
93
|
+
transition: transform var(--gooee-motion-base) var(--gooee-ease-morph);
|
|
93
94
|
}
|
|
94
95
|
|
|
95
|
-
.trigger[data-open] .chevron { transform: rotate(180deg); }
|
|
96
|
+
.trigger[data-state="open"] .chevron { transform: rotate(180deg); }
|
|
96
97
|
|
|
97
98
|
.list {
|
|
98
99
|
z-index: var(--gooee-z-popover);
|
|
@@ -106,13 +107,13 @@
|
|
|
106
107
|
box-shadow: var(--gooee-shadow-3);
|
|
107
108
|
outline: none;
|
|
108
109
|
transform-origin: top center;
|
|
109
|
-
animation: listIn var(--gooee-motion-base) var(--gooee-ease-
|
|
110
|
+
animation: listIn var(--gooee-motion-base) var(--gooee-ease-morph);
|
|
110
111
|
}
|
|
111
112
|
|
|
112
113
|
.list[data-side="top"] { transform-origin: bottom center; }
|
|
113
114
|
|
|
114
115
|
.list[data-state="closed"] {
|
|
115
|
-
animation: listOut var(--gooee-motion-fast) var(--gooee-ease-
|
|
116
|
+
animation: listOut var(--gooee-motion-fast) var(--gooee-ease-morph) forwards;
|
|
116
117
|
pointer-events: none;
|
|
117
118
|
}
|
|
118
119
|
|
|
@@ -130,8 +131,8 @@
|
|
|
130
131
|
border-radius: max(0px, calc(var(--gooee-radius-md) - var(--gooee-space-2)));
|
|
131
132
|
background: var(--gooee-color-surface-hover);
|
|
132
133
|
transition:
|
|
133
|
-
transform var(--gooee-motion-base) var(--gooee-ease-
|
|
134
|
-
height var(--gooee-motion-base) var(--gooee-ease-
|
|
134
|
+
transform var(--gooee-motion-base) var(--gooee-ease-morph),
|
|
135
|
+
height var(--gooee-motion-base) var(--gooee-ease-morph);
|
|
135
136
|
}
|
|
136
137
|
|
|
137
138
|
.option {
|
|
@@ -144,7 +145,7 @@
|
|
|
144
145
|
padding: var(--gooee-space-2) var(--gooee-space-4);
|
|
145
146
|
border-radius: max(0px, calc(var(--gooee-radius-md) - var(--gooee-space-2)));
|
|
146
147
|
cursor: pointer;
|
|
147
|
-
animation: optionIn var(--gooee-motion-slow) var(--gooee-ease-
|
|
148
|
+
animation: optionIn var(--gooee-motion-slow) var(--gooee-ease-morph) backwards;
|
|
148
149
|
animation-delay: calc(var(--i) * var(--gooee-motion-stagger) / 2);
|
|
149
150
|
}
|
|
150
151
|
|
|
@@ -180,11 +181,11 @@
|
|
|
180
181
|
opacity: 0;
|
|
181
182
|
transform: scale(var(--gooee-check-scale));
|
|
182
183
|
transition:
|
|
183
|
-
opacity var(--gooee-motion-fast) var(--gooee-ease-
|
|
184
|
-
transform var(--gooee-motion-slow) var(--gooee-ease-
|
|
184
|
+
opacity var(--gooee-motion-fast) var(--gooee-ease-morph),
|
|
185
|
+
transform var(--gooee-motion-slow) var(--gooee-ease-morph);
|
|
185
186
|
}
|
|
186
187
|
|
|
187
|
-
.
|
|
188
|
+
.option[data-selected] .check {
|
|
188
189
|
opacity: 1;
|
|
189
190
|
transform: none;
|
|
190
191
|
}
|
|
@@ -204,3 +205,4 @@
|
|
|
204
205
|
@keyframes valueIn {
|
|
205
206
|
from { opacity: 0; transform: translateY(var(--gooee-shift-sm)); }
|
|
206
207
|
}
|
|
208
|
+
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { useEffect, useId, useLayoutEffect, useRef, useState, type KeyboardEvent, type ReactNode } from 'react'
|
|
4
4
|
import { cx } from '../../internal/cx'
|
|
5
|
-
import { CheckIcon, ChevronDownIcon } from '../../
|
|
5
|
+
import { CheckIcon, ChevronDownIcon } from '../../icons/icons'
|
|
6
6
|
import { useDismiss } from '../../internal/layers'
|
|
7
7
|
import { useLiquid } from '../../internal/liquid'
|
|
8
8
|
import { useEdgeFlow } from '../../internal/liquidMore'
|
|
@@ -16,6 +16,13 @@ import styles from './Select.module.css'
|
|
|
16
16
|
|
|
17
17
|
export type SelectOption = { value: string; label: string; disabled?: boolean; hint?: string }
|
|
18
18
|
|
|
19
|
+
export type SelectLabels = {
|
|
20
|
+
/** Shown in the open list when there are no options. */
|
|
21
|
+
empty: string
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
const defaultLabels: SelectLabels = { empty: 'No options' }
|
|
25
|
+
|
|
19
26
|
export type SelectProps = {
|
|
20
27
|
/** Visible name of the field, also read by screen readers. */
|
|
21
28
|
label: string
|
|
@@ -35,8 +42,8 @@ export type SelectProps = {
|
|
|
35
42
|
help?: ReactNode
|
|
36
43
|
/** Error message under the field. Also marks the field invalid. */
|
|
37
44
|
error?: ReactNode
|
|
38
|
-
/**
|
|
39
|
-
|
|
45
|
+
/** Text in the open list, so you can translate it. Missing keys use the English defaults. */
|
|
46
|
+
labels?: Partial<SelectLabels>
|
|
40
47
|
/** Stops the list from opening. */
|
|
41
48
|
disabled?: boolean
|
|
42
49
|
/** Submits the selected value in a hidden field with this name. */
|
|
@@ -57,12 +64,13 @@ export function Select({
|
|
|
57
64
|
placeholder = 'Choose one',
|
|
58
65
|
help,
|
|
59
66
|
error,
|
|
60
|
-
|
|
67
|
+
labels: labelsProp,
|
|
61
68
|
disabled,
|
|
62
69
|
name,
|
|
63
70
|
id,
|
|
64
71
|
className,
|
|
65
72
|
}: SelectProps) {
|
|
73
|
+
const labels = { ...defaultLabels, ...labelsProp }
|
|
66
74
|
const auto = useId()
|
|
67
75
|
const baseId = id ?? auto
|
|
68
76
|
const labelId = `${baseId}-label`
|
|
@@ -82,7 +90,7 @@ export function Select({
|
|
|
82
90
|
// The list grows out of the field and folds back into it.
|
|
83
91
|
useLiquid(listRef, triggerRef, state, mounted && ready)
|
|
84
92
|
// Open or keyboard focused, the field's dark edge (its focus indicator) flows round it from where it was pressed, or from its start edge for a key.
|
|
85
|
-
useEdgeFlow(triggerRef, triggerRef, ':is([data-open], :focus-visible)', styles.edge)
|
|
93
|
+
useEdgeFlow(triggerRef, triggerRef, ':is([data-state="open"], :focus-visible)', styles.edge)
|
|
86
94
|
const [hl, setHl] = useState<{ top: number; height: number } | null>(null)
|
|
87
95
|
|
|
88
96
|
const selectedIndex = options.findIndex((o) => o.value === value)
|
|
@@ -140,8 +148,8 @@ export function Select({
|
|
|
140
148
|
const describedBy = [help && !error ? helpId : null, error ? errorId : null, open && empty ? emptyId : null].filter(Boolean).join(' ')
|
|
141
149
|
|
|
142
150
|
return (
|
|
143
|
-
<div className={cx(styles.root, className)}>
|
|
144
|
-
<span id={labelId} className={cx(styles.label, hideLabel && styles.hiddenLabel)} onClick={() => triggerRef.current?.focus()}>
|
|
151
|
+
<div className={cx(styles.root, className)} data-slot="select">
|
|
152
|
+
<span id={labelId} className={cx(styles.label, hideLabel && styles.hiddenLabel)} data-slot="field-label" onClick={() => triggerRef.current?.focus()}>
|
|
145
153
|
{label}
|
|
146
154
|
</span>
|
|
147
155
|
<button
|
|
@@ -150,7 +158,8 @@ export function Select({
|
|
|
150
158
|
role="combobox"
|
|
151
159
|
id={triggerId}
|
|
152
160
|
className={styles.trigger}
|
|
153
|
-
data-
|
|
161
|
+
data-slot="select-trigger"
|
|
162
|
+
data-state={open ? 'open' : 'closed'}
|
|
154
163
|
data-invalid={error ? true : undefined}
|
|
155
164
|
aria-labelledby={`${labelId} ${triggerId}`}
|
|
156
165
|
aria-haspopup="listbox"
|
|
@@ -163,12 +172,12 @@ export function Select({
|
|
|
163
172
|
onClick={() => (open ? close() : openList())}
|
|
164
173
|
onKeyDown={onKeyDown}
|
|
165
174
|
>
|
|
166
|
-
<span className={cx(styles.value, !selected && styles.placeholder)}>
|
|
175
|
+
<span className={cx(styles.value, !selected && styles.placeholder)} data-slot="select-value">
|
|
167
176
|
<span key={selected?.value ?? 'none'} className={styles.valueText} title={selected ? selected.label : placeholder}>
|
|
168
177
|
{selected ? selected.label : placeholder}
|
|
169
178
|
</span>
|
|
170
179
|
</span>
|
|
171
|
-
<ChevronDownIcon className={styles.chevron} />
|
|
180
|
+
<ChevronDownIcon className={styles.chevron} data-slot="select-icon" />
|
|
172
181
|
</button>
|
|
173
182
|
{name && <input type="hidden" name={name} value={value ?? ''} />}
|
|
174
183
|
<FieldMessage helpId={helpId} errorId={errorId} help={help} error={error} />
|
|
@@ -181,12 +190,13 @@ export function Select({
|
|
|
181
190
|
aria-labelledby={labelId}
|
|
182
191
|
tabIndex={-1}
|
|
183
192
|
className={styles.list}
|
|
193
|
+
data-slot="select-list"
|
|
184
194
|
data-state={state}
|
|
185
195
|
data-side={side}
|
|
186
196
|
style={style}
|
|
187
197
|
onMouseDown={(e) => e.preventDefault()}
|
|
188
198
|
>
|
|
189
|
-
{hl && <span className={styles.highlight} style={{ transform: `translateY(${hl.top}px)`, height: hl.height }} aria-hidden="true" />}
|
|
199
|
+
{hl && <span className={styles.highlight} data-slot="select-highlight" style={{ transform: `translateY(${hl.top}px)`, height: hl.height }} aria-hidden="true" />}
|
|
190
200
|
{options.map((o, i) => (
|
|
191
201
|
<div
|
|
192
202
|
key={o.value}
|
|
@@ -198,21 +208,24 @@ export function Select({
|
|
|
198
208
|
aria-selected={o.value === value}
|
|
199
209
|
aria-disabled={o.disabled || undefined}
|
|
200
210
|
className={styles.option}
|
|
201
|
-
data-
|
|
211
|
+
data-slot="select-option"
|
|
212
|
+
data-highlighted={i === active || undefined}
|
|
213
|
+
data-selected={o.value === value || undefined}
|
|
214
|
+
data-disabled={o.disabled || undefined}
|
|
202
215
|
style={{ ['--i' as string]: i }}
|
|
203
216
|
onPointerMove={() => enabled(i) && active !== i && setActive(i)}
|
|
204
217
|
onClick={() => choose(i)}
|
|
205
218
|
>
|
|
206
|
-
<span className={styles.optionText}>
|
|
219
|
+
<span className={styles.optionText} data-slot="select-option-text">
|
|
207
220
|
{o.label}
|
|
208
|
-
{o.hint && <span className={styles.hint}>{o.hint}</span>}
|
|
221
|
+
{o.hint && <span className={styles.hint} data-slot="select-option-hint">{o.hint}</span>}
|
|
209
222
|
</span>
|
|
210
|
-
<CheckIcon className={styles.check} data-
|
|
223
|
+
<CheckIcon className={styles.check} data-slot="select-option-indicator" />
|
|
211
224
|
</div>
|
|
212
225
|
))}
|
|
213
226
|
{empty && (
|
|
214
|
-
<div id={emptyId} className={styles.empty}>
|
|
215
|
-
{
|
|
227
|
+
<div id={emptyId} className={styles.empty} data-slot="select-empty">
|
|
228
|
+
{labels.empty}
|
|
216
229
|
</div>
|
|
217
230
|
)}
|
|
218
231
|
</div>
|