comparing v0.1.3 and main on kitten.sh/use-interactions

+26

.github/workflows/mirror.yml

···

       1
       +
       # Mirrors to https://tangled.sh/@kitten.sh (knot.kitten.sh)

     

       2
       +
       name: Mirror (Git Backup)

     

       3
       +
       on:

     

       4
       +
         push:

     

       5
       +
           branches:

     

       6
       +
             - main

     

       7
       +
       jobs:

     

       8
       +
         mirror:

     

       9
       +
           runs-on: ubuntu-latest

     

       10
       +
           steps:

     

       11
       +
             - name: Checkout repository

     

       12
       +
               uses: actions/checkout@v4

     

       13
       +
               with:

     

       14
       +
                 fetch-depth: 0

     

       15
       +
                 fetch-tags: true

     

       16
       +
             - name: Mirror

     

       17
       +
               env:

     

       18
       +
                 MIRROR_SSH_KEY: ${{ secrets.MIRROR_SSH_KEY }}

     

       19
       +
                 GIT_SSH_COMMAND: 'ssh -o StrictHostKeyChecking=yes'

     

       20
       +
               run: |

     

       21
       +
                 mkdir -p ~/.ssh

     

       22
       +
                 echo "$MIRROR_SSH_KEY" > ~/.ssh/id_rsa

     

       23
       +
                 chmod 600 ~/.ssh/id_rsa

     

       24
       +
                 ssh-keyscan -H knot.kitten.sh >> ~/.ssh/known_hosts

     

       25
       +
                 git remote add mirror "git@knot.kitten.sh:kitten.sh/${GITHUB_REPOSITORY#*/}"

     

       26
       +
                 git push --mirror mirror

+1 -1

package.json

···

       1
        
       {

     

       2
        
         "name": "use-interactions",

     

       3
        
         "description": "Reusable and common web interactions with WCAG accessibility criteria for React",

     

       4
       -
         "version": "0.1.3",

     

       5
        
         "main": "dist/use-interactions.js",

     

       6
        
         "module": "dist/use-interactions.es.js",

     

       7
        
         "types": "dist/use-interactions.d.ts",

···

       1
        
       {

     

       2
        
         "name": "use-interactions",

     

       3
        
         "description": "Reusable and common web interactions with WCAG accessibility criteria for React",

     

       4
       +
         "version": "0.1.5",

     

       5
        
         "main": "dist/use-interactions.js",

     

       6
        
         "module": "dist/use-interactions.es.js",

     

       7
        
         "types": "dist/use-interactions.d.ts",

+1 -1

src/types.ts

···

       1
        
       import type { CSSProperties } from 'react';

     

       2
        
       

     

       3
       -
       export interface Ref<T extends HTMLElement> {

     

       4
        
         readonly current: T | null;

     

       5
        
       }

     

       6

···

       1
        
       import type { CSSProperties } from 'react';

     

       2
        
       

     

       3
       +
       export interface Ref<T extends HTMLElement | SVGElement> {

     

       4
        
         readonly current: T | null;

     

       5
        
       }

     

       6

+20 -12

src/useDismissable.ts

···

       36
        
             const { target, relatedTarget } = event;

     

       37
        
             if (

     

       38
        
               !event.defaultPrevented &&

     

       39
       -
               (relatedTarget || willLoseFocus) &&

     

       40
        
               contains(element, target) &&

     

       41
        
               !contains(element, relatedTarget)

     

       42
        
             ) {

     
···

       47
        
       

     

       48
        
           function onFocusIn(event: FocusEvent) {

     

       49
        
             const { target } = event;

     

       50
       -
             if (!event.defaultPrevented && !contains(element, target)) {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       51
        
               onDismissRef.current(event);

     

       52
        
             }

     

       53
        
           }

     
···

       82
        
             }

     

       83
        
           }

     

       84
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       85
        
           if (focusLoss) {

     

       86
       -
             root.addEventListener('focusout', onFocusOut, true);

     

       87
       -
             root.addEventListener('focusin', onFocusIn, true);

     

       88
        
           }

     

       89
        
       

     

       90
       -
           root.addEventListener('click', onClick, true);

     

       91
       -
           root.addEventListener('touchstart', onClick, true);

     

       92
       -
           root.addEventListener('keydown', onKey, true);

     

       93
        
       

     

       94
        
           return () => {

     

       95
        
             if (focusLoss) {

     

       96
       -
               root.removeEventListener('focusout', onFocusOut, true);

     

       97
       -
               root.removeEventListener('focusin', onFocusIn, true);

     

       98
        
             }

     

       99
        
       

     

       100
       -
             root.removeEventListener('click', onClick, true);

     

       101
       -
             root.removeEventListener('touchstart', onClick, true);

     

       102
       -
             root.removeEventListener('keydown', onKey, true);

     

       103
        
           };

     

       104
        
         }, [ref.current, hasPriority, disabled, focusLoss]);

     

       105
        
       }

···

       36
        
             const { target, relatedTarget } = event;

     

       37
        
             if (

     

       38
        
               !event.defaultPrevented &&

     

       39
       +
               willLoseFocus &&

     

       40
        
               contains(element, target) &&

     

       41
        
               !contains(element, relatedTarget)

     

       42
        
             ) {

     
···

       47
        
       

     

       48
        
           function onFocusIn(event: FocusEvent) {

     

       49
        
             const { target } = event;

     

       50
       +
             if (

     

       51
       +
               !event.defaultPrevented &&

     

       52
       +
               willLoseFocus &&

     

       53
       +
               !contains(element, target)

     

       54
       +
             ) {

     

       55
       +
               willLoseFocus = false;

     

       56
        
               onDismissRef.current(event);

     

       57
        
             }

     

       58
        
           }

     
···

       87
        
             }

     

       88
        
           }

     

       89
        
       

     

       90
       +
           const opts = { capture: true } as any;

     

       91
       +
           const touchOpts = { capture: true, passive: false } as any;

     

       92
       +
       

     

       93
        
           if (focusLoss) {

     

       94
       +
             root.addEventListener('focusout', onFocusOut, opts);

     

       95
       +
             root.addEventListener('focusin', onFocusIn, opts);

     

       96
        
           }

     

       97
        
       

     

       98
       +
           root.addEventListener('click', onClick, opts);

     

       99
       +
           root.addEventListener('touchstart', onClick, touchOpts);

     

       100
       +
           root.addEventListener('keydown', onKey, opts);

     

       101
        
       

     

       102
        
           return () => {

     

       103
        
             if (focusLoss) {

     

       104
       +
               root.removeEventListener('focusout', onFocusOut, opts);

     

       105
       +
               root.removeEventListener('focusin', onFocusIn, opts);

     

       106
        
             }

     

       107
        
       

     

       108
       +
             root.removeEventListener('click', onClick, opts);

     

       109
       +
             root.removeEventListener('touchstart', onClick, touchOpts);

     

       110
       +
             root.removeEventListener('keydown', onKey, opts);

     

       111
        
           };

     

       112
        
         }, [ref.current, hasPriority, disabled, focusLoss]);

     

       113
        
       }

Compare changes