Skip to content

🐛 Fix: prevent rendering tooltip for add someday btn when dragging someday event #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
that-one-arab merged 2 commits into from
Jun 16, 2025
Merged

🐛 Fix: prevent rendering tooltip for add someday btn when dragging someday event #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28803f
chore(web): extract add someday event btn into dedicated component
that-one-arab Jun 16, 2025
a94de4f
fix(web): prevent rendering tooltip for add someday btn when dragging…
that-one-arab Jun 16, 2025
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
11 changes: 11 additions & 0 deletions ...ar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEventsContainer/AddSomedayEvent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react";
import { Text } from "@web/components/Text";
import { EventPlaceholder } from "@web/views/Calendar/components/Sidebar/styled";

export const AddSomedayEvent = () => {
return (
<EventPlaceholder>
<Text size="l">+</Text>
</EventPlaceholder>
);
};
40 changes: 23 additions & 17 deletions ...onents/Sidebar/SomedayTab/SomedayEvents/SomedayEventsContainer/SomedayEventsContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ import {
COLUMN_WEEK,
ID_SOMEDAY_DRAFT,
} from "@web/common/constants/web.constants";
import { Text } from "@web/components/Text";
import { TooltipWrapper } from "@web/components/Tooltip/TooltipWrapper";
import { selectDraftCategory } from "@web/ducks/events/selectors/draft.selectors";
import { useAppSelector } from "@web/store/store.hooks";
import { useSidebarContext } from "@web/views/Calendar/components/Draft/sidebar/context/useSidebarContext";
import { State_Sidebar } from "@web/views/Calendar/components/Draft/sidebar/hooks/useSidebarState";
import { EventPlaceholder } from "../../../styled";
import { DraggableSomedayEvent } from "../DraggableSomedayEvent/DraggableSomedayEvent";
import { DraggableSomedayEvents } from "../DraggableSomedayEvent/DraggableSomedayEvents";
import { AddSomedayEvent } from "./AddSomedayEvent";
import { DropZone } from "./Dropzone";

const getSomedayEvents = (
Expand Down Expand Up @@ -55,6 +54,23 @@ export const SomedayEventsContainer: FC<Props> = ({
const isDraftingThisCategory =
state.isDraftingNew && category === draftCategory;

// Render add someday event tooltip
const renderWithTooltip = (children: React.ReactNode) => {
return (
<TooltipWrapper
description={
category === Categories_Event.SOMEDAY_MONTH
? "Add to month"
: "Add to week"
}
onClick={() => onPlaceholderClick(category)}
shortcut={category === Categories_Event.SOMEDAY_MONTH ? "M" : "W"}
>
{children}
</TooltipWrapper>
);
};

return (
<>
<Droppable droppableId={column.id}>
Expand All @@ -79,21 +95,11 @@ export const SomedayEventsContainer: FC<Props> = ({

{!isDraftingNew && (
<div style={{ opacity: state.isDragging ? 0 : 1 }}>
<TooltipWrapper
description={
category === Categories_Event.SOMEDAY_MONTH
? "Add to month"
: "Add to week"
}
onClick={() => onPlaceholderClick(category)}
shortcut={
category === Categories_Event.SOMEDAY_MONTH ? "M" : "W"
}
>
<EventPlaceholder>
<Text size="l">+</Text>
</EventPlaceholder>
</TooltipWrapper>
{state.isDragging ? (
<AddSomedayEvent />
) : (
renderWithTooltip(<AddSomedayEvent />)
)}
</div>
)}

Expand Down