Oliver/presenton
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Merge conflict

Browse source
This commit is contained in:
shiva raj badu 2026-03-29 18:14:33 +05:45
parent 61cc0d3d8c
commit 13672f6254
No known key found for this signature in database
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electron/servers/nextjs/app/(presentation-generator)/(dashboard)/dashboard/components/PresentationCard.tsx
View file

@ -111,7 +111,7 @@ export const PresentationCard = ({
<img src="/card_bg.svg" alt="" className="absolute top-0 left-0 w-full h-full object-cover" />
<div className="scale-[0.75] mt-4 border border-gray-300 rounded-lg overflow-hidden">
<SlideScale slide={firstSlide} isClickable={true} />
<SlideScale slide={firstSlide} isClickable={false} />
</div>
<div className="w-full py-3 px-5 mt-auto z-40 relative bg-white border-t border-[#EDEEEF]">

7
electron/servers/nextjs/app/(presentation-generator)/components/PresentationRender.tsx
View file

@ -12,7 +12,8 @@ const SlideScale = ({
isEditMode = true,
/** Fill viewport; scale may exceed 1 so slides appear larger in present mode */
presentMode = false,
}: { slide: any; theme?: any; isEditMode?: boolean; presentMode?: boolean }) => {
isClickable = true,
}: { slide: any; theme?: any; isEditMode?: boolean; presentMode?: boolean; isClickable?: boolean }) => {
const containerRef = useRef<HTMLDivElement | null>(null);
const [box, setBox] = useState({ w: 0, h: 0 });
@ -76,11 +77,11 @@ const SlideScale = ({
} as React.CSSProperties}
>
{isClickable && <div
{!isClickable && <div
className="absolute inset-0 bg-transparent z-30 w-full h-full select-none"
aria-hidden="true"
/> */}
/>}
<V1ContentRender slide={slide} isEditMode={isEditMode} theme={theme} />
</div>