From 3676c7af07a25ddbb247e6490f3ccc1eafff4977 Mon Sep 17 00:00:00 2001 From: Enoch Riese Date: Mon, 14 Nov 2022 16:53:31 -0600 Subject: [PATCH] lint fixes --- sites/shared/components/workbench/draft/svg-wrapper.js | 2 ++ .../components/workbench/exporting/export-handler.js | 3 +-- sites/shared/components/workbench/layout/draft/part.js | 10 +++++----- .../shared/components/workbench/layout/print/index.js | 6 +++--- .../shared/components/workbench/layout/print/plugin.js | 2 +- .../components/workbench/layout/print/settings.js | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sites/shared/components/workbench/draft/svg-wrapper.js b/sites/shared/components/workbench/draft/svg-wrapper.js index 0e8cdbf41aa..829bf4bd113 100644 --- a/sites/shared/components/workbench/draft/svg-wrapper.js +++ b/sites/shared/components/workbench/draft/svg-wrapper.js @@ -67,4 +67,6 @@ const SvgWrapper = forwardRef((props, ref) => { ) }) +SvgWrapper.displayName = 'SvgWrapper' + export default SvgWrapper diff --git a/sites/shared/components/workbench/exporting/export-handler.js b/sites/shared/components/workbench/exporting/export-handler.js index 21cc1bfc1b5..40deeb725ce 100644 --- a/sites/shared/components/workbench/exporting/export-handler.js +++ b/sites/shared/components/workbench/exporting/export-handler.js @@ -32,7 +32,7 @@ export const handleExport = async (format, gist, design, t, app, onComplete, onE app.startLoading() // get a worker going - const worker = new Worker(new URL('./export-worker.js', import.meta.url), { type: module }) + const worker = new Worker(new URL('./export-worker.js', import.meta.url), { type: 'module' }) // listen for the worker's message back worker.addEventListener('message', (e) => { @@ -56,7 +56,6 @@ export const handleExport = async (format, gist, design, t, app, onComplete, onE app.stopLoading() }) - let svg = '' // pdf settings const settings = { ...defaultPdfSettings, diff --git a/sites/shared/components/workbench/layout/draft/part.js b/sites/shared/components/workbench/layout/draft/part.js index fbcf53149b8..9f6604f9f65 100644 --- a/sites/shared/components/workbench/layout/draft/part.js +++ b/sites/shared/components/workbench/layout/draft/part.js @@ -56,9 +56,6 @@ const Stack = (props) => { const stackLayout = layout.stacks?.[stackName] - // // Don't just assume this makes sense - if (typeof stackLayout?.move?.x === 'undefined') return null - // Use a ref for direct DOM manipulation const stackRef = useRef(null) const centerRef = useRef(null) @@ -82,6 +79,9 @@ const Stack = (props) => { handleDrag(select(stackRef.current)) }, [rotate, stackRef, stackLayout]) + // // Don't just assume this makes sense + if (typeof stackLayout?.move?.x === 'undefined') return null + // These are kept as vars because re-rendering on drag would kill performance // Managing the difference between re-render and direct DOM updates makes this // whole thing a bit tricky to wrap your head around @@ -144,7 +144,7 @@ const Stack = (props) => { didDrag = true setTransforms() }) - .on('end', function (event) { + .on('end', function () { // save to gist if anything actually changed if (didDrag) updateLayout() @@ -152,7 +152,7 @@ const Stack = (props) => { }) /** reset the part's transforms */ - const resetPart = (event) => { + const resetPart = () => { rotation = 0 flipX = 0 flipY = 0 diff --git a/sites/shared/components/workbench/layout/print/index.js b/sites/shared/components/workbench/layout/print/index.js index d1309adb4d3..aef51f45348 100644 --- a/sites/shared/components/workbench/layout/print/index.js +++ b/sites/shared/components/workbench/layout/print/index.js @@ -13,7 +13,7 @@ const PrintLayout = (props) => { // disable xray useEffect(() => { if (props.gist?._state?.xray?.enabled) props.updateGist(['_state', 'xray', 'enabled'], false) - }, []) + }) const { t } = useTranslation(['workbench']) const [error, setError] = useState(false) @@ -45,8 +45,8 @@ const PrintLayout = (props) => { props.design, t, props.app, - (e) => setError(false), - (e) => setError(true) + () => setError(false), + () => setError(true) ) } diff --git a/sites/shared/components/workbench/layout/print/plugin.js b/sites/shared/components/workbench/layout/print/plugin.js index 50aff7574c0..40bd480181f 100644 --- a/sites/shared/components/workbench/layout/print/plugin.js +++ b/sites/shared/components/workbench/layout/print/plugin.js @@ -96,7 +96,7 @@ const doScanForBlanks = (stacks, layout, x, y, w, h) => { const basePlugin = ({ sheetWidth, sheetHeight, - boundary = false, + // boundary = false, partName = 'pages', responsiveColumns = true, printStyle = false, diff --git a/sites/shared/components/workbench/layout/print/settings.js b/sites/shared/components/workbench/layout/print/settings.js index a76caae58b7..698908243aa 100644 --- a/sites/shared/components/workbench/layout/print/settings.js +++ b/sites/shared/components/workbench/layout/print/settings.js @@ -7,10 +7,10 @@ import ExportIcon from 'shared/components/icons/export' import { useTranslation } from 'next-i18next' const PrintLayoutSettings = (props) => { + const { t } = useTranslation(['workbench']) let pages = props.draft?.setStores[0].get('pages') if (!pages) return null const { cols, rows, count } = pages - const { t } = useTranslation(['workbench']) const setMargin = (evt) => { props.updateGist(