solid-ui 2.4.22-34747cd0 → 2.4.22-3e0d1a42

package/lib/versionInfo.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2022-05-02T13:37:35Z',
-  commit: '34747cd0e7be84514d29e13b42586ebe4442e1f0',
+  buildTime: '2022-05-10T17:01:23Z',
+  commit: '3e0d1a42e042cb5542cbc183d7ae53eec6498254',
   npmInfo: {
     'solid-ui': '2.4.22',
     npm: '6.14.16',

package/lib/versionInfo.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/versionInfo.ts"],"names":["versionInfo","buildTime","commit","npmInfo","npm","ares","brotli","cldr","icu","llhttp","modules","napi","nghttp2","node","openssl","tz","unicode","uv","v8","zlib"],"mappings":";;;;;;AAAO,IAAMA,WAAW,GAAG;AACzBC,EAAAA,SAAS,EAAE,sBADc;AAEzBC,EAAAA,MAAM,EAAE,0CAFiB;AAGzBC,EAAAA,OAAO,EACT;AACE,gBAAY,QADd;AAEEC,IAAAA,GAAG,EAAE,SAFP;AAGEC,IAAAA,IAAI,EAAE,QAHR;AAIEC,IAAAA,MAAM,EAAE,OAJV;AAKEC,IAAAA,IAAI,EAAE,MALR;AAMEC,IAAAA,GAAG,EAAE,MANP;AAOEC,IAAAA,MAAM,EAAE,OAPV;AAQEC,IAAAA,OAAO,EAAE,IARX;AASEC,IAAAA,IAAI,EAAE,GATR;AAUEC,IAAAA,OAAO,EAAE,QAVX;AAWEC,IAAAA,IAAI,EAAE,SAXR;AAYEC,IAAAA,OAAO,EAAE,QAZX;AAaEC,IAAAA,EAAE,EAAE,QAbN;AAcEC,IAAAA,OAAO,EAAE,MAdX;AAeEC,IAAAA,EAAE,EAAE,QAfN;AAgBEC,IAAAA,EAAE,EAAE,oBAhBN;AAiBEC,IAAAA,IAAI,EAAE;AAjBR;AAJ2B,CAApB","sourcesContent":["export const versionInfo = {\n  buildTime: '2022-05-02T13:37:35Z',\n  commit: '34747cd0e7be84514d29e13b42586ebe4442e1f0',\n  npmInfo:\n{\n  'solid-ui': '2.4.22',\n  npm: '6.14.16',\n  ares: '1.18.1',\n  brotli: '1.0.9',\n  cldr: '40.0',\n  icu: '70.1',\n  llhttp: '2.1.4',\n  modules: '83',\n  napi: '8',\n  nghttp2: '1.42.0',\n  node: '14.19.1',\n  openssl: '1.1.1n',\n  tz: '2021a3',\n  unicode: '14.0',\n  uv: '1.42.0',\n  v8: '8.4.371.23-node.85',\n  zlib: '1.2.11'\n}\n}\n"],"file":"versionInfo.js"}
+{"version":3,"sources":["../src/versionInfo.ts"],"names":["versionInfo","buildTime","commit","npmInfo","npm","ares","brotli","cldr","icu","llhttp","modules","napi","nghttp2","node","openssl","tz","unicode","uv","v8","zlib"],"mappings":";;;;;;AAAO,IAAMA,WAAW,GAAG;AACzBC,EAAAA,SAAS,EAAE,sBADc;AAEzBC,EAAAA,MAAM,EAAE,0CAFiB;AAGzBC,EAAAA,OAAO,EACT;AACE,gBAAY,QADd;AAEEC,IAAAA,GAAG,EAAE,SAFP;AAGEC,IAAAA,IAAI,EAAE,QAHR;AAIEC,IAAAA,MAAM,EAAE,OAJV;AAKEC,IAAAA,IAAI,EAAE,MALR;AAMEC,IAAAA,GAAG,EAAE,MANP;AAOEC,IAAAA,MAAM,EAAE,OAPV;AAQEC,IAAAA,OAAO,EAAE,IARX;AASEC,IAAAA,IAAI,EAAE,GATR;AAUEC,IAAAA,OAAO,EAAE,QAVX;AAWEC,IAAAA,IAAI,EAAE,SAXR;AAYEC,IAAAA,OAAO,EAAE,QAZX;AAaEC,IAAAA,EAAE,EAAE,QAbN;AAcEC,IAAAA,OAAO,EAAE,MAdX;AAeEC,IAAAA,EAAE,EAAE,QAfN;AAgBEC,IAAAA,EAAE,EAAE,oBAhBN;AAiBEC,IAAAA,IAAI,EAAE;AAjBR;AAJ2B,CAApB","sourcesContent":["export const versionInfo = {\n  buildTime: '2022-05-10T17:01:23Z',\n  commit: '3e0d1a42e042cb5542cbc183d7ae53eec6498254',\n  npmInfo:\n{\n  'solid-ui': '2.4.22',\n  npm: '6.14.16',\n  ares: '1.18.1',\n  brotli: '1.0.9',\n  cldr: '40.0',\n  icu: '70.1',\n  llhttp: '2.1.4',\n  modules: '83',\n  napi: '8',\n  nghttp2: '1.42.0',\n  node: '14.19.1',\n  openssl: '1.1.1n',\n  tz: '2021a3',\n  unicode: '14.0',\n  uv: '1.42.0',\n  v8: '8.4.371.23-node.85',\n  zlib: '1.2.11'\n}\n}\n"],"file":"versionInfo.js"}

package/lib/widgets/forms.js

@@ -591,7 +591,7 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
     // delete button and move buttons
 
     if (kb.updater.editable(dataDoc.uri)) {
-      buttons.deleteButtonWithCheck(dom, subField, utils.label(property), deleteThisItem);
+      buttons.deleteButtonWithCheck(dom, subField, multipleUIlabel, deleteThisItem);
 
       if (ordered) {
         // Add controsl in a frame
@@ -642,7 +642,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);
@@ -691,6 +691,9 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
     return shim;
   }
 
+  var multipleUIlabel = kb.any(form, ui('label'));
+  if (!multipleUIlabel) multipleUIlabel = utils.label(property, true); // Init capital
+
   var min = kb.any(form, ui('min')); // This is the minimum number -- default 0
 
   min = min ? 0 + min.value : 0;
@@ -731,10 +734,9 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
     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 another ' + multipleUIlabel;
+    var prompt = dom.createElement('span');
+    prompt.textContent = (values.length === 0 ? 'Add another ' : 'Add ') + multipleUIlabel;
     tail.addEventListener('click', /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(_eventNotUsed) {
         return _regenerator["default"].wrap(function _callee5$(_context5) {
@@ -756,6 +758,7 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
         return _ref3.apply(this, arguments);
       };
     }(), true);
+    tail.appendChild(prompt);
   }
 
   function createListIfNecessary() {
@@ -1017,28 +1020,40 @@ _fieldFunction.field[ns.ui('Classifier').uri] = function (dom, container, alread
  **
  **  Not nested.  Generates a link to something from a given class.
  **  Optional subform for the thing selected.
+ **  Generates a subForm based on a ui:use form
+ **  Will look like:
+ ** <div id=dropDownDiv>
+ **   <div id=labelOfDropDown>
+ **   <div id=selectDiv>
+ **     <select id=dropDownSelect>
+ **       <option> ....
+ **     <subForm>
  **  Alternative implementatons caould be:
  ** -- pop-up menu (as here)
  ** -- radio buttons
  ** -- auto-complete typing
  **
- ** Todo: Deal with multiple.  Maybe merge with multiple code.
  */
 
 
 _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 uiMultipleInUse = false; // this signals to ui:choice that it is part of a ui:multiple
+
+  var multiSelect = false;
   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'));
 
@@ -1047,9 +1062,9 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
   }
 
   lhs.appendChild((0, _basic.fieldLabel)(dom, property, form));
-  var from = kb.any(form, ui('from'));
+  var uiFrom = kb.any(form, ui('from'));
 
-  if (!from) {
+  if (!uiFrom) {
     return (0, _error.errorMessageBlock)(dom, "No 'from' for Choice: " + form);
   }
 
@@ -1059,26 +1074,35 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
 
   var possible = [];
   var possibleProperties;
-  var nullLabel = '--' + utils.label(property) + '-?';
+  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) {
+    uiMultipleInUse = true;
+    firstSelectOptionText = utils.label(subject, true);
+  }
+
   var opts = {
     form: form,
-    multiple: multiple,
-    nullLabel: nullLabel,
+    subForm: subForm,
+    multiSelect: multiSelect,
+    firstSelectOptionText: firstSelectOptionText,
+    uiMultipleInUse: uiMultipleInUse,
     disambiguate: false
   };
-  possible = kb.each(undefined, ns.rdf('type'), from, formDoc);
+  possible = kb.each(undefined, ns.rdf('type'), uiFrom, formDoc);
 
-  for (var x in kb.findMembersNT(from)) {
+  for (var x in kb.findMembersNT(uiFrom)) {
     possible.push(kb.fromNT(x));
   } // Use rdfs
 
 
-  if (from.sameTerm(ns.rdfs('Class'))) {
+  if (uiFrom.sameTerm(ns.rdfs('Class'))) {
     for (p in buttons.allClassURIs()) {
       possible.push(kb.sym(p));
     } // log.debug("%%% Choice field: possible.length 2 = "+possible.length)
 
-  } else if (from.sameTerm(ns.rdf('Property'))) {
+  } else if (uiFrom.sameTerm(ns.rdf('Property'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.op) {
@@ -1090,7 +1114,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     }
 
     opts.disambiguate = true; // This is a big class, and the labels won't be enough.
-  } else if (from.sameTerm(ns.owl('ObjectProperty'))) {
+  } else if (uiFrom.sameTerm(ns.owl('ObjectProperty'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.op) {
@@ -1098,7 +1122,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     }
 
     opts.disambiguate = true;
-  } else if (from.sameTerm(ns.owl('DatatypeProperty'))) {
+  } else if (uiFrom.sameTerm(ns.owl('DatatypeProperty'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.dp) {
@@ -1108,26 +1132,45 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     opts.disambiguate = true;
   }
 
-  var object = kb.any(subject, property);
+  var sortedPossible = sortByLabel(possible); // TODO: this checks for any occurrence, regardless of true or false setting
 
-  function addSubForm() {
-    object = kb.any(subject, property);
-    (0, _fieldFunction.fieldFunction)(dom, subForm)(dom, rhs, already, object, subForm, follow ? object.doc() : dataDoc, callbackFunction);
+  if (kb.any(form, ui('canMintNew'))) {
+    opts.mint = '* Create new *'; // @@ could be better
   }
 
-  var possible2 = sortByLabel(possible);
+  var selector = makeSelectForOptions(dom, kb, subject, property, sortedPossible, uiFrom, opts, dataDoc, callbackFunction);
+  rhs.appendChild(selector);
+  var object;
 
-  if (kb.any(form, ui('canMintNew'))) {
-    opts.mint = '* New *'; // @@ could be better
+  if (selector.currentURI) {
+    object = $rdf.sym(selector.currentURI);
+  } else {
+    object = kb.any(subject, property);
+  }
 
-    opts.subForm = subForm;
+  if (object && subForm) {
+    removeNextSiblingsAfterElement(selector);
+    addSubFormChoice(dom, rhs, already, object, subForm, follow ? object.doc() : dataDoc, callbackFunction);
   }
 
-  var selector = makeSelectForOptions(dom, kb, subject, property, possible2, opts, dataDoc, callbackFunction);
-  rhs.appendChild(selector);
-  if (object && subForm) addSubForm();
   return box;
-}; //          Documentation - non-interactive fields
+};
+/**
+     * Removes all sibling elements after specified
+     * @param {HTMLElement} currentElement
+     * @private
+  */
+
+
+function removeNextSiblingsAfterElement(currentElement) {
+  while (currentElement.nextElementSibling) {
+    currentElement.nextElementSibling.remove();
+  }
+}
+
+function addSubFormChoice(dom, selectDiv, already, subject, subForm, dataDoc, callbackFunction) {
+  (0, _fieldFunction.fieldFunction)(dom, subForm)(dom, selectDiv, already, subject, subForm, dataDoc, callbackFunction);
+} //          Documentation - non-interactive fields
 //
 
 
@@ -1465,9 +1508,10 @@ function makeDescription(dom, kb, subject, predicate, dataDoc, callbackFunction)
 // @param subject - a term, the subject of the statement(s) being edited.
 // @param predicate - a term, the predicate of the statement(s) being edited
 // @param possible - a list of terms, the possible value the object can take
-// @param options.multiple - Boolean - Whether more than one at a time is allowed
-// @param options.nullLabel - a string to be displayed as the
-//                        option for none selected (for non multiple)
+// @param options.multiSelect - Boolean - Whether more than one at a time is allowed
+// @param options.firstSelectOptionText - a string to be displayed as the
+//                        option for none selected (for non multiSelect)
+// @param options.uiMultipleInUse - signals that the ui:choise is used with a ui:multiple
 // @param options.mint - User may create thing if this sent to the prompt string eg "New foo"
 // @param options.subForm - If mint, then the form to be used for minting the new thing
 // @param dataDoc - The web document being edited
@@ -1475,7 +1519,7 @@ function makeDescription(dom, kb, subject, predicate, dataDoc, callbackFunction)
 */
 
 
-function makeSelectForOptions(dom, kb, subject, predicate, possible, options, dataDoc, callbackFunction) {
+function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, options, dataDoc, callbackFunction) {
   log.debug('Select list length now ' + possible.length);
   var n = 0;
   var uris = {}; // Count them
@@ -1506,7 +1550,9 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
       actual = kb.findTypeURIs(subject);
     } else {
       kb.each(subject, predicate, null, dataDoc).forEach(function (x) {
-        actual[x.uri] = true;
+        if (x.uri) {
+          actual[x.uri] = true;
+        }
       });
     }
 
@@ -1516,8 +1562,6 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
   actual = getActual();
 
   var onChange = function onChange(_e) {
-    select.disabled = true; // until data written back - gives user feedback too
-
     var ds = [];
     var is = [];
 
@@ -1533,6 +1577,7 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
       var opt = select.options[_i];
 
       if (opt.selected && opt.AJAR_mint) {
+        // 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) {
@@ -1547,11 +1592,14 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
           newObject = newThing(dataDoc);
         }
 
-        is.push($rdf.st(subject, predicate, newObject, dataDoc));
+        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 (options.mintStatementsFun) {
           is = is.concat(options.mintStatementsFun(newObject));
         }
+
+        select.currentURI = newObject;
       }
 
       if (!opt.AJAR_uri) continue; // a prompt or mint
@@ -1559,11 +1607,7 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
       if (opt.selected && !(opt.AJAR_uri in actual)) {
         // new class
         is.push($rdf.st(subject, predicate, kb.sym(opt.AJAR_uri), dataDoc));
-      }
-
-      if (!opt.selected && opt.AJAR_uri in actual) {
-        // old class
-        removeValue(kb.sym(opt.AJAR_uri));
+        select.currentURI = opt.AJAR_uri;
       }
 
       if (opt.selected) select.currentURI = opt.AJAR_uri;
@@ -1583,38 +1627,29 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
       sel = sel.superSelect;
     }
 
-    function doneNew(ok, _body) {
-      callbackFunction(ok, {
-        widget: 'select',
-        event: 'new'
-      });
-    }
-
-    log.info('selectForOptions: data doc = ' + dataDoc);
-    kb.updater.update(ds, is, function (uri, ok, body) {
-      actual = getActual(); // refresh
+    log.info('selectForOptions: data doc = ' + dataDoc); // refresh subForm
 
+    removeNextSiblingsAfterElement(select);
+    addSubFormChoice(dom, select.parentNode, {}, $rdf.sym(select.currentURI), options.subForm, dataDoc, function (ok, body) {
       if (ok) {
-        select.disabled = false; // data written back
-
-        if (newObject) {
-          var fn = (0, _fieldFunction.fieldFunction)(dom, options.subForm);
-          fn(dom, select.parentNode, {}, newObject, options.subForm, dataDoc, doneNew);
-        }
+        kb.updater.update(ds, is, function (uri, success, errorBody) {
+          actual = getActual(); // refresh
+
+          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 select: ' + body));
+        select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in field of select: ' + body));
       }
-
-      if (callbackFunction) callbackFunction(ok, {
-        widget: 'select',
-        event: 'change'
-      });
     });
   };
 
   var select = dom.createElement('select');
   select.setAttribute('style', style.formSelectSTyle);
-  if (options.multiple) select.setAttribute('multiple', 'true');
+  if (options.multiSelect) select.setAttribute('multiSelect', 'true');
   select.currentURI = null;
 
   select.refresh = function () {
@@ -1665,11 +1700,14 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
     select.insertBefore(mint, select.firstChild);
   }
 
-  if (select.currentURI == null && !options.multiple) {
+  if (!select.currentURI && options.uiMultipleInUse) {
     var prompt = dom.createElement('option');
-    prompt.appendChild(dom.createTextNode(options.nullLabel));
-    select.insertBefore(prompt, select.firstChild);
+    prompt.appendChild(dom.createTextNode(options.firstSelectOptionText));
+    prompt.disabled = true;
+    prompt.value = true;
+    prompt.hidden = true;
     prompt.selected = true;
+    select.insertBefore(prompt, select.firstChild);
   }
 
   if (editable) {
@@ -1688,11 +1726,11 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
 function makeSelectForCategory(dom, kb, subject, category, dataDoc, callbackFunction) {
   var du = kb.any(category, ns.owl('disjointUnionOf'));
   var subs;
-  var multiple = false;
+  var multiSelect = false;
 
   if (!du) {
     subs = kb.each(undefined, ns.rdfs('subClassOf'), category);
-    multiple = true;
+    multiSelect = true;
   } else {
     subs = du.elements;
   }
@@ -1700,16 +1738,15 @@ function makeSelectForCategory(dom, kb, subject, category, dataDoc, callbackFunc
   log.debug('Select list length ' + subs.length);
 
   if (subs.length === 0) {
-    return (0, _error.errorMessageBlock)(dom, "Can't do " + (multiple ? 'multiple ' : '') + 'selector with no subclasses of category: ' + category);
+    return (0, _error.errorMessageBlock)(dom, "Can't do " + (multiSelect ? 'multiple ' : '') + 'selector with no subclasses of category: ' + category);
   }
 
   if (subs.length === 1) {
-    return (0, _error.errorMessageBlock)(dom, "Can't do " + (multiple ? 'multiple ' : '') + 'selector with only 1 subclass of category: ' + category + ':' + subs[1]);
+    return (0, _error.errorMessageBlock)(dom, "Can't do " + (multiSelect ? 'multiple ' : '') + 'selector with only 1 subclass of category: ' + category + ':' + subs[1]);
   }
 
-  return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, {
-    multiple: multiple,
-    nullPrompt: '--classify--'
+  return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, null, {
+    multiSelect: multiSelect
   }, dataDoc, callbackFunction);
 }
 /** Make SELECT element to select subclasses recurively