solid-ui 2.4.22-68b7539f → 2.4.22-6ae4df24

package/dist/main.js

@@ -15192,8 +15192,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2022-05-06T16:10:20Z',
-  commit: '68b7539f641a205961c371a2b1e6787306576255',
+  buildTime: '2022-05-10T15:38:52Z',
+  commit: '6ae4df243e825dee4607d8bde360d12bd9de6925',
   npmInfo: {
     'solid-ui': '2.4.22',
     npm: '6.14.16',
@@ -17745,7 +17745,7 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
 
         var _shim = dom.createElement('div');
 
-        _shim.appendChild(subField); // Subfield has its own laytout
+        _shim.appendChild(subField); // Subfield has its own layout
 
 
         frame.appendChild(_shim);
@@ -17830,14 +17830,16 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
   if (kb.updater.editable(dataDoc.uri)) {
     var tail = box.appendChild(dom.createElement('div'));
     tail.style.padding = '0.5em';
+    var label = kb.any(form, ui('label'));
+    if (!label) label = utils.label(property, true); // Init capital
+
     var img = tail.appendChild(dom.createElement('img'));
     img.setAttribute('src', plusIconURI); //  plus sign
 
     img.setAttribute('style', 'margin: 0.2em; width: 1.5em; height:1.5em');
-    img.title = 'Click to add one or more ' + utils.predicateLabel(property, reverse);
-    var prompt = tail.appendChild(dom.createElement('span'));
-    prompt.textContent = (values.length === 0 ? 'Add one or more ' : 'Add more ') + utils.predicateLabel(property, reverse); // utils.label(property)
-
+    img.title = 'Click to add one or more ' + label;
+    var prompt = dom.createElement('span');
+    prompt.textContent = (values.length === 0 ? 'Add one or more ' : 'Add more ') + utils.predicateLabel(property, reverse);
     tail.addEventListener('click', /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(_eventNotUsed) {
         return _regenerator["default"].wrap(function _callee5$(_context5) {
@@ -17859,6 +17861,7 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
         return _ref3.apply(this, arguments);
       };
     }(), true);
+    tail.appendChild(prompt);
   }
 
   function createListIfNecessary() {
@@ -18140,16 +18143,18 @@ _fieldFunction.field[ns.ui('Classifier').uri] = function (dom, container, alread
 _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, subject, form, dataDoc, callbackFunction) {
   var ui = ns.ui;
   var kb = _solidLogic.store;
-  var multiple = false;
   var formDoc = form.doc ? form.doc() : null; // @@ if blank no way to know
 
   var p;
-  var box = dom.createElement('div'); // Set flexDirection column?
+  var box = dom.createElement('div');
+  box.setAttribute('class', 'choiceBox'); // Set flexDirection column?
 
   if (container) container.appendChild(box);
   var lhs = dom.createElement('div');
+  lhs.setAttribute('class', 'formFieldName choiceBox-label');
   box.appendChild(lhs);
   var rhs = dom.createElement('div');
+  rhs.setAttribute('class', 'formFieldValue choiceBox-selectBox');
   box.appendChild(rhs);
   var property = kb.any(form, ui('property'));
 
@@ -18158,13 +18163,27 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
   }
 
   lhs.appendChild((0, _basic.fieldLabel)(dom, property, form));
+  var uiFrom = kb.any(form, ui('from'));
+
+  if (!uiFrom) {
+    return (0, _error.errorMessageBlock)(dom, "No 'from' for Choice: " + form);
+  }
+
   var subForm = kb.any(form, ui('use')); // Optional
 
   var follow = kb.anyJS(form, ui('follow'), null, formDoc); // data doc moves to new subject?
 
   var possible = [];
   var possibleProperties;
-  var firstSelectOptionText = '* Select from ' + utils.label(subject, true) + ' *';
+  var multiple = false;
+  var firstSelectOptionText = '* Select for ' + utils.label(subject, true) + ' *'; // if we do NOT have a container it means it is a ui:Multiple
+  // only important for the first option text in select
+
+  if (!container) {
+    multiple = true;
+    firstSelectOptionText = utils.label(subject, true);
+  }
+
   var opts = {
     form: form,
     subForm: subForm,
@@ -18172,12 +18191,6 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     firstSelectOptionText: firstSelectOptionText,
     disambiguate: false
   };
-  var uiFrom = kb.any(form, ui('from'));
-
-  if (!uiFrom) {
-    return (0, _error.errorMessageBlock)(dom, "No 'from' for Choice: " + form);
-  }
-
   possible = kb.each(undefined, ns.rdf('type'), uiFrom, formDoc);
 
   for (var x in kb.findMembersNT(uiFrom)) {
@@ -18220,7 +18233,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     opts.disambiguate = true;
   }
 
-  var sortedPossible = sortByLabel(possible); // TODO: this checks for any occurance regardles if it is set to true or false
+  var sortedPossible = sortByLabel(possible); // TODO: this checks for any occurrence, regardless of true or false setting
 
   if (kb.any(form, ui('canMintNew'))) {
     opts.mint = '* Create new *'; // @@ could be better
@@ -18664,7 +18677,7 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
       var opt = select.options[_i];
 
       if (opt.selected && opt.AJAR_mint) {
-        // not sure if this if is used because I cannot find mintClass
+        // not sure if this 'if' is used because I cannot find mintClass
         if (options.mintClass) {
           var thisForm = promptForNew(dom, kb, subject, predicate, options.mintClass, null, dataDoc, function (ok, body) {
             if (!ok) {
@@ -18680,7 +18693,7 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
         }
 
         is.push($rdf.st(subject, predicate, kb.sym(newObject), dataDoc));
-        if (uiFrom) is.push($rdf.st(newObject, ns.rdf('type'), kb.sym(uiFrom), dataDoc)); // not sure if this if is used because I cannot find mintStatementsFun
+        if (uiFrom) is.push($rdf.st(newObject, ns.rdf('type'), kb.sym(uiFrom), dataDoc)); // not sure if this 'if' is used because I cannot find mintStatementsFun
 
         if (options.mintStatementsFun) {
           is = is.concat(options.mintStatementsFun(newObject));
@@ -18722,19 +18735,21 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
         kb.updater.update(ds, is, function (uri, success, errorBody) {
           actual = getActual(); // refresh
 
-          if (!success) return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in select: ' + errorBody));
-          if (callbackFunction) callbackFunction(success, {
-            widget: 'select',
-            event: 'new'
-          });
+          if (!success) select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating select: ' + errorBody));
+        });
+        if (callbackFunction) callbackFunction(ok, {
+          widget: 'select',
+          event: 'new'
         });
-      } else return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in field of select: ' + body));
+      } else {
+        select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in field of select: ' + body));
+      }
     });
   };
 
   var select = dom.createElement('select');
-  select.setAttribute('style', style.formSelectSTyle);
-  if (options.multiple) select.setAttribute('multiple', 'true');
+  select.setAttribute('style', style.formSelectSTyle); // if (options.multiple) select.setAttribute('multiple', 'true') // use case merged with ui:Multiple
+
   select.currentURI = null;
 
   select.refresh = function () {
@@ -18785,13 +18800,13 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
     select.insertBefore(mint, select.firstChild);
   }
 
-  if (!select.currentURI && !options.multiple) {
+  if (!select.currentURI && options.multiple) {
     var prompt = dom.createElement('option');
     prompt.appendChild(dom.createTextNode(options.firstSelectOptionText));
-    prompt.selected = true;
     prompt.disabled = true;
     prompt.value = true;
     prompt.hidden = true;
+    prompt.selected = true;
     select.insertBefore(prompt, select.firstChild);
   }