Skip to content

page override wip #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions examples/vite_basic/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ const App = () => {
handleFileChange,
} = useFileLoader(AVAILABLE_FILES[0]);

console.log("test page ", testPage);

if (testPage) {
testPage.children = [undefined];
}
// uncomment to trigger error in renderer
// if (testPage) {
// testPage.children = [undefined];
// }

// Get backrefs for the currently selected file
const currentBackrefs = selectedFile?.backrefs || [];
Expand Down Expand Up @@ -112,6 +111,10 @@ const App = () => {
return <PageDelimiter {...props} />;
},
}}
pageOverride={{
pageNum: 1,
component: <p>hehe</p>,
}}
/>
)}
</div>
Expand Down
6 changes: 6 additions & 0 deletions typescript/src/renderer/JsonDocRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ interface JsonDocRendererProps {
viewJson?: boolean;
backrefs?: Backref[];
onError?: (error: Error, errorInfo: React.ErrorInfo) => void;
pageOverride?: {
pageNum: number;
component: React.ReactNode;
};
}

export const JsonDocRenderer = ({
Expand All @@ -34,6 +38,7 @@ export const JsonDocRenderer = ({
viewJson = false,
backrefs = [],
onError,
pageOverride,
}: JsonDocRendererProps) => {
console.log("theme: ", theme);
return (
Expand All @@ -50,6 +55,7 @@ export const JsonDocRenderer = ({
resolveImageUrl={resolveImageUrl}
viewJson={viewJson}
backrefs={backrefs}
pageOverride={pageOverride}
/>
</GlobalErrorBoundary>
</div>
Expand Down
39 changes: 39 additions & 0 deletions typescript/src/renderer/components/RendererContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ interface RendererContainerProps {
resolveImageUrl?: (url: string) => Promise<string>;
viewJson?: boolean;
backrefs?: Backref[];
pageOverride?: {
pageNum: number;
component: React.ReactNode;
};
}

export const RendererContainer: React.FC<RendererContainerProps> = ({
Expand All @@ -34,13 +38,16 @@ export const RendererContainer: React.FC<RendererContainerProps> = ({
resolveImageUrl,
viewJson = false,
backrefs = [],
pageOverride,
}) => {
// Use the modular hooks for highlight management
const { highlightCount, currentActiveIndex, navigateToHighlight } =
useHighlights({
backrefs,
});

console.log("pageOverride ", pageOverride);

useEffect(() => {
try {
//TODO: this is not throwing for invalid page object (one that doesn't follow schema)
Expand Down Expand Up @@ -78,6 +85,38 @@ export const RendererContainer: React.FC<RendererContainerProps> = ({
? (page.children[index + 1]?.metadata as any)?.origin?.page_num
: null;

console.log("pageOverride ", pageOverride);
console.log("currentPageNum ", currentPageNum);
console.log(
"pageOverride && currentPageNum === pageOverride.pageNum ",
pageOverride && currentPageNum === pageOverride.pageNum
);
console.log("\n".repeat(5));

// Check if this page should be replaced with override component
if (pageOverride && currentPageNum === pageOverride.pageNum) {
// Skip rendering blocks for this page and show override instead
const isLastBlockOfPage =
nextPageNum !== currentPageNum ||
index === page.children.length - 1;
if (isLastBlockOfPage) {
return (
<React.Fragment key={`page-override-${currentPageNum}`}>
{pageOverride.component}
{/* Still show page delimiter after override */}
{!components?.page_delimiter && (
<PageDelimiter pageNumber={currentPageNum} />
)}
{components?.page_delimiter && (
<components.page_delimiter pageNumber={currentPageNum} />
)}
</React.Fragment>
);
}
// Skip other blocks of the same page
return null;
}

// Show delimiter after the last block of each page
const showPageDelimiter =
currentPageNum &&
Expand Down
Loading