Skip to content

Commit ca7fa97

Browse files
brianhelbabrianhelba
committed
Enable ESLint rule vue/no-template-shadow 
1 parent 0f48716 commit ca7fa97

5 files changed

Lines changed: 30 additions & 28 deletions

File tree

‎web/eslint.config.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ export default defineConfigWithVueTs(
2323
"vue/valid-v-slot": ["error", { allowModifiers: true }],
2424
// `any` is used everywhere and will be difficult to eliminate
2525
"@typescript-eslint/no-explicit-any": "off",
26-
// Temporary ignores until rules can be fixed
27-
"vue/no-template-shadow": "off",
2826
},
2927
},
3028

‎web/src/components/projects/AccessControl.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ onMounted(() => {
272272
}
273273
"
274274
>
275-
<template #item="{ props, item }">
275+
<template #item="{ props: itemProps, item }">
276276
<v-list-item
277-
v-bind="props"
277+
v-bind="itemProps"
278278
:title="
279279
item.first_name && item.last_name
280280
? item.first_name + ' ' + item.last_name

‎web/src/components/sidebars/ColormapEditor.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@ onMounted(init);
283283
class="py-2 marker-row"
284284
>
285285
<v-menu :close-on-content-click="false" open-on-hover location="end">
286-
<template #activator="{ props }">
286+
<template #activator="{ props: activatorProps }">
287287
<div
288-
v-bind="props"
288+
v-bind="activatorProps"
289289
class="color-square ma-0"
290290
:style="{ backgroundColor: marker.color }"
291291
/>

‎web/src/components/sidebars/CompareLayerStyle.vue‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,12 @@ const panels = ref(["A", "B"] as const);
227227
emit('setLayerActive', props.activeLayer !== props.layer)
228228
"
229229
>
230-
<template #activator="{ props }">
231-
<v-icon v-tooltip="appliedStyleText" v-bind="props" icon="mdi-cog" />
230+
<template #activator="{ props: activatorProps }">
231+
<v-icon
232+
v-tooltip="appliedStyleText"
233+
v-bind="activatorProps"
234+
icon="mdi-cog"
235+
/>
232236
</template>
233237
<v-card
234238
v-if="currentStyleSpecs.A && currentStyleSpecs.B"

‎web/src/components/sidebars/LayerStyle.vue‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -605,12 +605,12 @@ onMounted(resetCurrentStyle);
605605
emit('setLayerActive', props.activeLayer !== props.layer)
606606
"
607607
>
608-
<template #activator="{ props }">
608+
<template #activator="{ props: activatorProps }">
609609
<v-icon
610610
v-tooltip="
611611
appliedStyleName ? 'Style: ' + appliedStyleName : 'Configure styling'
612612
"
613-
v-bind="props"
613+
v-bind="activatorProps"
614614
icon="mdi-cog"
615615
/>
616616
</template>
@@ -663,9 +663,9 @@ onMounted(resetCurrentStyle);
663663
:close-on-content-click="false"
664664
location="start"
665665
>
666-
<template #activator="{ props }">
666+
<template #activator="{ props: activatorProps }">
667667
<v-icon
668-
v-bind="props"
668+
v-bind="activatorProps"
669669
:disabled="!currentLayerStyle.id"
670670
icon="mdi-pencil"
671671
/>
@@ -868,9 +868,9 @@ onMounted(resetCurrentStyle);
868868
open-on-hover
869869
location="end"
870870
>
871-
<template #activator="{ props }">
871+
<template #activator="{ props: activatorProps }">
872872
<div
873-
v-bind="props"
873+
v-bind="activatorProps"
874874
class="color-square"
875875
:style="{
876876
backgroundColor: group.single_color,
@@ -908,8 +908,8 @@ onMounted(resetCurrentStyle);
908908
(v: Colormap) => setGroupColormap(group.name, v)
909909
"
910910
>
911-
<template #item="{ props, item }">
912-
<v-list-item v-bind="props">
911+
<template #item="{ props: itemProps, item }">
912+
<v-list-item v-bind="itemProps">
913913
<template #append>
914914
<v-icon
915915
v-if="
@@ -1261,9 +1261,9 @@ onMounted(resetCurrentStyle);
12611261
open-on-hover
12621262
location="end"
12631263
>
1264-
<template #activator="{ props }">
1264+
<template #activator="{ props: activatorProps }">
12651265
<div
1266-
v-bind="props"
1266+
v-bind="activatorProps"
12671267
class="color-square"
12681268
:style="{
12691269
backgroundColor: group.single_color,
@@ -1312,8 +1312,8 @@ onMounted(resetCurrentStyle);
13121312
}
13131313
"
13141314
>
1315-
<template #item="{ props, item }">
1316-
<v-list-item v-bind="props">
1315+
<template #item="{ props: itemProps, item }">
1316+
<v-list-item v-bind="itemProps">
13171317
<template #append>
13181318
<v-chip
13191319
v-if="(item as any).sample_label"
@@ -1353,8 +1353,8 @@ onMounted(resetCurrentStyle);
13531353
(v: Colormap) => setGroupColormap(group.name, v)
13541354
"
13551355
>
1356-
<template #item="{ props, item }">
1357-
<v-list-item v-bind="props">
1356+
<template #item="{ props: itemProps, item }">
1357+
<v-list-item v-bind="itemProps">
13581358
<template #append>
13591359
<v-icon
13601360
v-if="
@@ -1561,9 +1561,9 @@ onMounted(resetCurrentStyle);
15611561
:disabled="!group.visible"
15621562
location="end"
15631563
>
1564-
<template #activator="{ props }">
1564+
<template #activator="{ props: activatorProps }">
15651565
<div
1566-
v-bind="props"
1566+
v-bind="activatorProps"
15671567
class="color-square"
15681568
:style="{
15691569
backgroundColor: group.colormap.null_color,
@@ -1706,9 +1706,9 @@ onMounted(resetCurrentStyle);
17061706
placeholder="Select property"
17071707
hide-details
17081708
>
1709-
<template #item="{ props, item }">
1709+
<template #item="{ props: itemProps, item }">
17101710
<v-list-item
1711-
v-bind="props"
1711+
v-bind="itemProps"
17121712
:disabled="!(item as any).range"
17131713
>
17141714
<template #append>
@@ -1891,8 +1891,8 @@ onMounted(resetCurrentStyle);
18911891
hide-details
18921892
@update:model-value="(v) => updateFilterBy(filter.id, v)"
18931893
>
1894-
<template #item="{ props, item }">
1895-
<v-list-item v-bind="props">
1894+
<template #item="{ props: itemProps, item }">
1895+
<v-list-item v-bind="itemProps">
18961896
<template #append>
18971897
<v-chip
18981898
v-if="(item as any).sample_label"

0 commit comments

Comments
 (0)