@entryscape/rdforms 10.9.5 → 10.10.1

package/package.json

@@ -8,7 +8,7 @@
     "application profile",
     "linked data"
   ],
-  "version": "10.9.5",
+  "version": "10.10.1",
   "main": "dist/rdforms.node.js",
   "browser": "dist/rdforms.react.js",
   "module": "main.js",
@@ -40,8 +40,8 @@
     "nls-loader": "https://bitbucket.org/metasolutions/nls-loader#master",
     "node-fetch": "^2.6.0",
     "popper.js": "^1.12.9",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-hooks-lib": "^0.1.5",
     "regenerator-runtime": "^0.13.2",
     "select2": "4.0.8",

package/src/template/Item.js

@@ -70,7 +70,10 @@ export default class Item {
       'deprecated',
       'inline',
       'truncate',
-      'noTruncate'
+      'noTruncate',
+      'card',
+      'cardInPresent',
+      'cardInEdit'
     ];
     this._getLocalizedValue = utils.getLocalizedValue;
   }

package/src/view/Editor.js

@@ -174,7 +174,7 @@ export default class Editor extends Presenter {
     } else {
       target = 1;
     }
-    if (item.hasStyle('nonEditable') && !item.hasStyle('autoInitDate') && !item.hasStyle('autoUpdateDate') && !item.hasStyle('autoUUID') && !item.hasStyle('autoValue')) {
+    if (item.hasStyle('nonEditable') && !item.hasStyle('autoInitDate') && !item.hasStyle('autoUpdateDate') && !item.hasStyle('autoUUID') && !item.hasStyle('autoValue') && !item.getValue()) {
       return _bindings;
     }
     if (target > _bindings.length) {

package/src/view/View.js

@@ -353,7 +353,11 @@ export default class View {
       renderingContext.domClassToggle(rowNode, 'hiddenProperty', true);
     }
 
-    if (item.hasStyle('card')) {
+    const isEditor = this._subEditors !== undefined;
+    if (item.hasStyle('card') ||
+      (item.hasStyle('cardInEdit') && isEditor) ||
+      (item.hasStyle('cardInPresent') && !isEditor)
+    ) {
       renderingContext.domClassToggle(rowNode, 'rdformsCard', true);
     }
     return rowNode;

package/src/view/react/Wrappers.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import Presenter from '../Presenter';
 import Editor from '../Editor';
 import ValidationPresenter from '../ValidationPresenter';
@@ -12,7 +12,8 @@ const fixIt = (Cls) => {
       if (!this.initiatedAlready && this.domNode.parent instanceof Node) {
         // eslint-disable-next-line no-unused-vars
         const Cmp = this.domNode.component;
-        ReactDOM.render(<Cmp></Cmp>, this.domNode.parent);
+        const root = createRoot(this.domNode.parent);
+        root.render(<Cmp></Cmp>);
       }
       this.initiatedAlready = true;
     }
@@ -33,4 +34,8 @@ const ReactEditor = fixIt(Editor);
 const ReactPresenter = fixIt(Presenter);
 const ReactValidationPresenter = fixIt(ValidationPresenter);
 
-export { ReactEditor as Editor, ReactPresenter as Presenter, ReactValidationPresenter as ValidationPresenter };
+export {
+  ReactEditor as Editor,
+  ReactPresenter as Presenter,
+  ReactValidationPresenter as ValidationPresenter,
+};