Merge pull request #31 from betagouv/mep

betagouv · Aug 7, 2024 · 2db8738 · 2db8738
2 parents 58d01b6 + bb2af91
commit 2db8738
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/packages/frontend/src/components/Chip.tsx b/packages/frontend/src/components/Chip.tsx
@@ -7,7 +7,7 @@ export const ChipGroup = ({
   options,
   isMulti,
   label,
-  canBeEmpty,
+  canBeEmpty = true,
   value,
   onChange,
   className,
@@ -76,11 +76,10 @@ export const Chip = ({
   isChecked?: boolean;
   onCheckChange: (value: boolean) => void;
 }) => {
-  const styles = chip({ isChecked });
-
   return (
     <Tag
-      className={styles}
+      // className={styles}
+      pressed={isChecked}
       nativeButtonProps={{
         onClick: () => onCheckChange(!isChecked),
         type: "button",
@@ -90,18 +89,3 @@ export const Chip = ({
     </Tag>
   );
 };
-
-const chip = cva({
-  base: {
-    color: "background-action-high-blue-france",
-    bgColor: "background-action-low-blue-france",
-  },
-  variants: {
-    isChecked: {
-      true: {
-        color: "background-action-low-blue-france",
-        bgColor: "background-action-high-blue-france",
-      },
-    },
-  },
-});
diff --git a/packages/frontend/src/features/InfoForm.tsx b/packages/frontend/src/features/InfoForm.tsx
@@ -186,7 +186,12 @@ export const InfoForm = () => {
         <Button
           type="button"
           iconId="ri-arrow-right-line"
-          nativeButtonProps={{ type: "button", onClick: () => tab.setValue("notes") }}
+          nativeButtonProps={{
+            type: "button",
+            onClick: () => {
+              tab.setValue("notes");
+            },
+          }}
         >
           Rédiger le bilan
         </Button>

diff --git a/packages/frontend/src/routes/edit.$reportId.tsx b/packages/frontend/src/routes/edit.$reportId.tsx
@@ -86,6 +86,7 @@ const WithReport = ({ report }: { report: Report }) => {
 
   const setTab = (tab: string) => {
     navigate({ search: { tab }, replace: true });
+    document.getElementById("root")!.scrollTo(0, 0);
   };
 
   const options = [

diff --git a/packages/pdf/src/report.tsx b/packages/pdf/src/report.tsx
@@ -1,8 +1,13 @@
-import { Document, PDFViewer, Page } from "@react-pdf/renderer";
+import { Document, Font, Page } from "@react-pdf/renderer";
 import { Html } from "react-pdf-html";
 import React from "react";
 import type { Udap, Report, Service_instructeurs, Clause_v2 } from "@cr-vif/electric-client/frontend";
 
+Font.registerHyphenationCallback((word) => {
+  console.log(word);
+  return [word];
+});
+
 export const ReportPDFDocument = ({ udap, htmlString, images }: ReportPDFDocumentProps) => {
   return (
     <Document>
@@ -93,7 +98,6 @@ export const ReportPDFDocument = ({ udap, htmlString, images }: ReportPDFDocumen
             align-items: flex-end;
           }
 
-
         </style>
             <div class="header">
               <div class="marianne">
@@ -187,6 +191,8 @@ export const getReportHtmlString = (
       Ref cadastrale : ${report.projectCadastralRef ?? ""}<br/>
     </p>
 
+    <span class="link">https://stackoverflow.com/questions/8753296/how-to-prevent-line-break-at-hyphens-in-all-browsers</span>
+
     <p>
       <strong>Objet de la demande : ${report.title ?? ""}</strong>
     </p>