Merge pull request 'add view switcher' (#1) from pov into master

.babelrc

@@ -0,0 +1,5 @@
+{
+    "plugins": [
+      ["import", { "libraryName": "antd", "libraryDirectory": "es", "style": "css" }] // `style: true` for less
+    ]
+  }

package.json

@@ -1,14 +1,19 @@
 {
-  "name": "my-app",
-  "version": "0.1.0",
-  "private": true,
+  "name": "image-viewer",
+  "version": "0.1.2",
+  "private": false,
   "dependencies": {
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
+    "@types/styled-components": "^5.1.0",
+    "antd": "^4.2.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-scripts": "3.4.1"
+    "react-scripts": "3.4.1",
+    "react-spring": "^8.0.27",
+    "styled-components": "^5.1.0",
+    "typescript": "^3.8.3"
   },
   "scripts": {
     "start": "react-scripts start",

src/App.css

@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

src/App.js

@@ -1,24 +1,14 @@
 import React from 'react';
-import logo from './logo.svg';
-import './App.css';
+import BookComponent from './components/BookComponent'
 
 function App() {
   return (
     <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.js</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
+      <div style={{
+        padding: "24px 0"
+      }}>
+        <BookComponent/>
+      </div> 
     </div>
   );
 }

src/App.test.js

@@ -1,9 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  const { getByText } = render(<App />);
-  const linkElement = getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});

src/components/BookComponent.tsx

@@ -0,0 +1,87 @@
+import React, {createContext} from 'react'
+import OnePageView from './OnePageView'
+
+export const BookContext = createContext({})
+
+export interface IBookPage {
+    src: string
+    alt?: string
+    thumbnail?: string
+}
+
+export const bookViewModes = [
+    {
+        text: 'One Page',
+        value: 'one page',
+        icon: ''
+    },
+    {
+        text: 'Two Pages',
+        value: 'two pages',
+        icon: ''
+    }
+]
+
+export enum BookViewMode {
+    onePage = 'one page',
+    twoPages = 'two pages'
+}
+
+export interface IBookContext {
+    currIndex?: number,
+    src?: IBookPage[],
+    flagToReverse?: boolean,
+    mode?: BookViewMode,
+    readonly setBookContextState: (newState: any)=> undefined
+}
+
+
+class BookComponent extends React.Component<any>{
+    constructor(props: any){
+        super(props)
+        this.state = {
+            currIndex: 0,
+            src: [],
+            flagToReverse: false,
+            mode: "one page",
+            setBookContextState: (newState: IBookContext)=>{
+                this.setState(oldState=> ({
+                    ...oldState,
+                    ...newState
+                }))
+            }
+        } 
+    }
+
+    componentDidMount(){
+        fetch('https://picsum.photos/v2/list')
+            .then(response=>{
+                return response.json()
+            }).then(data=>{
+                data = data.map((item: any)=>{
+                    return {
+                        src: item.download_url,
+                        alt: item.author
+                    }
+                })
+
+                this.setState({
+                    src: data
+                })
+            })
+    }
+    
+    render(){
+        return <BookContext.Provider value={{...this.state}}>
+            <BookContext.Consumer>
+                {state=>(
+                    <>
+                        <OnePageView {...state}/>
+                    </>
+                )}
+            </BookContext.Consumer>
+        </BookContext.Provider>
+    }
+}
+
+export default BookComponent

src/components/BookComponentsController.tsx

@@ -0,0 +1,47 @@
+import React from 'react'
+import styled from 'styled-components'
+import {Button, Popover} from 'antd'
+import ViewSwitcher from './ViewSwitcher'
+import JumpControls from './JumpControls'
+
+const ControlsContanter = styled.div`
+    display: inline-flex;
+    justify-content: space-between;
+    width: 500px;
+`
+export default function BookCoponentsController(props: any) {
+    const {onPrevClick, prevDisable, onNextClick, nextDisable, ...restProps} = props
+
+    return (
+        <ControlsContanter>
+            <Button
+                onClick={()=>{
+                    onPrevClick()
+                }}
+                disabled={prevDisable}
+            >
+                Previous
+            </Button>
+            <Button 
+                onClick={()=>{
+                    onNextClick()
+                }}
+                disabled={nextDisable}
+            >
+                Next
+            </Button>
+            
+            
+            <Popover
+                trigger="click" 
+                content={<JumpControls {...restProps}/>}>
+                <Button>
+                    Jump
+                </Button>
+            </Popover>
+
+            <ViewSwitcher {...restProps}/>
+            
+        </ControlsContanter>            
+    )
+}

src/components/JumpControls.tsx

@@ -0,0 +1,47 @@
+import React, {useState, useCallback, useEffect} from 'react'
+import {Row, Col, Slider, InputNumber} from 'antd'
+
+const JumpControls = (props: any)=>{
+    const {src, currIndex, setBookContextState} = props
+    const [inputValue, setInputValue] = useState(currIndex)
+
+    const onChange = useCallback(
+        (value) => {
+            if(value){
+                const newCurrIndex = value -1
+                if(newCurrIndex < src.length && newCurrIndex >=0){
+                    setBookContextState({
+                        currIndex: value - 1,
+                        flagToReverse: value < inputValue
+                    })
+                }                
+            }  
+        },
+        [inputValue])
+
+    useEffect(()=>{
+        setInputValue(currIndex + 1)
+    }, [currIndex])
+
+    return <Row>
+        <Col span={12}>
+        <Slider
+            min={1}
+            max={src.length}
+            onChange={onChange}
+            value={typeof inputValue === 'number' ? inputValue : 0}
+        />
+        </Col>
+        <Col span={4}>
+        <InputNumber
+            min={1}
+            max={src.length}
+            style={{ margin: '0 8px' }}
+            value={inputValue}
+            onChange={onChange}
+        />
+        </Col>
+    </Row>
+}
+
+export default JumpControls

src/components/OnePageView.tsx

@@ -0,0 +1,103 @@
+import React, {useState, useCallback, useEffect} from 'react'
+import {Transition, animated} from 'react-spring/renderprops'
+import styled, { } from 'styled-components'
+import BookComponentsController from './BookComponentsController'
+
+const ComponentContainer = styled.div`
+    display: flex;
+    flex-direction: column;  
+    overflowY: hidden;
+    align-items: center;
+`
+
+const PageContainer = styled.div`
+    height: 600px;
+    position: relative;
+    width: 100%;
+    cursor: pointer;
+    margin-bottom: 8px;
+    overflow-x: hidden;
+    & > div {
+        will-change: transform, opacity;
+        position: absolute;
+        width: 100%;
+        height: 100%;
+    }
+`
+
+const StyledImage = styled(animated.div)<{src:string}>`
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: ${props=> `url('${props.src}')`} no-repeat center;
+    background-size: contain;
+`
+
+const PageComponent = (props: any)=>{
+    const {src} = props
+    return <StyledImage src={src}/>
+}
+
+
+function BookComponent(props: any) {
+    const {src, currIndex, setBookContextState, flagToReverse} = props
+    const [prevDisable, setPrevDisable] = useState(true)
+    const [nextDisable, setNextDisable] = useState(false)
+    
+    const changePage = useCallback((indexToGo, goToPrevious)=>{
+        const newCurrIndex = currIndex + indexToGo
+        setBookContextState({
+            currIndex: newCurrIndex,
+            flagToReverse: goToPrevious
+        })
+    
+    }, [currIndex])
+
+    useEffect(() => {
+        setNextDisable(currIndex >= src.length - 1)
+        setPrevDisable(currIndex <= 0)
+    }, [currIndex, src])
+
+    return (
+        <ComponentContainer>
+            <PageContainer>
+                <Transition
+                    reset
+                    unique
+                    items={currIndex}
+                    from={{opacity: 1, transform: flagToReverse? "translate3d(-50%, 0, 0)": "translate3d(100%, 0, 0)"}}
+                    enter={{ opacity: 1, transform: "translate3d(0%, 0, 0)" }}
+                    leave={{ opacity: 0, transform: flagToReverse? "translate3d(100%, 0, 0)": "translate3d(-50%, 0, 0)"}}
+                    initial={{}}
+                >
+                    {
+                        currIndex=> style=>{
+                            return(
+                                <animated.div style={{
+                                    ...style,
+                                    overflowX: 'hidden'
+                                    
+                                    }}>
+                                    {React.createElement(()=><PageComponent src={src[currIndex]? src[currIndex].src: null}/>)}
+                                </animated.div>
+                            )
+                        }
+                    }
+                </Transition>
+            </PageContainer>
+
+            <BookComponentsController 
+                prevDisable={prevDisable} 
+                onPrevClick={()=> changePage(-1, true)}
+                nextDisable={nextDisable}
+                onNextClick={()=>changePage(1, false)}
+                {...props}
+            />
+
+        </ComponentContainer>
+    )
+}
+
+export default BookComponent

src/components/ViewSwitcher.tsx

@@ -0,0 +1,26 @@
+import React, {useCallback} from 'react'
+import {Select} from 'antd'
+import {IBookContext, bookViewModes} from './BookComponent'
+
+
+const {Option} = Select
+
+export default function ViewSwitcher(props: IBookContext) {
+    const {mode, setBookContextState} = props
+
+    const viewModeChange = useCallback((mode) => {
+        setBookContextState({
+            mode
+        })
+    },[])
+
+    return (
+        <Select value={mode} onSelect={viewModeChange}>
+            {
+                bookViewModes.map((item: any)=>{
+                    return <Option value={item.value}>{item.text}</Option>
+                })
+            }
+        </Select> 
+    )
+}

src/index.css

@@ -1,13 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}

