mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-04-11 03:26:58 +02:00
Better tab dropdown handling
This commit is contained in:
@@ -40,7 +40,9 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
|
|||||||
[unorderedRequests],
|
[unorderedRequests],
|
||||||
);
|
);
|
||||||
|
|
||||||
const moveState = useRef<{ move: (e: MouseEvent) => void; up: () => void } | null>(null);
|
const moveState = useRef<{ move: (e: MouseEvent) => void; up: (e: MouseEvent) => void } | null>(
|
||||||
|
null,
|
||||||
|
);
|
||||||
const unsub = () => {
|
const unsub = () => {
|
||||||
if (moveState.current !== null) {
|
if (moveState.current !== null) {
|
||||||
document.documentElement.removeEventListener('mousemove', moveState.current.move);
|
document.documentElement.removeEventListener('mousemove', moveState.current.move);
|
||||||
@@ -57,9 +59,11 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
|
|||||||
const startWidth = width.value;
|
const startWidth = width.value;
|
||||||
moveState.current = {
|
moveState.current = {
|
||||||
move: (e: MouseEvent) => {
|
move: (e: MouseEvent) => {
|
||||||
|
e.preventDefault(); // Prevent text selection and things
|
||||||
width.set(startWidth + (e.clientX - mouseStartX));
|
width.set(startWidth + (e.clientX - mouseStartX));
|
||||||
},
|
},
|
||||||
up: () => {
|
up: (e: MouseEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
unsub();
|
unsub();
|
||||||
setIsResizing(false);
|
setIsResizing(false);
|
||||||
},
|
},
|
||||||
@@ -79,13 +83,13 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
|
|||||||
{/* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */}
|
{/* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */}
|
||||||
<div
|
<div
|
||||||
aria-hidden
|
aria-hidden
|
||||||
className="group absolute z-10 right-0 w-1 top-0 bottom-0 cursor-ew-resize flex justify-end"
|
className="group absolute z-10 right-0 w-2 top-0 bottom-0 cursor-ew-resize flex justify-end"
|
||||||
onMouseDown={handleResizeStart}
|
onMouseDown={handleResizeStart}
|
||||||
onDoubleClick={width.reset}
|
onDoubleClick={width.reset}
|
||||||
>
|
>
|
||||||
<div // drag-divider
|
<div // drag-divider
|
||||||
className={classnames(
|
className={classnames(
|
||||||
'transition-colors w-0.5 group-hover:bg-gray-300 h-full pointer-events-none',
|
'transition-colors w-1 group-hover:bg-gray-300 h-full pointer-events-none',
|
||||||
isResizing && '!bg-blue-500/70',
|
isResizing && '!bg-blue-500/70',
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -20,24 +20,30 @@ export type DropdownItem =
|
|||||||
export interface DropdownProps {
|
export interface DropdownProps {
|
||||||
children: ReactElement<HTMLAttributes<HTMLButtonElement>>;
|
children: ReactElement<HTMLAttributes<HTMLButtonElement>>;
|
||||||
items: DropdownItem[];
|
items: DropdownItem[];
|
||||||
|
ignoreClick?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Dropdown({ children, items }: DropdownProps) {
|
export function Dropdown({ children, items, ignoreClick }: DropdownProps) {
|
||||||
const [open, setOpen] = useState<boolean>(false);
|
const [open, setOpen] = useState<boolean>(false);
|
||||||
const ref = useRef<HTMLButtonElement>(null);
|
const ref = useRef<HTMLButtonElement>(null);
|
||||||
const child = useMemo(
|
const child = useMemo(() => {
|
||||||
() =>
|
const existingChild = Children.only(children);
|
||||||
cloneElement(Children.only(children) as never, {
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
ref,
|
const props: any = {
|
||||||
'aria-haspopup': 'true',
|
...existingChild.props,
|
||||||
onClick: (e: MouseEvent<HTMLButtonElement>) => {
|
ref,
|
||||||
|
'aria-haspopup': 'true',
|
||||||
|
onClick:
|
||||||
|
existingChild.props?.onClick ??
|
||||||
|
((e: MouseEvent<HTMLButtonElement>) => {
|
||||||
|
console.log('CLICK INSIDE');
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
setOpen((o) => !o);
|
setOpen((o) => !o);
|
||||||
},
|
}),
|
||||||
}),
|
};
|
||||||
[children],
|
return cloneElement(existingChild, props);
|
||||||
);
|
}, [children]);
|
||||||
|
|
||||||
const handleClose = useCallback(() => {
|
const handleClose = useCallback(() => {
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export const Tabs = memo(function Tabs({
|
|||||||
for (const tab of tabs ?? []) {
|
for (const tab of tabs ?? []) {
|
||||||
const v = tab.getAttribute('data-tab');
|
const v = tab.getAttribute('data-tab');
|
||||||
if (v === value) {
|
if (v === value) {
|
||||||
tab.setAttribute('tabindex', '0');
|
tab.setAttribute('tabindex', '-1');
|
||||||
tab.setAttribute('data-state', 'active');
|
tab.setAttribute('data-state', 'active');
|
||||||
} else {
|
} else {
|
||||||
tab.setAttribute('data-state', 'inactive');
|
tab.setAttribute('data-state', 'inactive');
|
||||||
@@ -67,7 +67,7 @@ export const Tabs = memo(function Tabs({
|
|||||||
<HStack space={1}>
|
<HStack space={1}>
|
||||||
{tabs.map((t) => {
|
{tabs.map((t) => {
|
||||||
const isActive = t.value === value;
|
const isActive = t.value === value;
|
||||||
if (t.options && isActive) {
|
if (t.options) {
|
||||||
return (
|
return (
|
||||||
<RadioDropdown
|
<RadioDropdown
|
||||||
key={t.value}
|
key={t.value}
|
||||||
@@ -78,7 +78,7 @@ export const Tabs = memo(function Tabs({
|
|||||||
<Button
|
<Button
|
||||||
color="custom"
|
color="custom"
|
||||||
size="sm"
|
size="sm"
|
||||||
onClick={(e) => e.stopPropagation()}
|
onClick={isActive ? undefined : () => handleTabChange(t.value)}
|
||||||
className={classnames(
|
className={classnames(
|
||||||
isActive ? 'bg-gray-100 text-gray-900' : 'text-gray-600 hover:text-gray-900',
|
isActive ? 'bg-gray-100 text-gray-900' : 'text-gray-600 hover:text-gray-900',
|
||||||
)}
|
)}
|
||||||
@@ -88,21 +88,6 @@ export const Tabs = memo(function Tabs({
|
|||||||
</Button>
|
</Button>
|
||||||
</RadioDropdown>
|
</RadioDropdown>
|
||||||
);
|
);
|
||||||
} else if (t.options && !isActive) {
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
key={t.value}
|
|
||||||
color="custom"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => handleTabChange(t.value)}
|
|
||||||
className={classnames(
|
|
||||||
isActive ? 'bg-gray-100 text-gray-900' : 'text-gray-600 hover:text-gray-900',
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{t.options.items.find((i) => i.value === t.options?.value)?.label ?? ''}
|
|
||||||
<Icon icon="triangleDown" className="-mr-1.5 opacity-40" />
|
|
||||||
</Button>
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
return (
|
return (
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
Reference in New Issue
Block a user