Skip to content
Snippets Groups Projects
Commit 9b40273f authored by Chris Beer's avatar Chris Beer
Browse files

Update GalleryView to use selectors

parent 9a66442b
Branches
Tags
No related merge requests found
import React from 'react';
import { shallow, mount } from 'enzyme';
import { shallow } from 'enzyme';
import manifesto from 'manifesto.js';
import manifestJson from '../../fixtures/version-2/019.json';
import { GalleryView } from '../../../src/components/GalleryView';
......@@ -9,7 +9,7 @@ function createWrapper(props) {
return shallow(
<GalleryView
window={{ id: '1234', canvasIndex: 0 }}
manifest={{ manifestation: manifesto.create(manifestJson) }}
canvases={manifesto.create(manifestJson).getSequences()[0].getCanvases()}
setCanvas={() => {}}
{...props}
/>,
......
......
......@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Typography from '@material-ui/core/Typography';
import ManifestoCanvas from '../lib/ManifestoCanvas';
import { getCanvasLabel, getManifestCanvases } from '../state/selectors';
import { getCanvasLabel } from '../state/selectors';
import { CanvasThumbnail } from './CanvasThumbnail';
import ns from '../config/css-ns';
......@@ -12,16 +12,6 @@ import ns from '../config/css-ns';
* OSD and Navigation
*/
export class GalleryView extends Component {
/**
* @param {Object} props
*/
constructor(props) {
super(props);
const { manifest } = this.props;
this.canvases = manifest.manifestation.getSequences()[0].getCanvases();
}
/**
* container classes
*/
......@@ -35,7 +25,7 @@ export class GalleryView extends Component {
* Renders things
*/
render() {
const { window, manifest, setCanvas } = this.props;
const { window, canvases, setCanvas } = this.props;
return (
<>
<section
......@@ -43,7 +33,7 @@ export class GalleryView extends Component {
id={`${window.id}-gallery`}
>
{
getManifestCanvases(manifest).map((canvas) => {
canvases.map((canvas) => {
const manifestoCanvas = new ManifestoCanvas(canvas);
return (
<div
......@@ -75,7 +65,7 @@ export class GalleryView extends Component {
}
GalleryView.propTypes = {
manifest: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
canvases: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
window: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
setCanvas: PropTypes.func.isRequired,
};
......@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
import * as actions from '../state/actions';
import { withPlugins } from '../extend';
import { GalleryView } from '../components/GalleryView';
import { getManifestCanvases } from '../state/selectors';
/**
* mapStateToProps - to hook up connect
......@@ -10,7 +11,9 @@ import { GalleryView } from '../components/GalleryView';
* @private
*/
const mapStateToProps = state => (
{}
{
canvases: getManifestCanvases(state, { windowId: window.id }),
}
);
/**
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment