@@ -9,7 +9,7 @@ export function registerFilters(eleventyConfig: UserConfig): void {
99 eleventyConfig . addFilter ( 'toSimpleDate' , toSimpleDate ) ;
1010 eleventyConfig . addFilter ( 'regexReplace' , regexReplace ) ;
1111 eleventyConfig . addFilter ( 'toISOString' , toISOString ) ;
12- eleventyConfig . addFilter ( 'activeNavEntryIndexArray ' , activeNavEntryIndexArray ) ;
12+ eleventyConfig . addFilter ( 'activeNavForPage ' , activeNavForPage ) ;
1313 eleventyConfig . addFilter ( 'arrayToSentenceString' , arrayToSentenceString ) ;
1414 eleventyConfig . addFilter ( 'underscoreBreaker' , underscoreBreaker ) ;
1515 eleventyConfig . addFilter ( 'throwError' , function ( error : any ) {
@@ -60,38 +60,49 @@ function toISOString(input: string | Date): string {
6060 }
6161}
6262
63- function activeNavEntryIndexArray ( navEntryTree : any , pageUrlPath : string = '' ) : number [ ] | null {
64- const activeEntryIndexes = _getActiveNavEntries ( navEntryTree , pageUrlPath ) ;
65- return activeEntryIndexes . length === 0 ? null : activeEntryIndexes ;
66- }
63+ function activeNavForPage ( pageUrlPath : string , activeNav : any ) {
64+ // Split the path for this page, dropping everything before the path.
65+ // Example: dart.dev/tools/pub/package-layout ->
66+ // [tools, pub, package-layout]
67+ const parts = pageUrlPath . toLowerCase ( ) . split ( '/' ) . slice ( 1 ) ;
68+ let currentPathPairs = activeNav ;
69+ let lastAllowedBackupActive = [ ] ;
70+
71+ parts . forEach ( part => {
72+ // If the current entry has active data,
73+ // allow its active data to be a backup if a later path isn't found.
74+ const currentEntryActiveData = currentPathPairs [ 'active' ] ;
75+ if ( currentEntryActiveData ) {
76+ lastAllowedBackupActive = currentEntryActiveData ;
77+ }
6778
68- function _getActiveNavEntries ( navEntryTree : any , pageUrlPath = '' ) : number [ ] {
69- // TODO(parlough): Simplify once standardizing with the Flutter site.
70- for ( let i = 0 ; i < navEntryTree . length ; i ++ ) {
71- const entry = navEntryTree [ i ] ;
72-
73- if ( entry . children ) {
74- const descendantIndexes = _getActiveNavEntries (
75- entry . children ,
76- pageUrlPath ,
77- ) ;
78- if ( descendantIndexes . length > 0 ) {
79- return [ i + 1 , ...descendantIndexes ] ;
80- }
79+ const paths = currentPathPairs [ 'paths' ] ;
80+
81+ // If the current entry has children paths, explore those next.
82+ if ( paths ) {
83+ currentPathPairs = paths ;
8184 }
8285
83- if ( entry . permalink ) {
84- const isMatch = entry [ 'match-page-url-exactly' ]
85- ? pageUrlPath === entry . permalink
86- : pageUrlPath . includes ( entry . permalink ) ;
86+ // Get the data for the next part.
87+ const nextPair = currentPathPairs [ part ] ;
8788
88- if ( isMatch ) {
89- return [ i + 1 ] ;
90- }
89+ // If the next part of the path doesn't have data,
90+ // use the active data for the current backup.
91+ if ( nextPair === undefined || nextPair === null ) {
92+ return lastAllowedBackupActive ;
9193 }
94+
95+ currentPathPairs = nextPair ;
96+ } ) ;
97+
98+ // If the last path part has active data, use that,
99+ // otherwise fall back to the backup active data.
100+ let activeEntries = currentPathPairs [ 'active' ] ;
101+ if ( activeEntries === undefined || activeEntries === null ) {
102+ activeEntries = lastAllowedBackupActive ;
92103 }
93104
94- return [ ] ;
105+ return activeEntries ;
95106}
96107
97108function arrayToSentenceString ( list : string [ ] , joiner : string = 'and' ) : string {
0 commit comments