Skip to content

Commit

Permalink
fixed jsx linting
Browse files Browse the repository at this point in the history
  • Loading branch information
samueljd committed Oct 3, 2023
1 parent 56fdfa6 commit 5989676
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 97 deletions.
33 changes: 8 additions & 25 deletions renderer/src/components/EditorPage/ObsEditor/ObsImage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,15 @@ import packageInfo from '../../../../../package.json';
import { newPath } from '../../../../../supabase';

function ObsImage({ story, online }) {
const path = require('path');
const newpath = localStorage.getItem('userPath');
const imageName = story.img.split('/');
const fileName = imageName[imageName.length - 1];
const obsImagePath = isElectron()
? path.join(
'file://',
newpath,
packageInfo.name,
'common',
environment.OBS_IMAGE_DIR,
fileName,
)
: path.join(
newPath,
packageInfo.name,
'common',
environment.OBS_IMAGE_DIR,
fileName,
);
const path = require('path');
const newpath = localStorage.getItem('userPath');
const imageName = story.img.split('/');
const fileName = imageName[imageName.length - 1];
const obsImagePath = isElectron() ? path.join('file://', newpath, packageInfo.name, 'common', environment.OBS_IMAGE_DIR, fileName)
: path.join(newPath, packageInfo.name, 'common', environment.OBS_IMAGE_DIR, fileName);

return online ? (
<img className='w-1/4 rounded-lg' src={story.img} alt='' />
) : (
<img className='w-1/4 rounded-lg' src={obsImagePath} alt='offline' />
);
return online ? (
<img className="w-1/4 rounded-lg" src={story.img} alt="" />) : (<img className="w-1/4 rounded-lg" src={obsImagePath} alt="offline" />);
}

export default ObsImage;
4 changes: 2 additions & 2 deletions renderer/src/components/EditorPage/Scribex/RecursiveBlock.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ export default function RecursiveBlock({
addSequenceId,
htmlPerf,
onHtmlPerf,
onInput: props?.onInput,
options,
onInput: props?.onInput,
options,
};
component = <HtmlPerfEditor {..._props} />;
}
Expand Down
15 changes: 7 additions & 8 deletions renderer/src/components/EditorPage/Scribex/ReferenceEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,13 @@ export default function ReferenceEditor(props) {
editable,
preview,
},
components: {
block: (__props) =>
ReferenceRecursiveBlock({
htmlPerf,
sequenceIds,
...__props,
}),
},
components: {
block: (__props) => ReferenceRecursiveBlock({
htmlPerf,
sequenceIds,
...__props,
}),
},
decorators: {},
verbose,
handlers,
Expand Down
118 changes: 56 additions & 62 deletions renderer/src/components/EditorPage/Scribex/ReferenceRecursiveBlock.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,71 @@ import React, { useEffect, useState } from 'react';
import { HtmlPerfEditor } from '@xelah/type-perf-html';

const getTarget = ({ content }) => {
const div = document.createElement('div');
div.innerHTML = content;
const div = document.createElement('div');
div.innerHTML = content;

const { target } = div.firstChild?.dataset || {};
const { target } = div.firstChild?.dataset || {};

return target;
return target;
};

export default function ReferenceRecursiveBlock({
htmlPerf,
onHtmlPerf,
sequenceIds,
addSequenceId,
options,
content,
style,
contentEditable,
index,
verbose,
setFootNote,
...props
htmlPerf,
onHtmlPerf,
sequenceIds,
addSequenceId,
options,
content,
style,
contentEditable,
index,
verbose,
setFootNote,
...props
}) {
useEffect(() => {
if (verbose) console.log('Block: Mount/First Render', index);
return () => {
if (verbose) console.log('Block: UnMount/Destroyed', index);
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
console.log({ contentEditable });
const checkReturnKeyPress = (event) => {
if (event.key === 'Enter') {
let activeTextArea = document.activeElement;
if (activeTextArea.children.length > 1) {
const lineBreak = activeTextArea.children[1]?.outerHTML;
const newLine = lineBreak.replace(/<br\s*\/?>/gi, '&nbsp');
activeTextArea.children[1].outerHTML = newLine;
}
}
};
const checkReturnKeyPress = (event) => {
if (event.key === 'Enter') {
const activeTextArea = document.activeElement;
if (activeTextArea.children.length > 1) {
const lineBreak = activeTextArea.children[1]?.outerHTML;
const newLine = lineBreak.replace(/<br\s*\/?>/gi, '&nbsp');
activeTextArea.children[1].outerHTML = newLine;
}
}
};

let component;
let component;

let editable = !!content.match(/data-type="paragraph"/);
const editable = !!content.match(/data-type="paragraph"/);

if (editable) {
component = (
<div
contentEditable={contentEditable}
onKeyUp={checkReturnKeyPress}
{...props}
/>
);
}
if (editable) {
component = (
<div
role="textbox"
contentEditable={contentEditable}
onKeyUp={checkReturnKeyPress}
{...props}
tabIndex={0}
/>
);
}

if (!editable) {
const sequenceId = getTarget({ content });
if (!editable) {
const sequenceId = getTarget({ content });

if (sequenceId && !options.preview) {
const _props = {
sequenceIds: [...sequenceIds, sequenceId],
addSequenceId,
htmlPerf,
onHtmlPerf,
onInput: props?.onInput,
options,
};
component = <HtmlPerfEditor {..._props} />;
}
component ||= <div {...props} contentEditable={false} />;
}

return <>{component}</>;
if (sequenceId && !options.preview) {
const _props = {
sequenceIds: [...sequenceIds, sequenceId],
addSequenceId,
htmlPerf,
onHtmlPerf,
onInput: props?.onInput,
options,
};
component = <HtmlPerfEditor {..._props} />;
}
component ||= <div {...props} contentEditable={false} />;
}
// eslint-disable-next-line react/jsx-no-useless-fragment
return <>{component}</>;
}

0 comments on commit 5989676

Please sign in to comment.