Merge pull request jossmac#79 from jossmac/pr/78

Pr/78
curology · Aug 20, 2016 · c10cb6b · c10cb6b
2 parents f9ee95e + 14540bf
commit c10cb6b
Show file tree

Hide file tree

Showing 126 changed files with 4,927 additions and 623 deletions.
diff --git a/examples/dist/app.js b/examples/dist/app.js
diff --git a/examples/dist/bundle.js b/examples/dist/bundle.js
diff --git a/examples/dist/images/1024-cat.jpg b/examples/dist/images/1024-cat.jpg
diff --git a/examples/dist/images/1024-cats.jpg b/examples/dist/images/1024-cats.jpg
diff --git a/examples/dist/images/1024-chameleon.jpg b/examples/dist/images/1024-chameleon.jpg
diff --git a/examples/dist/images/1024-dog.jpg b/examples/dist/images/1024-dog.jpg
diff --git a/examples/dist/images/1024-ducks.jpg b/examples/dist/images/1024-ducks.jpg
diff --git a/examples/dist/images/1024-goat.jpg b/examples/dist/images/1024-goat.jpg
diff --git a/examples/dist/images/1024-ostrich.jpg b/examples/dist/images/1024-ostrich.jpg
diff --git a/examples/dist/images/1024-pigeon.jpg b/examples/dist/images/1024-pigeon.jpg
diff --git a/examples/dist/images/1024-pigs.jpg b/examples/dist/images/1024-pigs.jpg
diff --git a/examples/dist/images/1024-seagulls.jpg b/examples/dist/images/1024-seagulls.jpg
diff --git a/examples/dist/images/1024-wasp.jpg b/examples/dist/images/1024-wasp.jpg
diff --git a/examples/dist/images/1024-yawn.jpg b/examples/dist/images/1024-yawn.jpg
diff --git a/examples/dist/images/320-cat.jpg b/examples/dist/images/320-cat.jpg
diff --git a/examples/dist/images/320-cats.jpg b/examples/dist/images/320-cats.jpg
diff --git a/examples/dist/images/320-chameleon.jpg b/examples/dist/images/320-chameleon.jpg
diff --git a/examples/dist/images/320-dog.jpg b/examples/dist/images/320-dog.jpg
diff --git a/examples/dist/images/320-ducks.jpg b/examples/dist/images/320-ducks.jpg
diff --git a/examples/dist/images/320-goat.jpg b/examples/dist/images/320-goat.jpg
diff --git a/examples/dist/images/320-ostrich.jpg b/examples/dist/images/320-ostrich.jpg
diff --git a/examples/dist/images/320-pigeon.jpg b/examples/dist/images/320-pigeon.jpg
diff --git a/examples/dist/images/320-pigs.jpg b/examples/dist/images/320-pigs.jpg
diff --git a/examples/dist/images/320-seagulls.jpg b/examples/dist/images/320-seagulls.jpg
diff --git a/examples/dist/images/320-wasp.jpg b/examples/dist/images/320-wasp.jpg
diff --git a/examples/dist/images/320-yawn.jpg b/examples/dist/images/320-yawn.jpg
diff --git a/examples/dist/images/500-cat.jpg b/examples/dist/images/500-cat.jpg
diff --git a/examples/dist/images/500-cats.jpg b/examples/dist/images/500-cats.jpg
diff --git a/examples/dist/images/500-chameleon.jpg b/examples/dist/images/500-chameleon.jpg
diff --git a/examples/dist/images/500-dog.jpg b/examples/dist/images/500-dog.jpg
diff --git a/examples/dist/images/500-ducks.jpg b/examples/dist/images/500-ducks.jpg
diff --git a/examples/dist/images/500-goat.jpg b/examples/dist/images/500-goat.jpg
diff --git a/examples/dist/images/500-ostrich.jpg b/examples/dist/images/500-ostrich.jpg
diff --git a/examples/dist/images/500-pigeon.jpg b/examples/dist/images/500-pigeon.jpg
diff --git a/examples/dist/images/500-pigs.jpg b/examples/dist/images/500-pigs.jpg
diff --git a/examples/dist/images/500-seagulls.jpg b/examples/dist/images/500-seagulls.jpg
diff --git a/examples/dist/images/500-wasp.jpg b/examples/dist/images/500-wasp.jpg
diff --git a/examples/dist/images/500-yawn.jpg b/examples/dist/images/500-yawn.jpg
diff --git a/examples/dist/images/800-cat.jpg b/examples/dist/images/800-cat.jpg
diff --git a/examples/dist/images/800-cats.jpg b/examples/dist/images/800-cats.jpg
diff --git a/examples/dist/images/800-chameleon.jpg b/examples/dist/images/800-chameleon.jpg
diff --git a/examples/dist/images/800-dog.jpg b/examples/dist/images/800-dog.jpg
diff --git a/examples/dist/images/800-ducks.jpg b/examples/dist/images/800-ducks.jpg
diff --git a/examples/dist/images/800-goat.jpg b/examples/dist/images/800-goat.jpg
diff --git a/examples/dist/images/800-ostrich.jpg b/examples/dist/images/800-ostrich.jpg
diff --git a/examples/dist/images/800-pigeon.jpg b/examples/dist/images/800-pigeon.jpg
diff --git a/examples/dist/images/800-pigs.jpg b/examples/dist/images/800-pigs.jpg
diff --git a/examples/dist/images/800-seagulls.jpg b/examples/dist/images/800-seagulls.jpg
diff --git a/examples/dist/images/800-wasp.jpg b/examples/dist/images/800-wasp.jpg
diff --git a/examples/dist/images/800-yawn.jpg b/examples/dist/images/800-yawn.jpg
diff --git a/examples/dist/images/thumbnail-cat.jpg b/examples/dist/images/thumbnail-cat.jpg
diff --git a/examples/dist/images/thumbnail-cats.jpg b/examples/dist/images/thumbnail-cats.jpg
diff --git a/examples/dist/images/thumbnail-chameleon.jpg b/examples/dist/images/thumbnail-chameleon.jpg
diff --git a/examples/dist/images/thumbnail-dog.jpg b/examples/dist/images/thumbnail-dog.jpg
diff --git a/examples/dist/images/thumbnail-ducks.jpg b/examples/dist/images/thumbnail-ducks.jpg
diff --git a/examples/dist/images/thumbnail-goat.jpg b/examples/dist/images/thumbnail-goat.jpg
diff --git a/examples/dist/images/thumbnail-ostrich.jpg b/examples/dist/images/thumbnail-ostrich.jpg
diff --git a/examples/dist/images/thumbnail-pigeon.jpg b/examples/dist/images/thumbnail-pigeon.jpg
diff --git a/examples/dist/images/thumbnail-pigs.jpg b/examples/dist/images/thumbnail-pigs.jpg
diff --git a/examples/dist/images/thumbnail-seagulls.jpg b/examples/dist/images/thumbnail-seagulls.jpg
diff --git a/examples/dist/images/thumbnail-wasp.jpg b/examples/dist/images/thumbnail-wasp.jpg
diff --git a/examples/dist/images/thumbnail-yawn.jpg b/examples/dist/images/thumbnail-yawn.jpg
diff --git a/examples/dist/standalone.js b/examples/dist/standalone.js
diff --git a/examples/src/app.js b/examples/src/app.js
@@ -3,29 +3,47 @@ import { render } from 'react-dom';
 import Gallery from './components/Gallery';
 import Lightbox from 'react-images';
 
