feat: Upgrade cozy-ui 100.1.0 to 101.1.0

cozy · Jan 16, 2024 · 2b1c710 · 2b1c710
1 parent 8c93215
commit 2b1c710
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 61 deletions.
diff --git a/jestHelpers/setup.js b/jestHelpers/setup.js
@@ -1,15 +1,6 @@
 import Enzyme from 'enzyme'
 import Adapter from 'enzyme-adapter-react-16'
 
-// To avoid the errors while creating theme (since no CSS stylesheet
-// defining CSS variables is injected during tests)
-// Material-UI: the color provided to augmentColor(color) is invalid.
-// The color object needs to have a `main` property or a `500` property.
-jest.mock('cozy-ui/transpiled/react/utils/color', () => ({
-  ...jest.requireActual('cozy-ui/transpiled/react/utils/color'),
-  getCssVariableValue: () => '#fff'
-}))
-
 global.cozy = {}
 
 jest.mock('cozy-bar/transpiled', () => ({

diff --git a/package.json b/package.json
@@ -85,10 +85,10 @@
     "cozy-logger": "1.9.1",
     "cozy-realtime": "4.6.0",
     "cozy-scanner": "^7.0.1",
-    "cozy-scripts": "^8.1.0",
+    "cozy-scripts": "^8.3.0",
     "cozy-sharing": "10.0.1",
     "cozy-stack-client": "^45.2.0",
-    "cozy-ui": "100.1.0",
+    "cozy-ui": "^101.1.0",
     "date-fns": "1.30.1",
     "diacritics": "1.3.0",
     "filesize": "3.6.1",

diff --git a/src/modules/navigation/Breadcrumb/breadcrumb.styl b/src/modules/navigation/Breadcrumb/breadcrumb.styl
@@ -1,5 +1,4 @@
 @require 'components/popover.styl'
-@require 'settings/palette.styl'
 @require 'settings/breakpoints.styl'
 @require 'settings/z-index.styl'
 @require '../../../styles/coz-bar-size.styl'

diff --git a/src/modules/search/__snapshots__/AppBarSearch.spec.jsx.snap b/src/modules/search/__snapshots__/AppBarSearch.spec.jsx.snap
@@ -4,12 +4,28 @@ exports[`should display the Searchbar 1`] = `
 {
   "asFragment": [Function],
   "baseElement": <body>
+    <div
+      class="CozyTheme--dark-inverted"
+      style="display: none;"
+    />
+    <div
+      class="CozyTheme--dark-normal"
+      style="display: none;"
+    />
+    <div
+      class="CozyTheme--light-inverted"
+      style="display: none;"
+    />
+    <div
+      class="CozyTheme--light-normal"
+      style="display: none;"
+    />
     <div>
       <div
-        class="CozyTheme--normal u-dc"
+        class="CozyTheme--light-normal u-dc"
       >
         <div
-          class="u-flex u-flex-items-center u-flex-grow CozyTheme--normal u-dc"
+          class="u-flex u-flex-items-center u-flex-grow CozyTheme--light-normal u-dc"
         >
           <div
             class="bar-search-container"
@@ -67,10 +83,10 @@ exports[`should display the Searchbar 1`] = `
   </body>,
   "container": <div>
     <div
-      class="CozyTheme--normal u-dc"
+      class="CozyTheme--light-normal u-dc"
     >
       <div
-        class="u-flex u-flex-items-center u-flex-grow CozyTheme--normal u-dc"
+        class="u-flex u-flex-items-center u-flex-grow CozyTheme--light-normal u-dc"
       >
         <div
           class="bar-search-container"

diff --git a/src/modules/upload/__snapshots__/Dropzone.spec.jsx.snap b/src/modules/upload/__snapshots__/Dropzone.spec.jsx.snap
@@ -22,6 +22,7 @@ exports[`Dropzone should match snapshot 1`] = `
     variant="normal"
   >
     <MuiCozyTheme
+      type="light"
       variant="normal"
     >
       <ThemeProvider
@@ -1467,7 +1468,7 @@ exports[`Dropzone should match snapshot 1`] = `
                     "& $indicator": {
                       "backgroundColor": "#fff",
                       "borderRadius": "99px",
-                      "boxShadow": "var(--shadow1)",
+                      "boxShadow": "#fff",
                       "height": "calc(100% - 2px)",
                       "top": "1px",
                       "transform": "scale(0.99)",
@@ -1588,6 +1589,7 @@ exports[`Dropzone should match snapshot 1`] = `
               },
               "tonalOffset": 0.2,
               "type": "light",
+              "variant": "normal",
               "warning": {
                 "contrastText": "#fff",
                 "dark": "#fff",
@@ -1597,32 +1599,31 @@ exports[`Dropzone should match snapshot 1`] = `
             },
             "props": {},
             "shadows": [
-              "var(--shadow0)",
-              "var(--shadow1)",
-              "var(--shadow2)",
-              "var(--shadow3)",
-              "var(--shadow4)",
-              "var(--shadow5)",
-              "var(--shadow6)",
-              "var(--shadow7)",
-              "var(--shadow8)",
-              "var(--shadow9)",
-              "var(--shadow10)",
-              "var(--shadow11)",
-              "var(--shadow12)",
-              "var(--shadow13)",
-              "var(--shadow14)",
-              "var(--shadow15)",
-              "var(--shadow16)",
-              "var(--shadow17)",
-              "var(--shadow18)",
-              "var(--shadow19)",
-              "var(--shadow20)",
-              "var(--shadow21)",
-              "var(--shadow22)",
-              "var(--shadow23)",
-              "var(--shadow24)",
-              "var(--shadow25)",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
+              "#fff",
             ],
             "shape": {
               "borderRadius": 6,
@@ -1762,7 +1763,7 @@ exports[`Dropzone should match snapshot 1`] = `
         }
       >
         <div
-          className="CozyTheme--normal u-dc"
+          className="CozyTheme--light-normal u-dc"
         >
           <Provider
             store={

diff --git a/src/modules/viewer/styles.styl b/src/modules/viewer/styles.styl
@@ -1,5 +1,4 @@
 @require 'settings/breakpoints.styl'
-@require 'settings/palette.styl'
 
 .pho-viewer-noviewer-cta
     position         relative

diff --git a/src/styles/actionmenu.styl b/src/styles/actionmenu.styl
@@ -1,5 +1,3 @@
-@require 'settings/palette.styl'
-
 .fil-mobileactionmenu-file-name
     overflow hidden
     text-overflow ellipsis

diff --git a/src/styles/dropzone.styl b/src/styles/dropzone.styl
@@ -1,5 +1,4 @@
 @require 'settings/z-index.styl'
-@require 'settings/palette.styl'
 
 .fil-dropzone-active
     [role='table']

diff --git a/src/styles/filelist.styl b/src/styles/filelist.styl
@@ -1,5 +1,4 @@
 @require 'components/table.styl'
-@require 'settings/palette.styl'
 
 .fil-content-cell
     display flex

diff --git a/src/styles/filenameinput.styl b/src/styles/filenameinput.styl
@@ -1,5 +1,4 @@
 @require 'components/forms.styl'
-@require 'settings/palette.styl'
 
 .fil-file-name-input
     @extend $form-text

diff --git a/src/styles/toolbar.styl b/src/styles/toolbar.styl
@@ -2,7 +2,6 @@
 @require 'settings/breakpoints.styl'
 @require 'settings/z-index.styl'
 @require 'utilities/display.styl'
-@require 'settings/palette.styl'
 
 .c-btn
     @extend $button
@@ -24,10 +23,10 @@
 .fil-toolbar-trash
     margin-left auto
     display     flex
-    
+
 .menu-recipients-wrapper
     position relative
-  
+
 .menu-recipients
     position absolute
     right    0

diff --git a/src/targets/browser/index.ejs b/src/targets/browser/index.ejs
@@ -20,6 +20,7 @@
     <link rel="manifest" href="/manifest.json" crossOrigin="use-credentials" />
     <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
     <meta name="theme-color" content="#ffffff" />
+    <meta name="color-scheme" content="only light" />
     <meta
       name="viewport"
       content="width=device-width, height=device-height, initial-scale=1, viewport-fit=cover"

diff --git a/src/targets/intents/index.ejs b/src/targets/intents/index.ejs
@@ -19,6 +19,7 @@
     />
     <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
     <meta name="theme-color" content="#ffffff" />
+    <meta name="color-scheme" content="only light" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <% if (__STACK_ASSETS__) { %>
     {{.CozyClientJS}}

diff --git a/src/targets/public/index.ejs b/src/targets/public/index.ejs
@@ -19,6 +19,7 @@
     />
     <link rel="mask-icon" href="/public/safari-pinned-tab.svg" color="#5bbad5" />
     <meta name="theme-color" content="#ffffff" />
+    <meta name="color-scheme" content="only light" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex, nofollow, noimageindex" />
     <% if (__STACK_ASSETS__) { %>

diff --git a/yarn.lock b/yarn.lock
@@ -6348,10 +6348,10 @@ cozy-scanner@^7.0.1:
   dependencies:
     cozy-device-helper "^3.0.0"
 
-cozy-scripts@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/cozy-scripts/-/cozy-scripts-8.1.0.tgz#bb8ae227c587c671cc2450fdffbad7f9daa20614"
-  integrity sha512-wNWShe11ENjcguNX3w69xnI69zqaZMCZmbp7EUCsxVnRY7GAaFR3bynti/+Z9pDemIWwgWD+uUsgUiyFKaHmZw==
+cozy-scripts@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/cozy-scripts/-/cozy-scripts-8.3.0.tgz#dec3a5c9568a5e44e1baf6cd9983a7c55418ba95"
+  integrity sha512-UrzifMUyIleTs7M+H449uOm/3OA/7vqUVlpA6IYi+BftUG4WbOEmU3oG9dmxRK5kVK+VhJURBk+9LJ+C+84syg==
   dependencies:
     "@babel/core" "7.10.0"
     "@babel/polyfill" "^7.10.4"
@@ -6446,10 +6446,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/cozy-tsconfig/-/cozy-tsconfig-1.2.0.tgz#17e61f960f139fae4d26cbac2254b9ab632b269e"
   integrity sha512-TRHnY9goF3FzVlUbP7BcHxuN2XAA4AmppT4fHHZmTKaSwYTByVR1Al+riFMDbce94kJZ1wzl9WNLWQuqzGZ6Cw==
 
-cozy-ui@100.1.0:
-  version "100.1.0"
-  resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-100.1.0.tgz#7a83a8684e6b37c9440cb64266638edb94f83561"
-  integrity sha512-wtt0dsAfDYFhEJSSmF/+ETHr+AFgBuvJGEB5mT3JBV6vvMA6Q+2yEt5gQw6/mtnRmp6kdn25P1uDJUyBF6Dxbw==
+cozy-ui@^101.1.0:
+  version "101.1.0"
+  resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-101.1.0.tgz#dbad7bd569457de9bd3d17fca89558977c9b6ca2"
+  integrity sha512-aSxfd1IblCy6qKN4XTJb7LWobPkblsDgnMLBLtAxI7vCM4L2dXY0zTLuCZcRPHjsOINTwsoTxvtE3KPk7cEUNg==
   dependencies:
     "@babel/runtime" "^7.3.4"
     "@material-ui/core" "4.12.3"