Skip to content

images only and more than one #782

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
SharonStrats merged 3 commits into from
Oct 27, 2026
Merged

images only and more than one #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cbc7ff
images only and more than one
SharonStrats Oct 27, 2026
8a63e5a
chore: update solidos dependencies (dev: solid-logic@6.0.1-5 solid-ui…
github-actions[bot] Oct 27, 2026
818cb33
Refactor slideshow condition to use Set for uniqueness
SharonStrats Oct 27, 2026
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
166 changes: 83 additions & 83 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 10 additions & 12 deletions src/slideshow/slideshowPane.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ import makeBSS from '@solid/better-simple-slideshow'
const ns = UI.ns
let slideshowId = 0

function getImageContents (subject, store) {
if (!solidLogicSingleton.resource.isContainer(subject)) return []

const contents = store.each(subject, ns.ldp('contains'))
return contents.filter(file => solidLogicSingleton.resource.isImage(file))
}

export const slideshowPane = {
icon: UI.icons.iconBase + 'noun_138712.svg',

Expand All @@ -20,11 +27,8 @@ export const slideshowPane = {
const store = context.session.store
if (solidLogicSingleton.resource.isContainer(subject)) {
const contents = store.each(subject, ns.ldp('contains'))
let count = 0
contents.forEach(function (file) {
if (solidLogicSingleton.resource.isImage(file)) count++
})
return count > 0 ? 'Slideshow' : null
const images = getImageContents(subject, store)
return new Set(images.map(image => image.uri)).size > 1 && images.length === contents.length ? 'Slideshow' : null
}
return null
},
Expand All @@ -38,23 +42,17 @@ export const slideshowPane = {
UI.widgets.addStyleSheet(dom, styleSheet)

const store = context.session.store
const ns = UI.ns
const div = dom.createElement('div')
const id = `slideshow-${++slideshowId}`
div.id = id
div.setAttribute('class', 'bss-slides')

let predicate
if (solidLogicSingleton.resource.isContainer(subject)) {
predicate = ns.ldp('contains')
}
const images = [...new Map(
store.each(subject, predicate).map(image => [image.uri, image])
getImageContents(subject, store).map(image => [image.uri, image])
).values()]
// @@ Ideally: sort by embedded time of image
images.sort((left, right) => left.uri.localeCompare(right.uri))
for (let i = 0; i < images.length; i++) {
if (!solidLogicSingleton.resource.isImage(images[i])) continue
const figure = div.appendChild(dom.createElement('figure'))
const img = figure.appendChild(dom.createElement('img'))

Expand Down
Loading
Loading