arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-14 20:19:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v3' into refactor/toast-animations

Browse Source
This commit is contained in:
HugoRCD
2025-07-08 11:18:08 +02:00
parent 8e82780df0 6519a74de4
commit 2afce33038
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/composables/useOverlay.ts
View File

@@ -71,7 +71,7 @@ function _useOverlay() {
isMounted: !!defaultOpen,
destroyOnClose: !!destroyOnClose,
originalProps: props || {},
props: { ...(props || {}) }
props: { ...props }
})
overlays.push(options)
@@ -135,7 +135,7 @@ function _useOverlay() {
const patch = <T extends Component>(id: symbol, props: Partial<ComponentProps<T>>): void => {
const overlay = getOverlay(id)
overlay.props = { ...props }
overlay.props = { ...overlay.props, ...props }
}
const getOverlay = (id: symbol): Overlay => {

2
src/theme/toaster.ts
View File

@@ -1,7 +1,7 @@
export default {
slots: {
viewport: 'fixed flex flex-col w-[calc(100%-2rem)] sm:w-96 z-[100] data-[expanded=true]:h-(--height) focus:outline-none transition-all duration-400 ease-in-out',
base: 'pointer-events-auto absolute inset-x-0 z-(--index) transform-(--transform) data-[expanded=false]:data-[front=false]:data-[second=false]:data-[third=false]:h-(--front-height) data-[expanded=false]:data-[front=false]:data-[second=false]:data-[third=false]:opacity-0 data-[expanded=false]:data-[second=true]:opacity-100 data-[expanded=false]:data-[third=true]:opacity-100 data-[expanded=false]:data-[second=true]:max-h-(--front-height) data-[expanded=false]:data-[third=true]:max-h-(--front-height) data-[expanded=false]:data-[second=true]:overflow-hidden data-[expanded=false]:data-[third=true]:overflow-hidden data-[expanded=false]:data-[second=true]:*:opacity-0 data-[expanded=false]:data-[third=true]:*:opacity-0 data-[front=false]:*:transition-opacity data-[front=false]:*:duration-300 transition-[transform,translate,height,opacity,max-height] duration-400 ease-in-out data-[state=closed]:animate-[toast-closed_300ms_ease-in-out] data-[state=closed]:data-[expanded=false]:data-[front=false]:animate-[toast-collapsed-closed_300ms_ease-in-out] data-[swipe=move]:transition-none'
base: 'pointer-events-auto absolute inset-x-0 z-(--index) transform-(--transform) data-[expanded=false]:data-[front=false]:data-[second=false]:data-[third=false]:h-(--front-height) data-[expanded=false]:data-[front=false]:data-[second=false]:data-[third=false]:opacity-0 data-[expanded=false]:data-[second=true]:opacity-100 data-[expanded=false]:data-[third=true]:opacity-100 data-[expanded=false]:data-[second=true]:*:opacity-0 data-[expanded=false]:data-[third=true]:*:opacity-0 data-[front=false]:*:transition-opacity data-[front=false]:*:duration-300 transition-[transform,translate,height,opacity] duration-400 ease-in-out data-[state=closed]:animate-[toast-closed_300ms_ease-in-out] data-[state=closed]:data-[expanded=false]:data-[front=false]:animate-[toast-collapsed-closed_300ms_ease-in-out] data-[swipe=move]:transition-none'
},
variants: {
position: {