From 60df57e9d9c22d1e0dfc9fbc07d1358c635f139f Mon Sep 17 00:00:00 2001 From: Shaurya Sharma Date: Mon, 7 Apr 2025 10:06:12 +0530 Subject: [PATCH] Comments resolved --- .../_components/DataTypes/Markdown.jsx | 84 +++++++++---------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/frontend/src/AppBuilder/Widgets/NewTable/_components/DataTypes/Markdown.jsx b/frontend/src/AppBuilder/Widgets/NewTable/_components/DataTypes/Markdown.jsx index 0806f1df2e..a8bb593409 100644 --- a/frontend/src/AppBuilder/Widgets/NewTable/_components/DataTypes/Markdown.jsx +++ b/frontend/src/AppBuilder/Widgets/NewTable/_components/DataTypes/Markdown.jsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react'; +import React, { useState, useEffect, useRef } from 'react'; import OverlayTrigger from 'react-bootstrap/OverlayTrigger'; import { determineJustifyContentValue } from '@/_helpers/utils'; import { default as ReactMarkdown } from 'react-markdown'; @@ -21,8 +21,8 @@ export const MarkdownColumn = ({ horizontalAlignment, cellSize, }) => { - const ref = React.useRef(null); - const cellTextColor = useTextColor(id, textColor, 'json'); + const ref = useRef(null); + const cellTextColor = useTextColor(id, textColor); const isMaxRowHeightAuto = useTableStore((state) => state.getTableStyles(id)?.isMaxRowHeightAuto, shallow); const maxRowHeightValue = useTableStore((state) => state.getTableStyles(id)?.maxRowHeightValue, shallow); const [hovered, setHovered] = useState(false); @@ -122,51 +122,49 @@ export const MarkdownColumn = ({ ref?.current?.clientHeight < ref?.current?.children[0]?.offsetHeight); return ( - <> - } - trigger={_showOverlay && ['hover', 'focus']} - rootClose={true} - show={_showOverlay && hovered && !isEditing} - > - {!isEditable ? ( + } + trigger={_showOverlay && ['hover', 'focus']} + rootClose={true} + show={_showOverlay && hovered && !isEditing} + > + {!isEditable ? ( +
{ + if (!hovered) setHovered(true); + }} + onMouseLeave={() => { + setHovered(false); + }} + ref={ref} + > + + {getCellValue(cellValue)} + +
+ ) : ( +
{ if (!hovered) setHovered(true); }} - onMouseLeave={() => { - setHovered(false); - }} - ref={ref} + onMouseLeave={() => setHovered(false)} + className={`${isEditing ? 'h-100 content-editing' : ''} h-100`} > - - {getCellValue(cellValue)} - + {renderEditable()}
- ) : ( -
-
{ - if (!hovered) setHovered(true); - }} - onMouseLeave={() => setHovered(false)} - className={`${isEditing ? 'h-100 content-editing' : ''} h-100`} - > - {renderEditable()} -
-
- )} - - +
+ )} +
); };