Migrate @mui/x-date-pickers to v6 by sebastianfrey · Pull Request #2139 · eclipsesource/jsonforms

sebastianfrey · 2023-05-23T10:38:02Z

Resolves #2137.

There are some things to consider:

Because @mui/date-pickers v6 relies on a newer version of @mui/base I had to upgrade @mui/material to a more recent version (v5.13.0).
There are no public types for the functional ActionBar API, so I had to introduce a custom interface to satisfy TS.
The input handling of the date picker components was reworked from the ground up in v6. For more details see here. For that reason I had to drop the custom <ResetableTextField /> component and the custom text input value handling. Both were introduced in Pass through original values for invalid dates #1949. Unfortunately, as I understand the MUI release blog article correctly, there is no way at the moment to disable the masked input behavior. That means the behavior introduced in Pass through original values for invalid dates #1949 cannot be replicated with v6.

…/x-date-pickers v6

CLAassistant · 2023-05-23T10:38:07Z

All committers have signed the CLA.

netlify · 2023-05-23T10:38:25Z

✅ Deploy Preview for jsonforms-examples ready!

Name	Link
🔨 Latest commit	`931cd66`
🔍 Latest deploy log	https://app.netlify.com/sites/jsonforms-examples/deploys/6478611016901a000807189a
😎 Deploy Preview	https://deploy-preview-2139--jsonforms-examples.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

sebastianfrey · 2023-05-23T10:51:36Z

I have noticed, that the Netlify prerview for materia renderers does not work. After checking the browser console logs I encountered the following error:

react-dom.production.min.js:216 TypeError: useEnhancedEffectExports is not a function
    at usePickerViews (usePickerViews.js:100:3)
    at usePicker (usePicker.js:28:31)
    at useDesktopPicker (useDesktopPicker.js:59:7)
    at DesktopDatePicker (DesktopDatePicker.js:49:7)
    at Ch (react-dom.production.min.js:157:137)
    at gi (react-dom.production.min.js:176:260)
    at ck (react-dom.production.min.js:271:400)
    at bk (react-dom.production.min.js:250:347)
    at ak (react-dom.production.min.js:250:278)
    at Tj (react-dom.production.min.js:250:138)

It seems that the Netlify deployment uses an older version of @mui than specified in the dependencies.

lucas-koehler · 2023-05-24T12:48:10Z

I have noticed, that the Netlify prerview for materia renderers does not work. After checking the browser console logs I encountered the following error:
react-dom.production.min.js:216 TypeError: useEnhancedEffectExports is not a function
    at usePickerViews (usePickerViews.js:100:3)
It seems that the Netlify deployment uses an older version of @mui than specified in the dependencies.

@sebastianfrey That is strange as the example apps are bundled to be self-contained in their corresponding packages. Can you also reproduce this issue locally?

coveralls · 2023-05-24T13:05:00Z

Coverage: 84.254%. Remained the same when pulling 931cd66 on sebastianfrey:2137-migrate-mui-date-pickers-to-v6 into b11f04c on eclipsesource:master.

sebastianfrey · 2023-05-24T13:23:23Z

@lucas-koehler Yes I can, when I run locally npm run build:examples-app to build the example apps, the issue is reproducible. Running the example app in dev mode with cd packages/material-renderers && npm run dev everything works fine. Maybe it has something to do with how rollup handles dependencies.

sebastianfrey · 2023-05-24T17:04:46Z

@lucas-koehler After a little bit more investigation it turns out, that the problem originates from the required @mui/material upgrade.

In detail the reason for the problem is

b. how @mui/utils is published (Transpiled ES-Module)
c. how @mui/utils is leveraged in @mui/x-date-pickers
d. how Rollup handles CommonJS default exports of transpile ES-Modules

It seems that rollup/plugins#948 is related and that rollup/plugins#1165 might fix it.

Unfortunately I have not the time right now to dig here deeper, maybe some of you guys might take a look?

UPDATE 2023-05-25:

Yesterday I was browsing through some GitHub-issues on the topic and read up a bit on how Rollup plugins do work. Actually I found a solution to the problem, but it is a bit hacky.

As I have already mentioned, the cause of the problem is on the one hand the way @mui/utils is published and on the other hand how the Rollup CommonJS plugin handles these imports. To come around the problem, I have created the following Rollup plugin:

diff --git a/packages/material-renderers/rollup.example.config.js b/packages/material-renderers/rollup.example.config.js
index 1cc764d0..e46b6711 100644
--- a/packages/material-renderers/rollup.example.config.js
+++ b/packages/material-renderers/rollup.example.config.js
@@ -6,6 +6,36 @@ import copy from 'rollup-plugin-copy';
 import css from 'rollup-plugin-import-css';
 import typescript from 'rollup-plugin-typescript2';
 