src/index.js

@@ -1,17 +1,10 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import './index.css';
 import App from './App';
-import * as serviceWorker from './serviceWorker';
+import 'antd/dist/antd.css';
 
 ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
+    <App />,
   document.getElementById('root')
 );
 
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();

src/logo.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>

src/react-app-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="react-scripts" />

src/serviceWorker.js

@@ -1,141 +0,0 @@
-// This optional code is used to register a service worker.
-// register() is not called by default.
-
-// This lets the app load faster on subsequent visits in production, and gives
-// it offline capabilities. However, it also means that developers (and users)
-// will only see deployed updates on subsequent visits to a page, after all the
-// existing tabs open on the page have been closed, since previously cached
-// resources are updated in the background.
-
-// To learn more about the benefits of this model and instructions on how to
-// opt-in, read https://bit.ly/CRA-PWA
-
-const isLocalhost = Boolean(
-  window.location.hostname === 'localhost' ||
-    // [::1] is the IPv6 localhost address.
-    window.location.hostname === '[::1]' ||
-    // 127.0.0.0/8 are considered localhost for IPv4.
-    window.location.hostname.match(
-      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
-    )
-);
-
-export function register(config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
-    // The URL constructor is available in all browsers that support SW.
-    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
-    if (publicUrl.origin !== window.location.origin) {
-      // Our service worker won't work if PUBLIC_URL is on a different origin
-      // from what our page is served on. This might happen if a CDN is used to
-      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
-      return;
-    }
-
-    window.addEventListener('load', () => {
-      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
-
-      if (isLocalhost) {
-        // This is running on localhost. Let's check if a service worker still exists or not.
-        checkValidServiceWorker(swUrl, config);
-
-        // Add some additional logging to localhost, pointing developers to the
-        // service worker/PWA documentation.
-        navigator.serviceWorker.ready.then(() => {
-          console.log(
-            'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://bit.ly/CRA-PWA'
-          );
-        });
-      } else {
-        // Is not localhost. Just register service worker
-        registerValidSW(swUrl, config);
-      }
-    });
-  }
-}
-
-function registerValidSW(swUrl, config) {
-  navigator.serviceWorker
-    .register(swUrl)
-    .then(registration => {
-      registration.onupdatefound = () => {
-        const installingWorker = registration.installing;
-        if (installingWorker == null) {
-          return;
-        }
-        installingWorker.onstatechange = () => {
-          if (installingWorker.state === 'installed') {
-            if (navigator.serviceWorker.controller) {
-              // At this point, the updated precached content has been fetched,
-              // but the previous service worker will still serve the older
-              // content until all client tabs are closed.
-              console.log(
-                'New content is available and will be used when all ' +
-                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
-              );
-
-              // Execute callback
-              if (config && config.onUpdate) {
-                config.onUpdate(registration);
-              }
-            } else {
-              // At this point, everything has been precached.
-              // It's the perfect time to display a
-              // "Content is cached for offline use." message.
-              console.log('Content is cached for offline use.');
-
-              // Execute callback
-              if (config && config.onSuccess) {
-                config.onSuccess(registration);
-              }
-            }
-          }
-        };
-      };
-    })
-    .catch(error => {
-      console.error('Error during service worker registration:', error);
-    });
-}
-
-function checkValidServiceWorker(swUrl, config) {
-  // Check if the service worker can be found. If it can't reload the page.
-  fetch(swUrl, {
-    headers: { 'Service-Worker': 'script' },
-  })
-    .then(response => {
-      // Ensure service worker exists, and that we really are getting a JS file.
-      const contentType = response.headers.get('content-type');
-      if (
-        response.status === 404 ||
-        (contentType != null && contentType.indexOf('javascript') === -1)
-      ) {
-        // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then(registration => {
-          registration.unregister().then(() => {
-            window.location.reload();
-          });
-        });
-      } else {
-        // Service worker found. Proceed as normal.
-        registerValidSW(swUrl, config);
-      }
-    })
-    .catch(() => {
-      console.log(
-        'No internet connection found. App is running in offline mode.'
-      );
-    });
-}
-
-export function unregister() {
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.ready
-      .then(registration => {
-        registration.unregister();
-      })
-      .catch(error => {
-        console.error(error.message);
-      });
-  }
-}

src/setupTests.js

@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';

tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react"
+  },
+  "include": [
+    "src"
+  ]
+}