solid-ui 2.4.22-349966b9 → 2.4.22-4e7a23dc

package/dist/main.js

@@ -15192,8 +15192,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2022-05-06T16:51:27Z',
-  commit: '349966b98886cdcfb0463cca0a1efec93b1fe247',
+  buildTime: '2022-05-09T08:12:16Z',
+  commit: '4e7a23dcab0793bde0b5d0affdfbbdd8124bd0ea',
   npmInfo: {
     'solid-ui': '2.4.22',
     npm: '6.14.16',
@@ -18120,14 +18120,6 @@ _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
@@ -18158,39 +18150,38 @@ _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'));
+
+  if (!from) {
+    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 nullLabel = '--' + utils.label(property) + '-?';
   var opts = {
     form: form,
-    subForm: subForm,
     multiple: multiple,
-    firstSelectOptionText: firstSelectOptionText,
+    nullLabel: nullLabel,
     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);
+  possible = kb.each(undefined, ns.rdf('type'), from, formDoc);
 
-  for (var x in kb.findMembersNT(uiFrom)) {
+  for (var x in kb.findMembersNT(from)) {
     possible.push(kb.fromNT(x));
   } // Use rdfs
 
 
-  if (uiFrom.sameTerm(ns.rdfs('Class'))) {
+  if (from.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 (uiFrom.sameTerm(ns.rdf('Property'))) {
+  } else if (from.sameTerm(ns.rdf('Property'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.op) {
@@ -18202,7 +18193,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 (uiFrom.sameTerm(ns.owl('ObjectProperty'))) {
+  } else if (from.sameTerm(ns.owl('ObjectProperty'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.op) {
@@ -18210,7 +18201,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     }
 
     opts.disambiguate = true;
-  } else if (uiFrom.sameTerm(ns.owl('DatatypeProperty'))) {
+  } else if (from.sameTerm(ns.owl('DatatypeProperty'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.dp) {
@@ -18220,45 +18211,26 @@ _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
-
-  if (kb.any(form, ui('canMintNew'))) {
-    opts.mint = '* Create new *'; // @@ could be better
-  }
+  var object = kb.any(subject, property);
 
-  var selector = makeSelectForOptions(dom, kb, subject, property, sortedPossible, uiFrom, opts, dataDoc, callbackFunction);
-  rhs.appendChild(selector);
-  var object;
-
-  if (selector.currentURI) {
-    object = $rdf.sym(selector.currentURI);
-  } else {
+  function addSubForm() {
     object = kb.any(subject, property);
+    (0, _fieldFunction.fieldFunction)(dom, subForm)(dom, rhs, already, object, subForm, follow ? object.doc() : dataDoc, callbackFunction);
   }
 
-  if (object && subForm) {
-    removeNextSiblingsAfterElement(selector);
-    addSubFormChoice(dom, rhs, already, object, subForm, follow ? object.doc() : dataDoc, callbackFunction);
-  }
-
-  return box;
-};
-/**
-     * Removes all sibling elements after specified
-     * @param {HTMLElement} currentElement
-     * @private
-  */
+  var possible2 = sortByLabel(possible);
 
+  if (kb.any(form, ui('canMintNew'))) {
+    opts.mint = '* New *'; // @@ could be better
 
-function removeNextSiblingsAfterElement(currentElement) {
-  while (currentElement.nextElementSibling) {
-    currentElement.nextElementSibling.remove();
+    opts.subForm = subForm;
   }
-}
 
-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
+  var selector = makeSelectForOptions(dom, kb, subject, property, possible2, opts, dataDoc, callbackFunction);
+  rhs.appendChild(selector);
+  if (object && subForm) addSubForm();
+  return box;
+}; //          Documentation - non-interactive fields
 //
 
 
@@ -18597,7 +18569,7 @@ function makeDescription(dom, kb, subject, predicate, dataDoc, callbackFunction)
 // @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.firstSelectOptionText - a string to be displayed as the
+// @param options.nullLabel - a string to be displayed as the
 //                        option for none selected (for non 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
@@ -18606,7 +18578,7 @@ function makeDescription(dom, kb, subject, predicate, dataDoc, callbackFunction)
 */
 
 
-function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, options, dataDoc, callbackFunction) {
+function makeSelectForOptions(dom, kb, subject, predicate, possible, options, dataDoc, callbackFunction) {
   log.debug('Select list length now ' + possible.length);
   var n = 0;
   var uris = {}; // Count them
@@ -18637,9 +18609,7 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
       actual = kb.findTypeURIs(subject);
     } else {
       kb.each(subject, predicate, null, dataDoc).forEach(function (x) {
-        if (x.uri) {
-          actual[x.uri] = true;
-        }
+        actual[x.uri] = true;
       });
     }
 
@@ -18649,6 +18619,8 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
   actual = getActual();
 
   var onChange = function onChange(_e) {
+    select.disabled = true; // until data written back - gives user feedback too
+
     var ds = [];
     var is = [];
 
@@ -18664,7 +18636,6 @@ 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
         if (options.mintClass) {
           var thisForm = promptForNew(dom, kb, subject, predicate, options.mintClass, null, dataDoc, function (ok, body) {
             if (!ok) {
@@ -18679,14 +18650,11 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
           newObject = newThing(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
+        is.push($rdf.st(subject, predicate, newObject, dataDoc));
 
         if (options.mintStatementsFun) {
           is = is.concat(options.mintStatementsFun(newObject));
         }
-
-        select.currentURI = newObject;
       }
 
       if (!opt.AJAR_uri) continue; // a prompt or mint
@@ -18694,7 +18662,11 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
       if (opt.selected && !(opt.AJAR_uri in actual)) {
         // new class
         is.push($rdf.st(subject, predicate, kb.sym(opt.AJAR_uri), dataDoc));
-        select.currentURI = opt.AJAR_uri;
+      }
+
+      if (!opt.selected && opt.AJAR_uri in actual) {
+        // old class
+        removeValue(kb.sym(opt.AJAR_uri));
       }
 
       if (opt.selected) select.currentURI = opt.AJAR_uri;
@@ -18714,21 +18686,32 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
       sel = sel.superSelect;
     }
 
-    log.info('selectForOptions: data doc = ' + dataDoc); // refresh subForm
+    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
 
-    removeNextSiblingsAfterElement(select);
-    addSubFormChoice(dom, select.parentNode, {}, $rdf.sym(select.currentURI), options.subForm, dataDoc, function (ok, body) {
       if (ok) {
-        kb.updater.update(ds, is, function (uri, success, errorBody) {
-          actual = getActual(); // refresh
+        select.disabled = false; // data written back
 
-          if (!success) return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in select: ' + errorBody));
-          if (callbackFunction) callbackFunction(success, {
-            widget: 'select',
-            event: 'new'
-          });
-        });
-      } else return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in field of select: ' + body));
+        if (newObject) {
+          var fn = (0, _fieldFunction.fieldFunction)(dom, options.subForm);
+          fn(dom, select.parentNode, {}, newObject, options.subForm, dataDoc, doneNew);
+        }
+      } else {
+        return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in select: ' + body));
+      }
+
+      if (callbackFunction) callbackFunction(ok, {
+        widget: 'select',
+        event: 'change'
+      });
     });
   };
 
@@ -18785,14 +18768,11 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
     select.insertBefore(mint, select.firstChild);
   }
 
-  if (!select.currentURI && !options.multiple) {
+  if (select.currentURI == null && !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.appendChild(dom.createTextNode(options.nullLabel));
     select.insertBefore(prompt, select.firstChild);
+    prompt.selected = true;
   }
 
   if (editable) {
@@ -18830,8 +18810,9 @@ function makeSelectForCategory(dom, kb, subject, category, dataDoc, callbackFunc
     return (0, _error.errorMessageBlock)(dom, "Can't do " + (multiple ? 'multiple ' : '') + 'selector with only 1 subclass of category: ' + category + ':' + subs[1]);
   }
 
-  return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, null, {
-    multiple: multiple
+  return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, {
+    multiple: multiple,
+    nullPrompt: '--classify--'
   }, dataDoc, callbackFunction);
 }
 /** Make SELECT element to select subclasses recurively