mirror of
https://github.com/ArthurDanjou/ui.git
synced 2026-01-19 22:41:42 +01:00
Merge branch 'v3' into feat/3880
This commit is contained in:
@@ -18,6 +18,8 @@ export interface InputTagsProps<T extends InputTagItem = InputTagItem> extends P
|
||||
as?: any
|
||||
/** The placeholder text when the input is empty. */
|
||||
placeholder?: string
|
||||
/** The maximum number of character allowed. */
|
||||
maxLength?: number
|
||||
/**
|
||||
* @defaultValue 'primary'
|
||||
*/
|
||||
@@ -182,6 +184,7 @@ defineExpose({
|
||||
ref="inputRef"
|
||||
v-bind="{ ...$attrs, ...ariaAttrs }"
|
||||
:placeholder="placeholder"
|
||||
:max-length="maxLength"
|
||||
:class="ui.input({ class: props.ui?.input })"
|
||||
/>
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import type { PopoverRootProps, HoverCardRootProps, PopoverRootEmits, PopoverContentProps, PopoverContentEmits, PopoverArrowProps } from 'reka-ui'
|
||||
import type { PopoverRootProps, HoverCardRootProps, PopoverRootEmits, PopoverContentProps, PopoverContentEmits, PopoverArrowProps, HoverCardTriggerProps } from 'reka-ui'
|
||||
import type { AppConfig } from '@nuxt/schema'
|
||||
import theme from '#build/ui/popover'
|
||||
import type { EmitsToProps, ComponentConfig } from '../types/utils'
|
||||
@@ -27,6 +27,12 @@ export interface PopoverProps extends PopoverRootProps, Pick<HoverCardRootProps,
|
||||
* @defaultValue true
|
||||
*/
|
||||
portal?: boolean | string | HTMLElement
|
||||
/**
|
||||
* The reference (or anchor) element that is being referred to for positioning.
|
||||
*
|
||||
* If not provided will use the current component as anchor.
|
||||
*/
|
||||
reference?: HoverCardTriggerProps['reference']
|
||||
/**
|
||||
* When `false`, the popover will not close when clicking outside or pressing escape.
|
||||
* @defaultValue true
|
||||
@@ -100,7 +106,7 @@ const Component = computed(() => props.mode === 'hover' ? HoverCard : Popover)
|
||||
|
||||
<template>
|
||||
<Component.Root v-slot="{ open }" v-bind="rootProps">
|
||||
<Component.Trigger v-if="!!slots.default" as-child :class="props.class">
|
||||
<Component.Trigger v-if="!!slots.default || !!reference" as-child :reference="reference" :class="props.class">
|
||||
<slot :open="open" />
|
||||
</Component.Trigger>
|
||||
|
||||
|
||||
@@ -165,6 +165,8 @@ export interface TableProps<T extends TableData = TableData> extends TableOption
|
||||
*/
|
||||
facetedOptions?: FacetedOptions<T>
|
||||
onSelect?: (row: TableRow<T>, e?: Event) => void
|
||||
onHover?: (e: Event, row: TableRow<T> | null) => void
|
||||
onContextmenu?: ((e: Event, row: TableRow<T>) => void) | Array<((e: Event, row: TableRow<T>) => void)>
|
||||
class?: any
|
||||
ui?: Table['slots']
|
||||
}
|
||||
@@ -313,7 +315,7 @@ function valueUpdater<T extends Updater<any>>(updaterOrValue: T, ref: Ref) {
|
||||
ref.value = typeof updaterOrValue === 'function' ? updaterOrValue(ref.value) : updaterOrValue
|
||||
}
|
||||
|
||||
function handleRowSelect(row: TableRow<T>, e: Event) {
|
||||
function onRowSelect(e: Event, row: TableRow<T>) {
|
||||
if (!props.onSelect) {
|
||||
return
|
||||
}
|
||||
@@ -326,9 +328,30 @@ function handleRowSelect(row: TableRow<T>, e: Event) {
|
||||
e.preventDefault()
|
||||
e.stopPropagation()
|
||||
|
||||
// FIXME: `e` should be the first argument for consistency
|
||||
props.onSelect(row, e)
|
||||
}
|
||||
|
||||
function onRowHover(e: Event, row: TableRow<T> | null) {
|
||||
if (!props.onHover) {
|
||||
return
|
||||
}
|
||||
|
||||
props.onHover(e, row)
|
||||
}
|
||||
|
||||
function onRowContextmenu(e: Event, row: TableRow<T>) {
|
||||
if (!props.onContextmenu) {
|
||||
return
|
||||
}
|
||||
|
||||
if (Array.isArray(props.onContextmenu)) {
|
||||
props.onContextmenu.forEach(fn => fn(e, row))
|
||||
} else {
|
||||
props.onContextmenu(e, row)
|
||||
}
|
||||
}
|
||||
|
||||
watch(
|
||||
() => props.data, () => {
|
||||
data.value = props.data ? [...props.data] : []
|
||||
@@ -382,7 +405,7 @@ defineExpose({
|
||||
<template v-for="row in tableApi.getRowModel().rows" :key="row.id">
|
||||
<tr
|
||||
:data-selected="row.getIsSelected()"
|
||||
:data-selectable="!!props.onSelect"
|
||||
:data-selectable="!!props.onSelect || !!props.onHover || !!props.onContextmenu"
|
||||
:data-expanded="row.getIsExpanded()"
|
||||
:role="props.onSelect ? 'button' : undefined"
|
||||
:tabindex="props.onSelect ? 0 : undefined"
|
||||
@@ -392,7 +415,10 @@ defineExpose({
|
||||
typeof tableApi.options.meta?.class?.tr === 'function' ? tableApi.options.meta.class.tr(row) : tableApi.options.meta?.class?.tr
|
||||
]
|
||||
})"
|
||||
@click="handleRowSelect(row, $event)"
|
||||
@click="onRowSelect($event, row)"
|
||||
@pointerenter="onRowHover($event, row)"
|
||||
@pointerleave="onRowHover($event, null)"
|
||||
@contextmenu="onRowContextmenu($event, row)"
|
||||
>
|
||||
<td
|
||||
v-for="cell in row.getVisibleCells()"
|
||||
|
||||
@@ -27,6 +27,11 @@ export interface TooltipProps extends TooltipRootProps {
|
||||
* @defaultValue true
|
||||
*/
|
||||
portal?: boolean | string | HTMLElement
|
||||
/**
|
||||
* The reference (or anchor) element that is being referred to for positioning.
|
||||
*
|
||||
* If not provided will use the current component as anchor.
|
||||
*/
|
||||
reference?: TooltipTriggerProps['reference']
|
||||
class?: any
|
||||
ui?: Tooltip['slots']
|
||||
|
||||
Reference in New Issue
Block a user