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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ export const PlaygroundTestConnectButton = () => {
<div className="track">
<ConnectButton active disabled onClick={noop} />
</div>
<h3>Connected (loading)</h3>
<div className="track">
<ConnectButton active loading onClick={noop} />
</div>
<h3>Interactive (active: {active ? 'true' : 'false'})</h3>
<div className="track">
<ConnectButton active={active} onClick={() => setActive((v) => !v)} />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import { motion } from 'motion/react';
import { useEffect, useRef, useState } from 'react';
import { motionTransitionStandard } from '../../../../consts';
import { TooltipContent } from '../../../../providers/tooltip/TooltipContent';
import { TooltipProvider } from '../../../../providers/tooltip/TooltipContext';
import { TooltipTrigger } from '../../../../providers/tooltip/TooltipTrigger';
import { isPresent } from '../../../../utils/isPresent';
import { Icon, type IconKindValue } from '../../../Icon';
import { LoaderSpinner } from '../../../LoaderSpinner/LoaderSpinner';
import './style.scss';
import clsx from 'clsx';

interface Props {
active: boolean;
onClick: () => void;
disabled?: boolean;
loading?: boolean;
icon?: IconKindValue | null;
text?: string | null;
tooltip?: string | null;
Expand All @@ -22,8 +27,35 @@ export const ConnectButton = ({
text,
tooltip,
disabled = false,
loading = false,
}: Props) => {
const label = isPresent(text) ? text : active ? 'Disconnect' : 'Connect VPN';
const isLoading = loading && !disabled;
const [swapDirection, setSwapDirection] = useState<'to-loading' | 'to-content' | null>(
null,
);
const previousLoadingRef = useRef(isLoading);

useEffect(() => {
if (previousLoadingRef.current !== isLoading) {
setSwapDirection(isLoading ? 'to-loading' : 'to-content');
previousLoadingRef.current = isLoading;
}
}, [isLoading]);

const contentTransition = {
...motionTransitionStandard,
delay:
!isLoading && swapDirection === 'to-content'
? motionTransitionStandard.duration
: 0,
};

const loaderTransition = {
...motionTransitionStandard,
delay:
isLoading && swapDirection === 'to-loading' ? motionTransitionStandard.duration : 0,
};

const button = (
// aria-disabled instead of disabled, a disabled button gets no hover to open the tooltip
Expand All @@ -34,14 +66,32 @@ export const ConnectButton = ({
disconnected: !active,
icon: isPresent(icon),
disabled,
loading: isLoading,
})}
aria-disabled={disabled}
aria-disabled={disabled || loading}
onClick={() => {
if (!disabled) onClick();
if (!disabled && !loading) onClick();
}}
>
{isPresent(icon) && <Icon icon={icon} size={20} />}
<p>{label}</p>
<motion.div
className="content"
aria-hidden={isLoading}
initial={false}
animate={{ opacity: isLoading ? 0 : 1 }}
transition={contentTransition}
>
{isPresent(icon) && <Icon icon={icon} size={20} />}
<p>{label}</p>
</motion.div>
<motion.div
className="loader-overlay"
aria-hidden={!isLoading}
initial={false}
animate={{ opacity: isLoading ? 1 : 0 }}
transition={loaderTransition}
>
<LoaderSpinner variant="primary" />
</motion.div>
</button>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
--shadow: 0 4px 5px 0 rgb(53 84 179 / 7%);
--color: var(--fg-action);
--border: transparent;
--loader-bg: transparent;

background: var(--bg);
border: 1px solid var(--border);
Expand All @@ -13,6 +14,7 @@
transition-timing-function: ease-in-out;
cursor: pointer;
display: inline-flex;
position: relative;
width: 100%;
align-items: center;
justify-content: center;
Expand All @@ -21,19 +23,31 @@
box-sizing: border-box;
padding: 0 var(--spacing-lg);

&:not(.connected, .disabled):hover {
&:not(.connected, .disabled, .loading):hover {
--bg: var(--bg-white-80);
}

&:not(.disabled).loading {
--bg: var(--c-white-10);
--loader-bg: var(--bg-white-10);

cursor: default;
}

&.connected {
--bg: transparent;
--color: var(--fg-white-100);
--border: var(--border-default);

&:not(.disabled):hover {
&:not(.disabled, .loading):hover {
--border: var(--border-default);
--bg: var(--bg-white-10);
}

&:not(.disabled).loading {
--bg: transparent;
--border: var(--border-disabled);
}
}

&.disabled {
Expand All @@ -44,14 +58,35 @@
cursor: not-allowed;
}

.icon {
--icon-color: var(--color);
& > .content {
display: inline-flex;
align-items: center;
justify-content: center;
color: inherit;

margin-right: var(--spacing-sm);
& > .icon {
--icon-color: var(--color);

margin-right: var(--spacing-sm);
}

& > p {
font: var(--t-body-sm-600);
color: inherit;
}
}

p {
font: var(--t-body-sm-600);
color: inherit;
& > .loader-overlay {
display: flex;
flex-flow: row;
align-items: center;
justify-content: center;
position: absolute;
inset: 0;
width: 100%;
height: 100%;
border-radius: inherit;
background-color: var(--loader-bg);
pointer-events: none;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const LocationCardConnectButton = () => {
},
});

const isBusy = isConnecting || isDisconnecting || isOpeningConfiguration;
const isBusy = isConnecting || isOpeningConfiguration;

const handleClick = () => {
if (location.active) {
Expand Down Expand Up @@ -89,6 +89,7 @@ export const LocationCardConnectButton = () => {
active={location.active}
onClick={handleClick}
disabled={isBusy || isBlocked}
loading={isDisconnecting}
tooltip={isBlocked ? connectBlockedTooltip : null}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const OverviewLocationCard = ({ location, instance }: Props) => {
const { mutate: configureMfa, isPending: isOpeningConfiguration } =
useConfigureFactorsScreen();

const isBusy = isConnecting || isDisconnecting || isOpeningConfiguration;
const isBusy = isConnecting || isOpeningConfiguration;

const connectionAbility = useConnectionAbility(location, instance);

Expand Down Expand Up @@ -143,6 +143,7 @@ export const OverviewLocationCard = ({ location, instance }: Props) => {
active={location.active}
onClick={handleConnectClick}
disabled={isBusy || isBlocked}
loading={isDisconnecting}
tooltip={isBlocked ? connectBlockedTooltip : null}
/>
</div>
Expand Down
Loading