Drop actions in favor of onBrowserMount

README.md

@@ -17,11 +17,11 @@ npm install louisette
 <script>
   import { createCollapsible } from 'louisette'
 
-  const { trigger, triggerAttrs, contentAttrs } = createCollapsible()
+  const { triggerAttrs, contentAttrs } = createCollapsible()
 </script>
 
 <div>
-  <button use:trigger {...$triggerAttrs}>Toggle</button>
+  <button {...$triggerAttrs}>Toggle</button>
   <div {...$contentAttrs}>
     <p>Content</p>
   </div>

package.json

@@ -43,7 +43,6 @@
   },
   "prettier": "@ubermanu/prettier-config",
   "devDependencies": {
-    "@floating-ui/dom": "^1.2.9",
     "@fontsource-variable/caveat": "^5.0.1",
     "@sveltejs/adapter-auto": "^2.0.1",
     "@sveltejs/adapter-static": "^2.0.2",
@@ -81,5 +80,9 @@
   },
   "peerDependencies": {
     "svelte": "^3.54.0"
+  },
+  "dependencies": {
+    "@floating-ui/dom": "^1.4.3",
+    "focusable-selectors": "^0.8.0"
   }
 }

src/lib/actions/FocusTrap/focusTrap.ts

@@ -0,0 +1,33 @@
+import { getFocusableElements } from '$lib/helpers/dom.js'
+import type { Action } from 'svelte/action'
+
+export const focusTrap: Action = (node: HTMLElement) => {
+  const onKeyDown = (event: KeyboardEvent) => {
+    const focusableElements = getFocusableElements(node)
+
+    const firstFocusableElement = focusableElements[0]
+    const lastFocusableElement = focusableElements[focusableElements.length - 1]
+
+    if (event.key === 'Tab') {
+      if (event.shiftKey) {
+        if (document.activeElement === firstFocusableElement) {
+          event.preventDefault()
+          lastFocusableElement.focus()
+        }
+      } else {
+        if (document.activeElement === lastFocusableElement) {
+          event.preventDefault()
+          firstFocusableElement.focus()
+        }
+      }
+    }
+  }
+
+  node.addEventListener('keydown', onKeyDown, true)
+
+  return {
+    destroy() {
+      node.removeEventListener('keydown', onKeyDown, true)
+    },
+  }
+}

src/lib/components/Accordion/accordion.ts

@@ -1,9 +1,9 @@
+import { onBrowserMount } from '$lib/helpers/environment.js'
 import type { DelegateEvent } from '$lib/helpers/events.js'
 import { delegateEventListeners } from '$lib/helpers/events.js'
 import { traveller } from '$lib/helpers/traveller.js'
 import { generateId } from '$lib/helpers/uuid.js'
