From d9a05c017a79e9a75c4a563bb6ead578478a4116 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 10 May 2023 15:27:26 +0200 Subject: [PATCH 1/3] :sparkles: Improving modal close with escape and backspace --- .../Components/DesignSystem/Modal/index.tsx | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/front/Components/DesignSystem/Modal/index.tsx b/src/front/Components/DesignSystem/Modal/index.tsx index a1bca8ef..3a9624e2 100644 --- a/src/front/Components/DesignSystem/Modal/index.tsx +++ b/src/front/Components/DesignSystem/Modal/index.tsx @@ -79,16 +79,35 @@ export default class Modal extends React.Component { willClose: false, }); }, this.props.animationDelay); + document.body.style.overflow = "auto"; } if (prevProps.isOpen !== this.props.isOpen && this.props.isOpen) { this.setState({ isOpen: true }); + document.body.style.overflow = "hidden"; } this.rootRefElement.current?.style.setProperty("--animation-delay", this.props.animationDelay!.toString().concat("ms")); } + public override componentDidMount(): void { + document.addEventListener("keydown", this.handleKeyDown); + } + + public override componentWillUnmount(): void { + document.body.style.overflow = "auto"; + document.removeEventListener("keydown", this.handleKeyDown); + } + protected close() { if (this.props.hasContainerClosable === false) return; if (this.state.willClose) return; this.props.onClose(); } + + + + private handleKeyDown = (e: KeyboardEvent): void => { + if (e.key === "Escape" || e.key === "Esc" || e.key === "Backspace") { + this.props.onClose(); + } + } } From db7918cf36facbe1faca6dfb7708528ffbea8f6c Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 10 May 2023 15:34:50 +0200 Subject: [PATCH 2/3] :bug: Fixing customer completion in a folder --- src/front/Components/DesignSystem/UserFolder/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/front/Components/DesignSystem/UserFolder/index.tsx b/src/front/Components/DesignSystem/UserFolder/index.tsx index f01f6cbb..9cd68c3c 100644 --- a/src/front/Components/DesignSystem/UserFolder/index.tsx +++ b/src/front/Components/DesignSystem/UserFolder/index.tsx @@ -138,7 +138,8 @@ export default class UserFolder extends React.Component { private calculateDocumentsPercentageProgress(): number { if (!this.props.customer.documents) return 0; - const totalDocuments: number = this.props.customer.documents.length; + const documents = this.props.customer.documents.filter((document) => document.folder?.uid === this.props.folder.uid); + const totalDocuments: number = documents.length; const numberDocumentsRefused: number = this.getDocumentsByStatus(EDocumentStatus.REFUSED)?.length || 0; const numberDocumentsAsked: number = this.getDocumentsByStatus(EDocumentStatus.ASKED)?.length || 0; const depositedDocuments: number = totalDocuments - numberDocumentsAsked - numberDocumentsRefused; From 2945a57b88f96469058eabd4fd8d3ed95c2fbe2d Mon Sep 17 00:00:00 2001 From: Hugo Lextrait Date: Wed, 10 May 2023 15:34:59 +0200 Subject: [PATCH 3/3] console.log() --- src/front/Api/BaseApiService.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/front/Api/BaseApiService.ts b/src/front/Api/BaseApiService.ts index 289179f5..47c40312 100644 --- a/src/front/Api/BaseApiService.ts +++ b/src/front/Api/BaseApiService.ts @@ -18,6 +18,7 @@ export default abstract class BaseApiService { } protected getBaseUrl() { + console.log("BaseApiService.baseUrl", BaseApiService.baseUrl); return BaseApiService.baseUrl; }