From 443d0df9fe64a62b1dd1729e0f4f3b3872c1a4f6 Mon Sep 17 00:00:00 2001 From: Connor Pearson Date: Thu, 6 Jun 2019 11:28:42 -0400 Subject: [PATCH] fix(use-v-on-exact): Don't flag events with different key codes --- lib/rules/use-v-on-exact.js | 37 +++++++++++++++++++++++++++---- tests/lib/rules/use-v-on-exact.js | 21 ++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/lib/rules/use-v-on-exact.js b/lib/rules/use-v-on-exact.js index bf194fd8e..29862b845 100644 --- a/lib/rules/use-v-on-exact.js +++ b/lib/rules/use-v-on-exact.js @@ -11,6 +11,7 @@ const utils = require('../utils') const SYSTEM_MODIFIERS = new Set(['ctrl', 'shift', 'alt', 'meta']) +const GLOBAL_MODIFIERS = new Set(['stop', 'prevent', 'capture', 'self', 'once', 'passive', 'native']) // ------------------------------------------------------------------------------ // Helpers @@ -36,6 +37,16 @@ function getEventDirectives (attributes, sourceCode) { })) } +/** + * Checks whether given modifier is key modifier + * + * @param {string} modifier + * @returns {boolean} + */ +function isKeyModifier (modifier) { + return !GLOBAL_MODIFIERS.has(modifier) && !SYSTEM_MODIFIERS.has(modifier) +} + /** * Checks whether given modifier is system one * @@ -86,6 +97,16 @@ function getSystemModifiersString (modifiers) { return modifiers.filter(isSystemModifier).sort().join(',') } +/** + * Creates alphabetically sorted string with key modifiers + * + * @param {array[string]} modifiers + * @returns {string} e.g. "enter,tab" + */ +function getKeyModifiersString (modifiers) { + return modifiers.filter(isKeyModifier).sort().join(',') +} + /** * Compares two events based on their modifiers * to detect possible event leakeage @@ -100,13 +121,21 @@ function hasConflictedModifiers (baseEvent, event) { event.modifiers.includes('exact') ) return false - const eventModifiers = getSystemModifiersString(event.modifiers) - const baseEventModifiers = getSystemModifiersString(baseEvent.modifiers) + const eventKeyModifiers = getKeyModifiersString(event.modifiers) + const baseEventKeyModifiers = getKeyModifiersString(baseEvent.modifiers) + + if ( + eventKeyModifiers && baseEventKeyModifiers && + eventKeyModifiers !== baseEventKeyModifiers + ) return false + + const eventSystemModifiers = getSystemModifiersString(event.modifiers) + const baseEventSystemModifiers = getSystemModifiersString(baseEvent.modifiers) return ( baseEvent.modifiers.length >= 1 && - baseEventModifiers !== eventModifiers && - baseEventModifiers.indexOf(eventModifiers) > -1 + baseEventSystemModifiers !== eventSystemModifiers && + baseEventSystemModifiers.indexOf(eventSystemModifiers) > -1 ) } diff --git a/tests/lib/rules/use-v-on-exact.js b/tests/lib/rules/use-v-on-exact.js index 2bb990403..437745260 100644 --- a/tests/lib/rules/use-v-on-exact.js +++ b/tests/lib/rules/use-v-on-exact.js @@ -158,6 +158,27 @@ ruleTester.run('use-v-on-exact', rule, { }, { code: `` + }, + { + code: `` + }, + { + code: `` + }, + { + code: `` } ],