From a5e44cf4780a7bba55e33653357c41dffdb6521b Mon Sep 17 00:00:00 2001
From: simeng-li <simeng@silverhand.io>
Date: Fri, 1 Jul 2022 10:07:43 +0800
Subject: [PATCH] style(ui): add dark mode social icon (#1265)

* style(ui): add dark mode social icon

add dark mode social icon

* style(ui): social landing icon

social landing icon

* fix(ui): dark connector icon cr update

dark connector icon cr update

* fix(ui): cr fix

cr fix
---
 .../Button/SocialIconButton.module.scss       | 11 +++----
 .../components/Button/SocialIconButton.tsx    | 26 +++++++++-------
 .../components/Button/SocialLinkButton.tsx    | 15 ++++------
 .../ui/src/components/Button/index.test.tsx   |  7 ++++-
 .../ui/src/containers/SocialLanding/index.tsx |  8 +++--
 .../SocialSignInDropdown/index.tsx            | 10 +++++--
 .../SocialSignInIconList/index.tsx            | 28 ++++++++++-------
 .../SocialSignIn/SocialSignInList/index.tsx   | 30 +++++++++++--------
 packages/ui/src/hooks/use-social.ts           |  3 +-
 packages/ui/src/utils/social-connectors.ts    |  2 ++
 10 files changed, 85 insertions(+), 55 deletions(-)

diff --git a/packages/ui/src/components/Button/SocialIconButton.module.scss b/packages/ui/src/components/Button/SocialIconButton.module.scss
index 029f14d97..36d5dc538 100644
--- a/packages/ui/src/components/Button/SocialIconButton.module.scss
+++ b/packages/ui/src/components/Button/SocialIconButton.module.scss
@@ -1,6 +1,5 @@
 @use '@/scss/underscore' as _;
 
-
 .socialButton {
   border-radius: 50%;
   @include _.flex-column;
@@ -9,6 +8,10 @@
   width: 40px;
   height: 40px;
   cursor: pointer;
+
+  &.inverse {
+    background: #fff;
+  }
 }
 
 .icon {
@@ -20,13 +23,11 @@
 
 :global(body.desktop) {
   .socialButton {
-    background: var(--color-layer);
-
-    &:active {
+    &:not(.inverse):active {
       background: var(--color-pressed);
     }
 
-    &:hover:not(:active) {
+    &:not(.inverse):hover:not(:active) {
       background: var(--color-hover);
     }
   }
diff --git a/packages/ui/src/components/Button/SocialIconButton.tsx b/packages/ui/src/components/Button/SocialIconButton.tsx
index 1c49d728f..580bec094 100644
--- a/packages/ui/src/components/Button/SocialIconButton.tsx
+++ b/packages/ui/src/components/Button/SocialIconButton.tsx
@@ -1,24 +1,28 @@
 import classNames from 'classnames';
 import React from 'react';
 
-import { ConnectorData } from '@/types';
+import { isAppleConnector } from '@/utils/social-connectors';
 
 import * as styles from './SocialIconButton.module.scss';
 
 type Props = {
   className?: string;
-  connector: ConnectorData;
+  logo: string;
+  target?: string;
   onClick?: () => void;
 };
 
-const SocialIconButton = ({ className, connector, onClick }: Props) => {
-  const { target, logo } = connector;
-
-  return (
-    <button className={classNames(styles.socialButton, className)} onClick={onClick}>
-      {logo && <img src={logo} alt={target} className={styles.icon} />}
-    </button>
-  );
-};
+const SocialIconButton = ({ className, logo, target, onClick }: Props) => (
+  <button
+    className={classNames(
+      styles.socialButton,
+      isAppleConnector(target) && styles.inverse,
+      className
+    )}
+    onClick={onClick}
+  >
+    {logo && <img src={logo} alt={target} className={styles.icon} />}
+  </button>
+);
 
 export default SocialIconButton;
diff --git a/packages/ui/src/components/Button/SocialLinkButton.tsx b/packages/ui/src/components/Button/SocialLinkButton.tsx
index 28cbba94b..c7af6963b 100644
--- a/packages/ui/src/components/Button/SocialLinkButton.tsx
+++ b/packages/ui/src/components/Button/SocialLinkButton.tsx
@@ -2,28 +2,25 @@ import classNames from 'classnames';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { ConnectorData } from '@/types';
-
 import * as socialLinkButtonStyles from './SocialLinkButton.module.scss';
 import * as styles from './index.module.scss';
 
 export type Props = {
   isDisabled?: boolean;
   className?: string;
-  connector: ConnectorData;
+  target: string;
+  logo: string;
+  name: Record<string, string>;
   onClick?: () => void;
 };
 
-const SocialLinkButton = ({ isDisabled, className, connector, onClick }: Props) => {
-  const { target, name, logo } = connector;
-
+const SocialLinkButton = ({ isDisabled, className, target, name, logo, onClick }: Props) => {
   const {
     t,
     i18n: { language },
   } = useTranslation();
-  // TODO: LOG-2393 should fix name[locale] syntax error
-  const foundName = Object.entries(name).find(([lang]) => lang === language);
-  const localName = foundName ? foundName[1] : name.en;
+
+  const localName = name[language] ?? target;
 
   return (
     <button
diff --git a/packages/ui/src/components/Button/index.test.tsx b/packages/ui/src/components/Button/index.test.tsx
index 8b5788995..f9c4b5ddb 100644
--- a/packages/ui/src/components/Button/index.test.tsx
+++ b/packages/ui/src/components/Button/index.test.tsx
@@ -28,7 +28,12 @@ describe('Button Component', () => {
   it('render SocialLinkButton', () => {
     const connector = mockSocialConnectorData;
     const { queryByText, container } = render(
-      <SocialLinkButton connector={connector} onClick={onClick} />
+      <SocialLinkButton
+        logo={connector.logo}
+        name={connector.name}
+        target={connector.target}
+        onClick={onClick}
+      />
     );
 
     expect(queryByText('action.sign_in_with')).not.toBeNull();
diff --git a/packages/ui/src/containers/SocialLanding/index.tsx b/packages/ui/src/containers/SocialLanding/index.tsx
index 4d240c493..37e373adf 100644
--- a/packages/ui/src/containers/SocialLanding/index.tsx
+++ b/packages/ui/src/containers/SocialLanding/index.tsx
@@ -13,13 +13,17 @@ type Props = {
 };
 
 const SocialLanding = ({ className, connectorId, isLoading = false }: Props) => {
-  const { experienceSettings } = useContext(PageContext);
+  const { experienceSettings, theme } = useContext(PageContext);
   const connector = experienceSettings?.socialConnectors.find(({ id }) => id === connectorId);
 
   return (
     <div className={classNames(styles.container, className)}>
       <div className={styles.connector}>
-        {connector?.logo ? <img src={connector.logo} /> : connectorId}
+        {connector ? (
+          <img src={theme === 'dark' ? connector.logoDark ?? connector.logo : connector.logo} />
+        ) : (
+          connectorId
+        )}
       </div>
       {isLoading && <LoadingIcon />}
     </div>
diff --git a/packages/ui/src/containers/SocialSignIn/SocialSignInDropdown/index.tsx b/packages/ui/src/containers/SocialSignIn/SocialSignInDropdown/index.tsx
index 7fbb809b5..bb08fb5d9 100644
--- a/packages/ui/src/containers/SocialSignIn/SocialSignInDropdown/index.tsx
+++ b/packages/ui/src/containers/SocialSignIn/SocialSignInDropdown/index.tsx
@@ -20,7 +20,7 @@ const SocialSignInDropdown = ({ isOpen, onClose, connectors, anchorRef }: Props)
     i18n: { language },
   } = useTranslation();
   const [contentStyle, setContentStyle] = useState<{ top?: number; left?: number }>();
-  const { invokeSocialSignIn } = useSocial();
+  const { invokeSocialSignIn, theme } = useSocial();
 
   const adjustPosition = useCallback(() => {
     if (anchorRef?.current) {
@@ -46,7 +46,7 @@ const SocialSignInDropdown = ({ isOpen, onClose, connectors, anchorRef }: Props)
       }}
     >
       {connectors.map((connector) => {
-        const { id, name, logo } = connector;
+        const { id, name, logo, logoDark } = connector;
         const languageKey = Object.keys(name).find((key) => key === language) ?? 'en';
         const localName = name[languageKey as Language];
 
@@ -58,7 +58,11 @@ const SocialSignInDropdown = ({ isOpen, onClose, connectors, anchorRef }: Props)
               onClose();
             }}
           >
-            <img src={logo} alt={id} className={styles.socialLogo} />
+            <img
+              src={theme === 'dark' ? logoDark ?? logo : logo}
+              alt={id}
+              className={styles.socialLogo}
+            />
             <span>{localName}</span>
           </DropdownItem>
         );
diff --git a/packages/ui/src/containers/SocialSignIn/SocialSignInIconList/index.tsx b/packages/ui/src/containers/SocialSignIn/SocialSignInIconList/index.tsx
index 04a4c443a..feacd50d3 100644
--- a/packages/ui/src/containers/SocialSignIn/SocialSignInIconList/index.tsx
+++ b/packages/ui/src/containers/SocialSignIn/SocialSignInIconList/index.tsx
@@ -6,6 +6,7 @@ import IconButton from '@/components/Button/IconButton';
 import SocialIconButton from '@/components/Button/SocialIconButton';
 import useSocial from '@/hooks/use-social';
 import { ConnectorData } from '@/types';
+import { isAppleConnector } from '@/utils/social-connectors';
 
 import * as styles from './index.module.scss';
 
@@ -24,20 +25,25 @@ const SocialSignInIconList = ({
   moreButtonRef,
   onMoreButtonClick,
 }: Props) => {
-  const { invokeSocialSignIn } = useSocial();
+  const { invokeSocialSignIn, theme } = useSocial();
 
   return (
     <div className={classNames(styles.socialIconList, className)}>
-      {connectors.map((connector) => (
-        <SocialIconButton
-          key={connector.id}
-          className={styles.socialButton}
-          connector={connector}
-          onClick={() => {
-            void invokeSocialSignIn(connector);
-          }}
-        />
-      ))}
+      {connectors.map((connector) => {
+        const { id, target, logo, logoDark } = connector;
+
+        return (
+          <SocialIconButton
+            key={id}
+            className={styles.socialButton}
+            logo={(theme === 'dark' && !isAppleConnector(target) && logoDark) || logo}
+            target={target}
+            onClick={() => {
+              void invokeSocialSignIn(connector);
+            }}
+          />
+        );
+      })}
       {hasMore && (
         <IconButton ref={moreButtonRef} className={styles.moreButton} onClick={onMoreButtonClick}>
           <MoreSocialIcon />
diff --git a/packages/ui/src/containers/SocialSignIn/SocialSignInList/index.tsx b/packages/ui/src/containers/SocialSignIn/SocialSignInList/index.tsx
index 08f73a97d..90d1e947c 100644
--- a/packages/ui/src/containers/SocialSignIn/SocialSignInList/index.tsx
+++ b/packages/ui/src/containers/SocialSignIn/SocialSignInList/index.tsx
@@ -25,7 +25,7 @@ const SocialSignInList = ({
   onSocialSignInCallback,
 }: Props) => {
   const [expand, setExpand] = useState(false);
-  const { invokeSocialSignIn } = useSocial();
+  const { invokeSocialSignIn, theme } = useSocial();
   const isOverSize = socialConnectors.length > defaultSize;
   const displayAll = !isOverSize || !isCollapseEnabled;
 
@@ -39,17 +39,23 @@ const SocialSignInList = ({
 
   return (
     <div className={classNames(styles.socialLinkList, className)}>
-      {displayConnectors.map((connector) => (
-        <SocialLinkButton
-          key={connector.id}
-          className={styles.socialLinkButton}
-          connector={connector}
-          onClick={() => {
-            void invokeSocialSignIn(connector);
-            onSocialSignInCallback?.();
-          }}
-        />
-      ))}
+      {displayConnectors.map((connector) => {
+        const { id, name, logo, logoDark, target } = connector;
+
+        return (
+          <SocialLinkButton
+            key={id}
+            className={styles.socialLinkButton}
+            name={name}
+            logo={(theme === 'dark' && logoDark) || logo}
+            target={target}
+            onClick={() => {
+              void invokeSocialSignIn(connector);
+              onSocialSignInCallback?.();
+            }}
+          />
+        );
+      })}
       {!displayAll && (
         <IconButton
           className={classNames(styles.expandIcon, expand && styles.expanded)}
diff --git a/packages/ui/src/hooks/use-social.ts b/packages/ui/src/hooks/use-social.ts
index 3bbc1cbba..466a532e1 100644
--- a/packages/ui/src/hooks/use-social.ts
+++ b/packages/ui/src/hooks/use-social.ts
@@ -10,7 +10,7 @@ import { PageContext } from './use-page-context';
 import useTerms from './use-terms';
 
 const useSocial = () => {
-  const { experienceSettings } = useContext(PageContext);
+  const { experienceSettings, theme } = useContext(PageContext);
   const { termsValidation } = useTerms();
 
   const { run: asyncInvokeSocialSignIn } = useApi(invokeSocialSignIn);
@@ -64,6 +64,7 @@ const useSocial = () => {
   );
 
   return {
+    theme,
     socialConnectors: experienceSettings?.socialConnectors ?? [],
     invokeSocialSignIn: invokeSocialSignInHandler,
   };
diff --git a/packages/ui/src/utils/social-connectors.ts b/packages/ui/src/utils/social-connectors.ts
index d6fe3ed8f..66565b17c 100644
--- a/packages/ui/src/utils/social-connectors.ts
+++ b/packages/ui/src/utils/social-connectors.ts
@@ -196,3 +196,5 @@ export const filterPreviewSocialConnectors = (
 
   return Array.from(connectorMap.values());
 };
+
+export const isAppleConnector = (target?: string) => target === 'apple';