Skip to content

Commit 276ccd7

Browse files
authored
Merge pull request #7491 from nextcloud-libraries/backport/7489/stable8
[stable8] fix(NcAppNavigationItem): ensure to pass boolean where needed
2 parents a111794 + 9106347 commit 276ccd7

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/components/NcAppNavigationItem/NcAppNavigationItem.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,14 +301,14 @@ Just set the `pinned` prop.
301301
:class="{
302302
'app-navigation-entry--editing': editingActive,
303303
'app-navigation-entry--deleted': undo,
304-
active: (isActive && to) || active,
304+
active: (to && isActive) || active,
305305
}"
306306
class="app-navigation-entry">
307307
<!-- Icon and name -->
308308
<a
309309
v-if="!undo"
310310
class="app-navigation-entry-link"
311-
:aria-current="active || (isActive && to) ? 'page' : undefined"
311+
:aria-current="active || (to && isActive) ? 'page' : undefined"
312312
:aria-description="ariaDescription"
313313
:aria-expanded="$scopedSlots.default ? opened.toString() : undefined"
314314
:href="href || routerLinkHref || '#'"
@@ -336,7 +336,7 @@ Just set the `pinned` prop.
336336
ref="editingInput"
337337
v-model="editingValue"
338338
:placeholder="editPlaceholder !== '' ? editPlaceholder : name"
339-
:primary="(isActive && to) || active"
339+
:primary="(to && isActive) || active"
340340
@cancel="cancelEditing"
341341
@confirm="handleEditingDone" />
342342
</div>
@@ -369,7 +369,7 @@ Just set the `pinned` prop.
369369
:boundaries-element="actionsBoundariesElement"
370370
:placement="menuPlacement"
371371
:open="menuOpen"
372-
:type="(isActive && to) || active ? 'tertiary-on-primary' : 'tertiary'"
372+
:type="(to && isActive) || active ? 'tertiary-on-primary' : 'tertiary'"
373373
:force-menu="forceMenu"
374374
:default-icon="menuIcon"
375375
@update:open="onMenuToggle">
@@ -400,7 +400,7 @@ Just set the `pinned` prop.
400400
</div>
401401
<NcAppNavigationIconCollapsible
402402
v-if="isCollapsible()"
403-
:active="(isActive && to) || active"
403+
:active="(to && isActive) || active"
404404
:open="opened"
405405
@click.prevent.stop="toggleCollapse" />
406406

0 commit comments

Comments
 (0)