Merge pull request #1254 from webkom/dependabot/npm_and_yarn/nextui-org/react-2.6.8

Bump @nextui-org/react from 2.2.10 to 2.6.8

Author: norbye

.drone.yml

@@ -93,7 +93,7 @@ steps:
       - yarn start
 
   - name: cypress
-    image: cypress/included:10.7.0
+    image: cypress/included:13.17.0
     when:
       event:
         - push

package.json

@@ -23,7 +23,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@nextui-org/react": "^2.2.10",
+    "@nextui-org/react": "^2.6.8",
     "final-form": "^4.20.10",
     "framer-motion": "^11.11.8",
     "next": "^14.1.4",
@@ -51,7 +51,7 @@
     "eslint-plugin-react": "^7.37.1",
     "postcss": "^8.4.40",
     "prettier": "^3.3.3",
-    "tailwindcss": "^3.4.7",
+    "tailwindcss": "^3.4.17",
     "typescript": "^5.6.3"
   }
 }

webapp/components/elements/FormInput.tsx

@@ -1,11 +1,11 @@
-import { Field, FieldRenderProps } from 'react-final-form';
 import { Input, InputProps, Textarea, TextAreaProps } from '@nextui-org/react';
+import { Field, FieldRenderProps } from 'react-final-form';
+import { DataListItem } from 'utils/datalists';
 import {
   FieldValidator,
   requiredValidator,
   validateField,
 } from 'utils/validators';
-import { DataListItem } from 'utils/datalists';
 
 type Props = {
   name: string;
@@ -67,7 +67,7 @@ const ReceiptInput: React.FC<Props> = ({
         <Textarea
           onBlur={(event) =>
             props.input.onBlur(
-              event as React.FocusEvent<HTMLTextAreaElement, Element>
+              event as React.FocusEvent<HTMLInputElement, Element>
             )
           }
           minRows={2}

webapp/cypress/e2e/index.cy.js

@@ -1,15 +1,23 @@
+const selectItem = (selector, itemValue) => {
+  cy.get(selector).click();
+  cy.get("div[data-slot='popover']")
+    .find(`span:contains(${itemValue})`)
+    .click();
+};
+
 describe('Load', () => {
+  beforeEach(() => cy.visit('/'));
   it('should navigate to index page', () => {
-    cy.visit('/');
     cy.get('h4').contains('Kvitteringsskjema');
   });
 });
 
 describe('Form', () => {
+  beforeEach(() => cy.visit('/'));
   it('should be able to fill in basic fields', () => {
     cy.get('#name').type('John Doe');
     cy.get('#mailFrom').type('[email protected]');
-    cy.get('#mailTo').type('Webkom');
+    selectItem('#mailTo', 'Webkom');
     cy.get('#accountNumber').type('1234 56 78903');
     cy.get('#amount').type('1000');
     cy.get('#date').type('1970-01-01');
@@ -19,6 +27,7 @@ describe('Form', () => {
 });
 
 describe('Uploads', () => {
+  beforeEach(() => cy.visit('/'));
   it('should be able to upload signature', () => {
     cy.get('#signature').attachFile('abakus.png');
   });
@@ -40,6 +49,7 @@ describe('Uploads', () => {
 });
 
 describe('Signature drawing', () => {
+  beforeEach(() => cy.visit('/'));
   it('should be possible to draw the signature', () => {
     cy.get('#signButton').click();
     cy.get('h3').contains('Signer i feltet under');
@@ -49,8 +59,8 @@ describe('Signature drawing', () => {
 });
 
 describe('Submit', () => {
+  beforeEach(() => cy.visit('/'));
   it('should be possible to submit', () => {
-    cy.visit('/');
     // Set up a catch for the POST request
     cy.intercept(
       {
@@ -63,7 +73,7 @@ describe('Submit', () => {
     // Fill in values
     cy.get('#name').type('John Doe');
     cy.get('#mailFrom').type('[email protected]');
-    cy.get('#mailTo').type('Webkom');
+    selectItem('#mailTo', 'Webkom');
     cy.get('#accountNumber').type('1234 56 78903');
     cy.get('#amount').type('1000');
     cy.get('#date').type('1970-01-01');