@hina-ui/vue 1.4.0 → 1.5.0

package/src/components/sheet/sheet.variants.ts

@@ -3,17 +3,30 @@ import { tv } from '../../lib/tv'
 export const sheetPanel = tv({
   base: [
     'hn-anim-sheet-bottom hn-transition pointer-events-auto fixed inset-x-0 bottom-0 z-(--hn-z-overlay)',
-    'mx-auto flex max-h-[calc(100dvh-3rem)] w-full flex-col gap-4 sm:max-w-xl',
-    'rounded-t-xl rounded-b-none border-b-0 pt-2 shadow-lg outline-none',
-    'pb-[max(var(--hn-panel-p),env(safe-area-inset-bottom))]',
+    'mx-auto flex max-h-[calc(100dvh-3rem)] w-full flex-col sm:max-w-xl',
+    'rounded-t-xl rounded-b-none border-b-0 shadow-lg outline-none',
     'data-dragging:transition-none',
   ],
+  variants: {
+    padded: { true: 'gap-4 pb-[max(var(--hn-panel-p),env(safe-area-inset-bottom))]' },
+    grip: { true: '', false: '' },
+  },
+  compoundVariants: [
+    { padded: true, grip: true, class: 'pt-2' },
+    { padded: true, grip: false, class: 'pt-(--hn-panel-p)' },
+  ],
+  defaultVariants: { grip: true, padded: true },
 })
 
 export const sheetGrip = tv({
   base: 'flex shrink-0 cursor-grab touch-none flex-col select-none data-dragging:cursor-grabbing',
+  variants: { standalone: { true: 'py-2' } },
 })
 
 export const sheetHandle = tv({
-  base: 'bg-line-strong hn-transition-base mx-auto mb-3 h-1.5 w-10 rounded-full data-disabled:opacity-50',
+  base: 'bg-line-strong hn-transition-base mx-auto h-1.5 w-10 rounded-full data-disabled:opacity-50',
+  variants: {
+    header: { true: 'mb-3', false: '' },
+  },
+  defaultVariants: { header: true },
 })

package/src/index.ts

@@ -214,6 +214,7 @@ export { default as TooltipProvider } from './components/tooltip/TooltipProvider
 export { default as Tooltip } from './components/tooltip/Tooltip.vue'
 export { vTooltip } from './components/tooltip/directive'
 export type { TooltipDirectiveOptions, TooltipDirectiveValue } from './components/tooltip/types'
+export type { OverlayAnchor, OverlayPositionStrategy } from './lib/overlay-anchor'
 export { default as Popover } from './components/popover/Popover.vue'
 export { default as DropdownMenu } from './components/dropdown-menu/DropdownMenu.vue'
 export { default as DropdownMenuItem } from './components/dropdown-menu/DropdownMenuItem.vue'

package/src/lib/anchored-overlay.ts

