Skip to content

Commit e07c2d1

Browse files
authored
Pass navigatorItems to the visual scroller instead (#814) rdar://124954448
Pass `navigatorItems` to the visual scroller instead (#814) rdar://124954448
1 parent 7a24ee9 commit e07c2d1

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/components/Navigator/NavigatorCard.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
ref="scroller"
5151
class="scroller"
5252
:aria-label="$t('navigator.title')"
53-
:items="nodesToRender"
53+
:items="navigatorItems"
5454
:min-item-size="itemSize"
5555
emit-update
5656
key-field="uid"
@@ -248,9 +248,9 @@ export default {
248248
},
249249
computed: {
250250
politeAriaLive() {
251-
const { hasNodes, nodesToRender } = this;
251+
const { hasNodes, navigatorItems } = this;
252252
if (!hasNodes) return '';
253-
return this.$tc(ITEMS_FOUND, nodesToRender.length, { number: nodesToRender.length });
253+
return this.$tc(ITEMS_FOUND, navigatorItems.length, { number: navigatorItems.length });
254254
},
255255
assertiveAriaLive: ({
256256
hasNodes, hasFilter, errorFetching,
@@ -288,8 +288,8 @@ export default {
288288
activePathMap: ({ activePathChildren }) => (
289289
Object.fromEntries(activePathChildren.map(({ uid }) => [uid, true]))
290290
),
291-
activeIndex: ({ activeUID, nodesToRender }) => (
292-
nodesToRender.findIndex(node => node.uid === activeUID)
291+
activeIndex: ({ activeUID, navigatorItems }) => (
292+
navigatorItems.findIndex(node => node.uid === activeUID)
293293
),
294294
/**
295295
* This generates a map of all the nodes we are allowed to render at a certain time.
@@ -365,8 +365,8 @@ export default {
365365
apiChangesObject() {
366366
return this.apiChanges || {};
367367
},
368-
hasNodes: ({ nodesToRender }) => !!nodesToRender.length,
369-
totalItemsToNavigate: ({ nodesToRender }) => nodesToRender.length,
368+
hasNodes: ({ navigatorItems }) => !!navigatorItems.length,
369+
totalItemsToNavigate: ({ navigatorItems }) => navigatorItems.length,
370370
lastActivePathItem: ({ activePath }) => last(activePath),
371371
},
372372
created() {

src/mixins/navigator/filteredChildren.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
filterPattern,
2424
filterChildren,
2525
}) => (filterChildren(children, selectedTags, apiChanges, filterPattern)),
26+
navigatorItems: ({ nodesToRender }) => nodesToRender,
2627
},
2728
methods: {
2829
filterChildren(children, selectedTags, apiChanges, filterPattern) {

0 commit comments

Comments
 (0)