Merge pull request #464 from contentstack/VE-6600-Hover-Toolbar-Support

HoverToolbar: Requested Changes

Author: csAyushDubey

src/visualBuilder/components/Tooltip.tsx

@@ -150,18 +150,18 @@ function ToolbarTooltipContent({contentTypeName, referenceFieldName}: {contentTy
   return (
     <div className={classNames("toolbar-tooltip-content", visualBuilderStyles()["toolbar-tooltip-content"])}>
       {
-        referenceFieldName && (
+        contentTypeName && (
           <div className={classNames("toolbar-tooltip-content-item", visualBuilderStyles()["toolbar-tooltip-content-item"])}>
-            <div dangerouslySetInnerHTML={{__html: FieldTypeIconsMap.reference}} className={classNames("visual-builder__field-icon", visualBuilderStyles()["visual-builder__field-icon"])}/>
-            <p>{referenceFieldName}</p>
+            <ContentTypeIcon />
+            <p>{contentTypeName}</p>
           </div>
         )
       }
       {
-        contentTypeName && (
+        referenceFieldName && (
           <div className={classNames("toolbar-tooltip-content-item", visualBuilderStyles()["toolbar-tooltip-content-item"])}>
-            <ContentTypeIcon />
-            <p>{contentTypeName}</p>
+            <div dangerouslySetInnerHTML={{__html: FieldTypeIconsMap.reference}} className={classNames("visual-builder__field-icon", visualBuilderStyles()["visual-builder__field-icon"])}/>
+            <p>{referenceFieldName}</p>
           </div>
         )
       }

src/visualBuilder/listeners/mouseHover.ts

@@ -223,6 +223,7 @@ const throttledMouseHover = throttle(async (params: HandleMouseHoverParams) => {
             eventTarget &&
             isFieldPathDropdown(eventTarget)
         ) {
+            params.customCursor && hideCustomCursor(params.customCursor);
             showOutline();
             showHoverToolbar({
                 event: params.event,