-import type { Action } from 'svelte/action'
-import { derived, get, readonly, writable } from 'svelte/store'
+import { derived, get, readable, readonly, writable } from 'svelte/store'
 import type { Accordion, AccordionConfig } from './accordion.types.js'
 
 export const createAccordion = (config?: AccordionConfig): Accordion => {
@@ -14,16 +14,20 @@ export const createAccordion = (config?: AccordionConfig): Accordion => {
   const disabled$ = writable(disabled || [])
 
   const baseId = generateId()
-  const getTriggerId = (key: string) => `${baseId}-trigger-${key}`
-  const getContentId = (key: string) => `${baseId}-content-${key}`
+  const triggerId = (key: string) => `${baseId}-trigger-${key}`
+  const contentId = (key: string) => `${baseId}-content-${key}`
+
+  const rootAttrs = readable({
+    'data-accordion': baseId,
+  })
 
   const triggerAttrs = derived(
     [expanded$, disabled$],
     ([expanded, disabled]) => {
       return (key: string) => ({
-        id: getTriggerId(key),
+        id: triggerId(key),
         role: 'button',
-        'aria-controls': getContentId(key),
+        'aria-controls': contentId(key),
         'aria-expanded': expanded.includes(key),
         'aria-disabled': disabled.includes(key),
         tabIndex: disabled.includes(key) ? -1 : 0,
@@ -35,9 +39,9 @@ export const createAccordion = (config?: AccordionConfig): Accordion => {
 
   const contentAttrs = derived([expanded$], ([expanded]) => {
     return (key: string) => ({
-      id: getContentId(key),
+      id: contentId(key),
       role: 'region',
-      'aria-labelledby': getTriggerId(key),
+      'aria-labelledby': triggerId(key),
       'aria-hidden': !expanded.includes(key),
       inert: !expanded.includes(key) ? '' : undefined,
       'data-accordion-content': key,
@@ -113,7 +117,7 @@ export const createAccordion = (config?: AccordionConfig): Accordion => {
   /** Toggles the accordion when the trigger is clicked. */
   const onTriggerClick = (event: DelegateEvent<MouseEvent>) => {
     event.preventDefault()
-    toggle(event.delegateTarget.dataset.accordionTrigger as string)
+    toggle(event.delegateTarget.dataset.accordionTrigger!)
   }
 
   /**
@@ -128,7 +132,7 @@ export const createAccordion = (config?: AccordionConfig): Accordion => {
    */
   const onTriggerKeyDown = (event: DelegateEvent<KeyboardEvent>) => {
     const target = event.delegateTarget
-    const key = target.dataset.accordionTrigger as string
+    const key = target.dataset.accordionTrigger!
 
     if (event.key === 'Enter' || event.key === ' ') {
       event.preventDefault()
@@ -140,15 +144,10 @@ export const createAccordion = (config?: AccordionConfig): Accordion => {
       collapse(key)
     }
 
-    if (!rootNode) {
-      console.warn('The accordion root node is not defined.')
-      return
-    }
-
     const $disabled = get(disabled$)
 
-    const nodes = traveller(rootNode, '[data-accordion-trigger]', (el) => {
-      return $disabled.includes(el.dataset.accordionTrigger as string)
+    const nodes = traveller(rootNode!, '[data-accordion-trigger]', (el) => {
+      return $disabled.includes(el.dataset.accordionTrigger!)
     })
 
     if (event.key === 'ArrowUp') {
@@ -172,11 +171,16 @@ export const createAccordion = (config?: AccordionConfig): Accordion => {
     }
   }
 
-  /** Bind event listeners to the accordion */
-  const useAccordion: Action = (node) => {
-    rootNode = node
+  onBrowserMount(() => {
+    rootNode = document.querySelector<HTMLElement>(
+      `[data-accordion="${baseId}"]`
+    )
 
-    const removeListeners = delegateEventListeners(node, {
+    if (!rootNode) {
+      throw new Error('No root node found for the accordion')
+    }
+
+    const removeListeners = delegateEventListeners(rootNode, {
       keydown: {
         '[data-accordion-trigger]': onTriggerKeyDown,
       },
@@ -192,21 +196,19 @@ export const createAccordion = (config?: AccordionConfig): Accordion => {
       }
     })
 
-    return {
-      destroy() {
-        removeListeners()
-        unsubscribe()
-      },
+    return () => {
+      removeListeners()
+      unsubscribe()
     }
-  }
+  })
 
   return {
     multiple: multiple$,
     expanded: readonly(expanded$),
     disabled: readonly(disabled$),
+    rootAttrs,
     triggerAttrs,
     contentAttrs,
-    accordion: useAccordion,
     expand,
     collapse,
     toggle,

src/lib/components/Accordion/accordion.types.ts

@@ -1,5 +1,4 @@
 import type { HTMLAttributes } from '$lib/helpers/types.js'
-import type { Action } from 'svelte/action'
 import type { Readable } from 'svelte/store'
 
 export type AccordionConfig = {
@@ -12,9 +11,9 @@ export type Accordion = {
   multiple: Readable<boolean>
   expanded: Readable<string[]>
   disabled: Readable<string[]>
+  rootAttrs: Readable<HTMLAttributes>
   triggerAttrs: Readable<(key: string) => HTMLAttributes>
   contentAttrs: Readable<(key: string) => HTMLAttributes>
-  accordion: Action
   expand: (key: string) => void
   collapse: (key: string) => void
   toggle: (key: string) => void

src/lib/components/Accordion/example/Accordion.svelte

@@ -2,10 +2,10 @@
   import { createAccordion } from '$lib'
   import { setContext } from 'svelte'
 
-  const { accordion, ...accordionContext } = createAccordion()
+  const { rootAttrs, ...accordionContext } = createAccordion()
   setContext('accordion', accordionContext)
 </script>
 
-<div use:accordion>
+<div {...$rootAttrs}>
   <slot />
 </div>

src/lib/components/Accordion/tests/Accordion.test.svelte

@@ -4,10 +4,10 @@
   export let items: { id: number; label: string; content: string }[] = []
   export let defaults = {}
 
-  const { accordion, triggerAttrs, contentAttrs } = createAccordion(defaults)
+  const { rootAttrs, triggerAttrs, contentAttrs } = createAccordion(defaults)
 </script>
 
-<div data-testid="accordion" use:accordion>
+<div data-testid="accordion" {...$rootAttrs}>
   {#each items as item}
     <div data-testid="accordion-item-{item.id}">
       <div

src/lib/components/Button/button.ts

@@ -1,4 +1,5 @@
-import type { Action } from 'svelte/action'
+import { onBrowserMount } from '$lib/helpers/environment.js'
+import { generateId } from '$lib/helpers/uuid.js'
 import { derived, get, writable } from 'svelte/store'
 import type { Button, ButtonConfig } from './button.types.js'
 
@@ -7,10 +8,13 @@ export const createButton = (config?: ButtonConfig): Button => {
 
   const disabled$ = writable(disabled || false)
 
+  const baseId = generateId()
+
   const buttonAttrs = derived([disabled$], ([disabled]) => ({
     role: 'button',
     'aria-disabled': disabled,
     tabIndex: disabled ? -1 : 0,
+    'data-button': baseId,
   }))
 
   const onButtonClick = (event: MouseEvent) => {
@@ -27,21 +31,26 @@ export const createButton = (config?: ButtonConfig): Button => {
     }
   }
 
-  const useButton: Action = (node) => {
+  onBrowserMount(() => {
+    const node = document.querySelector<HTMLElement>(
+      `[data-button="${baseId}"]`
+    )
+
+    if (!node) {
+      throw new Error('Could not find the button')
+    }
+
     node.addEventListener('click', onButtonClick)
     node.addEventListener('keydown', onButtonKeyDown)
 
-    return {
-      destroy() {
-        node.removeEventListener('click', onButtonClick)
-        node.removeEventListener('keydown', onButtonKeyDown)
-      },
+    return () => {
+      node.removeEventListener('click', onButtonClick)
+      node.removeEventListener('keydown', onButtonKeyDown)
     }
-  }
+  })
 
   return {
     disabled: disabled$,
     buttonAttrs,
-    button: useButton,
   }
 }

src/lib/components/Button/button.types.ts

@@ -1,13 +1,11 @@
 import type { HTMLAttributes } from '$lib/helpers/types.js'
-import type { Action } from 'svelte/action'
-import type { Readable } from 'svelte/store'
+import type { Readable, Writable } from 'svelte/store'
 
 export type ButtonConfig = {
   disabled?: boolean
 }
 
 export type Button = {
-  disabled: Readable<boolean>
+  disabled: Writable<boolean>
   buttonAttrs: Readable<HTMLAttributes>
-  button: Action
 }

src/lib/components/Button/example/Button.svelte

@@ -1,11 +1,10 @@
 <script lang="ts">
   import { createButton } from '$lib'
 
-  const { button, buttonAttrs } = createButton()
+  const { buttonAttrs } = createButton()
 </script>
 
 <div
-  use:button
   {...$buttonAttrs}
   class="inline-flex w-auto select-none items-center rounded-md border border-transparent bg-accent-500 px-4 py-2 text-base font-medium text-white shadow-sm transition duration-150 ease-in-out hover:bg-accent-400 focus:outline-none focus-visible:ring focus-visible:ring-accent-500 focus-visible:ring-opacity-50 active:bg-accent-700 active:shadow-inner"
   on:click

src/lib/components/Button/tests/Button.test.svelte

@@ -3,7 +3,7 @@
 
   export let defaults = {}
 
-  const { button, buttonAttrs } = createButton(defaults)
+  const { buttonAttrs } = createButton(defaults)
 </script>
 
-<div data-testid="button" use:button {...$buttonAttrs}>Button</div>
+<div data-testid="button" {...$buttonAttrs}>Button</div>