Skip to content

Take control over your live stream video by running it yourself. Streaming + chat out of the box.

fix(js): fixes #4452 action buttons not showing externally while mobile (#4547)

Gabe Kangas47eea4db9d2b
diff --git a/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.tsx b/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.tsx
index d9e1d4e622..775df3abe5 100644
--- a/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.tsx
+++ b/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.tsx
@@ -3,7 +3,7 @@ import { Button, Dropdown } from 'antd';
import classNames from 'classnames';
import dynamic from 'next/dynamic';
import styles from './ActionButtonMenu.module.scss';
-import { ExternalAction } from '../../../interfaces/external-action';
+import { ExternalAction, ExternalActionUtils } from '../../../interfaces/external-action';
// Lazy loaded components
@@ -50,12 +50,15 @@ export const ActionButtonMenu: FC<ActionButtonMenuProps> = ({
followItemSelected();
return;
}
- const action = actions.find(x => x.url === a.key);
- externalActionSelected(action);
+ // Find the action using the utility function
+ const action = ExternalActionUtils.findByKey(actions, a.key);
+ if (action) {
+ externalActionSelected(action);
+ }
};
const items = actions.map(action => ({
- key: action.url,
+ key: ExternalActionUtils.generateKey(action),
label: (
<span className={styles.item}>
{action.icon && <img className={styles.icon} src={action.icon} alt={action.title} />}{' '}
diff --git a/web/components/ui/Content/ActionButtons.tsx b/web/components/ui/Content/ActionButtons.tsx
index eb1df95bbc..04f4066f8a 100644
--- a/web/components/ui/Content/ActionButtons.tsx
+++ b/web/components/ui/Content/ActionButtons.tsx
@@ -1,7 +1,7 @@
import { Dispatch, FC, SetStateAction } from 'react';
import dynamic from 'next/dynamic';
import { Skeleton } from 'antd';
-import { ExternalAction } from '../../../interfaces/external-action';
+import { ExternalAction, ExternalActionUtils } from '../../../interfaces/external-action';
import { ActionButtonMenu } from '../../action-buttons/ActionButtonMenu/ActionButtonMenu';
import { ActionButtonRow } from '../../action-buttons/ActionButtonRow/ActionButtonRow';
import { FollowButton } from '../../action-buttons/FollowButton';
@@ -17,7 +17,6 @@ interface ActionButtonProps {
setShowFollowModal: Dispatch<SetStateAction<boolean>>;
setShowNotifyModal: Dispatch<SetStateAction<boolean>>;
disableNotifyReminderPopup: () => void;
- setExternalActionToDisplay: any;
externalActionSelected: (action: ExternalAction) => void;
}
@@ -37,12 +36,11 @@ const ActionButtons: FC<ActionButtonProps> = ({
setShowNotifyModal,
disableNotifyReminderPopup,
externalActions,
- setExternalActionToDisplay,
externalActionSelected,
}) => {
const externalActionButtons = externalActions.map(action => (
<ActionButton
- key={action.url || action.html}
+ key={ExternalActionUtils.generateKey(action)}
action={action}
externalActionSelected={externalActionSelected}
/>
@@ -70,13 +68,12 @@ const ActionButtons: FC<ActionButtonProps> = ({
<div className={styles.mobileActionButtons}>
{(supportsBrowserNotifications ||
supportsBrowserNotifications ||
- externalActionButtons.length > 0) && (
+ externalActions.length > 0) && (
<ActionButtonMenu
- className={styles.actionButtonMenu}
+ actions={externalActions}
showFollowItem={supportFediverseFeatures}
showNotifyItem={supportsBrowserNotifications}
- actions={externalActions}
- externalActionSelected={setExternalActionToDisplay}
+ externalActionSelected={externalActionSelected}
notifyItemSelected={() => setShowNotifyModal(true)}
followItemSelected={() => setShowFollowModal(true)}
/>
diff --git a/web/components/ui/Content/Content.tsx b/web/components/ui/Content/Content.tsx
index 6a9a30716e..3354999641 100644
--- a/web/components/ui/Content/Content.tsx
+++ b/web/components/ui/Content/Content.tsx
@@ -274,7 +274,6 @@ export const Content: FC = () => {
setShowNotifyModal={setShowNotifyModal}
disableNotifyReminderPopup={disableNotifyReminderPopup}
externalActions={externalActions || []}
- setExternalActionToDisplay={setExternalActionToDisplay}
setShowFollowModal={setShowFollowModal}
externalActionSelected={externalActionSelected}
/>
diff --git a/web/interfaces/external-action.ts b/web/interfaces/external-action.ts
index bdbdf26fbc..3280566aab 100644
--- a/web/interfaces/external-action.ts
+++ b/web/interfaces/external-action.ts
@@ -7,3 +7,24 @@ export interface ExternalAction {
icon?: string;
openExternally?: boolean;
}
+
+/**
+ * Utility functions for working with ExternalAction objects
+ */
+export namespace ExternalActionUtils {
+ /**
+ * Generates a unique key for an external action based on its properties.
+ * This ensures each action has a unique identifier for React rendering.
+ */
+ export function generateKey(action: ExternalAction): string {
+ return `${action.title}-${action.url || action.html || 'no-url'}-${action.color || 'no-color'}`;
+ }
+
+ /**
+ * Finds an action from an array based on a generated key.
+ * Useful for finding actions in event handlers when only the key is available.
+ */
+ export function findByKey(actions: ExternalAction[], key: string): ExternalAction | undefined {
+ return actions.find(action => generateKey(action) === key);
+ }
+}