diff --git a/src/components/Player/InputBox.jsx b/src/components/Player/InputBox.jsx index 69f6c0d..bcc4832 100644 --- a/src/components/Player/InputBox.jsx +++ b/src/components/Player/InputBox.jsx @@ -52,7 +52,7 @@ export default function ({ useEffect(() => { setTargetWindow( windows - .find(({id}) => + .find(({ id }) => id === currentWindowId)) }, [currentWindowId, windows]) diff --git a/src/components/Player/Player.jsx b/src/components/Player/Player.jsx index 11796cc..3c57cc6 100644 --- a/src/components/Player/Player.jsx +++ b/src/components/Player/Player.jsx @@ -1,9 +1,5 @@ import { h } from 'preact' import { useState, useEffect } from 'preact/hooks' -import { - compressToUTF16 as encode, - decompressFromUTF16 as decode -} from 'lz-string' import CheapGlkOte from 'cheap-glkote' @@ -13,7 +9,7 @@ import GridBuffer from './GridBuffer' import InputBox from './InputBox' import Status from './Status' -import {Handlers} from './playerHandlers' +import { Handlers } from './playerHandlers' import './player.css' @@ -74,8 +70,8 @@ export default function ({ } return ({ - 'buffer': , - 'grid': + buffer: , + grid: })[currentWindow.type] } @@ -85,18 +81,19 @@ export default function ({ return status.stage !== 'ready' ? () : (
-
{ +
{ windows .sort(byTop) .filter(singleWindow - ? ({id}) => id === currentWindowId + ? ({ id }) => id === currentWindowId : _ => true) .map(textWindow(inbox))} -
- -
) +
+ + ) } diff --git a/src/components/Player/TextBuffer.jsx b/src/components/Player/TextBuffer.jsx index 69ab702..a475f0b 100644 --- a/src/components/Player/TextBuffer.jsx +++ b/src/components/Player/TextBuffer.jsx @@ -85,7 +85,7 @@ export default function ({ inbox, currentWindow }) { tabindex='0' ref={textBufferEl} className={classes}> - {messages.map(TextMessage)} + {messages.map(TextMessage)} ) } diff --git a/src/components/Player/UrlPlayer.jsx b/src/components/Player/UrlPlayer.jsx index c9f4312..8eee112 100644 --- a/src/components/Player/UrlPlayer.jsx +++ b/src/components/Player/UrlPlayer.jsx @@ -50,6 +50,6 @@ export default function ({ url, singleWindow }) { ? () + }} />) : () } diff --git a/src/components/Player/playerHandlers.js b/src/components/Player/playerHandlers.js index d463ca9..e7d88cd 100644 --- a/src/components/Player/playerHandlers.js +++ b/src/components/Player/playerHandlers.js @@ -1,3 +1,8 @@ +import { + compressToUTF16 as encode, + decompressFromUTF16 as decode +} from 'lz-string' + export const Handlers = ({ setStatus, setWindows, @@ -13,9 +18,9 @@ export const Handlers = ({ setWindows(windows) }, onUpdateInputs: data => { - if (data.length === 0) return void null + if (data.length === 0) return null - const {type, id} = data[0] + const { type, id } = data[0] setCurrentWindowId(id) setInputType(type) }, diff --git a/src/index.js b/src/index.js index 66b9d16..8e50529 100644 --- a/src/index.js +++ b/src/index.js @@ -25,7 +25,8 @@ function App () { () + singleWindow + }} />) return ( diff --git a/src/views/PlayerView/PlayerView.jsx b/src/views/PlayerView/PlayerView.jsx index b3564a2..9548328 100644 --- a/src/views/PlayerView/PlayerView.jsx +++ b/src/views/PlayerView/PlayerView.jsx @@ -22,7 +22,8 @@ export default function ({
+ singleWindow + }} />
) }