Skip to content
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.

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

Add support for Overview-mode #731

Merged
merged 1 commit into from
Sep 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion src/components/deck/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
DEFAULT_SLIDE_INDEX
} from '../../utils/constants';
import searchChildrenForAppear from '../../utils/search-children-appear';
import OverviewDeck from './overview-deck';

const AnimatedDeckDiv = styled(animated.div)`
height: 100vh;
Expand Down Expand Up @@ -65,6 +66,7 @@ const initialState = {
currentSlideElement: DEFAULT_SLIDE_ELEMENT_INDEX,
reverseDirection: false,
presenterMode: false,
overviewMode: false,
notes: {},
resolvedInitialUrl: false
};
Expand Down Expand Up @@ -172,7 +174,17 @@ const Deck = ({

let content = null;
if (state.resolvedInitialUrl) {
if (state.presenterMode) {
if (state.overviewMode) {
const staticSlides = filteredChildren.map((slide, index) =>
React.cloneElement(slide, {
slideNum: index,
template: rest.template
})
);
content = (
<OverviewDeck goToSlide={goToSlide}>{staticSlides}</OverviewDeck>
);
} else if (state.presenterMode) {
const staticSlides = filteredChildren.map((slide, index) =>
React.cloneElement(slide, {
slideNum: index,
Expand Down
41 changes: 41 additions & 0 deletions src/components/deck/overview-deck.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import * as React from 'react';
import propTypes from 'prop-types';
import styled from 'styled-components';

const SlideGrid = styled('div')`
display: grid;
grid-template-columns: repeat(3, 30vw);
grid-column-gap: 3vw;
grid-row-gap: 15px;
padding: 15px;
width: 100vw;
`;

const SlideGridItem = styled('div')`
height: 200px;

.spectacle-progress-indicator,
.spectacle-fullscreen-button {
display: none;
}
`;

export default function OverviewDeck(props) {
return (
<SlideGrid>
{props.children.map((child, idx) => (
<SlideGridItem
onClick={() => props.goToSlide(idx)}
key={`slide-${idx}`}
>
{child}
</SlideGridItem>
))}
</SlideGrid>
);
}

OverviewDeck.propTypes = {
children: propTypes.node,
goToSlide: propTypes.func.isRequired
};
6 changes: 5 additions & 1 deletion src/components/fullscreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ const FullScreen = props => {
}
}, []);
return (
<div onClick={toggleFullScreen} style={{ pointerEvents: 'all' }}>
<div
className="spectacle-fullscreen-button"
onClick={toggleFullScreen}
style={{ pointerEvents: 'all' }}
>
<svg width={props.size} height={props.size} viewBox="0 0 512 512">
<path
fill={props.color}
Expand Down
2 changes: 1 addition & 1 deletion src/components/progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const Circle = styled('div')`
const Progress = props => {
const { numberOfSlides, state, goToSlide } = React.useContext(DeckContext);
return (
<div>
<div className="spectacle-progress-indicator">
{Array(numberOfSlides)
.fill(0)
.map((_, idx) => (
Expand Down
1 change: 1 addition & 0 deletions src/hooks/use-deck.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ function useDeck(initialState) {
immediateElement: false,
reverseDirection: action.payload.reverseDirection,
presenterMode: action.payload.presenterMode,
overviewMode: action.payload.overviewMode,
resolvedInitialUrl: true
};
return newState;
Expand Down
27 changes: 22 additions & 5 deletions src/hooks/use-url-routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default function useUrlRouting(options) {
currentSlide,
currentSlideElement,
currentPresenterMode,
currentOverviewMode,
loop,
animationsWhenGoingBack,
onUrlChange
Expand Down Expand Up @@ -55,6 +56,7 @@ export default function useUrlRouting(options) {
const query = queryString.parse(url);
const immediate = Boolean(query.immediate);
const presenterMode = Boolean(query.presenterMode);
const overviewMode = Boolean(query.overviewMode);
const proposedSlideNumber = parseInt(query.slide, 10);
const proposedSlideElementNumber = parseInt(query.slideElement, 10);
const slideNumber = isSlideOutOfBounds(proposedSlideNumber)
Expand All @@ -68,9 +70,16 @@ export default function useUrlRouting(options) {
? DEFAULT_SLIDE_ELEMENT_INDEX
: proposedSlideElementNumber;

if (overviewMode && presenterMode) {
throw new Error(
'Presenter Mode and Overview Mode cannot be used at the same time.'
);
}

return {
immediate,
presenterMode,
overviewMode,
proposedSlideNumber,
proposedSlideElementNumber,
slideNumber,
Expand All @@ -84,13 +93,14 @@ export default function useUrlRouting(options) {
slideNumber => {
const qs = queryString.stringify({
presenterMode: currentPresenterMode || undefined,
overviewMode: currentOverviewMode || undefined,
immediate: true,
slide: slideNumber,
slideElement: DEFAULT_SLIDE_ELEMENT_INDEX
});
history.current.push(`?${qs}`);
},
[currentPresenterMode]
[currentPresenterMode, currentOverviewMode]
);

const onHistoryChange = React.useCallback(() => {
Expand All @@ -100,6 +110,7 @@ export default function useUrlRouting(options) {
proposedSlideNumber,
proposedSlideElementNumber,
presenterMode,
overviewMode,
immediate
} = stateFromUrl(window.location.search);
/**
Expand All @@ -115,7 +126,8 @@ export default function useUrlRouting(options) {
slide: slideNumber,
slideElement: slideElementNumber,
immediate: immediate || undefined,
presenterMode: presenterMode || undefined
presenterMode: presenterMode || undefined,
overviewMode: overviewMode || undefined
});
history.current.replace(`?${qs}`);
return;
Expand All @@ -132,7 +144,8 @@ export default function useUrlRouting(options) {
type: 'GO_TO_SLIDE',
payload: {
...update,
presenterMode
presenterMode,
overviewMode
}
});
onUrlChange(update);
Expand Down Expand Up @@ -175,13 +188,15 @@ export default function useUrlRouting(options) {
slide: nextSafeSlideIndex,
slideElement: nextSafeSlideElementIndex,
immediate: immediate || undefined,
presenterMode: currentPresenterMode || undefined
presenterMode: currentPresenterMode || undefined,
overviewMode: currentOverviewMode || undefined
});
history.current.push(`?${qs}`);
},
[
countSlideElements,
currentPresenterMode,
currentOverviewMode,
currentSlide,
currentSlideElement,
loop,
Expand Down Expand Up @@ -227,13 +242,15 @@ export default function useUrlRouting(options) {
slide: previousSafeSlideIndex,
slideElement: previousSafeSlideElementIndex,
immediate: immediate || undefined,
presenterMode: currentPresenterMode || undefined
presenterMode: currentPresenterMode || undefined,
overviewMode: currentOverviewMode || undefined
});
history.current.push(`?${qs}`);
}, [
animationsWhenGoingBack,
countSlideElements,
currentPresenterMode,
currentOverviewMode,
currentSlide,
currentSlideElement,
loop,
Expand Down