@vc-shell/framework 1.0.166 → 1.0.168

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.166",
+  "version": "1.0.168",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -53,9 +53,9 @@
     "whatwg-fetch": "^3.6.19"
   },
   "devDependencies": {
-    "@vc-shell/api-client-generator": "^1.0.166",
-    "@vc-shell/config-generator": "^1.0.166",
-    "@vc-shell/ts-config": "^1.0.166",
+    "@vc-shell/api-client-generator": "^1.0.168",
+    "@vc-shell/config-generator": "^1.0.168",
+    "@vc-shell/ts-config": "^1.0.168",
     "@vitejs/plugin-vue": "^5.0.3",
     "sass": "^1.69.6",
     "typescript": "^5.3.3",

package/shared/modules/dynamic/components/fields/Card.ts

@@ -13,7 +13,6 @@ import { CardCollection } from "../factories";
 import componentProps from "./props";
 import { CardSchema } from "../../types";
 import { nodeBuilder } from "../../helpers/nodeBuilder";
-import * as _ from "lodash-es";
 import { unrefNested } from "../../helpers/unrefNested";
 
 export default {
@@ -32,24 +31,31 @@ export default {
 
     const hasNoCommentNodes = (components: (VNodeChild | VNodeNormalizedChildren)[]): boolean => {
       const vnodeIterable = Array.isArray(components) ? components : [components];
-      return _.every(vnodeIterable, (component) => {
-        if (Array.isArray(component) && component.length > 0) {
-          return hasNoCommentNodes(component);
-        }
+      const commentCounter = ref(0);
 
-        if (component && typeof component === "object" && !Array.isArray(component)) {
+      for (const component of vnodeIterable) {
+        if (Array.isArray(component) && component.length > 0) {
+          if (!hasNoCommentNodes(component)) {
+            commentCounter.value++;
+            break;
+          }
+        } else if (component && typeof component === "object" && !Array.isArray(component)) {
           if (Array.isArray(component.children) && component.children.length > 0) {
             // Recursive check for nested components
-            return hasNoCommentNodes(component.children);
+            if (!hasNoCommentNodes(component.children)) {
+              commentCounter.value++;
+              break;
+            }
           }
 
           if (component.el && (component.el as HTMLElement).nodeType === 8) {
-            return false;
+            commentCounter.value++;
+            break;
           }
         }
+      }
 
-        return true;
-      });
+      return commentCounter.value !== vnodeIterable.length;
     };
 
     return () => {

package/ui/components/molecules/vc-select/vc-select.vue

@@ -514,7 +514,7 @@ const defaultValue = ref<Option[]>([]) as Ref<Option[]>;
 
 const optionsList = ref<Option[]>([]) as Ref<Option[]>;
 
-// const optionsList = ref<Option[]>([]) as Ref<Option[]>;
+const optionsTemp = ref<Option[]>([]) as Ref<Option[]>;
 
 const totalItems = ref();
 
@@ -600,16 +600,10 @@ watch(
     } else if (props.options && Array.isArray(props.options)) {
       optionsList.value = props.options as Option[];
     }
-  },
-  { immediate: true },
-);
 
-watch(
-  () => optionsList.value,
-  (newVal) => {
-    optionsList.value = newVal;
+    optionsTemp.value = optionsList.value;
   },
-  { immediate: true, deep: true },
+  { immediate: true },
 );
 
 watch(
@@ -626,8 +620,10 @@ async function onLoadMore() {
     try {
       listLoading.value = true;
       const data = await props.options(filterString.value, optionsList.value.length);
-      optionsList.value.push(...(data.results as Option[]));
+      optionsList.value = _.unionBy<Option>(optionsList.value, data.results as Option[], "id");
+
       totalItems.value = data.totalCount;
+      optionsTemp.value = optionsList.value;
     } finally {
       listLoading.value = false;
     }
@@ -766,6 +762,7 @@ const onDropdownClose = async () => {
   } else {
     optionsList.value = props.options as Option[];
   }
+  optionsTemp.value = optionsList.value;
 
   filterString.value = undefined;
 };
@@ -828,7 +825,8 @@ function toggleOption(opt: Option) {
     if (innerValue.value.length === 0 || _.isEqual(getOptionValue.value(innerValue.value[0]), optValue) !== true) {
       emit("update:modelValue", props.emitValue === true ? optValue : opt);
     }
-    isOpened.value = false;
+
+    closeDropdown();
     return;
   }
 
@@ -860,14 +858,16 @@ async function onSearch(value: string) {
   if (props.options && typeof props.options === "function") {
     try {
       listLoading.value = true;
+
       const data = await props.options(filterString.value);
+
       optionsList.value = data.results as Option[];
       totalItems.value = data.totalCount;
     } finally {
       listLoading.value = false;
     }
   } else {
-    optionsList.value = optionsList.value.filter((x: Option) => {
+    optionsList.value = optionsTemp.value.filter((x: Option) => {
       return (x[props.optionLabel as keyof Option] as string).toLowerCase().includes(filterString.value.toLowerCase());
     });
   }