mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-06 16:32:40 +00:00
"Refactor BrewRenderer: simplify URL param extraction, remove iframe existence checks, and update scrollIntoView behavior"
This commit is contained in:
@@ -81,9 +81,7 @@ const BrewRenderer = (props)=>{
|
|||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Extract element ID from the URL
|
const elementId = window.location.hash.slice(1); // Remove the leading '#'
|
||||||
const urlParams = new URLSearchParams(window.location.search);
|
|
||||||
const elementId = urlParams.get('elementId'); // Assume the URL is like ?elementId=yourElementId
|
|
||||||
|
|
||||||
if (elementId) {
|
if (elementId) {
|
||||||
const iframe = document.getElementById('BrewRenderer');
|
const iframe = document.getElementById('BrewRenderer');
|
||||||
@@ -106,7 +104,7 @@ const BrewRenderer = (props)=>{
|
|||||||
if (brewRenderer) {
|
if (brewRenderer) {
|
||||||
const pages = brewRenderer.querySelectorAll('.page');
|
const pages = brewRenderer.querySelectorAll('.page');
|
||||||
if (pages && pages[pageNumber]) {
|
if (pages && pages[pageNumber]) {
|
||||||
pages[pageNumber].scrollIntoView({ behavior: 'smooth', block: 'start' });
|
pages[pageNumber].scrollIntoView({ block: 'start' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -114,22 +112,10 @@ const BrewRenderer = (props)=>{
|
|||||||
|
|
||||||
const getPageContainingElement = (iframe, elementId) => {
|
const getPageContainingElement = (iframe, elementId) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
if (!iframe || !iframe.contentWindow) {
|
|
||||||
console.log("iframe doesn't exist or content window is not accessible.");
|
|
||||||
reject(new Error("iframe doesn't exist or content window is not accessible."));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
iframe.addEventListener('load', () => {
|
iframe.addEventListener('load', () => {
|
||||||
console.log('Iframe has finished loading');
|
|
||||||
|
|
||||||
const brewRenderer = iframe.contentWindow.document.querySelector('.brewRenderer');
|
const brewRenderer = iframe.contentWindow.document.querySelector('.brewRenderer');
|
||||||
console.log('brewRenderer:', brewRenderer);
|
console.log('brewRenderer:', brewRenderer);
|
||||||
if (!brewRenderer) {
|
|
||||||
console.log("brewRenderer doesn't exist");
|
|
||||||
reject(new Error("brewRenderer doesn't exist"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const pages = brewRenderer.querySelectorAll('.page');
|
const pages = brewRenderer.querySelectorAll('.page');
|
||||||
@@ -137,11 +123,8 @@ const BrewRenderer = (props)=>{
|
|||||||
|
|
||||||
for (let i = 0; i < pages.length; i++) {
|
for (let i = 0; i < pages.length; i++) {
|
||||||
if (pages[i].querySelector(`#${elementId}`)) {
|
if (pages[i].querySelector(`#${elementId}`)) {
|
||||||
console.log('Page containing element found:', i);
|
|
||||||
resolve(i);
|
resolve(i);
|
||||||
return;
|
return;
|
||||||
} else {
|
|
||||||
console.log('Page containing element not found:', i);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user