adata-ui 2.1.40-beta.18 → 2.1.40-beta.19

package/components/overlays/modal/AModalV2.vue

@@ -0,0 +1,397 @@
+<script setup lang="ts">
+import { onKeyStroke, useScrollLock, useWindowSize } from '@vueuse/core'
+
+type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'container' | 'fullscreen'
+
+const props = withDefaults(defineProps<{
+  title?: string
+  size?: ModalSize
+  width?: string
+  closeOnOverlay?: boolean
+  closeOnEsc?: boolean
+  lockScroll?: boolean
+  persistent?: boolean
+  transition?: boolean
+  contentClass?: string
+  hideHeader?: boolean
+  hideClose?: boolean
+  blur?: boolean | 'sm' | 'md' | 'lg' | 'xl'
+  mobileSheet?: boolean
+  swipeToClose?: boolean
+  swipeThreshold?: number
+  showDragHandle?: boolean
+  dataTestId?: string
+  iconXMarkTestId?: string
+}>(), {
+  size: 'md',
+  closeOnOverlay: true,
+  closeOnEsc: true,
+  lockScroll: true,
+  persistent: false,
+  transition: true,
+  hideHeader: false,
+  hideClose: false,
+  blur: false,
+  mobileSheet: true,
+  swipeToClose: true,
+  swipeThreshold: 65,
+  showDragHandle: true,
+  dataTestId: undefined,
+  iconXMarkTestId: undefined,
+})
+
+const emit = defineEmits<{
+  (e: 'close'): void
+  (e: 'open'): void
+}>()
+
+const open = defineModel<boolean>({ required: true })
+
+const contentRef = ref<HTMLElement | null>(null)
+const overlayRef = ref<HTMLElement | null>(null)
+const swipeClosing = ref(false)
+const bodyScrollLocked = useScrollLock(import.meta.client ? document.body : null)
+const { width: windowWidth } = useWindowSize()
+
+const isMobile = computed(() => windowWidth.value < 1025)
+const isSheet = computed(() => isMobile.value && props.mobileSheet)
+
+const sizeStyle = computed(() => {
+  if (isSheet.value) return { width: '100%' }
+  if (props.width) return { width: props.width }
+
+  switch (props.size) {
+    case 'sm': return { width: '380px' }
+    case 'md': return { width: '520px' }
+    case 'lg': return { width: '720px' }
+    case 'xl': return { width: '1100px' }
+    case 'container': return {}
+    case 'fullscreen': return { width: '100vw', height: '100vh' }
+    default: return { width: '520px' }
+  }
+})
+
+const blurClass = computed(() => {
+  if (!props.blur) return ''
+
+  switch (props.blur) {
+    case 'sm': return 'backdrop-blur-sm'
+    case 'md': return 'backdrop-blur-md'
+    case 'lg': return 'backdrop-blur-lg'
+    case 'xl': return 'backdrop-blur-xl'
+    default: return 'backdrop-blur'
+  }
+})
+
+const overlayClass = computed(() => {
+  const base = ['modal-v2-overlay fixed inset-0 z-[10000] flex bg-black/40 dark:bg-black/60']
+
+  if (isSheet.value) {
+    base.push('items-end justify-stretch')
+  }
+  else {
+    base.push(props.size === 'container' ? 'items-center justify-center' : 'items-center justify-center p-4')
+  }
+
+  if (blurClass.value) base.push(blurClass.value)
+
+  return base.join(' ')
+})
+
+const contentBaseClass = computed(() => {
+  const base = ['modal-v2-content flex flex-col overflow-hidden border bg-white shadow-2xl dark:bg-gray-900']
+
+  if (isSheet.value) {
+    base.push('w-full max-w-none max-h-[100dvh] rounded-t-xl rounded-b-none border-x-0 border-b-0 border-t border-gray-200 dark:border-gray-800')
+  }
+  else {
+    const radius = props.size === 'fullscreen' ? 'rounded-none' : 'rounded-xl'
+    const widthCls = props.size === 'container'
+      ? ' w-full max-w-screen-sm md:max-w-screen-md lg:max-w-screen-lg xl:max-w-screen-xl 2xl:max-w-screen-2xl'
+      : ''
+    base.push(`max-h-[calc(100vh-2rem)] border-gray-200 dark:border-gray-800 ${radius}${widthCls}`)
+  }
+
+  return base.join(' ')
+})
+
+const overlayTransitionName = computed(() => {
+  if (swipeClosing.value) return ''
+  return props.transition ? 'modal-v2-overlay' : ''
+})
+const contentTransitionName = computed(() => {
+  if (swipeClosing.value || !props.transition) return ''
+  return isSheet.value ? 'modal-v2-sheet' : 'modal-v2-content'
+})
+
+function closeIfAllowed() {
+  if (props.persistent) return
+  open.value = false
+}
+
+function onOverlayClick(event: MouseEvent) {
+  if (!props.closeOnOverlay || props.persistent) return
+  if (event.target === event.currentTarget) {
+    open.value = false
+  }
+}
+
+onKeyStroke('Escape', () => {
+  if (!open.value) return
+  if (!props.closeOnEsc || props.persistent) return
+  open.value = false
+})
+
+function setScrollbarCompensation(active: boolean) {
+  if (!import.meta.client) return
+
+  if (active) {
+    const scrollbarWidth = window.innerWidth - document.documentElement.clientWidth
+    document.body.style.paddingRight = scrollbarWidth > 0 ? `${scrollbarWidth}px` : ''
+  }
+  else {
+    document.body.style.paddingRight = ''
+  }
+}
+
+watch(open, (value) => {
+  if (props.lockScroll) {
+    if (value) setScrollbarCompensation(true)
+    bodyScrollLocked.value = value
+    if (!value) setScrollbarCompensation(false)
+  }
+
+  if (value) emit('open')
+  else emit('close')
+})
+
+onBeforeUnmount(() => {
+  if (bodyScrollLocked.value) {
+    bodyScrollLocked.value = false
+  }
+  setScrollbarCompensation(false)
+})
+
+const dragging = ref(false)
+const dragStartY = ref(0)
+const dragDelta = ref(0)
+
+function canSwipe() {
+  return isSheet.value && props.swipeToClose && !props.persistent
+}
+
+function setTransform(value: string) {
+  if (contentRef.value) {
+    contentRef.value.style.transform = value
+  }
+}
+
+function onTouchStart(event: TouchEvent) {
+  if (!canSwipe()) return
+  dragging.value = true
+  dragStartY.value = event.touches[0].clientY
+  dragDelta.value = 0
+
+  if (contentRef.value) {
+    contentRef.value.style.transition = 'none'
+  }
+}
+
+function onTouchMove(event: TouchEvent) {
+  if (!dragging.value || !canSwipe()) return
+
+  const delta = event.touches[0].clientY - dragStartY.value
+  if (delta < 0) {
+    dragDelta.value = 0
+    setTransform('')
+    return
+  }
+
+  dragDelta.value = delta
+  setTransform(`translateY(${delta}px)`)
+}
+
+function prefersReducedMotion() {
+  return import.meta.client && window.matchMedia('(prefers-reduced-motion: reduce)').matches
+}
+
+function animateClose() {
+  const content = contentRef.value
+
+  if (!content || prefersReducedMotion()) {
+    open.value = false
+    return
+  }
+
+  swipeClosing.value = true
+
+  let done = false
+  const finish = () => {
+    if (done) return
+    done = true
+    content.removeEventListener('transitionend', onTransitionEnd)
+    open.value = false
+    swipeClosing.value = false
+  }
+
+  function onTransitionEnd(event: TransitionEvent) {
+    if (event.target === content && event.propertyName === 'transform') {
+      finish()
+    }
+  }
+
+  content.addEventListener('transitionend', onTransitionEnd)
+  setTimeout(finish, 320)
+
+  requestAnimationFrame(() => {
+    content.style.transition = 'transform 260ms cubic-bezier(0.22, 1, 0.36, 1)'
+    content.style.transform = 'translateY(100%)'
+
+    if (overlayRef.value) {
+      overlayRef.value.style.transition = 'opacity 260ms ease'
+      overlayRef.value.style.opacity = '0'
+    }
+  })
+}
+
+function onTouchEnd() {
+  if (!dragging.value) return
+  dragging.value = false
+
+  const shouldClose = dragDelta.value > props.swipeThreshold && canSwipe()
+
+  if (shouldClose) {
+    animateClose()
+  }
+  else {
+    if (contentRef.value) {
+      contentRef.value.style.transition = 'transform 220ms cubic-bezier(0.22, 1, 0.36, 1)'
+      contentRef.value.style.transform = ''
+    }
+  }
+
+  dragDelta.value = 0
+}
+</script>
+
+<template>
+  <client-only>
+    <teleport to="body">
+      <transition :name="overlayTransitionName">
+        <div
+          v-if="open"
+          ref="overlayRef"
+          :class="overlayClass"
+          @mousedown="onOverlayClick"
+        >
+          <transition :name="contentTransitionName" appear>
+            <div
+              v-if="open"
+              ref="contentRef"
+              :class="contentBaseClass"
+              :style="sizeStyle"
+              :data-test-id="dataTestId"
+              @mousedown.stop
+            >
+              <div
+                v-if="isSheet && showDragHandle"
+                class="flex shrink-0 cursor-grab touch-none justify-center py-2"
+                @touchstart.passive="onTouchStart"
+                @touchmove="onTouchMove"
+                @touchend="onTouchEnd"
+                @touchcancel="onTouchEnd"
+              >
+                <div class="h-1 w-10 rounded-full bg-gray-300 dark:bg-gray-600" />
+              </div>
+
+              <header
+                v-if="!hideHeader"
+                class="flex shrink-0 items-center justify-between gap-3 border-b border-gray-200 px-5 py-4 dark:border-gray-800"
+                @touchstart.passive="onTouchStart"
+                @touchmove="onTouchMove"
+                @touchend="onTouchEnd"
+                @touchcancel="onTouchEnd"
+              >
+                <slot name="header">
+                  <h2 v-if="title" class="text-h5 text-gray-900 dark:text-gray-100">
+                    {{ title }}
+                  </h2>
+                </slot>
+                <button
+                  v-if="!hideClose"
+                  type="button"
+                  class="ml-auto rounded-sm p-1 transition hover:bg-gray-100 dark:hover:bg-gray-800 dark:hover:text-gray-200"
+                  :data-test-id="iconXMarkTestId"
+                  @click="closeIfAllowed"
+                >
+                  <a-icon-x-mark class="size-4" />
+                </button>
+              </header>
+
+              <div class="min-h-0 flex-1 overflow-auto" :class="contentClass">
+                <slot :close="closeIfAllowed" />
+              </div>
+
+              <footer
+                v-if="$slots.footer"
+                class="shrink-0 border-t border-gray-200 px-5 py-4 dark:border-gray-800"
+              >
+                <slot name="footer" :close="closeIfAllowed" />
+              </footer>
+            </div>
+          </transition>
+        </div>
+      </transition>
+    </teleport>
+  </client-only>
+</template>
+
+<style scoped lang="scss">
+.modal-v2-overlay-enter-active {
+  transition: opacity 200ms ease-out;
+}
+
+.modal-v2-overlay-leave-active {
+  transition: opacity 150ms ease-in;
+}
+
+.modal-v2-overlay-enter-from,
+.modal-v2-overlay-leave-to {
+  opacity: 0;
+}
+
+.modal-v2-content-enter-active {
+  transition: transform 220ms cubic-bezier(0.22, 1, 0.36, 1), opacity 220ms ease-out;
+}
+
+.modal-v2-content-leave-active {
+  transition: transform 150ms ease-in, opacity 150ms ease-in;
+}
+
+.modal-v2-content-enter-from,
+.modal-v2-content-leave-to {
+  opacity: 0;
+  transform: translateY(8px) scale(0.98);
+}
+
+.modal-v2-sheet-enter-active,
+.modal-v2-sheet-leave-active {
+  transition: transform 280ms cubic-bezier(0.22, 1, 0.36, 1);
+}
+
+.modal-v2-sheet-enter-from,
+.modal-v2-sheet-leave-to {
+  transform: translateY(100%);
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .modal-v2-overlay-enter-active,
+  .modal-v2-overlay-leave-active,
+  .modal-v2-content-enter-active,
+  .modal-v2-content-leave-active,
+  .modal-v2-sheet-enter-active,
+  .modal-v2-sheet-leave-active {
+    transition: none;
+  }
+}
+</style>

