Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions static/app/components/devtoolbar/components/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import LoadingTriangle from 'sentry/components/loadingTriangle';
import {useSessionStorage} from 'sentry/utils/useSessionStorage';

import usePlacementCss from '../hooks/usePlacementCss';
import useVisibility from '../hooks/useVisibility';
import {fixedContainerBaseCss} from '../styles/fixedContainer';
import {avatarCss, globalCss, loadingIndicatorCss} from '../styles/global';
import {resetFlexColumnCss} from '../styles/reset';
Expand All @@ -15,8 +16,12 @@ import PanelRouter from './panelRouter';

export default function App() {
const placement = usePlacementCss();
const [isHidden, setIsHidden] = useSessionStorage('hide_employee_devtoolbar', false);
if (isHidden) {
const [visibility] = useVisibility();
const [isDisabled, setIsDisabled] = useSessionStorage(
'hide_employee_devtoolbar',
false
);
if (isDisabled) {
return null;
}

Expand All @@ -25,10 +30,10 @@ export default function App() {
<Global styles={globalCss} />
<Global styles={loadingIndicatorCss} />
<Global styles={avatarCss} />
<div css={[fixedContainerBaseCss, placement.fixedContainer.css]}>
{isHidden ? null : (
<div css={[fixedContainerBaseCss, placement.fixedContainer.css, {visibility}]}>
{isDisabled ? null : (
<Fragment>
<Navigation setIsHidden={setIsHidden} />
<Navigation setIsDisabled={setIsDisabled} />
<Suspense fallback={<LoadingPanel />}>
<PanelRouter />
</Suspense>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import useReplayCount from 'sentry/utils/replayCount/useReplayCount';
import useConfiguration from '../../hooks/useConfiguration';
import useCurrentTransactionName from '../../hooks/useCurrentTransactionName';
import {useSDKFeedbackButton} from '../../hooks/useSDKFeedbackButton';
import useVisibility from '../../hooks/useVisibility';
import {
badgeWithLabelCss,
gridFlexEndCss,
Expand All @@ -34,7 +35,17 @@ import SentryAppLink from '../sentryAppLink';
import useInfiniteFeedbackList from './useInfiniteFeedbackList';

export default function FeedbackPanel() {
const buttonRef = useSDKFeedbackButton();
const [, setVisible] = useVisibility();

const buttonRef = useSDKFeedbackButton(
useMemo(
() => ({
onFormOpen: () => setVisible('hidden'),
onFormClose: () => setVisible('visible'),
}),
[setVisible]
)
);
const transactionName = useCurrentTransactionName();
const queryResult = useInfiniteFeedbackList({
query: `url:*${transactionName}`,
Expand Down
8 changes: 6 additions & 2 deletions static/app/components/devtoolbar/components/navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ import useToolbarRoute from '../hooks/useToolbarRoute';
import {navigationButtonCss, navigationCss} from '../styles/navigation';
import {resetButtonCss, resetDialogCss} from '../styles/reset';

export default function Navigation({setIsHidden}: {setIsHidden: (val: boolean) => void}) {
export default function Navigation({
setIsDisabled,
}: {
setIsDisabled: (val: boolean) => void;
}) {
const {trackAnalytics} = useConfiguration();
const placement = usePlacementCss();

Expand All @@ -26,7 +30,7 @@ export default function Navigation({setIsHidden}: {setIsHidden: (val: boolean) =
<NavButton panelName="feedback" label={'User Feedback'} icon={<IconMegaphone />} />
<HideButton
onClick={() => {
setIsHidden(true);
setIsDisabled(true);
trackAnalytics?.({
eventKey: `devtoolbar.nav.hide.click`,
eventName: `devtoolbar: Hide devtoolbar`,
Expand Down
5 changes: 4 additions & 1 deletion static/app/components/devtoolbar/components/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {lightTheme} from 'sentry/utils/theme';

import {ConfigurationContextProvider} from '../hooks/useConfiguration';
import {ToolbarRouterContextProvider} from '../hooks/useToolbarRoute';
import {VisibilityContextProvider} from '../hooks/useVisibility';
import type {Configuration} from '../types';

interface Props {
Expand Down Expand Up @@ -35,7 +36,9 @@ export default function Providers({children, config, container}: Props) {
<ThemeProvider theme={lightTheme}>
<ConfigurationContextProvider config={config}>
<QueryClientProvider client={queryClient}>
<ToolbarRouterContextProvider>{children}</ToolbarRouterContextProvider>
<VisibilityContextProvider>
<ToolbarRouterContextProvider>{children}</ToolbarRouterContextProvider>
</VisibilityContextProvider>
</QueryClientProvider>
</ConfigurationContextProvider>
</ThemeProvider>
Expand Down
12 changes: 9 additions & 3 deletions static/app/components/devtoolbar/hooks/useSDKFeedbackButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,23 @@ import {useEffect, useRef} from 'react';

import useConfiguration from './useConfiguration';

export function useSDKFeedbackButton() {
export function useSDKFeedbackButton({
onFormClose,
onFormOpen,
}: {
onFormClose?: () => void;
onFormOpen?: () => void;
}) {
const buttonRef = useRef<HTMLButtonElement>(null);
const {SentrySDK} = useConfiguration();
const feedback = SentrySDK && 'getFeedback' in SentrySDK && SentrySDK.getFeedback();

useEffect(() => {
if (feedback && buttonRef.current) {
return feedback.attachTo(buttonRef.current, {});
return feedback.attachTo(buttonRef.current, {onFormOpen, onFormClose});
}
return () => {};
}, [feedback]);
}, [feedback, onFormOpen, onFormClose]);

return feedback ? buttonRef : undefined;
}
20 changes: 20 additions & 0 deletions static/app/components/devtoolbar/hooks/useVisibility.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import type {CSSProperties, Dispatch, ReactNode, SetStateAction} from 'react';
import {createContext, useContext, useState} from 'react';

type State = CSSProperties['visibility'];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!


const VisibilityContext = createContext<[State, Dispatch<SetStateAction<State>>]>([
'visible',
() => {},
]);

export function VisibilityContextProvider({children}: {children: ReactNode}) {
const state = useState<State>('visible');
return (
<VisibilityContext.Provider value={state}>{children}</VisibilityContext.Provider>
);
}

export default function useVisibility() {
return useContext(VisibilityContext);
}