Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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 @@ -49,7 +49,6 @@ export function FloatingIconButtonGroup({
applyBlur={false}
applyShadow={false}
Icon={Icon}
key={index}
onClick={onClick}
position={position}
size={size}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { ReactElement, useState } from 'react';
import styled from '@emotion/styled';
import { motion } from 'framer-motion';

import { FloatingIconButton } from '@/ui/button/components/FloatingIconButton';
import { IconPencil } from '@/ui/icon';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';

import { CellHotkeyScopeContext } from '../../contexts/CellHotkeyScopeContext';
Expand All @@ -14,14 +11,10 @@ import { useIsSoftFocusOnCurrentCell } from '../hooks/useIsSoftFocusOnCurrentCel
import { useSetSoftFocusOnCurrentCell } from '../hooks/useSetSoftFocusOnCurrentCell';

import { EditableCellDisplayMode } from './EditableCellDisplayMode';
import { EditableCellEditButton } from './EditableCellEditButton';
import { EditableCellEditMode } from './EditableCellEditMode';
import { EditableCellSoftFocusMode } from './EditableCellSoftFocusMode';

const StyledEditButtonContainer = styled(motion.div)`
position: absolute;
right: 5px;
`;

const StyledCellBaseContainer = styled.div`
align-items: center;
box-sizing: border-box;
Expand Down Expand Up @@ -102,27 +95,20 @@ export function EditableCell({
{editModeContent}
</EditableCellEditMode>
) : hasSoftFocus ? (
<EditableCellSoftFocusMode>
{nonEditModeContent}
</EditableCellSoftFocusMode>
<>
{showEditButton && (
<EditableCellEditButton onClick={handlePenClick} />
)}
<EditableCellSoftFocusMode>
{nonEditModeContent}
</EditableCellSoftFocusMode>
</>
) : (
<>
{showEditButton && (
<StyledEditButtonContainer
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 0.1 }}
whileHover={{ scale: 1.04 }}
>
<FloatingIconButton
size="small"
onClick={handlePenClick}
Icon={IconPencil}
/>
</StyledEditButtonContainer>
<EditableCellEditButton onClick={handlePenClick} />
)}

<EditableCellDisplayMode>
<EditableCellDisplayMode isHovered={isHovered}>
{nonEditModeContent}
</EditableCellDisplayMode>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ export type EditableCellDisplayContainerProps = {
softFocus?: boolean;
onClick?: () => void;
scrollRef?: Ref<HTMLDivElement>;
isHovered?: boolean;
};

const StyledEditableCellDisplayModeOuterContainer = styled.div<
Pick<EditableCellDisplayContainerProps, 'softFocus'>
Pick<EditableCellDisplayContainerProps, 'softFocus' | 'isHovered'>
>`
align-items: center;
display: flex;
Expand All @@ -20,7 +21,7 @@ const StyledEditableCellDisplayModeOuterContainer = styled.div<
width: 100%;

${(props) =>
props.softFocus
props.softFocus || props.isHovered
? `background: ${props.theme.background.transparent.secondary};
border-radius: ${props.theme.border.radius.sm};
box-shadow: inset 0 0 0 1px ${props.theme.font.color.extraLight};`
Expand All @@ -40,6 +41,7 @@ export function EditableCellDisplayContainer({
softFocus,
onClick,
scrollRef,
isHovered,
}: React.PropsWithChildren<EditableCellDisplayContainerProps>) {
return (
<StyledEditableCellDisplayModeOuterContainer
Expand All @@ -49,6 +51,7 @@ export function EditableCellDisplayContainer({
: 'editable-cell-display-mode'
}
onClick={onClick}
isHovered={isHovered}
softFocus={softFocus}
ref={scrollRef}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { EditableCellDisplayContainer } from './EditableCellDisplayContainer';

export function EditableCellDisplayMode({
children,
}: React.PropsWithChildren<unknown>) {
isHovered,
}: React.PropsWithChildren<unknown> & { isHovered?: boolean }) {
const setSoftFocusOnCurrentCell = useSetSoftFocusOnCurrentCell();

const { openEditableCell } = useEditableCell();
Expand All @@ -16,7 +17,7 @@ export function EditableCellDisplayMode({
}

return (
<EditableCellDisplayContainer onClick={handleClick}>
<EditableCellDisplayContainer isHovered={isHovered} onClick={handleClick}>
{children}
</EditableCellDisplayContainer>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import styled from '@emotion/styled';
import { motion } from 'framer-motion';

import { FloatingIconButton } from '@/ui/button/components/FloatingIconButton';
import { IconPencil } from '@/ui/icon';

const StyledEditButtonContainer = styled(motion.div)`
position: absolute;
right: 5px;
`;

type EditableCellEditButtonProps = {
onClick?: () => void;
};

export function EditableCellEditButton({
onClick,
}: EditableCellEditButtonProps) {
return (
<StyledEditButtonContainer
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 0.1 }}
whileHover={{ scale: 1.04 }}
>
<FloatingIconButton size="small" onClick={onClick} Icon={IconPencil} />
</StyledEditButtonContainer>
);
}