@jinntec/fore 2.1.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jinntec/fore",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Fore - declarative user interfaces in plain HTML",
   "module": "./index.js",
   "publishConfig": {

package/src/fx-var.js

@@ -25,8 +25,13 @@ export class FxVariable extends foreElementMixin(HTMLElement) {
   refresh() {
     const inscope = getInScopeContext(this, this.valueQuery);
 
-    const values = evaluateXPath(this.valueQuery, inscope, this, this.precedingVariables);
-    [this.value] = values;
+      const values = evaluateXPath(this.valueQuery, inscope, this, this.precedingVariables);
+	  if (values.length) {
+		  [this.value] = values;
+	  } else {
+		  // There is no value: set to null so it's interpreted as empty-sequence later on
+		  this.value = null;
+	  }
   }
 
   setInScopeVariables(inScopeVariables) {

package/src/ui/fx-trigger.js

@@ -23,7 +23,9 @@ export class FxTrigger extends XfAbstractControl {
     const slot = this.shadowRoot.querySelector('slot');
     slot.addEventListener('slotchange', () => {
       const elements = slot.assignedElements({ flatten: true });
-      elements[0].setAttribute('tabindex', '0');
+      if(!elements[0].getAttribute('tabindex')){
+        elements[0].setAttribute('tabindex', '0');
+      }
       if(elements[0].nodeName !== 'BUTTON'){
         elements[0].setAttribute('role', 'button');
       }

package/src/xpath-evaluation.js

@@ -384,7 +384,9 @@ function functionNameResolver({prefix, localName}, _arity) {
 function getVariablesInScope(formElement) {
     let closestActualFormElement = formElement;
     while (closestActualFormElement && !('inScopeVariables' in closestActualFormElement)) {
-        closestActualFormElement = closestActualFormElement.parentNode;
+        closestActualFormElement = closestActualFormElement.nodeType === Node.ATTRIBUTE_NODE ?
+			closestActualFormElement.ownerElement :
+			closestActualFormElement.parentNode;
     }
 
     if (!closestActualFormElement) {