@entryscape/rdforms 10.8.0 → 10.8.1

package/package.json

@@ -8,7 +8,7 @@
     "application profile",
     "linked data"
   ],
-  "version": "10.8.0",
+  "version": "10.8.1",
   "main": "dist/rdforms.node.js",
   "browser": "dist/rdforms.react.js",
   "module": "main.js",

package/src/view/Editor.js

@@ -28,6 +28,9 @@ const showNow = (editor, item, bindings, includeLevel) => {
       if (groupedItemsArr.length === 0) {
         return true; // Corresponds to an extention or pure heading, since no children.
       }
+      if (item.hasStyle('atLeastOneChild') || item.hasStyle('exactlyOneChild')) {
+        return true;
+      }
       if (bindings[0].getItemGroupedChildBindings().find((childBindings, idx) =>
         showNow(editor, groupedItemsArr[idx], childBindings, includeLevel))) {
         return true;

package/src/view/View.js

@@ -20,9 +20,18 @@ export default class View {
     this.compact = params.compact !== false;
     this.showDescription = params.showDescription === true;
     this.styleCls = params.styleCls || '';
-    this.filterPredicates = Array.isArray(params.filterPredicates) ?
-      params.filterPredicates.reduce((prev, current) => { prev[current] = true; return prev; }, {}) :
-      params.filterPredicates || null;
+    if (Array.isArray(params.filterPredicates)) {
+      this.filterPredicates =
+        params.filterPredicates.reduce((prev, current) => { prev[current] = true; return prev; }, {});
+    } else if (typeof params.filterPredicates === 'object') {
+      this.filterPredicates = params.filterPredicates;
+    } else if (typeof params.filterPredicates === 'string') {
+      this.filterPredicates = params.filterPredicates.split(',')
+        .reduce((prev, current) => { prev[current] = true; return prev; }, {});
+    } else {
+      this.filterPredicates = null;
+    }
+
     this.restrictToItem = params.restrictToItem;
     this.fuzzy = params.fuzzy === true;
     this.markOrigin = params.markOrigin !== false;
@@ -350,7 +359,23 @@ export default class View {
       const prop = item.getProperty();
       // Exclude if property matches.
       if (prop) {
-        return fp[prop] === true || fp[namespaces.shortenKnown(prop)] === true;
+        // Check if we are in a root-like position,
+        // i.e. either directly at the root or further down below groups without property set.
+        let rootLike = true;
+        let view = this;
+        while (view.parentView) {
+          if (view.getBinding().getItem().getProperty()) {
+            rootLike = false;
+          }
+          view = view.parentView;
+        }
+        const shortedProp = namespaces.shortenKnown(prop);
+        if (rootLike) {
+          return fp[prop] === true || fp[shortedProp] === true ||
+            fp[`*${prop}`] === true || fp[`${shortedProp}`] === true;
+        } else {
+          return fp[`*${prop}`] === true || fp[`*${shortedProp}`] === true;
+        }
       } else if (item.getType() === 'group') {
         // Exclude group headers if all children hidden
         const childBindings = item.getChildren() || [];