Use NoteBox component, and fix overflow detection

VEuPathDB · Nov 15, 2024 · 163d857 · 163d857
1 parent 9539df4
commit 163d857
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 38 deletions.
diff --git a/packages/libs/wdk-client/src/Views/Records/RecordTable/RecordTableDescription.jsx b/packages/libs/wdk-client/src/Views/Records/RecordTable/RecordTableDescription.jsx
@@ -1,17 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { safeHtml, wrappable } from '../../../Utils/ComponentUtils';
-
-const containerStyle = {
-  display: 'flex',
-  flexWrap: 'wrap',
-  borderLeft: '.2em solid #79a3d7',
-  borderRight: '.2em solid #79a3d7',
-  padding: '.5em 1em',
-  background: '#ebf4ff',
-  gap: '1em',
-  marginBottom: '1em',
-};
+import { NoteBox } from '@veupathdb/coreui';
 
 function RecordTableDescription(props) {
   const { description } = props.table;
@@ -21,7 +11,7 @@ function RecordTableDescription(props) {
   if (!description) return null;
 
   return (
-    <div style={containerStyle}>
+    <NoteBox type="info">
       {safeHtml(
         description,
         {
@@ -30,7 +20,7 @@ function RecordTableDescription(props) {
               return;
             }
             if (
-              el.clientWidth >= el.scrollWidth ||
+              el.clientWidth >= el.scrollWidth &&
               el.clientHeight >= el.scrollHeight
             ) {
               setIsOverflowing(false);
@@ -51,15 +41,23 @@ function RecordTableDescription(props) {
         'div'
       )}
       {isOverflowing && (
-        <button
-          type="button"
-          className="link"
-          onClick={() => setIsExpanded((value) => !value)}
-        >
-          {isExpanded ? 'Read less' : 'Read more'}
-        </button>
+        <>
+          <button
+            type="button"
+            style={{
+              border: 'none',
+              padding: 0,
+              margin: '1ex 0 0 0',
+              background: 'transparent',
+              color: '#069',
+            }}
+            onClick={() => setIsExpanded((value) => !value)}
+          >
+            {isExpanded ? 'Read less' : 'Read more'}
+          </button>
+        </>
       )}
-    </div>
+    </NoteBox>
   );
 }
 

diff --git a/packages/sites/ortho-site/webapp/wdkCustomization/js/client/records/Sequences.tsx b/packages/sites/ortho-site/webapp/wdkCustomization/js/client/records/Sequences.tsx
@@ -31,6 +31,7 @@ import { PfamDomain } from 'ortho-client/components/pfam-domains/PfamDomain';
 import {
   FilledButton,
   FloatingButton,
+  NoteBox,
   OutlinedButton,
   SelectList,
   Undo,
@@ -662,23 +663,7 @@ export function RecordTable_Sequences(
         } as CSSProperties
       }
     >
-      {warningText && (
-        <div
-          style={{
-            display: 'flex',
-            flexWrap: 'wrap',
-            borderLeft: '.2em solid rgb(225, 133, 133)',
-            borderRight: '.2em solid rgb(225, 133, 133)',
-            padding: '.5em 1em',
-            background: 'rgb(255, 228, 228)',
-            gap: '1em',
-            marginBottom: '1em',
-            fontWeight: 500,
-          }}
-        >
-          {warningText}
-        </div>
-      )}
+      {warningText && <NoteBox type="error">{warningText}</NoteBox>}
       <div
         style={{
           padding: '10px',