From 6a8693118db395c718fdd62e7a8df67007aa8ff7 Mon Sep 17 00:00:00 2001 From: Lucas Tavares Date: Fri, 9 Aug 2024 15:49:30 -0300 Subject: [PATCH 1/2] fix --- .../placeDescription/PlaceDescriptionBar.js | 52 +++++++++++++------ .../ProgramaDescriptionBar.js | 4 +- .../temaDescription/TemaDescriptionBar.js | 10 ++-- 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/components/sidebars/placeDescription/PlaceDescriptionBar.js b/src/components/sidebars/placeDescription/PlaceDescriptionBar.js index 1811f69..87847fc 100644 --- a/src/components/sidebars/placeDescription/PlaceDescriptionBar.js +++ b/src/components/sidebars/placeDescription/PlaceDescriptionBar.js @@ -788,22 +788,40 @@ const PlaceDescriptionBar = forwardRef( - - {fullText && isTextClamped && ( - - )} - + +
+ {fullText && isTextClamped && ( + + )} + +
@@ -847,7 +865,7 @@ const PlaceDescriptionBar = forwardRef( )} - {isDesktop() && ( + {/* {isDesktop() && ( - )} + )} */} ); }); diff --git a/src/components/sidebars/programaDescription/ProgramaDescriptionBar.js b/src/components/sidebars/programaDescription/ProgramaDescriptionBar.js index 9b34011..b623fc5 100644 --- a/src/components/sidebars/programaDescription/ProgramaDescriptionBar.js +++ b/src/components/sidebars/programaDescription/ProgramaDescriptionBar.js @@ -389,7 +389,9 @@ const ProgramaDescriptionBar = forwardRef( const [isScreen500, setTextScreen500] = useState(false); - const fullText = programaData?.descricao?.replace(/<br \/>\\r/g, '
').replace(/- /g, '• ') + const fullText = programaData?.descricao + ?.replace(/<br \/>/g, '
') + .replace(/- /g, '• '); // Calcule o número de caracteres com base na altura da janela const numChars = Math.floor(windowHeight / (isScreen900 ? 3.9 : (isScreen500 ? 4 : 1.1))); diff --git a/src/components/sidebars/temaDescription/TemaDescriptionBar.js b/src/components/sidebars/temaDescription/TemaDescriptionBar.js index 940eb02..2ad500e 100644 --- a/src/components/sidebars/temaDescription/TemaDescriptionBar.js +++ b/src/components/sidebars/temaDescription/TemaDescriptionBar.js @@ -409,8 +409,11 @@ const TemaDescriptionBar = forwardRef( const [isScreen500, setTextScreen500] = useState(false); - const fullText = temaData?.descricao; + const fullText = temaData?.descricao + ?.replace(/<br \/>/g, '
') + .replace(/- /g, '• '); + console.log("fullText", fullText) // Calcule o número de caracteres com base na altura da janela const numChars = Math.floor(windowHeight / (isScreen900 ? 3 : (isScreen500 ? 4 : 1.8))); @@ -468,7 +471,7 @@ const TemaDescriptionBar = forwardRef( - {isTextExpanded ? fullText : shortText == "undefined ..." ? "Desculpe, ainda não possuímos descrição para este tema. Por favor, tente novamente mais tarde." : (fullText + " ..." === shortText) ? fullText : shortText} + {fullText && fullText !== "" && fullText + " ..." !== shortText &&