solid-ui 2.4.9-alpha-6eabfbac → 2.4.9-beta

package/lib/widgets/forms.js

@@ -77,15 +77,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-/*       F O R M S
- *
- *      A Vanilla Dom implementation of the form language
- */
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-/* eslint-disable multiline-ternary */
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-/* global alert */
-// Note default export
 var checkMarkCharacter = "\u2713";
 var cancelCharacter = "\u2715";
 var dashCharacter = '-';
@@ -237,25 +234,43 @@ _fieldFunction.field[ns.ui('Options').uri] = function (dom, container, already,
   var values;
 
   if (dependingOn.sameTerm(ns.rdf('type'))) {
-    values = kb.findTypeURIs(subject);
+    values = Object.keys(kb.findTypeURIs(subject)).map(function (uri) {
+      return $rdf.sym(uri);
+    }); // Use RDF-S inference
   } else {
-    var value = kb.any(subject, dependingOn);
+    values = kb.each(subject, dependingOn);
+  }
 
-    if (value === undefined) {
-      box.appendChild((0, _error.errorMessageBlock)(dom, "Can't select subform as no value of: " + dependingOn));
-    } else {
-      values = {};
-      values[value.uri] = true;
-    }
-  } // @@ Add box.refresh() to sync fields with values
+  if (values.length === 0) {
+    box.appendChild((0, _error.errorMessageBlock)(dom, "Can't select subform as no value of: " + dependingOn));
+  } else {
+    for (var i = 0; i < cases.length; i++) {
+      var c = cases[i];
+      var tests = kb.each(c, ui('for'), null, formDoc); // There can be multiple 'for'
 
+      var match = false;
 
-  for (var i = 0; i < cases.length; i++) {
-    var c = cases[i];
-    var tests = kb.each(c, ui('for'), null, formDoc); // There can be multiple 'for'
+      for (var j = 0; j < tests.length; j++) {
+        var _iterator = _createForOfIteratorHelper(values),
+            _step;
 
-    for (var j = 0; j < tests.length; j++) {
-      if (values[tests[j].uri]) {
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var value = _step.value;
+            var test = tests[j];
+
+            if (value.sameTerm(tests) || value.termType === test.termType && value.value === test.value) {
+              match = true;
+            }
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
+
+      if (match) {
         var _field3 = kb.the(c, ui('use'));
 
         if (!_field3) {
@@ -268,7 +283,8 @@ _fieldFunction.field[ns.ui('Options').uri] = function (dom, container, already,
         break;
       }
     }
-  }
+  } // @@ Add box.refresh() to sync fields with values
+
 
   return box;
 };
@@ -1729,15 +1745,14 @@ function makeSelectForNestedCategory(dom, kb, subject, category, dataDoc, callba
 
 function buildCheckboxForm(dom, kb, lab, del, ins, form, dataDoc, tristate) {
   var box = dom.createElement('div');
-  var tx = dom.createTextNode(lab);
+  var rhs = (0, _basic.renderNameValuePair)(dom, kb, box, form);
   var editable = kb.updater.editable(dataDoc.uri);
-  tx.style = style.checkboxStyle;
-  box.appendChild(tx);
-  var input; // eslint-disable-next-line prefer-const
+  var input = dom.createElement('button');
+  var colorCarrier = input; // Which element changes color to flag changed/saving/saved?
+
+  input.style = style.checkboxInputStyle; // colorCarrier.style = style.checkboxStyle
 
-  input = dom.createElement('button');
-  input.setAttribute('style', 'font-size: 150%; height: 1.2em; width: 1.2em; background-color: #eef; margin: 0.1em');
-  box.appendChild(input);
+  rhs.appendChild(input);
 
   function fix(x) {
     if (!x) return []; // no statements
@@ -1796,7 +1811,7 @@ function buildCheckboxForm(dom, kb, lab, del, ins, form, dataDoc, tristate) {
   if (!editable) return box;
 
   var boxHandler = function boxHandler(_e) {
-    tx.style = 'color: #bbb;'; // grey -- not saved yet
+    colorCarrier.style.color = '#bbb;'; // grey -- not saved yet
 
     var toDelete = input.state === true ? ins : input.state === false ? del : [];
     input.newState = input.state === null ? true : input.state === true ? false : tristate ? null : true;
@@ -1813,10 +1828,11 @@ function buildCheckboxForm(dom, kb, lab, del, ins, form, dataDoc, tristate) {
           }
         }
 
-        tx.style = 'color: #black; background-color: #fee;';
+        colorCarrier.style.color = 'color: #black;';
+        colorCarrier.style.backgroundColor = '#fee;';
         box.appendChild((0, _error.errorMessageBlock)(dom, "Checkbox: Error updating dataDoc from ".concat(input.state, " to ").concat(input.newState, ":\n\n").concat(errorBody)));
       } else {
-        tx.style = 'color: #black;';
+        colorCarrier.style = 'color: #black;';
         input.state = input.newState;
         input.textContent = {
           "true": checkMarkCharacter,
@@ -1841,7 +1857,7 @@ function fieldLabel(dom, property, form) {
 
   var anchor = dom.createElement('a');
   if (property.uri) anchor.setAttribute('href', property.uri);
-  anchor.setAttribute('style', 'color: #3B5998; text-decoration: none;'); // Not too blue and no underline
+  anchor.setAttribute('style', style.fieldLabelStyle); // Not too blue and no underline
 
   anchor.textContent = lab;
   return anchor;