@entryscape/rdforms 10.13.3 → 10.13.5

package/package.json

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

package/src/template/Item.js

@@ -554,6 +554,10 @@ export default class Item {
     return `'${this.getLabel()}' (${detailsArr.join(', ')})`;
   }
 
+  getHash() {
+    return `i_${this._internalId}`;
+  }
+
   //= ==================================================
   // Inherited methods
   //= ==================================================

package/src/template/ItemStore.js

@@ -191,6 +191,12 @@ export default class ItemStore {
   // eslint-disable-next-line class-methods-use-this
   createExtendedSource(origSource, extSource) {
     const newSource = Object.assign({}, origSource, extSource);
+    if (extSource.id === undefined) {
+      // If no new id is provided in the original source,
+      // don't inherit the id of the extention as then
+      // it will be overwrite it in the ItemStore
+      delete newSource.id;
+    }
     if (extSource.enhanced) {
       let keys;
       if (extSource.enhanced === true) {

package/src/view/react/labels.js

@@ -73,7 +73,7 @@ const ItemTooltip = (props) => {
     props.item.getEditDescriptionMap() || props.item.getDescriptionMap() : props.item.getDescriptionMap()
     || (property ? '' : props.context.view.messages.info_missing || '');
   const description = utils.getLocalizedValue(descriptionMap, props.context.view.getLocale()).value;
-  const tooltipId = `tt_${props.binding.getHash()}`;
+  const tooltipId = `tt_${props.binding ? props.binding.getHash() : props.item.getHash()}`;
 
   return (
     <ClickAwayListener onClickAway={handleTooltipClose}>
@@ -136,10 +136,10 @@ renderingContext.renderPresenterLabel = (rowNode, binding, item, context) => {
     <h2 tabIndex="0" id={labelId} className="rdformsLabelRow"><span className={rdformsLabel} role={role}>{label}</span></h2> :
     <span tabIndex="0" id={labelId} className="rdformsLabelRow"><span className={rdformsLabel} role={role}>{label}</span></span>;
   if (context.view.popupOnLabel) {
-    rowNode.appendChild(<Fragment key={`${binding ? binding.getHash() : item._internalId}_label` }><ItemTooltip
+    rowNode.appendChild(<Fragment key={`${binding ? binding.getHash() : item.getHash()}_label` }><ItemTooltip
       context={context} item={item} binding={binding}>{label}</ItemTooltip>{description}</Fragment>);
   } else {
-    rowNode.appendChild(<Fragment key={`${binding ? binding.getHash() : item._internalId}_label` }>{label}{description}</Fragment>);
+    rowNode.appendChild(<Fragment key={`${binding ? binding.getHash() : item.getHash()}_label` }>{label}{description}</Fragment>);
   }
 };