admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Feat/better hotkeys scope (#526)

Browse Source 
* Working version

* fix

* Fixed console log

* Fix lint

* wip

* Fix

* Fix

* consolelog

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Lucas Bordeau
2023-07-08 03:53:05 +02:00
committed by GitHub
parent 611cda1f41
commit 66dcc9b2e1
77 changed files with 1240 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
front/src/modules/auth/components/RequireOnboarded.tsx
View File

@ -2,9 +2,6 @@ import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { keyframes } from '@emotion/react';
import styled from '@emotion/styled';
import { useRecoilState } from 'recoil';
import { captureHotkeyTypeInFocusState } from '@/hotkeys/states/captureHotkeyTypeInFocusState';
import { useOnboardingStatus } from '../hooks/useOnboardingStatus';
import { OnboardingStatus } from '../utils/getOnboardingStatus';
@ -38,9 +35,6 @@ export function RequireOnboarded({
}): JSX.Element {
const navigate = useNavigate();
const [, setCaptureHotkeyTypeInFocus] = useRecoilState(
captureHotkeyTypeInFocusState,
);
const onboardingStatus = useOnboardingStatus();
useEffect(() => {
@ -53,12 +47,6 @@ export function RequireOnboarded({
}
}, [onboardingStatus, navigate]);
useEffect(() => {
if (onboardingStatus === OnboardingStatus.Completed) {
setCaptureHotkeyTypeInFocus(false);
}
}, [setCaptureHotkeyTypeInFocus, onboardingStatus]);
if (onboardingStatus !== OnboardingStatus.Completed) {
return (
<EmptyContainer>

7
front/src/modules/auth/components/ui/Modal.tsx
View File

@ -1,6 +1,8 @@
import React from 'react';
import styled from '@emotion/styled';
import { useHotkeysScopeOnMountOnly } from '@/hotkeys/hooks/useHotkeysScopeOnMountOnly';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { Modal as UIModal } from '@/ui/components/modal/Modal';
type Props = React.ComponentProps<'div'>;
@ -17,6 +19,11 @@ const StyledContainer = styled.div`
`;
export function AuthModal({ children, ...restProps }: Props) {
useHotkeysScopeOnMountOnly({
scope: InternalHotkeysScope.Modal,
customScopes: { 'command-menu': false, goto: false },
});
return (
<UIModal isOpen={true}>
<StyledContainer {...restProps}>{children}</StyledContainer>