**Feature:** Splash hooks & useInterval

src/Splash/Splash.Animation.tsx

@@ -1,8 +1,10 @@
-import * as React from "react"
-
+import React, { useState } from "react"
+import useInterval from "../useInterval"
+import useWindowSize from "../useWindowSize"
 import styled from "../utils/styled"
 
 export interface Props {
+ fullscreen?: boolean
  size?: number
 }
 
@@ -34,73 +36,75 @@ const bounce = (coord: number): number => {
  return coord
 }
 
-const Container = styled("div")<{ size: number }>(({ size }: { size: number }) => ({
- width: size,
- height: size,
+const Container = styled("div")({
  position: "absolute",
  top: "50%",
  left: "50%",
  transform: "translate3d(-50%, -50%, 0)",
-}))
+})
+
+/// Move highly highly dynamic style out of css-js to prevent uneeded classname generation
 
-const Box = styled("div")<{ x: number; y: number }>(({ x, y }) => ({
+const Box = styled("div")({
  position: "absolute",
  transition: "all 0.5s ease-in-out",
- top: `calc(${(x / (squares - 1)) * 100}% + 4px)`,
- left: `calc(${(y / (squares - 1)) * 100}% + 4px)`,
+
  borderRadius: 6,
  width: `calc(${100 / (squares - 1)}% - 8px)`,
  height: `calc(${100 / (squares - 1)}% - 8px)`,
  backgroundColor: "rgba(255, 255, 255, 0.06)",
-}))
-
-class Animation extends React.Component<Props, State> {
- public state = {
- animationStep: 0,
- coordinates: Array.apply(null, { length: boxes })
- .map(Number.call, Number)
- .map(() => ({ x: integerRandom(squares), y: integerRandom(squares) })),
- }
+})
 
- public animationInterval?: number
-
- // Shift the coordinate of every third tile in a random direction.
- // Each animation shifts a different set of tiles.
- public shiftSomeTiles() {
- this.setState(prevState => ({
- animationStep: prevState.animationStep + 1,
- coordinates: prevState.coordinates.map((coord: { x: number; y: number }, index: number) => {
- if (index % 3 === prevState.animationStep % 3) {
- const dx = integerRandom(3) - 1
- const dy = integerRandom(3) - 1
- return {
- x: bounce(coord.x + dx),
- y: bounce(coord.y - dy),
- }
- }
- return coord
- }),
- }))
- }
+const initialState = {
+ animationStep: 0,
+ coordinates: Array.apply(null, Array(boxes))
+ .map((_: any, i: number) => i) // Fixes typescript Error
+ .map(() => ({ x: integerRandom(squares), y: integerRandom(squares) })),
+}
 
- public componentDidMount() {
- this.animationInterval = window.setInterval(this.shiftSomeTiles.bind(this), 5000)
- }
+const Animation: React.FC<Props> = ({ fullscreen, size }) => {
+ let containerSize = size || 600
 
- public componentWillUnmount() {
- clearInterval(this.animationInterval)
+ if (fullscreen) {
+ const windowSize = useWindowSize()
+ containerSize = Math.max(windowSize.width, windowSize.height) - 20
  }
 
- public render() {
- const size = this.props.size || 600
- return (
- <Container size={size}>
- {this.state.coordinates.map((coord: { x: number; y: number }, index: number) => (
- <Box key={index} x={coord.x} y={coord.y} />
- ))}
- </Container>
- )
- }
+ const [state, updateAnimation] = useState<State>(initialState)
+ useInterval(
+ () => {
+ updateAnimation({
+ animationStep: state.animationStep + 1,
+ coordinates: state.coordinates.map((coord: { x: number; y: number }, index: number) => {
+ if (index % 3 === state.animationStep % 3) {
+ const dx = integerRandom(3) - 1
+ const dy = integerRandom(3) - 1
+ return {
+ x: bounce(coord.x + dx),
+ y: bounce(coord.y - dy),
+ }
+ }
+ return coord
+ }),
+ })
+ },
+ 5000,
+ true,
+ )
+
+ return (
+ <Container style={{ width: containerSize, height: containerSize }}>
+ {state.coordinates.map((coord: { x: number; y: number }, index: number) => (
+ <Box
+ key={index}
+ style={{
+ top: `${(coord.x / (squares - 1)) * 100}%`,
+ left: `${(coord.y / (squares - 1)) * 100}%`,
+ }}
+ />
+ ))}
+ </Container>
+ )
 }
 
 export default Animation

src/Splash/Splash.tsx

@@ -2,6 +2,7 @@ import * as React from "react"
 
 import { readableTextColor } from "../utils"
 import { expandColor, OperationalStyleConstants } from "../utils/constants"
+
 import styled from "../utils/styled"
 import Animation from "./Splash.Animation"
 import OperationalLogo from "./Splash.Logo"
@@ -89,47 +90,22 @@ const Static = styled("div")`
  }
 `
 
-class Splash extends React.Component<SplashProps, Readonly<State>> {
- public readonly state = {
- animationSize: Math.max(window.innerWidth, window.innerHeight),
- }
-
- public static defaultProps = {
- color: "#fff",
- }
-
- public handleResize = () => {
- this.setState({
- animationSize: Math.max(window.innerWidth, window.innerHeight) as number,
- })
- }
-
- public componentDidMount() {
- window.addEventListener("resize", this.handleResize)
- }
-
- public componentWillUnmount() {
- window.removeEventListener("resize", this.handleResize)
- }
-
- public render() {
- const { logo, color } = this.props
- return (
- <Container color={color}>
- <Animation size={this.state.animationSize} />
- <Content color={color}>
- <TitleBar>
- <OperationalLogo size={110} logo={logo} />
- <TitleBarContent>
- <h1>{this.props.title}</h1>
- <div>{this.props.actions}</div>
- </TitleBarContent>
- </TitleBar>
- <Static>{this.props.children}</Static>
- </Content>
- </Container>
- )
- }
+const Splash: React.FC<SplashProps> = ({ color, logo, children, title, actions }) => {
+ return (
+ <Container color={color}>
+ <Animation fullscreen />
+ <Content color={color}>
+ <TitleBar>
+ <OperationalLogo size={110} logo={logo} />
+ <TitleBarContent>
+ <h1>{title}</h1>
+ <div>{actions}</div>
+ </TitleBarContent>
+ </TitleBar>
+ <Static>{children}</Static>
+ </Content>
+ </Container>
+ )
 }
 
 export default Splash

src/useInterval/README.md

@@ -0,0 +1,18 @@
+## Usage
+
+This hook sets up an interval and clears it after unmounting
+
+```jsx
+const MyComponent = () => {
+ let [count, setCount] = React.useState(0)
+
+ useInterval(() => {
+ // Your custom logic here
+ setCount(count + 1)
+ }, 1000)
+
+ return <h1>{count}</h1>
+}
+
+;<MyComponent />
+```

src/useInterval/index.ts

@@ -0,0 +1,37 @@
+import { useEffect, useRef } from "react"
+
+// Ref: https://github.com/Hermanya/use-interval/blob/master/src/index.tsx
+
+// tslint:disable-next-line
+const noop = () => {}
+
+/**
+ * useInterval
+ */
+export function useInterval(callback: () => void, delay: number | null, immediate?: boolean) {
+ const savedCallback = useRef(noop)
+
+ // Remember the latest callback.
+ useEffect(() => {
+ savedCallback.current = callback
+ })
+
+ // Execute callback if immediate is set.
+ useEffect(() => {
+ if (immediate && delay !== null) {
+ savedCallback.current()
+ }
+ }, [immediate])
+
+ // Set up the interval.
+ useEffect(() => {
+ if (delay === null) {
+ return undefined
+ }
+ const tick = () => savedCallback.current()
+ const id = setInterval(tick, delay)
+ return () => clearInterval(id)
+ }, [delay])
+}
+
+export default useInterval

src/useInterval/useInterval.test.tsx

@@ -0,0 +1,75 @@
+import React from "react"
+import { cleanup, render } from "react-testing-library"
+
+import useInterval, { useInterval as namedHook } from "."
+
+// ref https://github.com/Hermanya/use-interval/blob/master/src/test.tsx
+
+beforeEach(cleanup)
+
+const MyComponent: React.FC<{ fn: () => void; delay: number | null; immediate?: boolean }> = ({
+ fn,
+ delay,
+ immediate,
+}) => {
+ useInterval(fn, delay, immediate)
+ return <span>A Interval is running </span>
+}
+
+describe("useInterval", () => {
+ it("exports a function (default)", () => {
+ expect(useInterval).toBeInstanceOf(Function)
+ })
+ it("exports a function (named)", () => {
+ expect(namedHook).toBeInstanceOf(Function)
+ })
+ it("hooks identity are the same", () => {
+ expect(useInterval).toBe(namedHook)
+ })
+ it("is a named function", () => {
+ // aids stack trace debugging.
+ expect(useInterval.name).toBe("useInterval")
+ })
+
+ describe("regular mode (delayed)", () => {
+ jest.useFakeTimers()
+
+ const fn: () => void = jest.fn()
+ const { container } = render(<MyComponent fn={fn} delay={500} />)
+
+ expect(fn).toBeCalledTimes(0 /* not called on first render */)
+ jest.advanceTimersByTime(500)
+ expect(fn).toBeCalledTimes(1)
+ jest.advanceTimersByTime(1500)
+ expect(fn).toBeCalledTimes(4)
+
+ test("cancels interval when delay is null", () => {
+ render(<MyComponent immediate fn={fn} delay={null} />, { container })
+ jest.advanceTimersByTime(1500)
+ expect(fn).toBeCalledTimes(4)
+ })
+
+ jest.clearAllTimers()
+ })
+
+ describe("immediate mode", () => {
+ jest.useFakeTimers()
+
+ const fn = jest.fn()
+ const { container } = render(<MyComponent immediate fn={fn} delay={500} />)
+
+ expect(fn).toBeCalledTimes(1 /* called immediatelly on render */)
+ jest.advanceTimersByTime(500)
+ expect(fn).toBeCalledTimes(2)
+ jest.advanceTimersByTime(1500)
+ expect(fn).toBeCalledTimes(5)
+
+ it("cancels interval when delay is null", () => {
+ render(<MyComponent immediate fn={fn} delay={null} />, { container })
+ jest.advanceTimersByTime(1500)
+ expect(fn).toBeCalledTimes(5)
+ })
+
+ jest.clearAllTimers()
+ })
+})