solid-ui 2.4.22-34747cd0 → 2.4.22-b44c9cf2

package/dist/main.js

@@ -15192,8 +15192,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2022-05-02T13:37:35Z',
-  commit: '34747cd0e7be84514d29e13b42586ebe4442e1f0',
+  buildTime: '2022-05-06T08:22:55Z',
+  commit: 'b44c9cf2e68393ba76311294f65964fdb45d2dd9',
   npmInfo: {
     'solid-ui': '2.4.22',
     npm: '6.14.16',
@@ -18120,6 +18120,14 @@ _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
@@ -18162,11 +18170,12 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
 
   var possible = [];
   var possibleProperties;
-  var nullLabel = '--' + utils.label(property) + '-?';
+  var firstSelectOptionText = '* Select from ' + utils.label(subject, true) + ' *';
   var opts = {
     form: form,
+    subForm: subForm,
     multiple: multiple,
-    nullLabel: nullLabel,
+    firstSelectOptionText: firstSelectOptionText,
     disambiguate: false
   };
   possible = kb.each(undefined, ns.rdf('type'), from, formDoc);
@@ -18211,26 +18220,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 occurance regardles if it is set to true or false
 
-  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, 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);
+    addSubFormDropDown(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 addSubFormDropDown(dom, selectDiv, already, subject, subForm, dataDoc, callbackFunction) {
+  (0, _fieldFunction.fieldFunction)(dom, subForm)(dom, selectDiv, already, subject, subForm, dataDoc, callbackFunction);
+} //          Documentation - non-interactive fields
 //
 
 
@@ -18569,7 +18597,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.nullLabel - a string to be displayed as the
+// @param options.firstSelectOptionText - 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
@@ -18609,7 +18637,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;
+        }
       });
     }
 
@@ -18636,25 +18666,9 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
       var opt = select.options[_i];
 
       if (opt.selected && opt.AJAR_mint) {
-        if (options.mintClass) {
-          var thisForm = promptForNew(dom, kb, subject, predicate, options.mintClass, null, dataDoc, function (ok, body) {
-            if (!ok) {
-              callbackFunction(ok, body, {
-                change: 'new'
-              }); // @@ if ok, need some form of refresh of the select for the new thing
-            }
-          });
-          select.parentNode.appendChild(thisForm);
-          newObject = thisForm.AJAR_subject;
-        } else {
-          newObject = newThing(dataDoc);
-        }
-
-        is.push($rdf.st(subject, predicate, newObject, dataDoc));
-
-        if (options.mintStatementsFun) {
-          is = is.concat(options.mintStatementsFun(newObject));
-        }
+        newObject = newThing(dataDoc);
+        removeNextSiblingsAfterElement(select);
+        addSubFormDropDown(dom, select.parentNode, {}, $rdf.sym(newObject), options.subForm, dataDoc, callbackFunction);
       }
 
       if (!opt.AJAR_uri) continue; // a prompt or mint
@@ -18664,11 +18678,6 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
         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));
-      }
-
       if (opt.selected) select.currentURI = opt.AJAR_uri;
     }
 
@@ -18694,16 +18703,18 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
     }
 
     log.info('selectForOptions: data doc = ' + dataDoc);
+    removeNextSiblingsAfterElement(select);
+    addSubFormDropDown(dom, select.parentNode, {}, $rdf.sym(select.currentURI), options.subForm, dataDoc, callbackFunction);
     kb.updater.update(ds, is, function (uri, ok, body) {
       actual = getActual(); // refresh
 
       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);
+          removeNextSiblingsAfterElement(select);
+          addSubFormDropDown(dom, select.parentNode, {}, newObject, options.subForm, dataDoc, doneNew);
         }
+
+        select.disabled = false; // data written back
       } else {
         return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in select: ' + body));
       }
@@ -18768,11 +18779,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.multiple) {
     var prompt = dom.createElement('option');
-    prompt.appendChild(dom.createTextNode(options.nullLabel));
-    select.insertBefore(prompt, select.firstChild);
+    prompt.appendChild(dom.createTextNode(options.firstSelectOptionText));
     prompt.selected = true;
+    prompt.disabled = true;
+    prompt.value = true;
+    prompt.hidden = true;
+    select.insertBefore(prompt, select.firstChild);
   }
 
   if (editable) {
@@ -18811,8 +18825,7 @@ function makeSelectForCategory(dom, kb, subject, category, dataDoc, callbackFunc
   }
 
   return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, {
-    multiple: multiple,
-    nullPrompt: '--classify--'
+    multiple: multiple
   }, dataDoc, callbackFunction);
 }
 /** Make SELECT element to select subclasses recurively