Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 @@ -13,7 +13,7 @@ import { useTranslation } from "@plane/i18n";
import { EmptyStateCompact } from "@plane/propel/empty-state";
import { PlusIcon, SearchIcon } from "@plane/propel/icons";
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import { copyUrlToClipboard, orderJoinedProjects } from "@plane/utils";
// components
import { CreateProjectModal } from "@/components/project/create-project-modal";
Expand Down Expand Up @@ -114,7 +114,7 @@ export const ExtendedProjectSidebar = observer(function ExtendedProjectSidebar()
<div className="flex items-center justify-between">
<span className="py-1.5 text-13 font-semibold text-tertiary">Projects</span>
{isAuthorizedUser && (
<Tooltip tooltipHeading={t("create_project")} tooltipContent="">
<Tooltip label={t("create_project")}>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
<button
type="button"
className="flex-shrink-0 rounded-sm p-0.5 text-tertiary transition-colors hover:bg-layer-1 hover:text-secondary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { ArchiveIcon, CycleIcon, ModuleIcon, WorkItemsIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import { EIssuesStoreType } from "@plane/types";
// ui
import { Breadcrumbs, Header } from "@plane/ui";
Expand Down Expand Up @@ -95,9 +95,10 @@ export const ProjectArchivesHeader = observer(function ProjectArchivesHeader(pro
</Breadcrumbs>
{activeTab === "issues" && issueCount && issueCount > 0 ? (
<Tooltip
isMobile={isMobile}
tooltipContent={`There are ${issueCount} ${issueCount > 1 ? "work items" : "work item"} in project's archived`}
position="bottom"
label={`There are ${issueCount} ${issueCount > 1 ? "work items" : "work item"} in project's archived`}
layout="stacked"
side="bottom"
disabled={isMobile}
>
<span className="flex flex-shrink-0 cursor-default items-center justify-center rounded-xl bg-accent-primary/20 px-2.5 py-0.5 text-center text-11 font-semibold text-accent-primary">
{issueCount}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { IconButton } from "@plane/propel/icon-button";
import { CycleIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { ICustomSearchSelectOption, IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";
import { EIssuesStoreType, EIssueLayoutTypes } from "@plane/types";
import { Breadcrumbs, BreadcrumbNavigationSearchDropdown, Header } from "@plane/ui";
Expand Down Expand Up @@ -169,11 +169,10 @@ export const CycleIssuesHeader = observer(function CycleIssuesHeader() {
</Breadcrumbs>
{workItemsCount && workItemsCount > 0 ? (
<Tooltip
isMobile={isMobile}
tooltipContent={`There are ${workItemsCount} ${
workItemsCount > 1 ? "work items" : "work item"
} in this cycle`}
position="bottom"
label={`There are ${workItemsCount} ${workItemsCount > 1 ? "work items" : "work item"} in this cycle`}
layout="stacked"
side="bottom"
disabled={isMobile}
>
<span className="flex flex-shrink-0 cursor-default items-center justify-center rounded-xl bg-accent-primary/20 px-2 text-center text-11 font-semibold text-accent-primary">
{workItemsCount}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from "@plane/constants";
import { Button } from "@plane/propel/button";
import { ModuleIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { ICustomSearchSelectOption, IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";
import { EIssuesStoreType, EIssueLayoutTypes } from "@plane/types";
import { Breadcrumbs, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
Expand Down Expand Up @@ -163,11 +163,10 @@ export const ModuleIssuesHeader = observer(function ModuleIssuesHeader() {
</Breadcrumbs>
{workItemsCount && workItemsCount > 0 ? (
<Tooltip
isMobile={isMobile}
tooltipContent={`There are ${workItemsCount} ${
workItemsCount > 1 ? "work items" : "work item"
} in this module`}
position="bottom"
label={`There are ${workItemsCount} ${workItemsCount > 1 ? "work items" : "work item"} in this module`}
layout="stacked"
side="bottom"
disabled={isMobile}
>
<span className="flex flex-shrink-0 cursor-default items-center justify-center rounded-xl bg-accent-primary/20 px-2 text-center text-11 font-semibold text-accent-primary">
{workItemsCount}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
} from "@plane/constants";
import { Button } from "@plane/propel/button";
import { LockIcon, ViewsIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { ICustomSearchSelectOption, IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";
import { EIssuesStoreType, EViewAccess, EIssueLayoutTypes } from "@plane/types";
import { Breadcrumbs, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
Expand Down Expand Up @@ -155,7 +155,7 @@ export const ProjectViewIssuesHeader = observer(function ProjectViewIssuesHeader

{viewDetails?.access === EViewAccess.PRIVATE ? (
<div className="cursor-default text-tertiary">
<Tooltip tooltipContent={"Private"}>
<Tooltip label={"Private"}>
<LockIcon className="h-4 w-4" />
</Tooltip>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// plane package imports
import { Logo } from "@plane/propel/emoji-icon-picker";
import { ProjectIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import { cn } from "@plane/utils";
// plane web hooks
import { useProject } from "@/hooks/store/use-project";
Expand Down Expand Up @@ -54,7 +54,7 @@ function ActiveProjectItem(props: Props) {
)}
</span>
</div>
<Tooltip tooltipContent={projectDetails?.name} position="top-start">
<Tooltip label={projectDetails?.name} layout="stacked" align="start">
<p className="truncate text-13 font-medium">{projectDetails?.name}</p>
</Tooltip>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { CopyIcon } from "@plane/propel/icons";
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { IApiToken } from "@plane/types";
// ui
import { renderFormattedDate, renderFormattedTime, copyTextToClipboard } from "@plane/utils";
Expand Down Expand Up @@ -48,7 +48,7 @@ export function GeneratedTokenDetails(props: Props) {
className="mt-4 flex w-full items-center justify-between truncate rounded-md border-[0.5px] border-subtle px-3 py-2 text-13 font-medium outline-none"
>
<span className="truncate pr-2">{tokenDetails.token}</span>
<Tooltip tooltipContent="Copy secret key" isMobile={isMobile}>
<Tooltip label="Copy secret key" disabled={isMobile}>
<CopyIcon className="h-4 w-4 flex-shrink-0 text-placeholder" />
</Tooltip>
</button>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/api-token/token-list-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { useState } from "react";
import { XCircle } from "lucide-react";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { IApiToken } from "@plane/types";
import { renderFormattedDate, calculateTimeAgo, renderFormattedTime } from "@plane/utils";
// components
Expand All @@ -30,7 +30,7 @@ export function ApiTokenListItem(props: Props) {
<>
<DeleteApiTokenModal isOpen={deleteModalOpen} onClose={() => setDeleteModalOpen(false)} tokenId={token.id} />
<div className="group relative flex flex-col justify-center border-b border-subtle py-3">
<Tooltip tooltipContent="Delete token" isMobile={isMobile}>
<Tooltip label="Delete token" disabled={isMobile}>
<button
onClick={() => setDeleteModalOpen(true)}
className="absolute right-4 hidden place-items-center group-hover:grid"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/base-layouts/layout-switcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { useTranslation } from "@plane/i18n";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { TBaseLayoutType } from "@plane/types";
import { cn } from "@plane/utils";
import { usePlatformOS } from "@/hooks/use-platform-os";
Expand Down Expand Up @@ -33,7 +33,7 @@ export function LayoutSwitcher(props: Props) {
{BASE_LAYOUTS.filter((l) => (layouts ? layouts.includes(l.key) : true)).map((layout) => {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed in ddc3383BASE_LAYOUTS.map() now skips non-selected layouts with an early return null instead of pre-filtering, so it is a single pass. (Note this chain was pre-existing; the migration only touched the <Tooltip> line in this file.)

const Icon = layout.icon;
return (
<Tooltip key={layout.key} tooltipContent={t(layout.label)} isMobile={isMobile}>
<Tooltip key={layout.key} label={t(layout.label)} disabled={isMobile}>
<button
type="button"
className={cn(
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/common/access-field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { LucideIcon } from "lucide-react";
// plane ui
import { useTranslation } from "@plane/i18n";
import type { ISvgIcons } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
// plane utils
import { cn } from "@plane/utils";

Expand All @@ -34,7 +34,7 @@ export function AccessField(props: Props) {
{accessSpecifiers.map((access, index) => {
const label = access.i18n_label ? t(access.i18n_label) : access.label;
return (
<Tooltip key={access.key} tooltipContent={label} isMobile={isMobile}>
<Tooltip key={access.key} label={label ?? ""} layout="stacked" disabled={isMobile}>
<button
type="button"
onClick={() => onChange(access.key)}
Expand Down
6 changes: 3 additions & 3 deletions apps/web/core/components/common/activity/activity-block.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import type { FC, ReactNode } from "react";
import { Network } from "lucide-react";
// types
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { TWorkspaceBaseActivity } from "@plane/types";
// ui
// helpers
Expand Down Expand Up @@ -46,8 +46,8 @@ export function ActivityBlockComponent(props: TActivityBlockComponent) {
</div>
<div className="mt-1">
<Tooltip
isMobile={isMobile}
tooltipContent={`${renderFormattedDate(activity.created_at)}, ${renderFormattedTime(activity.created_at)}`}
label={`${renderFormattedDate(activity.created_at)}, ${renderFormattedTime(activity.created_at)}`}
disabled={isMobile}
>
<span className="cursor-help font-medium whitespace-nowrap text-tertiary">
{calculateTimeAgo(activity.created_at)}
Expand Down
7 changes: 4 additions & 3 deletions apps/web/core/components/core/activity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
RelatedIcon,
WorkItemsIcon,
} from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { IIssueActivity } from "@plane/types";
import { renderFormattedDate, generateWorkItemLink, capitalizeFirstLetter } from "@plane/utils";
// helpers
Expand All @@ -56,8 +56,9 @@ export function IssueLink({ activity }: { activity: IIssueActivity }) {

return (
<Tooltip
tooltipContent={activity?.issue_detail ? activity.issue_detail.name : "This work item has been deleted"}
isMobile={isMobile}
label={activity?.issue_detail ? activity.issue_detail.name : "This work item has been deleted"}
layout="stacked"
disabled={isMobile}
>
{activity?.issue_detail ? (
<a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { CopyIcon, ChevronLeftIcon, ChevronRightIcon } from "@plane/propel/icons";
import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { TDescriptionVersion } from "@plane/types";
import { Avatar, EModalPosition, EModalWidth, Loader, ModalCore } from "@plane/ui";
import { calculateTimeAgo, cn, getFileURL } from "@plane/utils";
Expand Down Expand Up @@ -156,7 +156,7 @@ export const DescriptionVersionsModal = observer(function DescriptionVersionsMod
{/* End version description */}
{/* Footer */}
<div className="flex items-center justify-between gap-2 border-t-[0.5px] border-subtle pt-4">
<Tooltip tooltipContent={t("common.actions.copy_markdown")}>
<Tooltip label={t("common.actions.copy_markdown")}>
<IconButton type="button" variant="ghost" size="base" onClick={handleCopyMarkdown} icon={CopyIcon} />
</Tooltip>
<div className="flex items-center gap-2">
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/core/list/list-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import React from "react";
// ui
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import { ControlLink, Row } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
Expand Down Expand Up @@ -86,7 +86,7 @@ export function ListItem(props: IListItemProps) {
>
<div className={cn("flex items-center gap-4 truncate", leftElementClassName)}>
{prependTitleElement && <span className="flex flex-shrink-0 items-center">{prependTitleElement}</span>}
<Tooltip tooltipContent={title} position="top" isMobile={isMobile}>
<Tooltip label={title} layout="stacked" disabled={isMobile}>
<span className="truncate text-13">{title}</span>
</Tooltip>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { SearchIcon, CloseIcon } from "@plane/propel/icons";
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { ISearchIssueResponse, TProjectIssuesSearchParams } from "@plane/types";
// ui
import { Switch } from "@makeplane/propel/components/switch";
Expand Down Expand Up @@ -193,7 +193,7 @@ export function ExistingIssuesListModal(props: Props) {
</div>
)}
{workspaceLevelToggle && (
<Tooltip tooltipContent="Toggle workspace level search" isMobile={isMobile}>
<Tooltip label="Toggle workspace level search" disabled={isMobile}>
<div
className={`flex flex-shrink-0 cursor-pointer items-center gap-1 text-11 ${
isWorkspaceLevel ? "text-primary" : "text-secondary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Tab } from "@headlessui/react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { PriorityIcon } from "@plane/propel/icons";
import { Tooltip } from "@plane/propel/tooltip";
import { Tooltip } from "@makeplane/propel/components/tooltip";
import type { TWorkItemFilterCondition } from "@plane/shared-state";
import type { ICycle } from "@plane/types";
import { EIssuesStoreType } from "@plane/types";
Expand Down Expand Up @@ -207,7 +207,7 @@ export const ActiveCycleStats = observer(function ActiveCycleStats(props: Active
>
<div className="flex w-full min-w-24 flex-grow items-center gap-1.5 truncate">
<IssueIdentifier issueId={issue.id} projectId={projectId} size="xs" variant="secondary" />
<Tooltip position="top-start" tooltipHeading="Title" tooltipContent={issue.name}>
<Tooltip label={`Title: ${issue.name}`} layout="stacked" align="start">
<span className="truncate text-13 text-primary">{issue.name}</span>
</Tooltip>
</div>
Expand All @@ -223,10 +223,7 @@ export const ActiveCycleStats = observer(function ActiveCycleStats(props: Active
showTooltip
/>
{issue.target_date && (
<Tooltip
tooltipHeading="Target Date"
tooltipContent={renderFormattedDate(issue.target_date)}
>
<Tooltip label={`Target Date: ${renderFormattedDate(issue.target_date) ?? ""}`}>
<div className="flex h-full cursor-pointer items-center gap-1.5 truncate rounded-sm bg-layer-1 px-2 py-0.5 text-11 group-hover:bg-surface-1">
<CalendarCheck className="h-3 w-3 flex-shrink-0" />
<span className="truncate text-11">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import { useEffect } from "react";
import { observer } from "mobx-react";
import { Controller, useForm } from "react-hook-form";
import { ArrowRight } from "lucide-react";
// Plane Imports
import { CYCLE_STATUS, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
Expand Down Expand Up @@ -176,13 +175,9 @@ export const CycleSidebarHeader = observer(function CycleSidebarHeader(props: Pr
to: t("project_cycles.end_date"),
}}
customTooltipHeading={t("project_cycles.in_your_timezone")}
customTooltipContent={
<span className="flex gap-1">
{renderFormattedDateInUserTimezone(cycleDetails.start_date ?? "")}
<ArrowRight className="my-auto h-3 w-3 flex-shrink-0" />
{renderFormattedDateInUserTimezone(cycleDetails.end_date ?? "")}
</span>
}
customTooltipContent={`${renderFormattedDateInUserTimezone(
cycleDetails.start_date ?? ""
)} → ${renderFormattedDateInUserTimezone(cycleDetails.end_date ?? "")}`}
mergeDates
showTooltip={!!cycleDetails.start_date && !!cycleDetails.end_date} // show tooltip only if both start and end date are present
required={cycleDetails.status !== "draft"}
Expand Down
Loading
Loading