diff --git a/package-lock.json b/package-lock.json index 0cb32258..457e5d16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5461,9 +5461,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.479", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.479.tgz", - "integrity": "sha512-uAJdJQ7vHa4TvPfzt1TOqoRgHmav5gwmqHMPLxBH6m8Cbj5R9/z/rygTOQiZ8pe5g0ZAEogga1bP6HoKcOzx/Q==", + "version": "1.5.480", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.480.tgz", + "integrity": "sha512-7WLDoWPKc+YiH37GshK2sLagySSbcQk3K2s6swA3x+BtWUH8BtphwL+YqarJQi09Sbf+LOCIW75RQooN2PqXsA==", "dev": true, "license": "ISC" }, @@ -10587,22 +10587,22 @@ } }, "node_modules/tldts": { - "version": "7.4.19", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.19.tgz", - "integrity": "sha512-48dH6aSpQnpbzDUc4vIQZ1VjB8tkK+e8c1yx05/SZK+rkssgjEOlxDd/yU8/a4vGYQ9vRgJr9dwMq9TJ0b3X2Q==", + "version": "7.4.21", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.21.tgz", + "integrity": "sha512-SomReMX1GpjzK4KzAMr8SKtn628eakKLlPWEEPOLnC2lfKXt5UZ5gh/y2I8cgRI2zWidULCx2p7vfYyjGSwnaw==", "devOptional": true, "license": "MIT", "dependencies": { - "tldts-core": "^7.4.19" + "tldts-core": "^7.4.21" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "7.4.20", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.20.tgz", - "integrity": "sha512-C630TWXZCZmLq0F2bW4QqwnaaxCQ/svpAqvJwnC4JvgEM5ohhBnGsEzTLSOXcN+xjz+kEaHS5uoWIw2klnqd0A==", + "version": "7.4.21", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.21.tgz", + "integrity": "sha512-sj8bAOjYu9juPKgsB3A58Uj91ybcnsRzgEUxbEGACP32rfJ5o9EScerRIfX1c6GPCiQlMoy4rCu2qTVIQgL4UA==", "devOptional": true, "license": "MIT" }, diff --git a/src/slideshow/slideshowPane.js b/src/slideshow/slideshowPane.js index 79c6b0f3..9b46f0ab 100644 --- a/src/slideshow/slideshowPane.js +++ b/src/slideshow/slideshowPane.js @@ -26,9 +26,8 @@ export const slideshowPane = { label: function (subject, context) { const store = context.session.store if (solidLogicSingleton.resource.isContainer(subject)) { - const contents = store.each(subject, ns.ldp('contains')) const images = getImageContents(subject, store) - return new Set(images.map(image => image.uri)).size > 1 && images.length === contents.length ? 'Slideshow' : null + return new Set(images.map(image => image.uri)).size > 1 ? 'Slideshow' : null } return null }, diff --git a/test/unit/slideshowPane.test.ts b/test/unit/slideshowPane.test.ts index a847c02e..0b2bd448 100644 --- a/test/unit/slideshowPane.test.ts +++ b/test/unit/slideshowPane.test.ts @@ -30,13 +30,14 @@ describe('slideshow pane', () => { expect(slideshowPane.label(subject as any, context)).toBeNull() }) - it('rejects containers containing non-image resources', () => { + it('accepts containers containing multiple images and other resources', () => { const { subject, context } = contextFor([ { uri: 'one.png', image: true }, - { uri: 'notes.txt', image: false } + { uri: 'notes.txt', image: false }, + { uri: 'two.png', image: true } ]) - expect(slideshowPane.label(subject as any, context)).toBeNull() + expect(slideshowPane.label(subject as any, context)).toBe('Slideshow') }) it('accepts containers containing multiple images only', () => {