[Explorer] Reduces the size of the copy icon that is used with IDs (#…

…4504) * sets default copy icon size at 14px * enlarges the copy icon for IDs at the top of results pages * splits copy button into 2 entities and makes no copy button the default * set stroke colour * the smaller copy icon disappears on mobile * modify copied text for mobile * use gap * lower copy icon * adjustments for mobile * updates tests * reduces x gap to 6px * adds 1px to bottom of badge
MystenLabs · Sep 9, 2022 · a8dafe7 · a8dafe7
1 parent 2bf1304
commit a8dafe7
Show file tree

Hide file tree

Showing 22 changed files with 72 additions and 59 deletions.
diff --git a/explorer/client/cypress/e2e/static/e2e.cy.ts b/explorer/client/cypress/e2e/static/e2e.cy.ts
@@ -6,7 +6,7 @@ Cypress.config('baseUrl', 'http://localhost:8080');
 // Standardized CSS Selectors
 const mainBodyCSS = 'main > section > div';
 const nftObject = (num: number) => `div#ownedObjects > div:nth-child(${num}) a`;
-const ownerButton = 'td#owner span:first-child';
+const ownerButton = 'td#owner > div > div';
 
 // Standardized expectations:
 const expectHome = () => {

diff --git a/explorer/client/src/assets/SVGIcons/16px/Copy.svg b/explorer/client/src/assets/SVGIcons/16px/Copy.svg
diff --git a/explorer/client/src/assets/SVGIcons/24px/Copy.svg b/explorer/client/src/assets/SVGIcons/24px/Copy.svg
diff --git a/explorer/client/src/assets/SVGIcons/Copy.svg b/explorer/client/src/assets/SVGIcons/Copy.svg
diff --git a/explorer/client/src/components/longtext/Longtext.module.css b/explorer/client/src/components/longtext/Longtext.module.css
@@ -1,25 +1,25 @@
-.copy {
-    @apply cursor-pointer mr-2;
+.copy16,
+.copy24 {
+    @apply cursor-pointer stroke-sui-blue-steel leading-[100%] self-start sm:self-end;
+}
 
-    /* fix some wiered vertical spacing svg with copy 16px is the high of svg */
-    font-size: 16px !important;
-    vertical-align: middle;
-    line-height: 100%;
+.copy16 {
+    @apply hidden sm:block;
 }
 
 .copied {
-    @apply text-green-600 ml-1 text-sm;
+    @apply text-green-600 text-sm self-start sm:self-center;
 }
 
-.longtext,
-.longtext > a {
-    @apply no-underline text-sui-dark hover:text-[#1F6493] cursor-pointer break-all inline mr-2;
+.copied span {
+    @apply block sm:inline w-[20vw] text-center;
 }
 
-.linktext {
-    @apply mr-2;
+.longtext,
+.longtext > a {
+    @apply no-underline text-sui-dark hover:text-[#1F6493] cursor-pointer break-all inline;
 }
 
 .longtextwrapper {
-    @apply inline md:block min-w-fit;
+    @apply flex items-center gap-[6px] min-w-fit;
 }
diff --git a/explorer/client/src/components/longtext/Longtext.tsx b/explorer/client/src/components/longtext/Longtext.tsx
@@ -4,7 +4,8 @@
 import { useCallback, useState, useContext } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 
-import { ReactComponent as ContentCopyIcon } from '../../assets/SVGIcons/Copy.svg';
+import { ReactComponent as ContentCopyIcon16 } from '../../assets/SVGIcons/16px/Copy.svg';
+import { ReactComponent as ContentCopyIcon24 } from '../../assets/SVGIcons/24px/Copy.svg';
 import { ReactComponent as ContentForwardArrowDark } from '../../assets/SVGIcons/forward-arrow-dark.svg';
 import { NetworkContext } from '../../context';
 import { navigateWithUnknown } from '../../utils/searchUtil';
@@ -17,7 +18,7 @@ function Longtext({
     category = 'unknown',
     isLink = true,
     alttext = '',
-    isCopyButton = true,
+    copyButton = 'none',
     showIconButton = false,
 }: {
     text: string;
@@ -30,7 +31,7 @@ function Longtext({
         | 'unknown';
     isLink?: boolean;
     alttext?: string;
-    isCopyButton?: boolean;
+    copyButton?: '16' | '24' | 'none';
     showIconButton?: boolean;
 }) {
     const [isCopyIcon, setCopyIcon] = useState(true);
@@ -48,17 +49,30 @@ function Longtext({
     let icon;
     let iconButton = <></>;
 
-    if (isCopyButton) {
+    if (copyButton !== 'none') {
         if (pleaseWait) {
-            icon = <span className={styles.copied}>&#8987; Please Wait</span>;
+            icon = <div className={styles.copied}>&#8987; Please Wait</div>;
         } else if (isCopyIcon) {
             icon = (
-                <span className={styles.copy} onClick={handleCopyEvent}>
-                    <ContentCopyIcon />
-                </span>
+                <div
+                    className={
+                        copyButton === '16' ? styles.copy16 : styles.copy24
+                    }
+                    onClick={handleCopyEvent}
+                >
+                    {copyButton === '16' ? (
+                        <ContentCopyIcon16 />
+                    ) : (
+                        <ContentCopyIcon24 />
+                    )}
+                </div>
             );
         } else {
-            icon = <span className={styles.copied}>&#10003; Copied</span>;
+            icon = (
+                <span className={styles.copied}>
+                    <span>&#10003;</span> <span>Copied</span>
+                </span>
+            );
         }
     } else {
         icon = <></>;
@@ -88,9 +102,9 @@ function Longtext({
     if (isLink) {
         if (category === 'unknown') {
             textComponent = (
-                <span className={styles.longtext} onClick={navigateUnknown}>
+                <div className={styles.longtext} onClick={navigateUnknown}>
                     {alttext ? alttext : text}
-                </span>
+                </div>
             );
         } else if (category === 'ethAddress') {
             textComponent = (
@@ -102,17 +116,19 @@ function Longtext({
             );
         } else {
             textComponent = (
-                <Link
-                    className={styles.longtext}
-                    to={`/${category}/${encodeURIComponent(text)}`}
-                >
-                    {alttext ? alttext : text} {iconButton}
-                </Link>
+                <div>
+                    <Link
+                        className={styles.longtext}
+                        to={`/${category}/${encodeURIComponent(text)}`}
+                    >
+                        {alttext ? alttext : text} {iconButton}
+                    </Link>
+                </div>
             );
         }
     } else {
         textComponent = (
-            <span className={styles.linktext}>{alttext ? alttext : text}</span>
+            <div className={styles.linktext}>{alttext ? alttext : text}</div>
         );
     }
 

diff --git a/explorer/client/src/components/ownedobjects/views/OwnedCoinView.tsx b/explorer/client/src/components/ownedobjects/views/OwnedCoinView.tsx
@@ -65,7 +65,6 @@ function SingleCoinView({
                                     <Longtext
                                         text={subObj.id}
                                         category="objects"
-                                        isCopyButton={false}
                                     />
                                 </div>
                                 <div />

diff --git a/explorer/client/src/components/ownedobjects/views/OwnedNFTView.tsx b/explorer/client/src/components/ownedobjects/views/OwnedNFTView.tsx
@@ -23,7 +23,6 @@ export default function OwnedNFTView({ results }: { results: DataType }) {
                             <Longtext
                                 text={entryObj.id}
                                 category="objects"
-                                isCopyButton={false}
                                 alttext={alttextgen(entryObj.id)}
                             />
                         </div>

diff --git a/explorer/client/src/components/table/TableCard.tsx b/explorer/client/src/components/table/TableCard.tsx
@@ -66,7 +66,7 @@ export function TxAddresses({ content }: { content: LinkObj[] }) {
                         alttext={itm.name}
                         category={(itm.category as Category) || 'unknown'}
                         isLink={itm?.isLink}
-                        isCopyButton={itm?.copy}
+                        copyButton={itm?.copy ? '16' : 'none'}
                     />
                     {idx !== content.length - 1 && <ContentForwardArrow />}
                 </div>

diff --git a/explorer/client/src/components/top-groups/TopGroups.tsx b/explorer/client/src/components/top-groups/TopGroups.tsx
@@ -125,7 +125,6 @@ function TopGroupsCard() {
                             text=""
                             category="transactions"
                             isLink={true}
-                            isCopyButton={false}
                             showIconButton={true}
                             alttext="More NFT Collections"
                         />

diff --git a/explorer/client/src/components/top-validators-card/TopValidatorsCard.tsx b/explorer/client/src/components/top-validators-card/TopValidatorsCard.tsx
@@ -100,7 +100,6 @@ function TopValidatorsCard({ state }: { state: ValidatorState }): JSX.Element {
                     alttext={truncate(validator.address, 14)}
                     category={'addresses'}
                     isLink={true}
-                    isCopyButton={false}
                 />
             ),
             pubkeyBytes: (
@@ -109,7 +108,6 @@ function TopValidatorsCard({ state }: { state: ValidatorState }): JSX.Element {
                     alttext={truncate(validator.pubkeyBytes, 14)}
                     category={'addresses'}
                     isLink={false}
-                    isCopyButton={false}
                 />
             ),
         })),

diff --git a/explorer/client/src/pages/address-result/AddressResult.tsx b/explorer/client/src/pages/address-result/AddressResult.tsx
@@ -39,6 +39,7 @@ function AddressResult() {
                             text={addressID}
                             category="addresses"
                             isLink={false}
+                            copyButton="24"
                         />
                     </div>
                 </div>

diff --git a/explorer/client/src/pages/object-result/views/PkgView.tsx b/explorer/client/src/pages/object-result/views/PkgView.tsx
@@ -48,7 +48,6 @@ function PkgView({ data }: { data: DataType }) {
                                         text={viewedData.id}
                                         category="objects"
                                         isLink={false}
-                                        isCopyButton={false}
                                     />
                                 </td>
                             </tr>
@@ -66,7 +65,6 @@ function PkgView({ data }: { data: DataType }) {
                                             text={viewedData.publisherAddress}
                                             category="addresses"
                                             isLink={!isPublisherGenesis}
-                                            isCopyButton={false}
                                         />
                                     </td>
                                 </tr>

diff --git a/explorer/client/src/pages/object-result/views/TokenView.tsx b/explorer/client/src/pages/object-result/views/TokenView.tsx
@@ -100,7 +100,6 @@ function TokenView({ data }: { data: DataType }) {
                                         text={viewedData.id}
                                         category="objects"
                                         isLink={false}
-                                        isCopyButton={false}
                                     />
                                 </td>
                             </tr>
@@ -113,7 +112,6 @@ function TokenView({ data }: { data: DataType }) {
                                             text={viewedData.tx_digest}
                                             category="transactions"
                                             isLink={true}
-                                            isCopyButton={false}
                                         />
                                     </td>
                                 </tr>
@@ -138,7 +136,6 @@ function TokenView({ data }: { data: DataType }) {
                                             viewedData.owner !== 'Immutable' &&
                                             viewedData.owner !== 'Shared'
                                         }
-                                        isCopyButton={false}
                                     />
                                 </td>
                             </tr>

diff --git a/explorer/client/src/pages/object-result/views/shared/ObjHeader.tsx b/explorer/client/src/pages/object-result/views/shared/ObjHeader.tsx
@@ -22,7 +22,12 @@ function ObjAddressHeader({ data }: { data: ObjHeaderData }) {
                 <ObjIcon /> {data.objKind}
             </div>
             <div className={resultheaderstyle.address}>
-                <Longtext text={data.objId} category="objects" isLink={false} />
+                <Longtext
+                    text={data.objId}
+                    category="objects"
+                    isLink={false}
+                    copyButton="24"
+                />
             </div>
             {data.objName && (
                 <div className={styles.objname}>{data.objName}</div>

diff --git a/explorer/client/src/pages/transaction-result/SendReceiveView.tsx b/explorer/client/src/pages/transaction-result/SendReceiveView.tsx
@@ -32,7 +32,6 @@ function SendRecieveView({ data }: { data: TxAddress }) {
                 <Longtext
                     text={data.sender}
                     category="addresses"
-                    isCopyButton={false}
                     isLink={true}
                 />
                 {data.recipient && (
@@ -43,7 +42,6 @@ function SendRecieveView({ data }: { data: TxAddress }) {
                                     text={add}
                                     category="addresses"
                                     isLink={true}
-                                    isCopyButton={false}
                                     alttext={add}
                                 />
                             </li>

diff --git a/explorer/client/src/pages/transaction-result/TransactionView.tsx b/explorer/client/src/pages/transaction-result/TransactionView.tsx
@@ -212,6 +212,7 @@ function ItemView({ data }: { data: TxItemView }) {
                                         text={item.value as string}
                                         category={item.category as Category}
                                         isLink={true}
+                                        copyButton="16"
                                     />
                                 ) : item.href ? (
                                     <Link
@@ -267,12 +268,7 @@ function TransactionView({ txdata }: { txdata: DataType }) {
 
     let eventTitlesDisplay = eventTitles.map((et) => (
         <div key={et} className={styles.eventtitle}>
-            <Longtext
-                text={et}
-                category={'unknown'}
-                isCopyButton={false}
-                isLink={false}
-            />
+            <Longtext text={et} category={'unknown'} isLink={false} />
         </div>
     ));
 

diff --git a/explorer/client/src/pages/transaction-result/TxLinks.tsx b/explorer/client/src/pages/transaction-result/TxLinks.tsx
@@ -39,6 +39,7 @@ function TxLinks({ data }: { data: Addresslist }) {
                                     text={objId}
                                     category={data?.category as Category}
                                     isLink={true}
+                                    copyButton="16"
                                 />
                             </li>
                         ))}

diff --git a/explorer/client/src/pages/transaction-result/TxResultHeader.module.css b/explorer/client/src/pages/transaction-result/TxResultHeader.module.css
@@ -12,7 +12,7 @@
 }
 
 .txresulttype {
-    @apply capitalize py-[4px] px-[8px] flex items-center gap-[6px] mt-[8px] lg:ml-[6px] lg:mt-0  rounded-[6px] w-fit;
+    @apply capitalize pt-[4px] pb-[5px] px-[8px] flex items-center gap-[6px] mt-[8px] lg:ml-[6px] lg:mt-0  rounded-[6px] w-fit;
 }
 
 .explain > span,

diff --git a/explorer/client/src/pages/transaction-result/TxResultHeader.tsx b/explorer/client/src/pages/transaction-result/TxResultHeader.tsx
@@ -56,6 +56,7 @@ function TxAddressHeader({ data }: { data: TxResultState }) {
                         text={data.txId}
                         category="addresses"
                         isLink={false}
+                        copyButton="24"
                     />
                     <div
                         className={cl([

diff --git a/explorer/client/src/pages/validators/Validators.tsx b/explorer/client/src/pages/validators/Validators.tsx
@@ -185,7 +185,6 @@ function ValidatorsPage({ state }: { state: ValidatorState }): JSX.Element {
                         alttext={truncate(validator.pubkeyBytes, 14)}
                         category={'addresses'}
                         isLink={false}
-                        isCopyButton={false}
                     />
                 ),
             };
@@ -222,7 +221,6 @@ function ValidatorsPage({ state }: { state: ValidatorState }): JSX.Element {
                             text=""
                             category="validators"
                             isLink={false}
-                            isCopyButton={false}
                             alttext=""
                         />
                     </TabFooter>

diff --git a/explorer/client/tailwind.config.js b/explorer/client/tailwind.config.js
@@ -32,6 +32,9 @@ module.exports = {
                         40: '#F7F8F8',
                         35: '#FEFEFE',
                     },
+                    blue: {
+                        steel: '#A0B6C3',
+                    },
                 },
                 issue: {
                     dark: '#EB5A29',