@@ -1,8 +1,21 @@
-import { computed, nextTick, shallowRef, watch, type Ref } from 'vue'
+import { computed, nextTick, watch, type Ref } from 'vue'
+import { defaultDocument } from '@vueuse/core'
+import { useOverlayPortal } from './overlay-portal'
+import {
+  overlayAnchorContext,
+  overlayAnchorElement,
+  useOverlayAnchor,
+  type OverlayAnchor,
+  type OverlayPositionStrategy,
+} from './overlay-anchor'
 import { useForwardExpose, type DropdownMenuContentEmits } from 'reka-ui'
 
 export function useAnchoredOverlay(
-  props: { anchor?: HTMLElement | null; modal: boolean },
+  props: {
+    anchor?: OverlayAnchor | null
+    modal: boolean
+    updatePositionStrategy: OverlayPositionStrategy
+  },
   open: Ref<boolean | undefined>,
   emit: <K extends keyof DropdownMenuContentEmits>(
     event: K,
@@ -11,14 +24,6 @@ export function useAnchoredOverlay(
   openAutoFocus?: (event: Event) => void,
 ) {
   const { forwardRef: trigger, currentElement: triggerElement } = useForwardExpose()
-  const retainedAnchor = shallowRef<HTMLElement>()
-  const reference = computed(
-    () =>
-      props.anchor ??
-      (open.value
-        ? (triggerElement.value ?? retainedAnchor.value)
-        : (retainedAnchor.value ?? triggerElement.value)),
-  )
   const visible = computed({
     get: () => !!open.value && !!(props.anchor || triggerElement.value),
     set: value => {
@@ -26,12 +31,12 @@ export function useAnchoredOverlay(
     },
   })
 
-  watch(
-    () => props.anchor,
-    anchor => {
-      if (anchor) retainedAnchor.value = anchor
-    },
-    { immediate: true, flush: 'sync' },
+  const { content, present } = useOverlayPortal(visible)
+  const reference = useOverlayAnchor(
+    () => props.anchor ?? triggerElement.value,
+    visible,
+    present,
+    () => props.updatePositionStrategy,
   )
 
   let previousFocus: HTMLElement | null = null
@@ -50,7 +55,10 @@ export function useAnchoredOverlay(
     visible,
     active => {
       if (!active) return
-      const document = props.anchor?.ownerDocument ?? triggerElement.value?.ownerDocument
+      const document =
+        overlayAnchorContext(props.anchor)?.ownerDocument ??
+        triggerElement.value?.ownerDocument ??
+        defaultDocument
       previousFocus = document?.activeElement as HTMLElement | null
       interactedOutside = false
     },
@@ -73,12 +81,11 @@ export function useAnchoredOverlay(
         (active === panel.ownerDocument.body || panel.contains(active))
       )
         target.focus({ preventScroll: true })
-      if (!visible.value) retainedAnchor.value = undefined
     })
   })
 
   const onInteractOutside = once((event: DropdownMenuContentEmits['interactOutside'][0]) => {
-    if (!triggerElement.value && props.anchor?.contains(event.target as Node))
+    if (!triggerElement.value && overlayAnchorElement(props.anchor)?.contains(event.target as Node))
       event.preventDefault()
     emit('interactOutside', event)
     const original = event.detail.originalEvent
@@ -89,6 +96,8 @@ export function useAnchoredOverlay(
 
   return {
     trigger,
+    content,
+    present,
     reference,
     visible,
     events: {

package/src/lib/overlay-anchor.ts

@@ -0,0 +1,65 @@
+import { shallowRef, watch, type Ref } from 'vue'
+
+export type OverlayAnchor =
+  | HTMLElement
+  | {
+      getBoundingClientRect: () => Pick<
+        DOMRect,
+        'x' | 'y' | 'width' | 'height' | 'top' | 'right' | 'bottom' | 'left'
+      >
+      contextElement?: Element
+    }
+export type OverlayPositionStrategy = 'optimized' | 'always'
+
+export function overlayAnchorElement(anchor?: OverlayAnchor | null): HTMLElement | undefined {
+  return anchor && 'nodeType' in anchor ? anchor : undefined
+}
+
+export function overlayAnchorContext(anchor?: OverlayAnchor | null): Element | undefined {
+  return (
+    overlayAnchorElement(anchor) ??
+    (anchor && 'contextElement' in anchor ? anchor.contextElement : undefined)
+  )
+}
+
+export function useOverlayAnchor(
+  source: () => OverlayAnchor | null | undefined,
+  open: Ref<boolean | undefined>,
+  present: Ref<boolean>,
+  strategy: () => OverlayPositionStrategy,
+) {
+  const reference = shallowRef<Exclude<OverlayAnchor, HTMLElement>>()
+
+  let current: OverlayAnchor | undefined
+
+  watch(
+    [source, open, present, strategy],
+    ([anchor, active, mounted]) => {
+      if (!mounted) {
+        current = undefined
+        reference.value = undefined
+        return
+      }
+      if (!anchor || (!active && reference.value && anchor !== current)) return
+      const contextElement = overlayAnchorContext(anchor)
+      if (contextElement && !contextElement.isConnected) return
+      current = anchor
+      const measure = () => {
+        const { x, y, width, height, top, right, bottom, left } = anchor.getBoundingClientRect()
+        return { x, y, width, height, top, right, bottom, left }
+      }
+      let rect = measure()
+      reference.value = {
+        contextElement,
+        getBoundingClientRect: () => {
+          if (source() === anchor && (!contextElement || contextElement.isConnected))
+            rect = measure()
+          return rect
+        },
+      }
+    },
+    { immediate: true, flush: 'post' },
+  )
+
+  return reference
+}

package/src/lib/scroll-viewport.ts

@@ -0,0 +1,8 @@
+import { computed, shallowRef } from 'vue'
+
+export function useScrollViewport() {
+  const scrollArea = shallowRef<{ viewport?: HTMLElement } | null>(null)
+  const viewport = computed(() => scrollArea.value?.viewport)
+
+  return { scrollArea, viewport }
+}