diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2024-05-22 09:01:25 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2024-05-28 15:40:41 +0200 |
| commit | 00cfb085c52f7440c8270c839344a00e5196db8c (patch) | |
| tree | 4d968c9b843918f5ab4caf086c314953a510c235 | |
| parent | b6db0f3487d5096e08b077c3d806c96b50aecf35 (diff) | |
| download | mullvadvpn-00cfb085c52f7440c8270c839344a00e5196db8c.tar.xz mullvadvpn-00cfb085c52f7440c8270c839344a00e5196db8c.zip | |
Add lint exception for some aria and testid props
| -rw-r--r-- | gui/.eslintrc.js | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/Switch.tsx | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/TransitionContainer.tsx | 1 | ||||
| -rw-r--r-- | gui/src/renderer/components/cell/Selector.tsx | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/cell/SettingsSelect.tsx | 1 |
5 files changed, 4 insertions, 6 deletions
diff --git a/gui/.eslintrc.js b/gui/.eslintrc.js index 4cf1921910..2817c63581 100644 --- a/gui/.eslintrc.js +++ b/gui/.eslintrc.js @@ -30,6 +30,10 @@ const namingConvention = [ { selector: 'typeProperty', format: ['camelCase'], + filter: { + regex: "^(data-testid|aria-labelledby|aria-describedby)$", + match: false, + }, }, { selector: 'typeLike', diff --git a/gui/src/renderer/components/Switch.tsx b/gui/src/renderer/components/Switch.tsx index f87bf2a52b..595bc422a2 100644 --- a/gui/src/renderer/components/Switch.tsx +++ b/gui/src/renderer/components/Switch.tsx @@ -5,9 +5,7 @@ import { colors } from '../../config.json'; interface IProps { id?: string; - // eslint-disable-next-line @typescript-eslint/naming-convention 'aria-labelledby'?: string; - // eslint-disable-next-line @typescript-eslint/naming-convention 'aria-describedby'?: string; isOn: boolean; onChange?: (isOn: boolean) => void; diff --git a/gui/src/renderer/components/TransitionContainer.tsx b/gui/src/renderer/components/TransitionContainer.tsx index 9773c64512..3e7007e3c8 100644 --- a/gui/src/renderer/components/TransitionContainer.tsx +++ b/gui/src/renderer/components/TransitionContainer.tsx @@ -48,7 +48,6 @@ interface StyledTransitionContentProps { export const StyledTransitionContent = styled.div.attrs< StyledTransitionContentProps, - // eslint-disable-next-line @typescript-eslint/naming-convention { 'data-testid': string } >({ 'data-testid': 'transition-content', diff --git a/gui/src/renderer/components/cell/Selector.tsx b/gui/src/renderer/components/cell/Selector.tsx index 5e5d685a59..6bfeeb3887 100644 --- a/gui/src/renderer/components/cell/Selector.tsx +++ b/gui/src/renderer/components/cell/Selector.tsx @@ -16,7 +16,6 @@ export interface SelectorItem<T> { label: string; value: T; disabled?: boolean; - // eslint-disable-next-line @typescript-eslint/naming-convention 'data-testid'?: string; } @@ -136,7 +135,6 @@ interface SelectorCellProps<T> { onSelect: (value: T) => void; children: React.ReactNode | Array<React.ReactNode>; forwardedRef?: React.Ref<HTMLButtonElement>; - // eslint-disable-next-line @typescript-eslint/naming-convention 'data-testid'?: string; } diff --git a/gui/src/renderer/components/cell/SettingsSelect.tsx b/gui/src/renderer/components/cell/SettingsSelect.tsx index 4286cda1e2..f0d918ded6 100644 --- a/gui/src/renderer/components/cell/SettingsSelect.tsx +++ b/gui/src/renderer/components/cell/SettingsSelect.tsx @@ -87,7 +87,6 @@ interface SettingsSelectProps<T extends string> { items: Array<SettingsSelectItem<T>>; onUpdate: (value: T) => void; direction?: 'down' | 'up'; - // eslint-disable-next-line @typescript-eslint/naming-convention 'data-testid'?: string; } |
