Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

refactor(frontend): move kernel-safe helpers next to lemon ui (#126325)

Paul D'Ambradd887a174c68
diff --git a/common/storybook/storybook-timings.json b/common/storybook/storybook-timings.json
index 77b7bac4409a..3bd12e45effd 100644
--- a/common/storybook/storybook-timings.json
+++ b/common/storybook/storybook-timings.json
@@ -239,7 +239,7 @@
"chromium": 3.045,
"webkit": 2.417
},
- "frontend/src/lib/components/KeyboardShortcut/KeyboardShortcut.stories.tsx": {
+ "frontend/src/lib/lemon-ui/KeyboardShortcut/KeyboardShortcut.stories.tsx": {
"chromium": 8.996,
"webkit": 2.76
},
diff --git a/frontend/src/lib/components/Account/AccountMenu.tsx b/frontend/src/lib/components/Account/AccountMenu.tsx
index 85768f03ef1e..26813824fb7f 100644
--- a/frontend/src/lib/components/Account/AccountMenu.tsx
+++ b/frontend/src/lib/components/Account/AccountMenu.tsx
@@ -22,9 +22,9 @@ import {
IconToggle,
} from '@posthog/icons'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { FEATURE_FLAGS } from 'lib/constants'
import { IconBlank } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
import { Link } from 'lib/lemon-ui/Link/Link'
import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture/ProfilePicture'
diff --git a/frontend/src/lib/components/Account/OrgSwitcher.tsx b/frontend/src/lib/components/Account/OrgSwitcher.tsx
index f7960f8d65bf..7aded62f7b77 100644
--- a/frontend/src/lib/components/Account/OrgSwitcher.tsx
+++ b/frontend/src/lib/components/Account/OrgSwitcher.tsx
@@ -4,9 +4,9 @@ import { useCallback, useMemo, useRef, useState } from 'react'
import { IconCheck, IconPlusSmall, IconSearch, IconX } from '@posthog/icons'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { upgradeModalLogic } from 'lib/components/UpgradeModal/upgradeModalLogic'
import { IconBlank } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
import { UploadedLogo } from 'lib/lemon-ui/UploadedLogo'
import { preflightLogic } from 'lib/logic/preflightLogic'
diff --git a/frontend/src/lib/components/Account/ProjectSwitcher.tsx b/frontend/src/lib/components/Account/ProjectSwitcher.tsx
index 56eb0a9fef29..c823a97fb96a 100644
--- a/frontend/src/lib/components/Account/ProjectSwitcher.tsx
+++ b/frontend/src/lib/components/Account/ProjectSwitcher.tsx
@@ -4,9 +4,9 @@ import { useCallback, useRef } from 'react'
import { IconCheck, IconPlusSmall, IconSearch, IconX } from '@posthog/icons'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { upgradeModalLogic } from 'lib/components/UpgradeModal/upgradeModalLogic'
import { IconBlank } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { preflightLogic } from 'lib/logic/preflightLogic'
import { ButtonPrimitive } from 'lib/ui/Button/ButtonPrimitives'
import { MenuSeparator } from 'lib/ui/Menus/Menus'
diff --git a/frontend/src/lib/components/ChartLegendSeriesMenu/ChartLegendSeriesMenu.tsx b/frontend/src/lib/components/ChartLegendSeriesMenu/ChartLegendSeriesMenu.tsx
index 48512e2983c9..7b152572d154 100644
--- a/frontend/src/lib/components/ChartLegendSeriesMenu/ChartLegendSeriesMenu.tsx
+++ b/frontend/src/lib/components/ChartLegendSeriesMenu/ChartLegendSeriesMenu.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react'
import { IconEye, IconHide, IconTarget } from '@posthog/icons'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
import { ButtonPrimitive } from 'lib/ui/Button/ButtonPrimitives'
import {
diff --git a/frontend/src/lib/components/Comments/Comment.tsx b/frontend/src/lib/components/Comments/Comment.tsx
index d916196843c9..2b68d069a63f 100644
--- a/frontend/src/lib/components/Comments/Comment.tsx
+++ b/frontend/src/lib/components/Comments/Comment.tsx
@@ -8,11 +8,11 @@ import { LemonButton, LemonCheckbox, LemonMenu, LemonTag, ProfilePicture, Toolti
import { SentenceList } from 'lib/components/ActivityLog/SentenceList'
import { EmojiPickerPopover } from 'lib/components/EmojiPicker/EmojiPickerPopover'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { TZLabel } from 'lib/components/TZLabel'
import { FEATURE_FLAGS } from 'lib/constants'
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { IconSlack } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
import { LemonRichContentEditor } from 'lib/lemon-ui/LemonRichContent/LemonRichContentEditor'
diff --git a/frontend/src/lib/components/Comments/CommentComposer.tsx b/frontend/src/lib/components/Comments/CommentComposer.tsx
index 75227b9dbd96..47587eb4360b 100644
--- a/frontend/src/lib/components/Comments/CommentComposer.tsx
+++ b/frontend/src/lib/components/Comments/CommentComposer.tsx
@@ -4,9 +4,9 @@ import { useEffect } from 'react'
import { LemonButton } from '@posthog/lemon-ui'
import { humanizeScope } from 'lib/components/ActivityLog/humanizeActivity'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { FEATURE_FLAGS } from 'lib/constants'
import { IconSlack } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonRichContentEditor } from 'lib/lemon-ui/LemonRichContent/LemonRichContentEditor'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
diff --git a/frontend/src/lib/components/HelpMenu/HelpMenu.tsx b/frontend/src/lib/components/HelpMenu/HelpMenu.tsx
index 575b20efc97a..9d13e144b0ce 100644
--- a/frontend/src/lib/components/HelpMenu/HelpMenu.tsx
+++ b/frontend/src/lib/components/HelpMenu/HelpMenu.tsx
@@ -4,8 +4,8 @@ import { useActions, useValues } from 'kea'
import { IconCopy, IconDatabase, IconOpenSidebar, IconServer, IconShieldLock, IconSparkles } from '@posthog/icons'
import { ProfilePicture } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { IconMenu, IconWithBadge } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonBadge } from 'lib/lemon-ui/LemonBadge/LemonBadge'
import { Link } from 'lib/lemon-ui/Link/Link'
import { preflightLogic } from 'lib/logic/preflightLogic'
diff --git a/frontend/src/lib/components/HelpMenu/incidentStatusLogic.test.ts b/frontend/src/lib/components/HelpMenu/incidentStatusLogic.test.ts
index b9ccb48ca71a..85e3be9d6fe3 100644
--- a/frontend/src/lib/components/HelpMenu/incidentStatusLogic.test.ts
+++ b/frontend/src/lib/components/HelpMenu/incidentStatusLogic.test.ts
@@ -1,5 +1,6 @@
import { expectLogic } from 'kea-test-utils'
+import { STATUS_PAGE_BASE } from 'lib/lemon-ui/LemonToast/incidentStatus'
import { preflightLogic } from 'lib/logic/preflightLogic'
import preflightJson from '~/mocks/fixtures/_preflight.json'
@@ -7,7 +8,7 @@ import { useMocks } from '~/mocks/jest'
import { initKeaTests } from '~/test/init'
import { Region } from '~/types'
-import { STATUS_PAGE_BASE, incidentStatusLogic } from './incidentStatusLogic'
+import { incidentStatusLogic } from './incidentStatusLogic'
describe('incidentStatusLogic', () => {
let logic: ReturnType<typeof incidentStatusLogic.build>
diff --git a/frontend/src/lib/components/HelpMenu/incidentStatusLogic.tsx b/frontend/src/lib/components/HelpMenu/incidentStatusLogic.tsx
index 5c737df7b124..e2b76e75d6e2 100644
--- a/frontend/src/lib/components/HelpMenu/incidentStatusLogic.tsx
+++ b/frontend/src/lib/components/HelpMenu/incidentStatusLogic.tsx
@@ -5,13 +5,13 @@ import posthog from 'posthog-js'
import { isBrowserNetworkFailure } from 'lib/api-error'
// eslint-disable-next-line import/no-cycle
import { superpowersLogic } from 'lib/components/Superpowers/superpowersLogic'
+import { NormalizedStatus, STATUS_PAGE_BASE, setIncidentStatus } from 'lib/lemon-ui/LemonToast/incidentStatus'
import { preflightLogic } from 'lib/logic/preflightLogic'
import { Region } from '~/types'
import type { PreflightStatus } from '../../../types'
import type { FakeStatusOverride } from '../Superpowers/superpowersLogic'
-import { NormalizedStatus, STATUS_PAGE_BASE, setIncidentStatus } from './incidentStatus'
// Raw status page API types
export type ComponentStatus = 'operational' | 'degraded_performance' | 'partial_outage' | 'full_outage'
@@ -19,10 +19,6 @@ export type Impact = 'partial_outage' | 'degraded_performance' | 'full_outage'
export type IncidentStatus = 'investigating' | 'identified' | 'monitoring'
export type MaintenanceStatus = 'maintenance_in_progress' | 'maintenance_scheduled'
-// The normalized display status and its shared read/write module live in ./incidentStatus, a
-// deliberate leaf so LemonToast can read the status without importing this logic's graph.
-export { getIncidentStatus, setIncidentStatus, STATUS_PAGE_BASE, type NormalizedStatus } from './incidentStatus'
-
export interface AffectedComponent {
id: string
name: string
diff --git a/frontend/src/lib/components/HelpMenu/posthogStatusLogic.tsx b/frontend/src/lib/components/HelpMenu/posthogStatusLogic.tsx
index 34889c496476..64140bbeeb0e 100644
--- a/frontend/src/lib/components/HelpMenu/posthogStatusLogic.tsx
+++ b/frontend/src/lib/components/HelpMenu/posthogStatusLogic.tsx
@@ -1,10 +1,10 @@
import { MakeLogicType, connect, kea, path, selectors } from 'kea'
import { superpowersLogic } from 'lib/components/Superpowers/superpowersLogic'
+import type { NormalizedStatus } from 'lib/lemon-ui/LemonToast/incidentStatus'
import { capitalizeFirstLetter } from 'lib/utils/strings'
import type { FakeStatusOverride } from '../Superpowers/superpowersLogic'
-import type { NormalizedStatus } from './incidentStatus'
import { incidentStatusLogic } from './incidentStatusLogic'
export type PostHogStatusType = 'operational' | 'degraded_performance' | 'partial_outage' | 'major_outage'
@@ -57,10 +57,7 @@ export const posthogStatusLogic = kea<posthogStatusLogicType>([
],
}),
selectors({
- postHogStatus: [
- (s) => [s.status],
- (status: import('./incidentStatus').NormalizedStatus): PostHogStatusType => status,
- ],
+ postHogStatus: [(s) => [s.status], (status: NormalizedStatus): PostHogStatusType => status],
isFakeStatus: [
(s) => [s.superpowersEnabled, s.fakeStatusOverride],
(
diff --git a/frontend/src/lib/components/Search/Search.tsx b/frontend/src/lib/components/Search/Search.tsx
index 5609d2f3f256..8b2a6548f073 100644
--- a/frontend/src/lib/components/Search/Search.tsx
+++ b/frontend/src/lib/components/Search/Search.tsx
@@ -18,9 +18,9 @@ import {
import { IconDay, IconNight, IconSearch, IconSparkles, IconX } from '@posthog/icons'
import { LemonTag, Link, Spinner, Tooltip } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { filterSearchItems } from 'lib/components/Search/utils'
import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { TreeDataItem } from 'lib/lemon-ui/LemonTree/LemonTree'
import { themeLogic } from 'lib/logic/themeLogic'
import posthog from 'lib/posthog-typed'
diff --git a/frontend/src/lib/components/Shortcuts/RenderKeybind.tsx b/frontend/src/lib/components/Shortcuts/RenderKeybind.tsx
index b55a055e24d1..1bfcbdc451a8 100644
--- a/frontend/src/lib/components/Shortcuts/RenderKeybind.tsx
+++ b/frontend/src/lib/components/Shortcuts/RenderKeybind.tsx
@@ -1,6 +1,6 @@
import React from 'react'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { cn } from 'lib/utils/css-classes'
interface RenderKeybindProps {
diff --git a/frontend/src/lib/components/KeyboardShortcut/KeyboardShortcut.scss b/frontend/src/lib/lemon-ui/KeyboardShortcut/KeyboardShortcut.scss
similarity index 100%
rename from frontend/src/lib/components/KeyboardShortcut/KeyboardShortcut.scss
rename to frontend/src/lib/lemon-ui/KeyboardShortcut/KeyboardShortcut.scss
diff --git a/frontend/src/lib/components/KeyboardShortcut/KeyboardShortcut.stories.tsx b/frontend/src/lib/lemon-ui/KeyboardShortcut/KeyboardShortcut.stories.tsx
similarity index 100%
rename from frontend/src/lib/components/KeyboardShortcut/KeyboardShortcut.stories.tsx
rename to frontend/src/lib/lemon-ui/KeyboardShortcut/KeyboardShortcut.stories.tsx
diff --git a/frontend/src/lib/components/KeyboardShortcut/KeyboardShortcut.tsx b/frontend/src/lib/lemon-ui/KeyboardShortcut/KeyboardShortcut.tsx
similarity index 100%
rename from frontend/src/lib/components/KeyboardShortcut/KeyboardShortcut.tsx
rename to frontend/src/lib/lemon-ui/KeyboardShortcut/KeyboardShortcut.tsx
diff --git a/frontend/src/lib/lemon-ui/LemonDrawer/LemonDrawer.tsx b/frontend/src/lib/lemon-ui/LemonDrawer/LemonDrawer.tsx
index 882589111b77..8b3c9269d0c0 100644
--- a/frontend/src/lib/lemon-ui/LemonDrawer/LemonDrawer.tsx
+++ b/frontend/src/lib/lemon-ui/LemonDrawer/LemonDrawer.tsx
@@ -7,10 +7,10 @@ import Modal from 'react-modal'
import { IconX } from '@posthog/icons'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { Resizer } from 'lib/components/Resizer/Resizer'
import { ResizerLogicProps, resizerLogic } from 'lib/components/Resizer/resizerLogic'
import { useFloatingContainer } from 'lib/hooks/useFloatingContainerContext'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { Tooltip } from '../Tooltip'
diff --git a/frontend/src/lib/lemon-ui/LemonInputSelect/LemonInputSelect.tsx b/frontend/src/lib/lemon-ui/LemonInputSelect/LemonInputSelect.tsx
index 47cd74aab90d..b57afa0e0258 100644
--- a/frontend/src/lib/lemon-ui/LemonInputSelect/LemonInputSelect.tsx
+++ b/frontend/src/lib/lemon-ui/LemonInputSelect/LemonInputSelect.tsx
@@ -12,9 +12,9 @@ import { IconCheck, IconPencil, IconX } from '@posthog/icons'
import { LemonCheckbox, Tooltip } from '@posthog/lemon-ui'
import { AutoSizer } from 'lib/components/AutoSizer'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { CLICK_OUTSIDE_BLOCK_CLASS } from 'lib/hooks/useOutsideClickHandler'
import { SortableDragIcon } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
import { LemonSnack } from 'lib/lemon-ui/LemonSnack/LemonSnack'
import { range } from 'lib/utils/arrays'
diff --git a/frontend/src/lib/lemon-ui/LemonMenu/LemonMenu.tsx b/frontend/src/lib/lemon-ui/LemonMenu/LemonMenu.tsx
index b4501f4c3da7..fb3afcc399e4 100644
--- a/frontend/src/lib/lemon-ui/LemonMenu/LemonMenu.tsx
+++ b/frontend/src/lib/lemon-ui/LemonMenu/LemonMenu.tsx
@@ -1,7 +1,7 @@
import { useMergeRefs } from '@floating-ui/react'
import React, { FunctionComponent, ReactNode, cloneElement, useCallback, useMemo } from 'react'
-import { KeyboardShortcut, KeyboardShortcutProps } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut, KeyboardShortcutProps } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonButton, LemonButtonProps } from '../LemonButton'
import { LemonDivider } from '../LemonDivider'
diff --git a/frontend/src/lib/lemon-ui/LemonModal/LemonModal.tsx b/frontend/src/lib/lemon-ui/LemonModal/LemonModal.tsx
index 4857a5a339f2..ea385f3ec272 100644
--- a/frontend/src/lib/lemon-ui/LemonModal/LemonModal.tsx
+++ b/frontend/src/lib/lemon-ui/LemonModal/LemonModal.tsx
@@ -6,8 +6,8 @@ import Modal from 'react-modal'
import { IconX } from '@posthog/icons'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { useFloatingContainer } from 'lib/hooks/useFloatingContainerContext'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { Tooltip } from '../Tooltip'
diff --git a/frontend/src/lib/lemon-ui/LemonToast/LemonToast.stories.tsx b/frontend/src/lib/lemon-ui/LemonToast/LemonToast.stories.tsx
index 7ace9e1dbff2..83ebc67f72fa 100644
--- a/frontend/src/lib/lemon-ui/LemonToast/LemonToast.stories.tsx
+++ b/frontend/src/lib/lemon-ui/LemonToast/LemonToast.stories.tsx
@@ -3,8 +3,8 @@ import { useMountedLogic, useValues } from 'kea'
import { useEffect } from 'react'
import { Slide, ToastContainer } from 'react-toastify'
-import { STATUS_PAGE_BASE } from 'lib/components/HelpMenu/incidentStatusLogic'
import { incidentStatusLogic } from 'lib/components/HelpMenu/incidentStatusLogic'
+import { STATUS_PAGE_BASE } from 'lib/lemon-ui/LemonToast/incidentStatus'
import { useStorybookMocks } from '~/mocks/browser'
import * as statusPageCritical from '~/mocks/fixtures/_status_page_critical.json'
diff --git a/frontend/src/lib/lemon-ui/LemonToast/LemonToast.tsx b/frontend/src/lib/lemon-ui/LemonToast/LemonToast.tsx
index 7e729e1625c9..40f7a67fa663 100644
--- a/frontend/src/lib/lemon-ui/LemonToast/LemonToast.tsx
+++ b/frontend/src/lib/lemon-ui/LemonToast/LemonToast.tsx
@@ -4,8 +4,8 @@ import { toast, type ToastOptions, type UpdateOptions } from 'react-toastify'
import { IconCheckCircle, IconCopy, IconInfo, IconWarning, IconX } from '@posthog/icons'
-import { getIncidentStatus, STATUS_PAGE_BASE } from 'lib/components/HelpMenu/incidentStatus'
-import { isChristmas } from 'lib/holidays'
+import { getIncidentStatus, STATUS_PAGE_BASE } from 'lib/lemon-ui/LemonToast/incidentStatus'
+import { isChristmas } from 'lib/utils/holidays'
import { renderDetailWithLinks } from 'lib/utils/renderDetailWithLinks'
import { hashCodeForString } from 'lib/utils/strings'
import { writeToClipboard } from 'lib/utils/writeToClipboard'
diff --git a/frontend/src/lib/components/HelpMenu/incidentStatus.ts b/frontend/src/lib/lemon-ui/LemonToast/incidentStatus.ts
similarity index 100%
rename from frontend/src/lib/components/HelpMenu/incidentStatus.ts
rename to frontend/src/lib/lemon-ui/LemonToast/incidentStatus.ts
diff --git a/frontend/src/lib/holidays.tsx b/frontend/src/lib/utils/holidays.tsx
similarity index 97%
rename from frontend/src/lib/holidays.tsx
rename to frontend/src/lib/utils/holidays.tsx
index e4d77c687ba9..92022353c2aa 100644
--- a/frontend/src/lib/holidays.tsx
+++ b/frontend/src/lib/utils/holidays.tsx
@@ -1,9 +1,8 @@
import posthog from 'posthog-js'
+import { FEATURE_FLAGS } from 'lib/constants'
import { inStorybook, inStorybookTestRunner } from 'lib/utils/dom'
-import { FEATURE_FLAGS } from './constants'
-
// Please remember that in Javascript months are 0-indexed
// January is 0 and December is 11
const getToday = (): { month: number; day: number } => {
diff --git a/frontend/src/mocks/handlers.ts b/frontend/src/mocks/handlers.ts
index dc776c13e832..b9093fc455a8 100644
--- a/frontend/src/mocks/handlers.ts
+++ b/frontend/src/mocks/handlers.ts
@@ -15,7 +15,7 @@ import {
import { HttpResponse } from 'msw'
-import { STATUS_PAGE_BASE } from 'lib/components/HelpMenu/incidentStatusLogic'
+import { STATUS_PAGE_BASE } from 'lib/lemon-ui/LemonToast/incidentStatus'
import sdkVersions from '~/mocks/fixtures/api/sdk_versions.json'
import teamSdkVersions from '~/mocks/fixtures/api/team_sdk_versions.json'
diff --git a/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx b/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
index a1d4844c3205..a19075b18533 100644
--- a/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
@@ -32,7 +32,6 @@ import { LemonBanner, LemonButton, LemonDivider, LemonMenu, LemonModal, LemonTab
import { ExportButton } from 'lib/components/ExportButton/ExportButton'
import { JSONViewer } from 'lib/components/JSONViewer'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { MCPUseCaseCard } from 'lib/components/MCPHint/MCPUseCaseCard'
import { Resizer } from 'lib/components/Resizer/Resizer'
import { type ResizerLogicProps, resizerLogic } from 'lib/components/Resizer/resizerLogic'
@@ -40,6 +39,7 @@ import { TZLabel } from 'lib/components/TZLabel'
import { PART_OF_WHOLE_DISPLAY_TYPES } from 'lib/constants'
import { useCellCopyContextMenu } from 'lib/hooks/useCellCopyContextMenu'
import { IconTableChart } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LoadingBar } from 'lib/lemon-ui/LoadingBar'
import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
import { getAccessControlDisabledReason } from 'lib/utils/accessControlUtils'
diff --git a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
index 1728fb8f3b0e..b4f72e73e687 100644
--- a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
+++ b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
@@ -19,7 +19,6 @@ import { AccessControlAction } from 'lib/components/AccessControlAction'
import { MCPUseCaseCard } from 'lib/components/MCPHint/MCPUseCaseCard'
import { supportLogic } from 'lib/components/Support/supportLogic'
import { dayjs } from 'lib/dayjs'
-import { holidaysMatcher, isChristmas } from 'lib/holidays'
import { useInterval } from 'lib/hooks/useInterval'
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { usePageVisibility } from 'lib/hooks/usePageVisibility'
@@ -32,6 +31,7 @@ import posthog from 'lib/posthog-typed'
import { inStorybook, inStorybookTestRunner } from 'lib/utils/dom'
import { GraphSeriesAddedSource, eventUsageLogic } from 'lib/utils/eventUsageLogic'
import { getDefaultEventLabel, getDefaultEventName } from 'lib/utils/getAppContext'
+import { holidaysMatcher, isChristmas } from 'lib/utils/holidays'
import { humanFriendlyNumber, humanizeBytes } from 'lib/utils/numbers'
import { renderDetailWithLinks } from 'lib/utils/renderDetailWithLinks'
import { insightLogic, insightOverridesPresent } from 'scenes/insights/insightLogic'
diff --git a/frontend/src/scenes/max/components/QuestionInput.tsx b/frontend/src/scenes/max/components/QuestionInput.tsx
index 150539dde050..bfe4bd7beaf1 100644
--- a/frontend/src/scenes/max/components/QuestionInput.tsx
+++ b/frontend/src/scenes/max/components/QuestionInput.tsx
@@ -7,7 +7,7 @@ import React, { ReactNode, useEffect, useRef, useState } from 'react'
import { IconArrowRight, IconCheck, IconPencil, IconStopFilled, IconTrash, IconUpload, IconX } from '@posthog/icons'
import { LemonButton, LemonSwitch, LemonTextArea, Spinner } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { cn } from 'lib/utils/css-classes'
import { AIConsentPopoverWrapper } from 'scenes/settings/organization/AIConsentPopoverWrapper'
diff --git a/frontend/src/scenes/notebooks/Notebook/NotebookJupyterShortcutsModal.tsx b/frontend/src/scenes/notebooks/Notebook/NotebookJupyterShortcutsModal.tsx
index ebe1203ffafc..c204e68825bc 100644
--- a/frontend/src/scenes/notebooks/Notebook/NotebookJupyterShortcutsModal.tsx
+++ b/frontend/src/scenes/notebooks/Notebook/NotebookJupyterShortcutsModal.tsx
@@ -1,5 +1,5 @@
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { useNotebookJupyterCommands, useNotebookJupyterStoreValue } from 'lib/components/MarkdownNotebook/jupyterMode'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonModal } from 'lib/lemon-ui/LemonModal'
import { HotKeyOrModifier } from '~/types'
diff --git a/frontend/src/scenes/session-recordings/player/commenting/CommentOnRecordingButton.tsx b/frontend/src/scenes/session-recordings/player/commenting/CommentOnRecordingButton.tsx
index 679b6b19cd06..1b36379c5802 100644
--- a/frontend/src/scenes/session-recordings/player/commenting/CommentOnRecordingButton.tsx
+++ b/frontend/src/scenes/session-recordings/player/commenting/CommentOnRecordingButton.tsx
@@ -6,7 +6,7 @@ import { LemonButton, LemonDropdown } from '@posthog/lemon-ui'
import { AccessControlAction } from 'lib/components/AccessControlAction'
import { EmojiPickerPopover } from 'lib/components/EmojiPicker/EmojiPickerPopover'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { emojiUsageLogic } from 'lib/lemon-ui/LemonTextArea/emojiUsageLogic'
import { cn } from 'lib/utils/css-classes'
import { playerCommentOverlayLogic } from 'scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic'
diff --git a/frontend/src/scenes/session-recordings/player/controller/ClipRecording.tsx b/frontend/src/scenes/session-recordings/player/controller/ClipRecording.tsx
index 72f11b34fa62..d9486993a71e 100644
--- a/frontend/src/scenes/session-recordings/player/controller/ClipRecording.tsx
+++ b/frontend/src/scenes/session-recordings/player/controller/ClipRecording.tsx
@@ -3,8 +3,8 @@ import { useMemo, useState } from 'react'
import { LemonButton, LemonSegmentedButton } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { IconRecordingClip } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonSegmentedSelect } from 'lib/lemon-ui/LemonSegmentedSelect'
import { cn } from 'lib/utils/css-classes'
import { colonDelimitedDuration } from 'lib/utils/durations'
diff --git a/frontend/src/scenes/session-recordings/player/controller/PlayerController.tsx b/frontend/src/scenes/session-recordings/player/controller/PlayerController.tsx
index 7fb3a2615d96..c0febc508104 100644
--- a/frontend/src/scenes/session-recordings/player/controller/PlayerController.tsx
+++ b/frontend/src/scenes/session-recordings/player/controller/PlayerController.tsx
@@ -4,13 +4,13 @@ import { useEffect, useRef, useState } from 'react'
import { IconCamera, IconPause, IconPlay, IconRewindPlay } from '@posthog/icons'
import { LemonButton } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
-import { isChristmas, isHalloween } from 'lib/holidays'
import { useKeyboardHotkeys } from 'lib/hooks/useKeyboardHotkeys'
import { useResizeBreakpoints } from 'lib/hooks/useResizeObserver'
import { IconFullScreen, IconGhost, IconSanta, IconSkipEnd, IconSkipStart } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
import { cn } from 'lib/utils/css-classes'
+import { isChristmas, isHalloween } from 'lib/utils/holidays'
import {
CommentOnRecordingButton,
EmojiCommentOnRecordingButton,
diff --git a/frontend/src/scenes/session-recordings/player/controller/PlayerControllerTime.tsx b/frontend/src/scenes/session-recordings/player/controller/PlayerControllerTime.tsx
index 3d16330aaf66..c932974f4a9b 100644
--- a/frontend/src/scenes/session-recordings/player/controller/PlayerControllerTime.tsx
+++ b/frontend/src/scenes/session-recordings/player/controller/PlayerControllerTime.tsx
@@ -4,10 +4,10 @@ import { useState } from 'react'
import { IconClock } from '@posthog/icons'
import { LemonButton, LemonButtonProps, Tooltip } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { Dayjs, dayjs } from 'lib/dayjs'
import { useKeyHeld } from 'lib/hooks/useKeyHeld'
import { IconSkipBackward } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { cn } from 'lib/utils/css-classes'
import { formatLocalizedDate, formatLocalizedTime } from 'lib/utils/datetime'
import { colonDelimitedDuration } from 'lib/utils/durations'
diff --git a/products/ai_observability/frontend/AIObservabilityTraceScene.tsx b/products/ai_observability/frontend/AIObservabilityTraceScene.tsx
index 8b7633a4889f..fd00982abca5 100644
--- a/products/ai_observability/frontend/AIObservabilityTraceScene.tsx
+++ b/products/ai_observability/frontend/AIObservabilityTraceScene.tsx
@@ -43,13 +43,13 @@ import { Button } from '@posthog/quill'
import { AccessControlAction } from 'lib/components/AccessControlAction'
import { JSONViewer } from 'lib/components/JSONViewer'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { NotFound } from 'lib/components/NotFound'
import ViewRecordingButton, { RecordingPlayerType } from 'lib/components/ViewRecordingButton/ViewRecordingButton'
import { FEATURE_FLAGS } from 'lib/constants'
import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { useKeyboardHotkeys } from 'lib/hooks/useKeyboardHotkeys'
import { IconWithCount } from 'lib/lemon-ui/icons/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { useAttachedLogic } from 'lib/logic/scenes/useAttachedLogic'
import { identifierToHuman, pluralize } from 'lib/utils/strings'
diff --git a/products/logs/frontend/components/LogsViewer/LogsViewerToolbar.tsx b/products/logs/frontend/components/LogsViewer/LogsViewerToolbar.tsx
index 87d30982e1e5..ede31999fa8c 100644
--- a/products/logs/frontend/components/LogsViewer/LogsViewerToolbar.tsx
+++ b/products/logs/frontend/components/LogsViewer/LogsViewerToolbar.tsx
@@ -3,10 +3,10 @@ import { useActions, useValues } from 'kea'
import { IconKeyboard } from '@posthog/icons'
import { LemonButton, Tooltip } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { Shortcut } from 'lib/components/Shortcuts/Shortcut'
import { keyBinds } from 'lib/components/Shortcuts/shortcuts'
import { IconPauseCircle, IconPlayCircle } from 'lib/lemon-ui/icons'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { Scene } from 'scenes/sceneTypes'
import { logsViewerDataLogic } from 'products/logs/frontend/components/LogsViewer/data/logsViewerDataLogic'
diff --git a/products/posthog_ai/frontend/components/QueuedMessageList.tsx b/products/posthog_ai/frontend/components/QueuedMessageList.tsx
index a746de8321de..4e9ccb14b3e4 100644
--- a/products/posthog_ai/frontend/components/QueuedMessageList.tsx
+++ b/products/posthog_ai/frontend/components/QueuedMessageList.tsx
@@ -3,7 +3,7 @@ import { useEffect, useMemo, useRef, useState } from 'react'
import { IconArrowRight, IconCheck, IconChevronDown, IconPencil, IconStack, IconTrash, IconX } from '@posthog/icons'
import { LemonButton, LemonTextArea } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { cn } from 'lib/utils/css-classes'
import type { QueueHold, QueuedMessage } from '../logics/runInteractionLogic'
diff --git a/products/replay_vision/frontend/observations/ObservationLabelControl.tsx b/products/replay_vision/frontend/observations/ObservationLabelControl.tsx
index 1db126ceb72c..5770363e86be 100644
--- a/products/replay_vision/frontend/observations/ObservationLabelControl.tsx
+++ b/products/replay_vision/frontend/observations/ObservationLabelControl.tsx
@@ -4,8 +4,8 @@ import { useState } from 'react'
import { IconThumbsDown, IconThumbsDownFilled, IconThumbsUp, IconThumbsUpFilled } from '@posthog/icons'
import { LemonButton, LemonTextArea, Popover } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { useKeyboardHotkeys } from 'lib/hooks/useKeyboardHotkeys'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { AccessControlLevel } from '~/types'
diff --git a/products/replay_vision/frontend/observations/QuillReplayObservationActions.tsx b/products/replay_vision/frontend/observations/QuillReplayObservationActions.tsx
index 9530eaef38fe..8a615f67830e 100644
--- a/products/replay_vision/frontend/observations/QuillReplayObservationActions.tsx
+++ b/products/replay_vision/frontend/observations/QuillReplayObservationActions.tsx
@@ -1,7 +1,7 @@
import { IconArrowLeft, IconArrowRight } from '@posthog/icons'
import { Button } from '@posthog/quill'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LinkPrimitive } from 'lib/lemon-ui/Link'
import { ReplayVisionFeedbackButton } from '../components/ReplayVisionFeedbackButton'
diff --git a/products/replay_vision/frontend/observations/ReplayObservation.tsx b/products/replay_vision/frontend/observations/ReplayObservation.tsx
index 7703e4a1100d..af4a27b719a9 100644
--- a/products/replay_vision/frontend/observations/ReplayObservation.tsx
+++ b/products/replay_vision/frontend/observations/ReplayObservation.tsx
@@ -5,9 +5,9 @@ import { Suspense, useEffect, useMemo, useRef, useState } from 'react'
import { IconArrowLeft, IconArrowRight } from '@posthog/icons'
import { LemonButton, LemonCard, LemonTabs, Link, Spinner } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { useKeyboardHotkeys } from 'lib/hooks/useKeyboardHotkeys'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { useAttachedLogic } from 'lib/logic/scenes/useAttachedLogic'
import { lazyWithRetry } from 'lib/utils/retryImport'
import { SceneExport } from 'scenes/sceneTypes'
diff --git a/products/signals/frontend/inbox/components/shell/HotkeyRadio.tsx b/products/signals/frontend/inbox/components/shell/HotkeyRadio.tsx
index 71c442129c7c..16e72ef677f3 100644
--- a/products/signals/frontend/inbox/components/shell/HotkeyRadio.tsx
+++ b/products/signals/frontend/inbox/components/shell/HotkeyRadio.tsx
@@ -1,5 +1,5 @@
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { useEventListener } from 'lib/hooks/useEventListener'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonRadio, LemonRadioOption } from 'lib/lemon-ui/LemonRadio'
import { HotKey } from '~/types'
diff --git a/products/signals/frontend/inbox/components/tabs/ReportsTab.tsx b/products/signals/frontend/inbox/components/tabs/ReportsTab.tsx
index 8ebab0ca884a..dfc1b2365c5c 100644
--- a/products/signals/frontend/inbox/components/tabs/ReportsTab.tsx
+++ b/products/signals/frontend/inbox/components/tabs/ReportsTab.tsx
@@ -3,7 +3,7 @@ import { Fragment, JSX, memo, useCallback, useEffect, useRef } from 'react'
import { LemonButton, LemonDivider } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { urls } from 'scenes/urls'
import { isRankingSortField } from '../../filterOptions'
diff --git a/products/signals/frontend/inbox/components/triage/DismissOrUnassignButton.tsx b/products/signals/frontend/inbox/components/triage/DismissOrUnassignButton.tsx
index 3e5d252cfa50..0b732346231c 100644
--- a/products/signals/frontend/inbox/components/triage/DismissOrUnassignButton.tsx
+++ b/products/signals/frontend/inbox/components/triage/DismissOrUnassignButton.tsx
@@ -3,7 +3,7 @@ import { useActions, useValues } from 'kea'
import { IconHide } from '@posthog/icons'
import { LemonButton } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { inboxTriageLogic } from '../../logics/inboxTriageLogic'
diff --git a/products/signals/frontend/inbox/components/triage/InboxTriageView.tsx b/products/signals/frontend/inbox/components/triage/InboxTriageView.tsx
index a0c5702cb473..15b6c40d625c 100644
--- a/products/signals/frontend/inbox/components/triage/InboxTriageView.tsx
+++ b/products/signals/frontend/inbox/components/triage/InboxTriageView.tsx
@@ -5,10 +5,10 @@ import { useEffect, useRef } from 'react'
import { IconArrowLeft, IconCheckCircle } from '@posthog/icons'
import { LemonButton, LemonSkeleton, Link, Tooltip } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { TZLabel } from 'lib/components/TZLabel'
import { HotkeyInterface, useKeyboardHotkeys } from 'lib/hooks/useKeyboardHotkeys'
import { useKeyHeld } from 'lib/hooks/useKeyHeld'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
import { cn } from 'lib/utils/css-classes'
import { isMac } from 'lib/utils/dom'
diff --git a/products/tracing/frontend/components/TraceDialog/TraceDialog.tsx b/products/tracing/frontend/components/TraceDialog/TraceDialog.tsx
index 5bbd52f44c25..acc22d5b01dc 100644
--- a/products/tracing/frontend/components/TraceDialog/TraceDialog.tsx
+++ b/products/tracing/frontend/components/TraceDialog/TraceDialog.tsx
@@ -3,9 +3,9 @@ import { useActions, useValues } from 'kea'
import { IconExternal } from '@posthog/icons'
import { LemonBanner, LemonButton, Spinner } from '@posthog/lemon-ui'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { RecordingPlayerType } from 'lib/components/ViewRecordingButton/ViewRecordingButton'
import { traceUrl } from 'lib/components/ViewTraceButton/traceUrl'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { TraceIdentityChips } from 'products/tracing/frontend/components/TraceDrawer/TraceIdentityChips'
import { TraceLoadErrorNotice } from 'products/tracing/frontend/components/TraceDrawer/TraceLoadErrorNotice'
diff --git a/products/tracing/frontend/components/TraceView/TraceViewShortcuts.tsx b/products/tracing/frontend/components/TraceView/TraceViewShortcuts.tsx
index 41829afd60ac..4817f99c9ec5 100644
--- a/products/tracing/frontend/components/TraceView/TraceViewShortcuts.tsx
+++ b/products/tracing/frontend/components/TraceView/TraceViewShortcuts.tsx
@@ -1,6 +1,6 @@
import { useValues } from 'kea'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { tracingConfigLogic } from 'products/tracing/frontend/tracingConfigLogic'
diff --git a/products/visual_review/frontend/scenes/VisualReviewRunScene.tsx b/products/visual_review/frontend/scenes/VisualReviewRunScene.tsx
index 63dcd2ec0ac8..5bf893488eff 100644
--- a/products/visual_review/frontend/scenes/VisualReviewRunScene.tsx
+++ b/products/visual_review/frontend/scenes/VisualReviewRunScene.tsx
@@ -7,9 +7,9 @@ import { LemonButton, LemonCheckbox, LemonSkeleton, Link } from '@posthog/lemon-
import { PostHogCaptureOnViewed } from '@posthog/react'
import { pngHoggie } from 'lib/brand/hoggies'
-import { KeyboardShortcut } from 'lib/components/KeyboardShortcut/KeyboardShortcut'
import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { useKeyboardHotkeys } from 'lib/hooks/useKeyboardHotkeys'
+import { KeyboardShortcut } from 'lib/lemon-ui/KeyboardShortcut/KeyboardShortcut'
import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
import { SceneExport } from 'scenes/sceneTypes'