-function capitalizeFirstLetter (str) {
-	return str.charAt(0).toUpperCase() + str.slice(1);
+function makeUnsplashSrc (id) {
+	return `https://images.unsplash.com/photo-${id}?dpr=2&auto=format&w=1600&h=1600`;
+}
+function makeUnsplashSrcSet (id, size) {
+	return `https://images.unsplash.com/photo-${id}?dpr=2&auto=format&w=${size} ${size}w`;
+}
+function makeUnsplashThumbnail (id) {
+	return `https://images.unsplash.com/photo-${id}?dpr=2&auto=format&crop=entropy&fit=crop&w=100&h=100`;
 }
 
-const IMAGE_NAMES = ['cat', 'cats', 'chameleon', 'dog', 'ducks', 'goat', 'ostrich', 'pigeon', 'pigs', 'seagulls', 'wasp', 'yawn'];
-const IMAGE_MAP = IMAGE_NAMES.map(img => ({
-	src: `./images/800-${img}.jpg`,
-	thumbnail: `./images/thumbnail-${img}.jpg`,
+const IMAGE_NAMES = [
+	{ id: '1471079502516-250c19af6928', caption: <span><a href="https://unsplash.com/photos/GIpGxe2_cT4" target="_blank">Turtle</a>, by Jeremy Bishop</span> },
+	{ id: '1455970022149-a8f26b6902dd', caption: <span><a href="https://unsplash.com/photos/a7bdqjeG6M4" target="_blank">Cat</a>, by Mona Magnussen</span> },
+	{ id: '1470317596697-cbdeda56f999', caption: <span><a href="https://unsplash.com/photos/XgF9e93Tkt0" target="_blank">Ladybug</a>, by Michel Bosma</span> },
+	{ id: '1454023492550-5696f8ff10e1', caption: <span><a href="https://unsplash.com/photos/LmVSKeDy6EA" target="_blank">Tiger</a>, by Jessica Weiller</span> },
+	{ id: '1470619549108-b85c56fe5be8', caption: <span><a href="https://unsplash.com/photos/SYzUF6XcWBY" target="_blank">Flamingo</a>, by Alan Emery</span> },
+	{ id: '1458167072153-a2eb76d67c1c', caption: <span><a href="https://unsplash.com/photos/I4AEXHh00uo" target="_blank">Chimpanzee</a>, by Liz Bridges</span> },
+	{ id: '1471101173712-b9884175254e', caption: <span><a href="https://unsplash.com/photos/5oRzZU5uwSM" target="_blank">Dragonfly</a>, by Pedro Lastra</span> },
+	{ id: '1471127432458-65206be149c9', caption: <span><a href="https://unsplash.com/photos/Kpgt4pl03O0" target="_blank">Deer</a>, by Ernesto Velázquez</span> },
+	{ id: '1470854989922-5be2f7456d78', caption: <span><a href="https://unsplash.com/photos/GXMr7BadXQo" target="_blank">Hedgehog</a>, by Piotr Łaskawski</span> },
+	{ id: '1470777639313-60af88918203', caption: <span><a href="https://unsplash.com/photos/GNUcUx-iObg" target="_blank">Koala</a>, by Cris Saur</span> },
+	{ id: '1453550486481-aa4175b013ea', caption: <span><a href="https://unsplash.com/photos/WiSeaZ4E6ZI" target="_blank">Elephant</a>, by Benjamin Pley</span> },
+];
+const IMAGE_MAP = IMAGE_NAMES.map(({ caption, id }) => ({
+	src: makeUnsplashSrc(id),
+	thumbnail: makeUnsplashThumbnail(id),
 	srcset: [
-		`./images/1024-${img}.jpg 1024w`,
-		`./images/800-${img}.jpg 800w`,
-		`./images/500-${img}.jpg 500w`,
-		`./images/320-${img}.jpg 320w`,
+		makeUnsplashSrcSet(id, 1024),
+		makeUnsplashSrcSet(id, 800),
+		makeUnsplashSrcSet(id, 500),
+		makeUnsplashSrcSet(id, 320),
 	],
-	caption: capitalizeFirstLetter(img),
+	caption,
 }));
 
 render(
 	<div>
 		<h3>Default options</h3>
 		<p style={{ marginBottom: 40 }}>Use your keyboard to navigate <kbd>left</kbd> <kbd>right</kbd> <kbd>esc</kbd> &mdash; Also, try resizing your browser window.</p>
 		<Gallery images={IMAGE_MAP} />
-		<p>Images courtesy of <a href="http://gratisography.com/" target="_blank">Gratisography</a></p>
+		<p>Images courtesy of <a href="https://unsplash.com/" target="_blank">Unsplash</a></p>
 
 		<h3>Without thumbnails</h3>
 		<p style={{ marginBottom: 40 }}>Set <code>{"thumbnails={false}"}</code> to remove thumbnails</p>

diff --git a/examples/src/images/1024-cat.jpg b/examples/src/images/1024-cat.jpg
diff --git a/examples/src/images/1024-cats.jpg b/examples/src/images/1024-cats.jpg
diff --git a/examples/src/images/1024-chameleon.jpg b/examples/src/images/1024-chameleon.jpg
diff --git a/examples/src/images/1024-dog.jpg b/examples/src/images/1024-dog.jpg
diff --git a/examples/src/images/1024-ducks.jpg b/examples/src/images/1024-ducks.jpg
diff --git a/examples/src/images/1024-goat.jpg b/examples/src/images/1024-goat.jpg
diff --git a/examples/src/images/1024-ostrich.jpg b/examples/src/images/1024-ostrich.jpg
diff --git a/examples/src/images/1024-pigeon.jpg b/examples/src/images/1024-pigeon.jpg
diff --git a/examples/src/images/1024-pigs.jpg b/examples/src/images/1024-pigs.jpg
diff --git a/examples/src/images/1024-seagulls.jpg b/examples/src/images/1024-seagulls.jpg
diff --git a/examples/src/images/1024-wasp.jpg b/examples/src/images/1024-wasp.jpg
diff --git a/examples/src/images/1024-yawn.jpg b/examples/src/images/1024-yawn.jpg
diff --git a/examples/src/images/320-cat.jpg b/examples/src/images/320-cat.jpg
diff --git a/examples/src/images/320-cats.jpg b/examples/src/images/320-cats.jpg
diff --git a/examples/src/images/320-chameleon.jpg b/examples/src/images/320-chameleon.jpg
diff --git a/examples/src/images/320-dog.jpg b/examples/src/images/320-dog.jpg
diff --git a/examples/src/images/320-ducks.jpg b/examples/src/images/320-ducks.jpg
diff --git a/examples/src/images/320-goat.jpg b/examples/src/images/320-goat.jpg
diff --git a/examples/src/images/320-ostrich.jpg b/examples/src/images/320-ostrich.jpg
diff --git a/examples/src/images/320-pigeon.jpg b/examples/src/images/320-pigeon.jpg
diff --git a/examples/src/images/320-pigs.jpg b/examples/src/images/320-pigs.jpg
diff --git a/examples/src/images/320-seagulls.jpg b/examples/src/images/320-seagulls.jpg
diff --git a/examples/src/images/320-wasp.jpg b/examples/src/images/320-wasp.jpg
diff --git a/examples/src/images/320-yawn.jpg b/examples/src/images/320-yawn.jpg
diff --git a/examples/src/images/500-cat.jpg b/examples/src/images/500-cat.jpg
diff --git a/examples/src/images/500-cats.jpg b/examples/src/images/500-cats.jpg
diff --git a/examples/src/images/500-chameleon.jpg b/examples/src/images/500-chameleon.jpg
diff --git a/examples/src/images/500-dog.jpg b/examples/src/images/500-dog.jpg
diff --git a/examples/src/images/500-ducks.jpg b/examples/src/images/500-ducks.jpg
diff --git a/examples/src/images/500-goat.jpg b/examples/src/images/500-goat.jpg
diff --git a/examples/src/images/500-ostrich.jpg b/examples/src/images/500-ostrich.jpg
diff --git a/examples/src/images/500-pigeon.jpg b/examples/src/images/500-pigeon.jpg
diff --git a/examples/src/images/500-pigs.jpg b/examples/src/images/500-pigs.jpg
diff --git a/examples/src/images/500-seagulls.jpg b/examples/src/images/500-seagulls.jpg
diff --git a/examples/src/images/500-wasp.jpg b/examples/src/images/500-wasp.jpg
diff --git a/examples/src/images/500-yawn.jpg b/examples/src/images/500-yawn.jpg
diff --git a/examples/src/images/800-cat.jpg b/examples/src/images/800-cat.jpg
diff --git a/examples/src/images/800-cats.jpg b/examples/src/images/800-cats.jpg
diff --git a/examples/src/images/800-chameleon.jpg b/examples/src/images/800-chameleon.jpg
diff --git a/examples/src/images/800-dog.jpg b/examples/src/images/800-dog.jpg
diff --git a/examples/src/images/800-ducks.jpg b/examples/src/images/800-ducks.jpg
diff --git a/examples/src/images/800-goat.jpg b/examples/src/images/800-goat.jpg
diff --git a/examples/src/images/800-ostrich.jpg b/examples/src/images/800-ostrich.jpg
diff --git a/examples/src/images/800-pigeon.jpg b/examples/src/images/800-pigeon.jpg
diff --git a/examples/src/images/800-pigs.jpg b/examples/src/images/800-pigs.jpg
diff --git a/examples/src/images/800-seagulls.jpg b/examples/src/images/800-seagulls.jpg
diff --git a/examples/src/images/800-wasp.jpg b/examples/src/images/800-wasp.jpg
diff --git a/examples/src/images/800-yawn.jpg b/examples/src/images/800-yawn.jpg
diff --git a/examples/src/images/thumbnail-cat.jpg b/examples/src/images/thumbnail-cat.jpg
diff --git a/examples/src/images/thumbnail-cats.jpg b/examples/src/images/thumbnail-cats.jpg
diff --git a/examples/src/images/thumbnail-chameleon.jpg b/examples/src/images/thumbnail-chameleon.jpg
diff --git a/examples/src/images/thumbnail-dog.jpg b/examples/src/images/thumbnail-dog.jpg
diff --git a/examples/src/images/thumbnail-ducks.jpg b/examples/src/images/thumbnail-ducks.jpg
diff --git a/examples/src/images/thumbnail-goat.jpg b/examples/src/images/thumbnail-goat.jpg
diff --git a/examples/src/images/thumbnail-ostrich.jpg b/examples/src/images/thumbnail-ostrich.jpg
diff --git a/examples/src/images/thumbnail-pigeon.jpg b/examples/src/images/thumbnail-pigeon.jpg
diff --git a/examples/src/images/thumbnail-pigs.jpg b/examples/src/images/thumbnail-pigs.jpg
diff --git a/examples/src/images/thumbnail-seagulls.jpg b/examples/src/images/thumbnail-seagulls.jpg
diff --git a/examples/src/images/thumbnail-wasp.jpg b/examples/src/images/thumbnail-wasp.jpg
diff --git a/examples/src/images/thumbnail-yawn.jpg b/examples/src/images/thumbnail-yawn.jpg
diff --git a/src/Footer.js b/src/Footer.js
@@ -33,7 +33,7 @@ function Footer ({
 };
 
 Footer.propTypes = {
-	caption: PropTypes.string,
+	caption: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
 	countCurrent: PropTypes.number,
 	countSeparator: PropTypes.string,
 	countTotal: PropTypes.number,

diff --git a/src/Lightbox.js b/src/Lightbox.js
@@ -272,7 +272,7 @@ Lightbox.propTypes = {
 		PropTypes.shape({
 			src: PropTypes.string.isRequired,
 			srcset: PropTypes.array,
-			caption: PropTypes.string,
+			caption: PropTypes.oneOfType([PropTypes.string, PropTypes.element])
 		})
 	).isRequired,
 	isOpen: PropTypes.bool,