@entryscape/rdforms 10.3.1 → 10.3.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "@entryscape/rdforms",
   "description": "RDForms (aka RDF Forms) is a JavaScript library that uses templates to describe how to edit, present and validate RDF. The library is intended to be used in web applications to ease the burden of developers to deal natively with RDF.",
   "keywords": ["RDF", "editor", "metadata", "application profile", "linked data"],
-  "version": "10.3.1",
+  "version": "10.3.2",
   "main": "dist/rdforms.node.js",
   "browser": "dist/rdforms.react.js",
   "module": "main.js",

package/src/model/engine.js

@@ -357,7 +357,7 @@ const _matchTextItem = (pb, item) => {
       if (_noDibbs(stmt) && _isPatternMatch(item, stmt)) {
         const ntMatch = _isNodeTypeMatch(item, stmt);
         const dtMatch = _isDataTypeMatch(item, stmt);
-        if ((ntMatch && dtMatch) || _fuzzy) {
+        if ((ntMatch && (dtMatch || item.hasStyle('relaxedDatatypeMatch'))) || _fuzzy) {
           _dibbs(stmt);
           let matchingCode = ntMatch ? CODES.OK : CODES.WRONG_NODETYPE;
           if (!dtMatch) {

package/src/template/Item.js

@@ -45,6 +45,7 @@ export default class Item {
       'label',
       'tooltip',
       'strictmatch',
+      'relaxedDatatypeMatch',
       'viewAllTranslations',
       'email',
       'atLeastOneChild',

package/src/view/Editor.js

@@ -18,7 +18,7 @@ const showNow = (editor, item, bindings, includeLevel) => {
   const prop = item.getProperty();
   if (bindings.length > 0) {
     if (prop) {
-      return !editor.filterProperty(prop);
+      return !editor.filterItem(item);
     }
 
     // Take care of layout grouping by checking recursively.

package/src/view/View.js

@@ -3,6 +3,7 @@ import renderingContext from './renderingContext';
 import GroupBinding from '../model/GroupBinding';
 import * as engine from '../model/engine';
 import { bindingReport } from '../model/validate';
+import {namespaces} from "@entryscape/rdfjson";
 
 let viewCounter = 0;
 export default class View {
@@ -286,24 +287,37 @@ export default class View {
   }
 
   filterBinding(binding) {
-    const fp = this._getFilterPredicates();
-    const stmt = binding.getStatement();
-    const item = binding.getItem();
-    if (fp && stmt) {
-      return fp[stmt.getPredicate()] === true;
-    }
-    if (fp && item.getType() === 'group' && !item.getProperty()) {
-      // Checks one level below if there is a child that is visible
-      const childBindings = item.getChildren() || [];
-      let hasNonFilteredChild = false;
-      childBindings.forEach((child) => {
-        if (fp[child.getProperty()] !== true) {
-          hasNonFilteredChild = true;
-        }
-      });
-      return !hasNonFilteredChild;
-    }
-    return false;
+    return this.filterItem(binding.getItem());
+  }
+
+  filterItem(itemToCheck) {
+    const filterPredicates = this._getFilterPredicates();
+
+    const filter = (item, fp) => {
+      // Exclude based on item id.
+      const id = item.getId();
+      if (id && fp && Object.keys(fp).includes(id)) {
+        return true;
+      }
+      // Exclude if property matches.
+      const prop = item.getProperty();
+      if (fp && prop) {
+        return fp[prop] === true || fp[namespaces.shortenKnown(prop)] === true;
+      }
+      if (fp && item.getType() === 'group' && !item.getProperty()) {
+        // Checks one level below if there is a child that is visible
+        const childBindings = item.getChildren() || [];
+        let hasNonFilteredChild = false;
+        childBindings.forEach((child) => {
+          if (!filter(child, fp)) {
+            hasNonFilteredChild = true;
+          }
+        });
+        return !hasNonFilteredChild;
+      }
+      return false;
+    };
+    return filter(itemToCheck, filterPredicates);
   }
 
   filterProperty(property) {