From cc48b68d38fb7bb2f4fa43eda7ad7ce5dfc4811f Mon Sep 17 00:00:00 2001
From: Ilya Y <75578537+ilya-bkv@users.noreply.github.com>
Date: Fri, 26 May 2023 05:32:20 +0300
Subject: [PATCH] add setIsActionPopupActive signal (#102)

---
 src/components/Feed/ArticleCard.tsx      | 10 +++++-----
 src/components/Feed/FeedArticlePopup.tsx | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/Feed/ArticleCard.tsx b/src/components/Feed/ArticleCard.tsx
index ffe4836c..775230e4 100644
--- a/src/components/Feed/ArticleCard.tsx
+++ b/src/components/Feed/ArticleCard.tsx
@@ -86,7 +86,7 @@ export const ArticleCard = (props: ArticleCardProps) => {
     changeSearchParam('scrollTo', 'comments')
   }
 
-  const [isSharePopupActive, setIsSharePopupActive] = createSignal(false)
+  const [isActionPopupActive, setIsActionPopupActive] = createSignal(false)
 
   return (
     <section
@@ -175,10 +175,9 @@ export const ArticleCard = (props: ArticleCardProps) => {
         </Show>
 
         <Show when={props.settings?.isFeedMode}>
-          <p>asdasd</p>
           <section
             class={styles.shoutCardDetails}
-            classList={{ [styles.shoutCardDetailsActive]: isSharePopupActive() }}
+            classList={{ [styles.shoutCardDetailsActive]: isActionPopupActive() }}
           >
             <div class={styles.shoutCardDetailsContent}>
               <ShoutRatingControl shout={props.article} class={styles.shoutCardDetailsItem} />
@@ -217,7 +216,7 @@ export const ArticleCard = (props: ArticleCardProps) => {
                 )}
               </Popover>
 
-              <Popover content={t('Share')} disabled={isSharePopupActive()}>
+              <Popover content={t('Share')} disabled={isActionPopupActive()}>
                 {(triggerRef: (el) => void) => (
                   <div class={styles.shoutCardDetailsItem} ref={triggerRef}>
                     <SharePopup
@@ -226,7 +225,7 @@ export const ArticleCard = (props: ArticleCardProps) => {
                       description={getDescription(body)}
                       imageUrl={cover}
                       shareUrl={getShareUrl({ pathname: `/${slug}` })}
-                      isVisible={(value) => setIsSharePopupActive(value)}
+                      isVisible={(value) => setIsActionPopupActive(value)}
                       trigger={
                         <button>
                           <Icon name="share-outline" class={clsx(styles.icon, styles.feedControlIcon)} />
@@ -244,6 +243,7 @@ export const ArticleCard = (props: ArticleCardProps) => {
                   description={getDescription(body)}
                   imageUrl={cover}
                   shareUrl={getShareUrl({ pathname: `/${slug}` })}
+                  isVisible={(value) => setIsActionPopupActive(value)}
                   trigger={
                     <button>
                       <Icon name="ellipsis" class={clsx(styles.icon, styles.feedControlIcon)} />
diff --git a/src/components/Feed/FeedArticlePopup.tsx b/src/components/Feed/FeedArticlePopup.tsx
index 22851e26..69ea2cf1 100644
--- a/src/components/Feed/FeedArticlePopup.tsx
+++ b/src/components/Feed/FeedArticlePopup.tsx
@@ -2,18 +2,32 @@ import styles from './FeedArticlePopup.module.scss'
 import type { PopupProps } from '../_shared/Popup'
 import { Popup } from '../_shared/Popup'
 import { useLocalize } from '../../context/localize'
+import { createEffect, createSignal } from 'solid-js'
 
 type FeedArticlePopupProps = {
   title: string
   shareUrl?: string
   imageUrl: string
   description: string
+  isVisible?: (value: boolean) => void
 } & Omit<PopupProps, 'children'>
 
 export const FeedArticlePopup = (props: FeedArticlePopupProps) => {
   const { t } = useLocalize()
+  const [isVisible, setIsVisible] = createSignal(false)
+
+  createEffect(() => {
+    if (props.isVisible) {
+      props.isVisible(isVisible())
+    }
+  })
   return (
-    <Popup {...props} variant="tiny" popupCssClass={styles.feedArticlePopup}>
+    <Popup
+      {...props}
+      variant="tiny"
+      onVisibilityChange={(value) => setIsVisible(value)}
+      popupCssClass={styles.feedArticlePopup}
+    >
       <ul class="nodash">
         <li>
           <button