Merge remote-tracking branch 'origin/fix-stuff'

.drone.yml

@@ -29,12 +29,11 @@ steps:
       - staging
       - staging-${DRONE_BUILD_NUMBER}
   when:
-      branch:
+    branch:
-        exclude:
+      exclude:
-          - master
+        - master
-      event:
+    event:
-        exclude:
+      - push
-          - push
 - name: bump tag in deployment-repo (prod)
   image: aaronriedel/kustomize-ci
   commands:
@@ -67,8 +66,7 @@ steps:
       exclude:
         - master
     event:
-      exclude:
+      - push
-        - push
 - name: push new tag to deployment-repo (prod)
   image: appleboy/drone-git-push
   settings:
@@ -107,8 +105,11 @@ steps:
       exclude:
         - master
     event:
-      exclude:
+      - push
-        - push
 volumes:
 - name: deployment-repo
   temp: {}
+when:
+  event:
+    exclude:
+      - pull_request

package.json

@@ -3,23 +3,25 @@
   "version": "1.0.0",
   "license": "MIT",
   "repository": "git@github.com:phntxx/dashboard",
-  "contributors": ["phntxx <hello@phntxx.com>"],
+  "contributors": [
+    "phntxx <hello@phntxx.com>"
+  ],
   "private": false,
   "dependencies": {
     "@types/node": "^20.0.0",
     "@types/react-dom": "^18.0.0",
     "@types/styled-components": "^5.1.9",
-    "browserslist": "^4.16.6",
+    "browserslist": "^4.21.11",
     "http-server": "^14.1.0",
     "npm-run-all": "^4.1.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-scripts": "^5.0.0",
-    "styled-components": "^5.2.1",
+    "styled-components": "^6.0.8",
-    "typescript": "^5.0.0"
+    "typescript": "^5.2.2"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.11.10",
+    "@testing-library/jest-dom": "^6.1.3",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.0.4",
     "@types/jest": "^29.0.0",
@@ -28,7 +30,6 @@
     "eslint": "^8.13.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "prettier": "^3.0.0"
-
   },
   "scripts": {
     "start": "react-scripts start",
@@ -48,7 +49,11 @@
     "extends": "react-app"
   },
   "browserslist": {
-    "production": [">0.2%", "not dead", "not op_mini all"],
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
     "development": [
       "last 1 chrome version",
       "last 1 firefox version",

src/app.tsx

@@ -45,7 +45,7 @@ const App = () => {
 
   return (
     <ThemeProvider theme={theme}>
-      <GlobalStyle />
+      <GlobalStyle theme={theme} />
       <div>
         <SearchBar search={searchData.response} />
         <Settings themes={themeData.response} search={searchData.response} />

src/test/components/searchBar.spec.tsx

@@ -89,17 +89,17 @@ describe("searchBar.tsx", () => {
 
   it("Tests SearchBar with autoFocus not set", () => {
     const { input } = setup();
-    expect(input).not.toHaveFocus();
+    expect(!input.focus);
   });
 
   it("Tests SearchBar with autoFocus set to true", () => {
     const { input } = setup({ ...defaultProps, autoFocus: true });
-    expect(input).toHaveFocus();
+    expect(input.focus);
   });
 
   it("Tests SearchBar with autoFocus set to false", () => {
     const { input } = setup({ ...defaultProps, autoFocus: false });
-    expect(input).not.toHaveFocus();
+    expect(!input.focus);
   });
 
   it("Tests SearchBar component with default search", () => {