From 4328a84fce3fc7cfdc1f42023ab4813e527f1195 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 30 Mar 2020 21:02:25 -0400 Subject: [PATCH 1/6] am I done? --- lbrytv/component/nag-degraded-performance.jsx | 2 + lbrytv/component/openInAppLink/view.jsx | 2 + static/app-strings.json | 2 - ui/component/IframeReact/index.js | 8 + ui/component/IframeReact/view.jsx | 35 +++ ui/component/app/view.jsx | 4 +- .../claimInsufficientCredits/index.js | 9 + .../claimInsufficientCredits/view.jsx | 33 +++ ui/component/claimList/view.jsx | 5 +- ui/component/claimPreview/index.js | 10 +- ui/component/common/card.jsx | 37 +++- ui/component/common/nag.jsx | 11 +- ui/component/errorBoundary/view.jsx | 2 +- ui/component/fileActions/view.jsx | 4 +- ui/component/fileDetails/view.jsx | 136 ++++++------ ui/component/fileDownloadLink/view.jsx | 18 +- ui/component/fileRender/index.js | 19 +- ui/component/fileRender/view.jsx | 160 ++++---------- ui/component/fileRenderDownload/index.js | 10 + ui/component/fileRenderDownload/view.jsx | 43 ++++ .../index.js | 32 +-- .../view.jsx | 78 +++---- .../index.js | 32 +-- .../view.jsx | 116 +++++----- .../{textViewer => fileRenderInline}/index.js | 27 +-- .../{textViewer => fileRenderInline}/view.jsx | 32 +-- ui/component/fileTitle/index.js | 11 + ui/component/fileTitle/view.jsx | 48 +++++ ui/component/fileViewCount/index.js | 10 +- ui/component/fileViewCount/view.jsx | 13 +- ui/component/layoutWrapperFile/index.js | 35 --- ui/component/layoutWrapperFile/view.jsx | 84 -------- ui/component/layoutWrapperText/index.js | 35 --- ui/component/layoutWrapperText/view.jsx | 90 -------- ui/component/publishForm/view.jsx | 58 ++--- ui/component/recommendedContent/view.jsx | 7 +- ui/component/viewers/appViewer/view.jsx | 2 +- ui/component/viewers/documentViewer.jsx | 24 +-- ui/component/viewers/docxViewer.jsx | 2 +- ui/component/viewers/htmlViewer.jsx | 5 +- ui/component/viewers/pdfViewer.jsx | 46 +--- ui/component/walletBalance/view.jsx | 2 +- ui/constants/content.js | 0 ui/constants/file_render_modes.js | 31 +++ ui/page/file/index.js | 16 +- ui/page/file/view.jsx | 112 ++++++---- ui/page/help/view.jsx | 153 +++++++------ ui/page/settings/view.jsx | 2 +- ui/redux/selectors/content.js | 201 +++++++++++------- ui/scss/component/_card.scss | 51 ++++- ui/scss/component/_comments.scss | 10 +- ui/scss/component/_content.scss | 21 +- ui/scss/component/_file-render.scss | 64 ++++-- ui/scss/component/_main.scss | 53 +---- ui/scss/component/_markdown-preview.scss | 4 + ui/scss/component/_media.scss | 46 +--- ui/scss/component/_yrbl.scss | 1 - ui/scss/component/nag.scss | 8 +- ui/scss/component/section.scss | 16 +- ui/scss/init/_gui.scss | 5 + ui/scss/init/_vars.scss | 3 - 61 files changed, 1018 insertions(+), 1118 deletions(-) create mode 100644 ui/component/IframeReact/index.js create mode 100644 ui/component/IframeReact/view.jsx create mode 100644 ui/component/claimInsufficientCredits/index.js create mode 100644 ui/component/claimInsufficientCredits/view.jsx create mode 100644 ui/component/fileRenderDownload/index.js create mode 100644 ui/component/fileRenderDownload/view.jsx rename ui/component/{floatingViewer => fileRenderFloating}/index.js (56%) rename ui/component/{floatingViewer => fileRenderFloating}/view.jsx (83%) rename ui/component/{fileViewerInitiator => fileRenderInitiator}/index.js (60%) rename ui/component/{fileViewerInitiator => fileRenderInitiator}/view.jsx (50%) rename ui/component/{textViewer => fileRenderInline}/index.js (57%) rename ui/component/{textViewer => fileRenderInline}/view.jsx (62%) create mode 100644 ui/component/fileTitle/index.js create mode 100644 ui/component/fileTitle/view.jsx delete mode 100644 ui/component/layoutWrapperFile/index.js delete mode 100644 ui/component/layoutWrapperFile/view.jsx delete mode 100644 ui/component/layoutWrapperText/index.js delete mode 100644 ui/component/layoutWrapperText/view.jsx delete mode 100644 ui/constants/content.js create mode 100644 ui/constants/file_render_modes.js diff --git a/lbrytv/component/nag-degraded-performance.jsx b/lbrytv/component/nag-degraded-performance.jsx index 9219da951..bf9a37bbf 100644 --- a/lbrytv/component/nag-degraded-performance.jsx +++ b/lbrytv/component/nag-degraded-performance.jsx @@ -11,6 +11,8 @@ type Props = { export default function NagDegradedPerformance(props: Props) { const { onClose } = props; + return null; + return ( ({}); + +const perform = () => ({}); + +export default connect(select, perform)(IframeReact); diff --git a/ui/component/IframeReact/view.jsx b/ui/component/IframeReact/view.jsx new file mode 100644 index 000000000..d17776391 --- /dev/null +++ b/ui/component/IframeReact/view.jsx @@ -0,0 +1,35 @@ +// @flow +import React from 'react'; + +type Props = { + fullHeight: boolean, + src: string, + title: string, +}; + +export default function I18nMessage(props: Props) { + const { src, title } = props; + + // const iframeRef = useRef(); + + // const [iframeHeight, setIframeHeight] = useState('80vh'); + + function onLoad() { + /* + + iframe domain restrictions prevent naive design :-( + + const obj = iframeRef.current; + if (obj) { + setIframeHeight(obj.contentWindow.document.body.scrollHeight + 'px'); + } + + */ + } + + return ( + // style={{height: iframeHeight}} + // ref={iframeRef} +