+function cjsCompatPlugin() {
+  return {
+    name: 'cjs-compat-plugin',
+    transform(code, id) {
+      // ignore all packages which are not @mui/utils
+      if (
+        !/@mui\/utils.*.js$/.test(id) ||
+        id.includes('@mui/utils/node_modules')
+      ) {
+        return code;
+      }
+
+      // try to extract the commonjs namespace variable
+      const moduleName = code.match(
+        /(?<module>[a-zA-Z0-9_$]*).default = _default;/
+      )?.groups?.module;
+
+      if (!moduleName || !code.includes(`return ${moduleName};`)) {
+        return code;
+      }
+
+      // return default export instead of namespace
+      return code.replace(
+        `return ${moduleName}`,
+        `return ${moduleName}.default`
+      );
+    },
+  };
+}
+
 /**
  * @type {import('rollup').RollupOptions}
  */
@@ -34,6 +64,7 @@ const config = {
         },
       },
     }),
+    cjsCompatPlugin(),
     copy({
       targets: [
         {

It basically mutates the generated CommonJS code by returning the default export instead of the namespace. If you're happy with that solution, I will update the PR.

lucas-koehler · 2023-05-30T12:41:10Z

Hi @sebastianfrey ,
thank you for your detailed investigation :) . As the examples build is solely used for dev purposes to deploy the examples page, using this "hacky" custom plugin is fine with me. When you update the PR, please just add a brief comment above the plugin definition why this is necessary so its purpose is immediately clear when looking at this config in the future.

sebastianfrey · 2023-05-30T13:02:52Z

Hi @lucas-koehler,

Here you go. Custom plugin and brief comment are pushed as requested. =)

lucas-koehler · 2023-05-31T09:16:25Z

Hi @sebastianfrey , thanks for the fixes and the effort :)
I'll have a closer look at the changes in June as I'm low on time right now.

lucas-koehler

Thanks again for the contribution ❤️
The changes already look pretty good to me.
I tried locally, and I didn't need the introduced PickersActionBarParams. Could you check again if we really need this, please?

Besides that, I tested the new inputs in the deployed example and it looks good to me. With the new fields mechanism, many invalid inputs are no longer possible and in case the value is deleted or incomplete, "Invalid Date" is written to the data. This seems fine to me. @sdirix Do you agree?

UI Schema based controls do not show a validation message for invalid data. However, this is already the case without this PR. So this is fine for me.

lucas-koehler

Thanks for the updates, LGTM now :)

sebastianfrey · 2023-06-05T07:43:40Z

@lucas-koehler Just out of curiosity: What's the timeline for v3.1.0?

lucas-koehler · 2023-06-05T07:59:33Z

@sebastianfrey There is no fixed timeline for the 3.1.0 release, yet. Most likely there will be at least one more consumable alpha or beta version beforehand.

sdirix · 2023-06-05T08:24:37Z

The change is released as part of the 3.1.0-beta.0 pre-release (@next) which is available now

sebastianfrey · 2023-06-05T08:29:02Z

@sdirix @lucas-koehler Thanks for your effort and fast response. I appreciate this.

sebastianfrey added 3 commits May 23, 2023 11:13

Upgrade @mui/x-date-pickers to v6

bfc4aa8

Upgrade @mui/material and @mui/icons-material

676ba4f

Migrate date and time pickers of @jsonforms/material-renderes to @mui…

d6c2790

…/x-date-pickers v6

Fix Rollup build for material renderers demo

3c72aac

Remove unused variable inputRef

a3ae022

lucas-koehler reviewed Jun 1, 2023

View reviewed changes

Comment thread packages/material-renderers/src/controls/MaterialDateControl.tsx Outdated

Remove unnecessary helper interface

931cd66

sebastianfrey force-pushed the 2137-migrate-mui-date-pickers-to-v6 branch from 9c1d37a to 931cd66 Compare June 1, 2023 09:12

lucas-koehler approved these changes Jun 5, 2023

View reviewed changes

lucas-koehler merged commit 5d5d3b5 into eclipsesource:master Jun 5, 2023

lucas-koehler modified the milestone: 3.1 Jun 5, 2023

Uh oh!

Conversation

sebastianfrey commented May 23, 2023

Uh oh!

CLAassistant commented May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify Bot commented May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for jsonforms-examples ready!

Uh oh!

sebastianfrey commented May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lucas-koehler commented May 24, 2023

Uh oh!

coveralls commented May 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sebastianfrey commented May 24, 2023

Uh oh!

sebastianfrey commented May 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lucas-koehler commented May 30, 2023

Uh oh!

sebastianfrey commented May 30, 2023

Uh oh!

lucas-koehler commented May 31, 2023

Uh oh!

lucas-koehler left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lucas-koehler left a comment

Choose a reason for hiding this comment

Uh oh!

sebastianfrey commented Jun 5, 2023

Uh oh!

lucas-koehler commented Jun 5, 2023

Uh oh!

sdirix commented Jun 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sebastianfrey commented Jun 5, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

CLAassistant commented May 23, 2023 •

edited

Loading

netlify Bot commented May 23, 2023 •

edited

Loading

sebastianfrey commented May 23, 2023 •

edited

Loading

coveralls commented May 24, 2023 •

edited

Loading

sebastianfrey commented May 24, 2023 •

edited

Loading

sdirix commented Jun 5, 2023 •

edited

Loading