0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 20:42:43 +00:00
This commit is contained in:
Trevor Buckner
2025-01-27 23:10:37 -05:00
parent c22bb7fb92
commit 36df121cf6
3 changed files with 8 additions and 8 deletions

View File

@@ -40,7 +40,7 @@ const BrewPage = (props)=>{
...props
};
const pageRef = useRef(null);
let cleanText = safeHTML(props.contents);
const cleanText = safeHTML(props.contents);
useEffect(()=>{
if(!pageRef.current) return;
@@ -77,7 +77,7 @@ const BrewPage = (props)=>{
centerObserver.disconnect();
};
}, []);
return <div className={props.className} id={`p${props.index + 1}`} data-index={props.index} ref={pageRef} style={props.style} {...props.attributes}>
<div className='columnWrapper' dangerouslySetInnerHTML={{ __html: cleanText }} />
</div>;
@@ -185,11 +185,11 @@ const BrewRenderer = (props)=>{
return <BrewPage className='page phb' index={index} key={index} contents={html} style={styles} onVisibilityChange={handlePageVisibilityChange} />;
} else {
if(pageText.startsWith('\\page')) {
let firstLineTokens = Markdown.marked.lexer(pageText.split('\n', 1)[0])[0].tokens;
let injectedTags = firstLineTokens.find(obj => obj.injectedTags !== undefined)?.injectedTags;
const firstLineTokens = Markdown.marked.lexer(pageText.split('\n', 1)[0])[0].tokens;
const injectedTags = firstLineTokens.find((obj)=>obj.injectedTags !== undefined)?.injectedTags;
if(injectedTags) {
styles = {...styles, ...injectedTags.styles};
styles = _.mapKeys(styles, (v, k) => _.camelCase(k)); // Convert CSS to camelCase for React
styles = { ...styles, ...injectedTags.styles };
styles = _.mapKeys(styles, (v, k)=>_.camelCase(k)); // Convert CSS to camelCase for React
attributes = injectedTags.attributes;
}
pageText = pageText.includes('\n') ? pageText.substring(pageText.indexOf('\n') + 1) : ''; // Remove the \page line

View File

@@ -193,7 +193,7 @@ const Editor = createClass({
(this.props.renderer == 'V3' && line.match(/^(?=\\page(?:{[^\n{}]+})?$)/))) {
if(lineNumber > 0) // Since \page is optional on first line of document,
editorPageCount += 1; // don't use it to increment page count; stay at 1
editorPageCount += 1; // don't use it to increment page count; stay at 1
// add back the original class 'background' but also add the new class '.pageline'
codeMirror.addLineClass(lineNumber, 'background', 'pageLine');

View File

@@ -1002,7 +1002,7 @@ const Markdown = {
});
return errors;
}
},
};
export default Markdown;