Skip to content

Commit

Permalink
Modal logo
Browse files Browse the repository at this point in the history
  • Loading branch information
@joel-jeremy
joel-jeremy committed Mar 24, 2024
1 parent 0571921 commit d18e561
Show file tree
Hide file tree
Showing 10 changed files with 262 additions and 318 deletions.
10 changes: 2 additions & 8 deletions packages/desktop-client/src/components/common/Menu.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ export function Menu<T extends MenuItem>({
);
}

const lastItem = items[idx - 1];
const Icon = item.icon;

return (
Expand All @@ -149,14 +148,9 @@ export function Menu<T extends MenuItem>({
key={item.name}
style={{
cursor: 'default',
padding: '9px 10px',
marginTop:
idx === 0 ||
lastItem === Menu.line ||
lastItem.type === Menu.label
? 0
: -3,
padding: 10,
flexDirection: 'row',
justifyContent: 'center',
alignItems: 'center',
color: theme.menuItemText,
...(item.disabled && { color: theme.buttonBareDisabledText }),
Expand Down
203 changes: 107 additions & 96 deletions packages/desktop-client/src/components/common/Modal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import ReactModal from 'react-modal';
import hotkeys from 'hotkeys-js';

import { AnimatedLoading } from '../../icons/AnimatedLoading';
import { SvgLogo } from '../../icons/logo';
import { SvgDelete } from '../../icons/v0';
import { type CSSProperties, styles, theme } from '../../style';
import { tokens } from '../../tokens';
Expand All @@ -20,21 +21,16 @@ import { Input } from './Input';
import { Text } from './Text';
import { View } from './View';

type ModalChildrenProps = {
isEditingTitle: boolean;
};

export type ModalProps = {
title?: string;
title?: ReactNode;
isCurrent?: boolean;
isHidden?: boolean;
children: ReactNode | ((props: ModalChildrenProps) => ReactNode);
children: ReactNode | (() => ReactNode);
size?: { width?: CSSProperties['width']; height?: CSSProperties['height'] };
padding?: CSSProperties['padding'];
showHeader?: boolean;
leftHeaderContent?: ReactNode;
showTitle?: boolean;
editableTitle?: boolean;
showClose?: boolean;
showOverlay?: boolean;
loading?: boolean;
Expand All @@ -43,11 +39,9 @@ export type ModalProps = {
stackIndex?: number;
parent?: HTMLElement;
style?: CSSProperties;
titleStyle?: CSSProperties;
contentStyle?: CSSProperties;
overlayStyle?: CSSProperties;
onClose?: () => void;
onTitleUpdate?: (title: string) => void;
};

export const Modal = ({
Expand All @@ -59,7 +53,6 @@ export const Modal = ({
showHeader = true,
leftHeaderContent,
showTitle = true,
editableTitle = false,
showClose = true,
showOverlay = true,
loading = false,
Expand All @@ -68,12 +61,10 @@ export const Modal = ({
stackIndex,
parent,
style,
titleStyle,
contentStyle,
overlayStyle,
children,
onClose,
onTitleUpdate,
}: ModalProps) => {
useEffect(() => {
// This deactivates any key handlers in the "app" scope. Ideally
Expand All @@ -84,20 +75,6 @@ export const Modal = ({
return () => hotkeys.setScope(prevScope);
}, []);

const [isEditingTitle, setIsEditingTitle] = useState(false);
const [_title, setTitle] = useState(title);

const onTitleClick = () => {
setIsEditingTitle(true);
};

const _onTitleUpdate = newTitle => {
if (newTitle !== title) {
onTitleUpdate?.(newTitle);
}
setIsEditingTitle(false);
};

return (
<ReactModal
isOpen={true}
Expand Down Expand Up @@ -172,76 +149,43 @@ export const Modal = ({
{showHeader && (
<View
style={{
justifyContent: 'center',
alignItems: 'center',
padding: 20,
position: 'relative',
flexShrink: 0,
height: 80,
}}
>
<View
style={{
position: 'absolute',
left: 0,
top: 0,
bottom: 0,
justifyContent: 'center',
alignItems: 'center',
margin: '0 5px',
}}
>
<View
style={{
flexDirection: 'row',
marginLeft: 15,
}}
>
{leftHeaderContent && !isEditingTitle
? leftHeaderContent
: null}
</View>
{leftHeaderContent}
</View>

{showTitle && (
<View
style={{
flex: 1,
alignSelf: 'center',
textAlign: 'center',
// We need to force a width for the text-overflow
// ellipses to work because we are aligning center.
// This effectively gives it a padding of 20px
width: 'calc(100% - 40px)',
}}
>
{isEditingTitle ? (
<Input
style={{
fontSize: 25,
fontWeight: 700,
textAlign: 'center',
}}
value={_title}
onChange={e => setTitle(e.target.value)}
onKeyDown={e => {
if (e.key === 'Enter') {
e.preventDefault();
_onTitleUpdate(e.currentTarget.value);
}
}}
onBlur={e => _onTitleUpdate(e.target.value)}
{!title ? (
<SvgLogo
width={30}
height={30}
style={{ justifyContent: 'center', alignSelf: 'center' }}
/>
) : typeof title === 'string' || typeof title === 'number' ? (
<ModalTitle title={`${title}`} />
) : (
<Text
style={{
fontSize: 25,
fontWeight: 700,
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
...titleStyle,
}}
{...(editableTitle && { onPointerUp: onTitleClick })}
>
{_title}
</Text>
title
)}
</View>
)}
Expand All @@ -250,36 +194,24 @@ export const Modal = ({
style={{
position: 'absolute',
right: 0,
top: 0,
bottom: 0,
justifyContent: 'center',
alignItems: 'center',
margin: '0 5px',
}}
>
<View
style={{
flexDirection: 'row',
marginRight: 15,
}}
>
{showClose && !isEditingTitle && (
<Button
type="bare"
onClick={onClose}
style={{ padding: '10px 10px' }}
aria-label="Close"
>
<SvgDelete width={10} style={{ color: 'inherit' }} />
</Button>
)}
</View>
{showClose && (
<Button
type="bare"
onClick={onClose}
style={{ padding: 10 }}
aria-label="Close"
>
<SvgDelete width={10} style={{ color: 'inherit' }} />
</Button>
)}
</View>
</View>
)}
<View style={{ padding, paddingTop: 0, flex: 1 }}>
{typeof children === 'function'
? children({ isEditingTitle })
: children}
{typeof children === 'function' ? children() : children}
</View>
{loading && (
<View
Expand Down Expand Up @@ -428,3 +360,82 @@ export const ModalButtons = ({
</View>
);
};

type ModalTitleProps = {
title: string;
isEditable?: boolean;
getStyle?: (isEditing: boolean) => CSSProperties;
onEdit?: (isEditing: boolean) => void;
onTitleUpdate?: (newName: string) => void;
};

export function ModalTitle({
title,
isEditable,
getStyle,
onTitleUpdate,
}: ModalTitleProps) {
const [isEditing, setIsEditing] = useState(false);
const style = getStyle?.(isEditing);

const _onEdit = () => {
if (!isEditable) {
return;
}

setIsEditing(true);
};

const _onTitleUpdate = newTitle => {
if (newTitle !== title) {
onTitleUpdate?.(newTitle);
}
setIsEditing(false);
};

const inputRef = useRef<HTMLInputElement>();
useEffect(() => {
if (isEditing) {
if (inputRef.current) {
inputRef.current.scrollLeft = 0;
}
}
}, [isEditing]);

return isEditing ? (
<Input
inputRef={inputRef}
style={{
fontSize: 25,
fontWeight: 700,
textAlign: 'center',
...style,
}}
focused={isEditing}
defaultValue={title}
onUpdate={_onTitleUpdate}
onKeyDown={e => {
if (e.key === 'Enter') {
e.preventDefault();
_onTitleUpdate?.(e.currentTarget.value);
}
}}
/>
) : (
<Text
style={{
fontSize: 25,
fontWeight: 700,
textAlign: 'center',
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
...(isEditable && styles.underlinedText),
...style,
}}
onClick={_onEdit}
>
{title}
</Text>
);
}
Loading

0 comments on commit d18e561

Please sign in to comment.