-
setPopoverVisibility('hidden') : undefined}
- />
-
setPopoverVisibility('visible') : undefined}
- {...dropProperties}
- >
-
-
-
-
- )
-}
diff --git a/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts b/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
index 23a14ba8d4d9b..45026a1b90121 100644
--- a/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
+++ b/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
@@ -7,25 +7,12 @@ import { NotebookNodeResource, SidePanelTab } from '~/types'
import { EditorFocusPosition } from '../Notebook/utils'
import type { notebookPanelLogicType } from './notebookPanelLogicType'
-import { notebookPopoverLogic } from './notebookPopoverLogic'
export const notebookPanelLogic = kea
([
path(['scenes', 'notebooks', 'Notebook', 'notebookPanelLogic']),
connect({
- values: [
- sidePanelStateLogic,
- ['sidePanelOpen', 'selectedTab'],
- featureFlagLogic,
- ['featureFlags'],
- notebookPopoverLogic,
- ['popoverVisibility'],
- ],
- actions: [
- sidePanelStateLogic,
- ['openSidePanel', 'closeSidePanel'],
- notebookPopoverLogic,
- ['setPopoverVisibility'],
- ],
+ values: [sidePanelStateLogic, ['sidePanelOpen', 'selectedTab'], featureFlagLogic, ['featureFlags']],
+ actions: [sidePanelStateLogic, ['openSidePanel', 'closeSidePanel']],
}),
actions({
selectNotebook: (id: string, options: { autofocus?: EditorFocusPosition; silent?: boolean } = {}) => ({
@@ -70,8 +57,8 @@ export const notebookPanelLogic = kea([
selectors(({ cache, actions }) => ({
visibility: [
- (s) => [s.selectedTab, s.sidePanelOpen, s.popoverVisibility],
- (selectedTab, sidePanelOpen): 'hidden' | 'peek' | 'visible' => {
+ (s) => [s.selectedTab, s.sidePanelOpen],
+ (selectedTab, sidePanelOpen): 'hidden' | 'visible' => {
return selectedTab === SidePanelTab.Notebooks && sidePanelOpen ? 'visible' : 'hidden'
},
],
diff --git a/frontend/src/scenes/notebooks/NotebookPanel/notebookPopoverLogic.ts b/frontend/src/scenes/notebooks/NotebookPanel/notebookPopoverLogic.ts
deleted file mode 100644
index d1a0997d2179e..0000000000000
--- a/frontend/src/scenes/notebooks/NotebookPanel/notebookPopoverLogic.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
-import { urlToAction } from 'kea-router'
-import { subscriptions } from 'kea-subscriptions'
-import posthog from 'posthog-js'
-import { HTMLProps, RefObject } from 'react'
-
-import { NotebookNodeResource, NotebookPopoverVisibility } from '~/types'
-
-import { EditorFocusPosition } from '../Notebook/utils'
-import type { notebookPopoverLogicType } from './notebookPopoverLogicType'
-
-export const notebookPopoverLogic = kea([
- path(['scenes', 'notebooks', 'Notebook', 'notebookPopoverLogic']),
- actions({
- setFullScreen: (full: boolean) => ({ full }),
- selectNotebook: (id: string, autofocus: EditorFocusPosition | undefined = undefined) => ({ id, autofocus }),
- setElementRef: (element: RefObject) => ({ element }),
- setPopoverVisibility: (visibility: NotebookPopoverVisibility) => ({ visibility }),
- startDropMode: true,
- endDropMode: true,
- setDropDistance: (distance: number) => ({ distance }),
- setDroppedResource: (resource: NotebookNodeResource | string | null) => ({ resource }),
- }),
-
- reducers(() => ({
- selectedNotebook: [
- 'scratchpad',
- { persist: true },
- {
- selectNotebook: (_, { id }) => id,
- },
- ],
- popoverVisibility: [
- 'hidden' as NotebookPopoverVisibility,
- {
- setPopoverVisibility: (_, { visibility }) => visibility,
- },
- ],
- fullScreen: [
- false,
- {
- setFullScreen: (_, { full }) => full,
- setPopoverVisibility: (state, { visibility }) => (visibility === 'hidden' ? false : state),
- },
- ],
- initialAutofocus: [
- 'start' as EditorFocusPosition,
- {
- selectNotebook: (_, { autofocus }) => autofocus ?? 'start',
- },
- ],
- elementRef: [
- null as RefObject | null,
- {
- setElementRef: (_, { element }) => element,
- },
- ],
- shownAtLeastOnce: [
- false,
- {
- setPopoverVisibility: (state, { visibility }) => visibility !== 'hidden' || state,
- },
- ],
- dropMode: [
- false,
- {
- startDropMode: () => true,
- endDropMode: () => false,
- },
- ],
- dropDistance: [
- 0,
- {
- startDropMode: () => -1,
- endDropMode: () => -1,
- setDropDistance: (_, { distance }) => distance,
- },
- ],
- droppedResource: [
- null as NotebookNodeResource | string | null,
- {
- setPopoverVisibility: (state, { visibility }) => (visibility === 'hidden' ? null : state),
- setDroppedResource: (_, { resource }) => resource,
- },
- ],
- })),
-
- selectors(({ cache, actions }) => ({
- dropProperties: [
- (s) => [s.dropMode, s.popoverVisibility, s.dropDistance],
- (
- dropMode,
- visibility,
- dropDistance
- ): Pick, 'onDragEnter' | 'onDragLeave' | 'style'> => {
- return dropMode
- ? {
- onDragEnter: () => {
- cache.dragEntercount = (cache.dragEntercount || 0) + 1
- if (cache.dragEntercount === 1) {
- actions.setPopoverVisibility('visible')
- }
- },
-
- onDragLeave: () => {
- cache.dragEntercount = (cache.dragEntercount || 0) - 1
-
- if (cache.dragEntercount <= 0) {
- cache.dragEntercount = 0
- actions.setPopoverVisibility('peek')
- }
- },
- style: {
- transform: visibility === 'peek' ? `translateX(${(1 - dropDistance) * 100}%)` : undefined,
- },
- }
- : {}
- },
- ],
- })),
-
- subscriptions({
- popoverVisibility: (value, oldvalue) => {
- if (oldvalue !== undefined && value !== oldvalue) {
- posthog.capture(`notebook sidebar ${value}`)
- }
- },
- }),
-
- listeners(({ cache, actions, values }) => ({
- startDropMode: () => {
- cache.dragEntercount = 0
- cache.dragStart = null
- actions.setPopoverVisibility('peek')
-
- cache.dragListener = (event: MouseEvent) => {
- if (!cache.dragStart) {
- cache.dragStart = event.pageX
- }
-
- // The drop distance is the percentage between where the drag started and where it now is
- const dropDistance = (event.pageX - cache.dragStart) / window.innerWidth
- actions.setDropDistance(dropDistance)
- }
- window.addEventListener('drag', cache.dragListener)
- },
- endDropMode: () => {
- if (values.popoverVisibility === 'peek') {
- actions.setPopoverVisibility('hidden')
- }
- window.removeEventListener('drag', cache.dragListener)
- },
- })),
-
- urlToAction(({ actions, values }) => ({
- '/*': (_, __, ___, { pathname }, { pathname: previousPathname }) => {
- if (values.popoverVisibility === 'visible' && pathname != previousPathname) {
- actions.setPopoverVisibility('hidden')
- }
- },
- })),
-])