Fix: update frontend to render css grid and proper aspect ratios for doc thumbnails, fix pdf landscape orientation
All checks were successful
Automated Container Build / build-and-push (push) Successful in 1m19s
All checks were successful
Automated Container Build / build-and-push (push) Successful in 1m19s
This commit is contained in:
parent
130aa1b806
commit
1c721b6f6f
4 changed files with 57 additions and 28 deletions
|
|
@ -218,7 +218,8 @@ func generateOfficeThumbnail(filePath, destPath string, cfg *config.Config) erro
|
||||||
"ignorePrintArea": true,
|
"ignorePrintArea": true,
|
||||||
"printGridlines": true,
|
"printGridlines": true,
|
||||||
"printHeadings": true,
|
"printHeadings": true,
|
||||||
"fitToWidth": 1,
|
"fitToWidth": 0,
|
||||||
|
"orientation": "landscape",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
pdfUrl, err := callConvert(pdfPayload)
|
pdfUrl, err := callConvert(pdfPayload)
|
||||||
|
|
|
||||||
|
|
@ -1222,10 +1222,10 @@ export default function FileExplorer({ onLogout }: FileExplorerProps) {
|
||||||
})();
|
})();
|
||||||
|
|
||||||
if (isMedia && file.checksum && viewMode === 'grid') {
|
if (isMedia && file.checksum && viewMode === 'grid') {
|
||||||
const isDoc = file.name.endsWith('.docx') || file.name.endsWith('.pptx') || file.name.endsWith('.xlsx');
|
const docType = file.name.endsWith('.docx') ? 'docs' : file.name.endsWith('.pptx') ? 'slides' : (file.name.endsWith('.xlsx') || file.name.endsWith('.xls')) ? 'sheets' : null;
|
||||||
return (
|
return (
|
||||||
<div className="relative w-full h-full flex items-center justify-center overflow-hidden rounded-md">
|
<div className="relative w-full h-full flex items-center justify-center overflow-hidden rounded-md">
|
||||||
<ThumbnailImage checksum={file.checksum} fallbackIcon={fallbackIcon} downloadToken={downloadToken} isDocument={isDoc} />
|
<ThumbnailImage checksum={file.checksum} fallbackIcon={fallbackIcon} downloadToken={downloadToken || ''} docType={docType} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -244,7 +244,7 @@ export default function OfficeHome({ type, onFileSelect, onCreateBlank, onPinCha
|
||||||
>
|
>
|
||||||
{file.checksum ? (
|
{file.checksum ? (
|
||||||
<div className="absolute inset-0 w-full h-full flex items-center justify-center z-0">
|
<div className="absolute inset-0 w-full h-full flex items-center justify-center z-0">
|
||||||
<ThumbnailImage checksum={file.checksum} fallbackIcon={<Icon className="w-16 h-16 text-3xl opacity-30 group-hover:opacity-60 transition-opacity" />} downloadToken={downloadToken} isDocument={true} />
|
<ThumbnailImage checksum={file.checksum} fallbackIcon={<Icon className="w-16 h-16 text-3xl opacity-30 group-hover:opacity-60 transition-opacity" />} downloadToken={downloadToken} docType={type} />
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<Icon className="w-16 h-16 text-3xl opacity-30 group-hover:opacity-60 transition-opacity" />
|
<Icon className="w-16 h-16 text-3xl opacity-30 group-hover:opacity-60 transition-opacity" />
|
||||||
|
|
|
||||||
|
|
@ -5,21 +5,28 @@ interface ThumbnailImageProps {
|
||||||
checksum: string;
|
checksum: string;
|
||||||
fallbackIcon: React.ReactNode;
|
fallbackIcon: React.ReactNode;
|
||||||
downloadToken: string;
|
downloadToken: string;
|
||||||
isDocument?: boolean;
|
docType?: 'docs' | 'slides' | 'sheets' | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function ThumbnailImage({ checksum, fallbackIcon, downloadToken, isDocument }: ThumbnailImageProps) {
|
export default function ThumbnailImage({ checksum, fallbackIcon, downloadToken, docType }: ThumbnailImageProps) {
|
||||||
const [errorCount, setErrorCount] = useState(0);
|
const [errorCount, setErrorCount] = useState(0);
|
||||||
const [key, setKey] = useState(0);
|
const [key, setKey] = useState(0);
|
||||||
const [showFallback, setShowFallback] = useState(false);
|
const [showFallback, setShowFallback] = useState(false);
|
||||||
|
|
||||||
return (
|
const docStyle = docType === 'docs'
|
||||||
<>
|
? 'w-[85%] aspect-[1/1.4] bg-white border border-gray-300 dark:border-gray-600 shadow-md'
|
||||||
|
: docType === 'slides'
|
||||||
|
? 'w-[85%] aspect-[16/9] bg-white border border-gray-300 dark:border-gray-600 shadow-md'
|
||||||
|
: docType === 'sheets'
|
||||||
|
? 'w-[85%] aspect-[1.4/1] bg-white border border-gray-300 dark:border-gray-600 shadow-md'
|
||||||
|
: 'w-full h-full';
|
||||||
|
|
||||||
|
const imgElement = (
|
||||||
<img
|
<img
|
||||||
key={key}
|
key={key}
|
||||||
src={downloadToken ? `${api.getThumbnailUrl(checksum, downloadToken)}${errorCount > 0 ? `&t=${key}` : ''}` : ''}
|
src={downloadToken ? `${api.getThumbnailUrl(checksum, downloadToken)}${errorCount > 0 ? `&t=${key}` : ''}` : ''}
|
||||||
alt=""
|
alt=""
|
||||||
className={`object-contain ${isDocument ? 'max-w-[85%] max-h-[85%] bg-white border border-gray-300 dark:border-gray-600 shadow-md' : 'w-full h-full'}`}
|
className={`object-contain ${docType ? 'w-full h-full object-cover mix-blend-multiply' : 'w-full h-full'}`}
|
||||||
style={{ display: showFallback ? 'none' : 'block' }}
|
style={{ display: showFallback ? 'none' : 'block' }}
|
||||||
onError={(e) => {
|
onError={(e) => {
|
||||||
if (errorCount < 20) {
|
if (errorCount < 20) {
|
||||||
|
|
@ -37,6 +44,27 @@ export default function ThumbnailImage({ checksum, fallbackIcon, downloadToken,
|
||||||
setShowFallback(false);
|
setShowFallback(false);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
|
if (docType) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={`flex items-center justify-center overflow-hidden ${docStyle}`}
|
||||||
|
style={docType === 'sheets' ? {
|
||||||
|
backgroundImage: 'linear-gradient(to right, #f3f4f6 1px, transparent 1px), linear-gradient(to bottom, #f3f4f6 1px, transparent 1px)',
|
||||||
|
backgroundSize: '16px 16px',
|
||||||
|
backgroundPosition: 'left top'
|
||||||
|
} : {}}
|
||||||
|
>
|
||||||
|
{imgElement}
|
||||||
|
{showFallback && fallbackIcon}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{imgElement}
|
||||||
{showFallback && fallbackIcon}
|
{showFallback && fallbackIcon}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Reference in a new issue