@humandialog/forms.svelte 0.5.2 → 0.5.4

package/components/list/list.svelte

@@ -35,8 +35,6 @@ const END_OF_LIST = {};
 let rows = [];
 let activate_after_dom_update = null;
 let inserter;
-let item_key = "";
-let item_type = "";
 clearActiveItem("props");
 let last_tick = -1;
 $:
@@ -51,29 +49,26 @@ function setup(...args) {
     items = item[a];
   if (items == void 0)
     items = [];
-  if (items.length > 0) {
-    let first_element = items[0];
-    let keys = Object.keys(first_element);
-    if (key)
-      item_key = key;
-    else if (keys.includes("Id"))
-      item_key = "Id";
-    else if (keys.includes("$ref"))
-      item_key = "$ref";
-    else if (keys.length > 0)
-      item_key = keys[0];
-    else
-      item_key = "";
-  }
   if (!typename)
     typename = $contextTypesStore[ctx];
 }
+function getItemKey(item2) {
+  if (key)
+    return item2[key];
+  else if (item2.Id)
+    return item2.Id;
+  else if (item2.$ref)
+    return item2.$ref;
+  else
+    return 0;
+}
 afterUpdate(() => {
   if (activate_after_dom_update) {
     let row_to_activate_idx = items.findIndex((e) => e == activate_after_dom_update);
     activate_after_dom_update = null;
     if (row_to_activate_idx >= 0) {
-      rows[row_to_activate_idx].activate();
+      let row = rows[row_to_activate_idx];
+      row?.activate();
     }
   }
 });
@@ -94,14 +89,14 @@ export function reload(data, selectElement = KEEP_SELECTION) {
     case SELECT_PREVIOUS:
       if (currentSelectedItem) {
         const selectedItemIdx = items?.findIndex((e) => e == currentSelectedItem);
-        if (selectedItemIdx && selectedItemIdx > 0)
+        if (selectedItemIdx != void 0 && selectedItemIdx > 0)
           selectElementId = items[selectedItemIdx - 1].Id ?? 0;
       }
       break;
     case SELECT_NEXT:
       if (currentSelectedItem) {
         const selectedItemIdx = items?.findIndex((e) => e == currentSelectedItem);
-        if (selectedItemIdx && selectedItemIdx < items.length - 1)
+        if (selectedItemIdx != void 0 && selectedItemIdx >= 0 && selectedItemIdx < items.length - 1)
           selectElementId = items[selectedItemIdx + 1].Id ?? 0;
       }
       break;
@@ -110,7 +105,7 @@ export function reload(data, selectElement = KEEP_SELECTION) {
         selectElementId = currentSelectedItem.Id ?? 0;
         if (currentSelectedItem) {
           const selectedItemIdx = items?.findIndex((e) => e == currentSelectedItem);
-          if (selectedItemIdx && selectedItemIdx < items.length - 1)
+          if (selectedItemIdx != void 0 && selectedItemIdx >= 0 && selectedItemIdx < items.length - 1)
             altSelectElementId = items[selectedItemIdx + 1].Id ?? 0;
         }
       }
@@ -207,7 +202,6 @@ export function edit(element, property_name) {
   rows[editing_idx].editProperty(property_name);
 }
 function reorderElements(items2, from = null) {
-  console.log(from);
   let fromIdx;
   let fromOrder;
   if (from) {
@@ -217,11 +211,9 @@ function reorderElements(items2, from = null) {
     fromOrder = MIN_ORDER;
     fromIdx = 0;
   }
-  console.log("reorder: ", fromOrder, fromIdx, items2);
   let order = fromOrder;
   for (let i = fromIdx; i < items2.length; i++) {
     let el = items2[i];
-    console.log("reoder el: ", el, order, i);
     el[orderAttrib] = order;
     informModification(el, orderAttrib);
     order += ORDER_STEP;
@@ -255,15 +247,16 @@ async function insert(title2, after) {
     } else
       newElement[orderAttrib] = MIN_ORDER;
   }
+  await definition.onInsert(newElement);
+  return;
   let insertedElement = await definition.onInsert(newElement);
   if (!insertedElement)
     return;
   if (after)
-    insertAfter(items, after, insertedElement);
+    items = insertAfter(items, after, insertedElement);
   else
-    items.push(insertedElement);
+    items = [...items, insertedElement];
   activate_after_dom_update = insertedElement;
-  rereder();
 }
 </script>
 
@@ -277,8 +270,8 @@ async function insert(title2, after) {
 
 <!--div class="w-full h-full overflow-y-auto"-->
 
-{#if items && items.length > 0 && !!item_key }
-    {#each items as element, i (element[item_key])}
+{#if items && items.length > 0 }
+    {#each items as element, i (getItemKey(element))}
         
         <List_element   item={element} 
                         {toolbarOperations}

package/components/sidebar/sidebar.list.svelte

@@ -55,7 +55,9 @@ function onNewElement(text) {
 </script>
 
 {#each objects as item (item.Id)}
-    <slot {item}/>
+    {#key item}             <!-- Forces to fully rerender when item changed to fire use: callbacks again -->
+        <slot {item}/>
+    {/key}
 {/each }
 
 {#if inserter}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@humandialog/forms.svelte",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Basic Svelte UI components for Object Reef applications",
   "devDependencies": {
     "@playwright/test": "^1.28.1",