package/components/overlays/side-panel/ASidePanel.vue

@@ -24,6 +24,7 @@ const props = withDefaults(defineProps<{
   headerClass?: string
   bodyClass?: string
   footerClass?: string
+  dataTestId?: string
 }>(), {
   idName: "vsp-container",
   side: "right",
@@ -36,7 +37,8 @@ const props = withDefaults(defineProps<{
   overlayOpacity: 0.5,
   overlayDuration: 500,
   panelColor: "bg-white dark:bg-gray-900",
-  panelDuration: 300
+  panelDuration: 300,
+  dataTestId: undefined,
 })
 
 defineEmits<{
@@ -128,10 +130,10 @@ watch(() => [modelValue.value, panel.value], (newP, oldP) => {
 
 const roundedClass = computed(() => {
   const classes = {
-    left: "rounded-r-xl",
-    right: "rounded-l-xl",
-    top: "rounded-b-xl",
-    bottom: "rounded-t-xl",
+    left: "rounded-r-lg",
+    right: "rounded-l-lg",
+    top: "rounded-b-lg",
+    bottom: "rounded-t-lg",
   }
 
   return classes[panelSide.value]
@@ -170,7 +172,7 @@ const modalHeight = ref(0)
 const touchstart = (event: TouchEvent) => {
   isClose.value = false
   positionStart.value = event.touches[0].clientY
-  modalHeight.value = panel.value?.offsetHeight || 0 // Запоминаем текущую высоту модалки
+  modalHeight.value = panel.value?.offsetHeight || 0
 }
 
 const touchmove = (event: TouchEvent) => {
@@ -179,7 +181,7 @@ const touchmove = (event: TouchEvent) => {
   const touchPosition = event.touches[0].clientY
   const step = touchPosition - positionStart.value
 
-  if (step < 0) return // предотвратить движение вверх
+  if (step < 0) return
 
   const newHeight = modalHeight.value - step
   panel.value.style.height = `${newHeight}px`
@@ -219,6 +221,7 @@ const touchend = () => {
             class="vsp fixed flex flex-col"
             :class="[`vsp--${panelSide}-side`, $attrs.class, roundedClass, panelColor]"
             :style="panelStyles"
+            :data-test-id="dataTestId"
           >
             <div
               class="w-full flex justify-center items-center mt-1 lg:hidden"

package/components/overlays/sideover/ASlideover.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 
-import { twJoin, twMerge } from 'tailwind-merge'
+import { twJoin, twMerge } from '#adata-ui/utils/twMerge'
 import { onClickOutside, useWindowSize } from '@vueuse/core'
 import {disableBodyScroll, enableBodyScroll} from "body-scroll-lock";
 
@@ -37,10 +37,10 @@ const uiConfig = {
     bottom: 'bottom-0 left-0 w-full'
   },
   rounded: {
-    top: 'rounded-b-lg',
-    bottom: 'rounded-t-lg',
-    left: 'rounded-r-lg',
-    right: 'rounded-l-lg'
+    top: 'rounded-b-md',
+    bottom: 'rounded-t-md',
+    left: 'rounded-r-md',
+    right: 'rounded-l-md'
   },
   fullscreen: 'w-screen h-screen rounded-none',
   transition: {
@@ -219,7 +219,7 @@ const modalHeight = ref(0)
 const touchstart = (event: TouchEvent) => {
   isClose.value = false
   positionStart.value = event.touches[0].clientY
-  modalHeight.value = slideover.value?.offsetHeight || 0 // Запоминаем текущую высоту модалки
+  modalHeight.value = slideover.value?.offsetHeight || 0
 }
 
 const touchmove = (event: TouchEvent) => {

package/components/overlays/tooltip/ATooltip.vue

@@ -56,7 +56,7 @@ const baseClass = computed(() => {
   const color = props.errorParsing ? 'text-[#E74135] dark:text-[#F47E75]' : 'text-white dark:text-deepblue-900'
   const pad = props.size === 'sm' ? 'px-4 py-2' : 'px-4 py-4'
   const truncated = props.truncate ? 'truncate' : 'max-w-[530px] w-max'
-  return ['text-xs font-normal absolute', bg, color, 'rounded-md', pad, truncated].join(' ')
+  return ['text-body-sm font-normal absolute', bg, color, 'rounded-sm', pad, truncated].join(' ')
 })
 
 /* --- positioning logic --- */