From a7f4326419f479913878efaa0d7922d3a8cd5ed7 Mon Sep 17 00:00:00 2001 From: brendanlaschke Date: Mon, 14 Aug 2023 22:12:29 +0200 Subject: [PATCH] - moved states --- .../companies/hooks/useOpenActionBar.tsx | 2 +- .../companies/hooks/useOpenContextMenu.tsx | 2 +- .../modules/people/hooks/useOpenActionBar.tsx | 2 +- .../modules/people/hooks/useOpenContextMenu.tsx | 2 +- .../ui/action-bar/components/ActionBar.tsx | 7 ++++--- .../states/ActionBarEntriesState.ts | 0 .../states/ActionBarIsOpenState.ts | 0 .../src/modules/ui/board/hooks/useActionBar.tsx | 2 +- .../ui/context-menu/components/ContextMenu.tsx | 8 ++++---- .../__stories__/ActionBar.stories.tsx | 17 +++++++++++++++++ .../states/ContextMenuEntriesState.ts | 0 .../states/ContextMenuIsOpenState.ts | 0 .../states/ContextMenuPositionState.ts} | 0 .../ui/table/components/CheckboxCell.tsx | 2 +- .../ui/table/components/EntityTableCell.tsx | 4 ++-- 15 files changed, 33 insertions(+), 15 deletions(-) rename front/src/modules/ui/{table => action-bar}/states/ActionBarEntriesState.ts (100%) rename front/src/modules/ui/{table => action-bar}/states/ActionBarIsOpenState.ts (100%) create mode 100644 front/src/modules/ui/context-menu/components/__stories__/ActionBar.stories.tsx rename front/src/modules/ui/{table => context-menu}/states/ContextMenuEntriesState.ts (100%) rename front/src/modules/ui/{table => context-menu}/states/ContextMenuIsOpenState.ts (100%) rename front/src/modules/ui/{table/states/contextMenuPositionState.ts => context-menu/states/ContextMenuPositionState.ts} (100%) diff --git a/front/src/modules/companies/hooks/useOpenActionBar.tsx b/front/src/modules/companies/hooks/useOpenActionBar.tsx index 3a623698a..731d2b38e 100644 --- a/front/src/modules/companies/hooks/useOpenActionBar.tsx +++ b/front/src/modules/companies/hooks/useOpenActionBar.tsx @@ -5,9 +5,9 @@ import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity'; import { GET_PIPELINES } from '@/pipeline/queries'; import { ActionBarEntry } from '@/ui/action-bar/components/ActionBarEntry'; +import { actionBarEntriesState } from '@/ui/action-bar/states/ActionBarEntriesState'; import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon'; import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; -import { actionBarEntriesState } from '@/ui/table/states/ActionBarEntriesState'; import { selectedRowIdsSelector } from '@/ui/table/states/selectedRowIdsSelector'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState'; import { diff --git a/front/src/modules/companies/hooks/useOpenContextMenu.tsx b/front/src/modules/companies/hooks/useOpenContextMenu.tsx index 376c19928..ecb67885f 100644 --- a/front/src/modules/companies/hooks/useOpenContextMenu.tsx +++ b/front/src/modules/companies/hooks/useOpenContextMenu.tsx @@ -6,8 +6,8 @@ import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity'; import { GET_PIPELINES } from '@/pipeline/queries'; import { ContextMenuEntry } from '@/ui/context-menu/components/ContextMenuEntry'; +import { contextMenuEntriesState } from '@/ui/context-menu/states/ContextMenuEntriesState'; import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; -import { contextMenuEntriesState } from '@/ui/table/states/ContextMenuEntriesState'; import { selectedRowIdsSelector } from '@/ui/table/states/selectedRowIdsSelector'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState'; import { diff --git a/front/src/modules/people/hooks/useOpenActionBar.tsx b/front/src/modules/people/hooks/useOpenActionBar.tsx index 2742e6b1e..ea7a6fc5c 100644 --- a/front/src/modules/people/hooks/useOpenActionBar.tsx +++ b/front/src/modules/people/hooks/useOpenActionBar.tsx @@ -4,9 +4,9 @@ import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'; import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds'; import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity'; import { ActionBarEntry } from '@/ui/action-bar/components/ActionBarEntry'; +import { actionBarEntriesState } from '@/ui/action-bar/states/ActionBarEntriesState'; import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon'; import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; -import { actionBarEntriesState } from '@/ui/table/states/ActionBarEntriesState'; import { selectedRowIdsSelector } from '@/ui/table/states/selectedRowIdsSelector'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState'; import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql'; diff --git a/front/src/modules/people/hooks/useOpenContextMenu.tsx b/front/src/modules/people/hooks/useOpenContextMenu.tsx index 559970177..e3b8d19bb 100644 --- a/front/src/modules/people/hooks/useOpenContextMenu.tsx +++ b/front/src/modules/people/hooks/useOpenContextMenu.tsx @@ -5,8 +5,8 @@ import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'; import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds'; import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity'; import { ContextMenuEntry } from '@/ui/context-menu/components/ContextMenuEntry'; +import { contextMenuEntriesState } from '@/ui/context-menu/states/ContextMenuEntriesState'; import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection'; -import { contextMenuEntriesState } from '@/ui/table/states/ContextMenuEntriesState'; import { selectedRowIdsSelector } from '@/ui/table/states/selectedRowIdsSelector'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState'; import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql'; diff --git a/front/src/modules/ui/action-bar/components/ActionBar.tsx b/front/src/modules/ui/action-bar/components/ActionBar.tsx index bc33aed4f..ece4c25f9 100644 --- a/front/src/modules/ui/action-bar/components/ActionBar.tsx +++ b/front/src/modules/ui/action-bar/components/ActionBar.tsx @@ -2,9 +2,10 @@ import React, { useRef } from 'react'; import styled from '@emotion/styled'; import { useRecoilValue } from 'recoil'; -import { actionBarEntriesState } from '@/ui/table/states/ActionBarEntriesState'; -import { actionBarOpenState } from '@/ui/table/states/ActionBarIsOpenState'; -import { contextMenuOpenState } from '@/ui/table/states/ContextMenuIsOpenState'; +import { actionBarEntriesState } from '@/ui/action-bar/states/ActionBarEntriesState'; +import { contextMenuOpenState } from '@/ui/context-menu/states/ContextMenuIsOpenState'; + +import { actionBarOpenState } from '../states/ActionBarIsOpenState'; type OwnProps = { selectedIds: string[]; diff --git a/front/src/modules/ui/table/states/ActionBarEntriesState.ts b/front/src/modules/ui/action-bar/states/ActionBarEntriesState.ts similarity index 100% rename from front/src/modules/ui/table/states/ActionBarEntriesState.ts rename to front/src/modules/ui/action-bar/states/ActionBarEntriesState.ts diff --git a/front/src/modules/ui/table/states/ActionBarIsOpenState.ts b/front/src/modules/ui/action-bar/states/ActionBarIsOpenState.ts similarity index 100% rename from front/src/modules/ui/table/states/ActionBarIsOpenState.ts rename to front/src/modules/ui/action-bar/states/ActionBarIsOpenState.ts diff --git a/front/src/modules/ui/board/hooks/useActionBar.tsx b/front/src/modules/ui/board/hooks/useActionBar.tsx index 0eee81fff..74a312522 100644 --- a/front/src/modules/ui/board/hooks/useActionBar.tsx +++ b/front/src/modules/ui/board/hooks/useActionBar.tsx @@ -1,6 +1,6 @@ import { useSetRecoilState } from 'recoil'; -import { actionBarEntriesState } from '@/ui/table/states/ActionBarEntriesState'; +import { actionBarEntriesState } from '@/ui/action-bar/states/ActionBarEntriesState'; import { BoardActionBarButtonDeleteBoardCard } from '../components/BoardActionBarButtonDeleteBoardCard'; diff --git a/front/src/modules/ui/context-menu/components/ContextMenu.tsx b/front/src/modules/ui/context-menu/components/ContextMenu.tsx index 06d587d0b..12ab9c01c 100644 --- a/front/src/modules/ui/context-menu/components/ContextMenu.tsx +++ b/front/src/modules/ui/context-menu/components/ContextMenu.tsx @@ -2,12 +2,12 @@ import React, { useRef } from 'react'; import styled from '@emotion/styled'; import { useRecoilValue, useSetRecoilState } from 'recoil'; -import { actionBarOpenState } from '@/ui/table/states/ActionBarIsOpenState'; -import { contextMenuEntriesState } from '@/ui/table/states/ContextMenuEntriesState'; -import { contextMenuOpenState } from '@/ui/table/states/ContextMenuIsOpenState'; -import { contextMenuPositionState } from '@/ui/table/states/contextMenuPositionState'; +import { actionBarOpenState } from '@/ui/action-bar/states/ActionBarIsOpenState'; +import { contextMenuPositionState } from '@/ui/context-menu/states/ContextMenuPositionState'; import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside'; +import { contextMenuEntriesState } from '../states/ContextMenuEntriesState'; +import { contextMenuOpenState } from '../states/ContextMenuIsOpenState'; import { PositionType } from '../types/PositionType'; type OwnProps = { diff --git a/front/src/modules/ui/context-menu/components/__stories__/ActionBar.stories.tsx b/front/src/modules/ui/context-menu/components/__stories__/ActionBar.stories.tsx new file mode 100644 index 000000000..c250b6e59 --- /dev/null +++ b/front/src/modules/ui/context-menu/components/__stories__/ActionBar.stories.tsx @@ -0,0 +1,17 @@ +import type { Meta, StoryObj } from '@storybook/react'; + +import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; + +import { ContextMenu } from '../ContextMenu'; + +const meta: Meta = { + title: 'UI/ContextMenu/ContextMenu', + component: ContextMenu, + decorators: [ComponentDecorator], + args: { selectedIds: [] }, +}; + +export default meta; +type Story = StoryObj; + +export const Default: Story = {}; diff --git a/front/src/modules/ui/table/states/ContextMenuEntriesState.ts b/front/src/modules/ui/context-menu/states/ContextMenuEntriesState.ts similarity index 100% rename from front/src/modules/ui/table/states/ContextMenuEntriesState.ts rename to front/src/modules/ui/context-menu/states/ContextMenuEntriesState.ts diff --git a/front/src/modules/ui/table/states/ContextMenuIsOpenState.ts b/front/src/modules/ui/context-menu/states/ContextMenuIsOpenState.ts similarity index 100% rename from front/src/modules/ui/table/states/ContextMenuIsOpenState.ts rename to front/src/modules/ui/context-menu/states/ContextMenuIsOpenState.ts diff --git a/front/src/modules/ui/table/states/contextMenuPositionState.ts b/front/src/modules/ui/context-menu/states/ContextMenuPositionState.ts similarity index 100% rename from front/src/modules/ui/table/states/contextMenuPositionState.ts rename to front/src/modules/ui/context-menu/states/ContextMenuPositionState.ts diff --git a/front/src/modules/ui/table/components/CheckboxCell.tsx b/front/src/modules/ui/table/components/CheckboxCell.tsx index 7a92a4a88..0b3a4749a 100644 --- a/front/src/modules/ui/table/components/CheckboxCell.tsx +++ b/front/src/modules/ui/table/components/CheckboxCell.tsx @@ -2,10 +2,10 @@ import { useCallback } from 'react'; import styled from '@emotion/styled'; import { useSetRecoilState } from 'recoil'; +import { actionBarOpenState } from '@/ui/action-bar/states/ActionBarIsOpenState'; import { Checkbox } from '@/ui/input/checkbox/components/Checkbox'; import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected'; -import { actionBarOpenState } from '../states/ActionBarIsOpenState'; const StyledContainer = styled.div` align-items: center; diff --git a/front/src/modules/ui/table/components/EntityTableCell.tsx b/front/src/modules/ui/table/components/EntityTableCell.tsx index 9dfc13de4..03ab133da 100644 --- a/front/src/modules/ui/table/components/EntityTableCell.tsx +++ b/front/src/modules/ui/table/components/EntityTableCell.tsx @@ -1,13 +1,13 @@ import { useContext } from 'react'; import { useSetRecoilState } from 'recoil'; +import { contextMenuOpenState } from '@/ui/context-menu/states/ContextMenuIsOpenState'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; +import { contextMenuPositionState } from '../../context-menu/states/ContextMenuPositionState'; import { GenericEditableCell } from '../editable-cell/components/GenericEditableCell'; import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected'; import { ColumnIndexContext } from '../states/ColumnIndexContext'; -import { contextMenuOpenState } from '../states/ContextMenuIsOpenState'; -import { contextMenuPositionState } from '../states/contextMenuPositionState'; import { ViewFieldContext } from '../states/ViewFieldContext'; export function EntityTableCell({ cellIndex }: { cellIndex: number }) {