#705 - further improve keywords section

estruyf · Nov 25, 2024 · a7f183b · a7f183b
1 parent e10ee11
commit a7f183b
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 145 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,12 +10,6 @@
       "values": ["#build", "#deploy", "#skip"]
     }
   ],
-  "workbench.colorCustomizations": {
-    "titleBar.activeBackground": "#15c2cb",
-    "titleBar.inactiveBackground": "#44ffd299",
-    "titleBar.activeForeground": "#0E131F",
-    "titleBar.inactiveForeground": "#0E131F99"
-  },
   "files.exclude": {
     "out": false // set this to true to hide the "out" folder with the compiled JS files
   },

diff --git a/l10n/bundle.l10n.json b/l10n/bundle.l10n.json
@@ -496,6 +496,8 @@
 
   "panel.seoDetails.recommended": "Recommended",
 
+  "panel.seoKeywords.checks": "Checks",
+  "panel.seoKeywords.density.tableTitle": "Freq.",
   "panel.seoKeywords.density": "Keyword density",
   "panel.seoKeywordInfo.validInfo.label": "Used in heading(s)",
   "panel.seoKeywordInfo.validInfo.content": "Content",

diff --git a/src/localization/localization.enum.ts b/src/localization/localization.enum.ts
@@ -1600,6 +1600,14 @@ export enum LocalizationKey {
    * Recommended
    */
   panelSeoDetailsRecommended = 'panel.seoDetails.recommended',
+  /**
+   * Checks
+   */
+  panelSeoKeywordsChecks = 'panel.seoKeywords.checks',
+  /**
+   * Freq.
+   */
+  panelSeoKeywordsDensityTableTitle = 'panel.seoKeywords.density.tableTitle',
   /**
    * Keyword density
    */

diff --git a/src/panelWebView/components/SeoKeywordInfo.tsx b/src/panelWebView/components/SeoKeywordInfo.tsx
@@ -5,6 +5,7 @@ import { Tag } from './Tag';
 import { LocalizationKey, localize } from '../../localization';
 import { Messenger } from '@estruyf/vscode/dist/client';
 import { CommandToCode } from '../CommandToCode';
+import { Tooltip } from 'react-tooltip'
 
 export interface ISeoKeywordInfoProps {
   keywords: string[];
@@ -27,6 +28,9 @@ const SeoKeywordInfo: React.FunctionComponent<ISeoKeywordInfoProps> = ({
   wordCount,
   headings
 }: React.PropsWithChildren<ISeoKeywordInfoProps>) => {
+
+  const tooltipClasses = `!py-[2px] !px-[8px] !rounded-[3px] !border-[var(--vscode-editorHoverWidget-border)] !border !border-solid !bg-[var(--vscode-editorHoverWidget-background)] !text-[var(--vscode-editorHoverWidget-foreground)] !font-normal !opacity-100 shadow-[0_2px_8px_var(--vscode-widget-shadow)] !z-[9999]`;
+
   const density = () => {
     if (!wordCount) {
       return null;
@@ -35,7 +39,7 @@ const SeoKeywordInfo: React.FunctionComponent<ISeoKeywordInfoProps> = ({
     const pattern = new RegExp(`(^${keyword.toLowerCase()}(?=\\s|$))|(\\s${keyword.toLowerCase()}(?=\\s|$))`, 'ig');
     const count = (content.match(pattern) || []).length;
     const density = (count / wordCount) * 100;
-    const densityTitle = `${density.toFixed(2)}% *`;
+    const densityTitle = `${density.toFixed(2)}* %`;
 
     if (density < 0.75) {
       return <ValidInfo label={densityTitle} isValid={false} className='text-xs' />;
@@ -67,7 +71,7 @@ const SeoKeywordInfo: React.FunctionComponent<ISeoKeywordInfoProps> = ({
     }
 
     const exists = headings.filter((heading) => validateKeywords(heading, keyword));
-    return <ValidInfo isValid={exists.length > 0} />;
+    return exists.length > 0;
   };
 
   const onRemove = React.useCallback((tag: string) => {
@@ -78,6 +82,50 @@ const SeoKeywordInfo: React.FunctionComponent<ISeoKeywordInfoProps> = ({
     });
   }, [keywords]);
 
+  const checks = React.useMemo(() => {
+    return {
+      title: !!title && title.toLowerCase().includes(keyword.toLowerCase()),
+      description: !!description && description.toLowerCase().includes(keyword.toLowerCase()),
+      slug:
+        !!slug &&
+        (slug.toLowerCase().includes(keyword.toLowerCase()) ||
+          slug.toLowerCase().includes(keyword.replace(/ /g, '-').toLowerCase())),
+      content: !!content && content.toLowerCase().includes(keyword.toLowerCase()),
+      heading: checkHeadings()
+    };
+  }, [title, description, slug, content, headings, wordCount]);
+
+  const tooltipContent = React.useMemo(() => {
+    return (
+      <>
+        <span className='inline-flex items-center gap-1'>{localize(LocalizationKey.commonTitle)}: <ValidInfo isValid={checks.title} /></span><br />
+        <span className='inline-flex items-center gap-1'>{localize(LocalizationKey.commonDescription)}: <ValidInfo isValid={checks.description} /></span><br />
+        <span className='inline-flex items-center gap-1'>{localize(LocalizationKey.commonSlug)}: <ValidInfo isValid={checks.slug} /></span><br />
+        <span className='inline-flex items-center gap-1'>{localize(LocalizationKey.panelSeoKeywordInfoValidInfoContent)}: <ValidInfo isValid={checks.content} /></span><br />
+        <span className='inline-flex items-center gap-1'>{localize(LocalizationKey.panelSeoKeywordInfoValidInfoLabel)}: <ValidInfo isValid={!!checks.heading} /></span>
+      </>
+    )
+  }, [checks]);
+
+  const checksMarkup = React.useMemo(() => {
+    const validData = Object.values(checks).filter((check) => check).length;
+    const totalChecks = Object.values(checks).length;
+
+    const isValid = validData === totalChecks;
+
+    return (
+      <div 
+        className={`inline-flex py-1 px-[4px] rounded-[3px] justify-center items-center text-[12px] leading-[16px] border border-solid ${isValid ? "text-[#1f883d] border-[#1f883d]" : "text-[var(--vscode-statusBarItem-warningBackground)] border-[var(--vscode-statusBarItem-warningBackground)]"}`}
+        data-tooltip-id={`tooltip-checks-${keyword}`}
+      >
+        <ValidInfo isValid={isValid} />
+        <span className='mr-[1px]'>{validData}</span>
+        <span>/</span>
+        <span className='ml-[1px]'>{totalChecks}</span>
+      </div>
+    );
+  }, [checks]);
+
   if (!keyword || typeof keyword !== 'string') {
     return null;
   }
@@ -88,40 +136,25 @@ const SeoKeywordInfo: React.FunctionComponent<ISeoKeywordInfoProps> = ({
         <div className='flex h-full items-center'>
           <Tag
             value={keyword}
-            className={`!mx-0 !my-1 !px-2 !py-1`}
+            className={`!w-full !justify-between !mx-0 !my-1 !px-2 !py-1`}
             onRemove={onRemove}
             onCreate={() => void 0}
             title={localize(LocalizationKey.panelTagsTagWarning, keyword)}
             disableConfigurable={true}
           />
         </div>
       </VSCodeTableCell>
-      <VSCodeTableCell className={`text-center`}>
-        <ValidInfo
-          isValid={!!title && title.toLowerCase().includes(keyword.toLowerCase())}
-        />
-      </VSCodeTableCell>
-      <VSCodeTableCell className={`text-center`}>
-        <ValidInfo
-          isValid={!!description && description.toLowerCase().includes(keyword.toLowerCase())}
-        />
-      </VSCodeTableCell>
-      <VSCodeTableCell className={`text-center`}>
-        <ValidInfo
-          isValid={
-            !!slug &&
-            (slug.toLowerCase().includes(keyword.toLowerCase()) ||
-              slug.toLowerCase().includes(keyword.replace(/ /g, '-').toLowerCase()))
-          }
-        />
-      </VSCodeTableCell>
-      <VSCodeTableCell className={`text-center`}>
-        <ValidInfo
-          isValid={!!content && content.toLowerCase().includes(keyword.toLowerCase())}
-        />
-      </VSCodeTableCell>
-      <VSCodeTableCell className={`text-center`}>
-        {checkHeadings()}
+      <VSCodeTableCell>
+        {checksMarkup}
+
+        <Tooltip 
+          id={`tooltip-checks-${keyword}`}
+          className={tooltipClasses} 
+          style={{
+            fontSize: '12px',
+            lineHeight: '19px'
+          }}
+          render={() => tooltipContent} />
       </VSCodeTableCell>
       <VSCodeTableCell className={`text-center`}>
         {density()}

diff --git a/src/panelWebView/components/SeoKeywords.tsx b/src/panelWebView/components/SeoKeywords.tsx
@@ -1,10 +1,9 @@
 import * as React from 'react';
 import { SeoKeywordInfo } from './SeoKeywordInfo';
 import { ErrorBoundary } from '@sentry/react';
-import { Tooltip } from 'react-tooltip'
 import { LocalizationKey, localize } from '../../localization';
 import { VSCodeTable, VSCodeTableBody, VSCodeTableHead, VSCodeTableHeader, VSCodeTableRow } from './VSCode/VSCodeTable';
-import { Icon } from 'vscrui';
+import { Tooltip } from 'react-tooltip'
 
 export interface ISeoKeywordsProps {
   keywords: string[] | null;
@@ -23,7 +22,7 @@ const SeoKeywords: React.FunctionComponent<ISeoKeywordsProps> = ({
 }: React.PropsWithChildren<ISeoKeywordsProps>) => {
   const [isReady, setIsReady] = React.useState(false);
 
-  const tooltipClasses = `!py-[2px] !px-[8px] !rounded-[3px] !border-[var(--vscode-editorHoverWidget-border)] !border !border-solid !bg-[var(--vscode-editorHoverWidget-background)] !text-[var(--vscode-editorHoverWidget-foreground)] !font-normal !opacity-100`;
+  const tooltipClasses = `!py-[2px] !px-[8px] !rounded-[3px] !border-[var(--vscode-editorHoverWidget-border)] !border !border-solid !bg-[var(--vscode-editorHoverWidget-background)] !text-[var(--vscode-editorHoverWidget-foreground)] !font-normal !opacity-100 shadow-[0_2px_8px_var(--vscode-widget-shadow)]`;
 
   const validateKeywords = () => {
     if (!keywords) {
@@ -59,98 +58,25 @@ const SeoKeywords: React.FunctionComponent<ISeoKeywordsProps> = ({
 
   return (
     <section className={`seo__keywords__table`}>
-      <VSCodeTable>
+      <VSCodeTable disableOverflow>
         <VSCodeTableHeader>
           <VSCodeTableRow className={`border-t border-t-[var(--vscode-editorGroup-border)]`}>
             <VSCodeTableHead>
               {localize(LocalizationKey.panelSeoKeywordsHeaderKeyword)}
             </VSCodeTableHead>
-            <VSCodeTableHead className='text-center'>
-              <div
-                className='flex items-center justify-center h-full'
-              >
-                <Icon
-                  className='!text-[var(--vscode-foreground)]'
-                  name='quote'
-                  data-tooltip-id="tooltip-title"
-                  data-tooltip-content={localize(LocalizationKey.commonTitle)} />
-                <Tooltip id="tooltip-title" className={tooltipClasses} style={{
-                  fontSize: '12px',
-                  lineHeight: '19px'
-                }} />
-              </div>
-            </VSCodeTableHead>
-            <VSCodeTableHead className='text-center'>
-              <div
-                className='flex items-center justify-center h-full'
-              >
-                <Icon
-                  className='!text-[var(--vscode-foreground)]'
-                  name='note'
-                  data-tooltip-id="tooltip-description"
-                  data-tooltip-content={localize(LocalizationKey.commonDescription)} />
-                <Tooltip id="tooltip-description" className={tooltipClasses} style={{
-                  fontSize: '12px',
-                  lineHeight: '19px'
-                }} />
-              </div>
-            </VSCodeTableHead>
-            <VSCodeTableHead className='text-center'>
-              <div
-                className='flex items-center justify-center h-full'
-              >
-                <Icon
-                  className='!text-[var(--vscode-foreground)]'
-                  name='link'
-                  data-tooltip-id="tooltip-slug"
-                  data-tooltip-content={localize(LocalizationKey.commonSlug)} />
-                <Tooltip id="tooltip-slug" className={tooltipClasses} style={{
-                  fontSize: '12px',
-                  lineHeight: '19px'
-                }} />
-              </div>
-            </VSCodeTableHead>
-            <VSCodeTableHead className='text-center'>
-              <div
-                className='flex items-center justify-center h-full'
-              >
-                <Icon
-                  className='!text-[var(--vscode-foreground)]'
-                  name='book'
-                  data-tooltip-id="tooltip-content"
-                  data-tooltip-content={localize(LocalizationKey.panelSeoKeywordInfoValidInfoContent)} />
-                <Tooltip id="tooltip-content" className={tooltipClasses} style={{
-                  fontSize: '12px',
-                  lineHeight: '19px'
-                }} />
-              </div>
+            <VSCodeTableHead>
+              {localize(LocalizationKey.panelSeoKeywordsChecks)}
             </VSCodeTableHead>
+
             <VSCodeTableHead className='text-center'>
               <div
                 className='flex items-center justify-center h-full'
               >
                 <span
-                  className='text-[var(--vscode-foreground)] cursor-default select-none'
-                  data-tooltip-id="tooltip-heading"
-                  data-tooltip-content={localize(LocalizationKey.panelSeoKeywordInfoValidInfoLabel)}
-                >
-                  H1
-                </span>
-                <Tooltip id="tooltip-heading" className={tooltipClasses} style={{
-                  fontSize: '12px',
-                  lineHeight: '19px'
-                }} />
-              </div>
-            </VSCodeTableHead>
-            <VSCodeTableHead className='text-center'>
-              <div
-                className='flex items-center justify-center h-full'
-              >
-                <Icon
-                  className='!text-[var(--vscode-foreground)]'
-                  name='percentage'
                   data-tooltip-id="tooltip-density"
-                  data-tooltip-content={localize(LocalizationKey.panelSeoKeywordsDensity)} />
+                  data-tooltip-content={localize(LocalizationKey.panelSeoKeywordsDensity)}>
+                  {localize(LocalizationKey.panelSeoKeywordsDensityTableTitle)}
+                </span>
                 <Tooltip id="tooltip-density" className={tooltipClasses} style={{
                   fontSize: '12px',
                   lineHeight: '19px'
@@ -163,16 +89,16 @@ const SeoKeywords: React.FunctionComponent<ISeoKeywordsProps> = ({
         <VSCodeTableBody>
           {validKeywords.map((keyword, index) => {
             return (
-              <ErrorBoundary key={keyword} fallback={<div />}>
-                <SeoKeywordInfo key={index} keywords={validKeywords} keyword={keyword} {...data} />
+              <ErrorBoundary key={`${keyword}-${index}`} fallback={<div />}>
+                <SeoKeywordInfo keywords={validKeywords} keyword={keyword} {...data} />
               </ErrorBoundary>
             );
           })}
         </VSCodeTableBody>
       </VSCodeTable>
 
       {data.wordCount && (
-        <div className={`text-xs mt-2`}>
+        <div className={`text-xs my-2`}>
           {localize(LocalizationKey.panelSeoKeywordsDensityDescription)}
         </div>
       )}

diff --git a/src/panelWebView/components/VSCode/VSCodeTable.tsx b/src/panelWebView/components/VSCode/VSCodeTable.tsx
@@ -3,9 +3,9 @@ import { cn } from "../../../utils/cn"
 
 const VSCodeTable = React.forwardRef<
   HTMLTableElement,
-  React.HTMLAttributes<HTMLTableElement>
->(({ className, ...props }, ref) => (
-  <div className="relative w-full overflow-auto">
+  React.HTMLAttributes<HTMLTableElement> & { disableOverflow?: boolean }
+>(({ className, disableOverflow, ...props }, ref) => (
+  <div className={`relative w-full ${disableOverflow ? "" : "overflow-auto"}`}>
     <table
       ref={ref}
       className={cn("w-full text-base border-collapse indent-0 [&_tr:nth-child(2n)]:bg-[var(--vscode-keybindingTable-rowsBackground)]", className)}

diff --git a/src/panelWebView/components/ValidInfo.tsx b/src/panelWebView/components/ValidInfo.tsx
@@ -15,7 +15,7 @@ const ValidInfo: React.FunctionComponent<IValidInfoProps> = ({
   return (
     <div className='inline-flex items-center h-full'>
       {isValid ? (
-        <CheckIcon className={`h-4 w-4 text-[#46ec86] mr-2`} />
+        <CheckIcon className={`h-4 w-4 text-[#1f883d] mr-2`} />
       ) : (
         <ExclamationTriangleIcon className={`h-4 w-4 text-[var(--vscode-statusBarItem-warningBackground)] mr-2`} />
       )}

diff --git a/src/panelWebView/styles.css b/src/panelWebView/styles.css
@@ -866,28 +866,29 @@ vscode-divider {
   padding: 0.25rem 0.25rem;
   margin-bottom: 0.5rem;
   margin-right: 0.5rem;
-}
-
-.tag button {
-  background: none;
-  border: none;
-  color: inherit;
-  outline: none !important;
-  outline-offset: inherit !important;
-  margin: 0;
-  display: inline-flex;
-  align-items: center;
-  padding: 0.25rem;
-}
+  
+  button {
+    background: none;
+    border: none;
+    color: inherit;
+    outline: none !important;
+    outline-offset: inherit !important;
+    margin: 0;
+    display: inline-flex;
+    align-items: center;
+    padding: 0.25rem;
+    width: auto;
+  }
 
-.tag .tag__create {
-  margin-right: 0.25rem;
-}
+  .tag__create {
+    margin-right: 0.25rem;
 
-.tag .tag__create:hover {
-  color: var(--vscode-inputValidation-infoForeground, #000);
-  background-color: var(--vscode-inputValidation-infoBackground);
-  border-radius: 2px;
+    &:hover {
+      color: var(--vscode-inputValidation-infoForeground, #000);
+      background-color: var(--vscode-inputValidation-infoBackground);
+      border-radius: 2px;
+    }
+  }
 }
 
 .vscode-dark .tag .tag__create:hover {