Skip to content

同じタイトルのページに対するサイドバーの挙動を修正 #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2025
Merged

同じタイトルのページに対するサイドバーの挙動を修正 #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions js/kunai/ui/treeview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class DOM {
async createHeaderContent(h) {
// this.log.debug(`createHeaderContent (${h.self.id.join()})`, e, elem, h)
let empty = true
let elem = this.indexElems.get(h.self.id)
let elem = this.indexElems.get(h.self)

if (h.classes && h.classes.length) {
empty = false
Expand Down Expand Up @@ -92,19 +92,19 @@ class DOM {
if (empty) {
elem.addClass('empty')
}
this.lazyLoaders.set(h.self.id, async () => await this.getHeader(h))
this.lazyLoaders.set(h.self, async () => await this.getHeader(h))
}

async getHeader(h) {
// this.log.debug(`getHeader (${h.self.id.join()})`, h)
return true // this.lazyLoaders.get(h.self.id)
return true // this.lazyLoaders.get(h.self)
}

async doExpand(id) {
async doExpand(idx) {
// this.log.debug(`doExpand '${id.join()}'`, id)

await this.lazyLoaders.get(id)()
let elem = this.indexElems.get(id)
await this.lazyLoaders.get(idx)()
let elem = this.indexElems.get(idx)
// let content_wrapper = elem.closest('.content-wrapper')
// let content = content_wrapper.children('.content')

Expand Down Expand Up @@ -141,10 +141,10 @@ class DOM {
}
}

async scrollAt(id) {
this.log.info(`scrollAt '${id.join()}'`, id)
async scrollAt(idx) {
this.log.info(`scrollAt '${idx.id.join()}'`, idx.id)

const e = this.indexElems.get(id)
const e = this.indexElems.get(idx)
const broot = e.closest('.kunai-branch')
const croot = broot.closest('.content')
let wrapper = croot.closest('.content-wrapper')
Expand Down Expand Up @@ -190,7 +190,7 @@ class DOM {
let li = $('<li>', {class: 'article'}).append(
$('<a>', {href: idx.url()}).text(idx.id.join())
)
this.indexElems.set(idx.id, li)
this.indexElems.set(idx, li)
return li
}

Expand All @@ -200,7 +200,7 @@ class DOM {
$('<a>', {href: m.url()})
.html(await m.join_html(DOM.crOptions))
)
this.indexElems.set(m.id, li)
this.indexElems.set(m, li)

if (this.kc.getPriorityForIndex(m).index !== this.kc.prioSpecials.get('__functions__').index) {
li.addClass('special')
Expand All @@ -210,7 +210,7 @@ class DOM {

async makeClass(c) {
let li = $('<li>', {class: 'class classy'})
this.indexElems.set(c.self.id, li)
this.indexElems.set(c.self, li)

$('<a>', {class: 'self'}).attr('href', c.self.url()).html(
await c.self.join_html(DOM.crClassOptions)
Expand All @@ -233,7 +233,7 @@ class DOM {

async makeOther(o) {
let li = $('<li>', {class: `other ${o.id.type}`})
this.indexElems.set(o.id, li)
this.indexElems.set(o, li)

if (IndexID.isClassy(o.id.type)) {
li.addClass('classy')
Expand Down Expand Up @@ -261,17 +261,17 @@ class DOM {

async makeExpandable(elem, obj) {
// this.log.debug(`makeExpandable '${obj.self.id.join()}'`, elem, obj)
this.indexElems.set(obj.self.id, elem)
this.indexElems.set(obj.self, elem)
this.lazyLoaders.set(
obj.self.id,
obj.self,
async () => { await this.createContent(obj) }
)

let bar = $('<div>', {class: 'expandbar'}).appendTo(elem)

bar.append(
$('<div>', {class: 'expander'}).on('click', async () => {
await this.doExpand(obj.self.id)
await this.doExpand(obj.self)
})
)

Expand Down Expand Up @@ -329,27 +329,21 @@ class Treeview {
const h = this.page_idx.in_header
this.log.info(`expanding current page header '${h.id.join()}'`, h, this.page_idx)

await this.dom.doExpand(h.id)
await this.dom.doExpand(h)
} else {
if (IType.isHeader(this.page_idx.id.type)) {
await this.dom.doExpand(this.page_idx.id)
await this.dom.doExpand(this.page_idx)
} else {
this.log.info(`current page '${this.page_idx.id.join()}' is not classy. nothing left to expand`)
}
}

if (ids.length > 1) {
if (this.page_idx.id.type === 'article' && this.page_idx.id.indexes.length > 1) {
const selector = `[data-lang-id="C++${this.page_idx.cpp_version}"] li.article`
const article = [...$(selector)].find(li => li.innerText === this.page_idx.name)
this.dom.indexElems.set(this.page_idx.id, $(article))
}

// highlight self
this.dom.indexElems.get(this.page_idx.id).addClass('current-page')
this.dom.indexElems.get(this.page_idx).addClass('current-page')

// finally, always scroll to self
await this.dom.scrollAt(this.page_idx.id)
await this.dom.scrollAt(this.page_idx)
}
} catch (e) {
this.log.error(`Failed to determine current page for id '${ids.join('/')}'. Sidebar will NOT work properly! (${e})`, ids)
Expand Down