@iankibetsh/shframework 4.4.4 → 4.4.6

package/dist/library.js

@@ -3697,7 +3697,7 @@ var script$j = {
   'files',
   'phones',
   'numbers',
-  'customComponent','modalTitle','class','successMessage'],
+  'customComponent','modalTitle','class','successMessage', 'modalId'],
   emits: ['success','fieldChanged','formSubmitted','formError','modalId'],
   setup(__props, { emit: __emit }) {
 
@@ -3705,12 +3705,12 @@ const props = __props;
 const emit = __emit;
 vue.ref(props);
 let btnClass=props.class;
-const modalId = 'rand' + (Math.random() + 1).toString(36).substring(2);
+const realModalId = props.modalId ?? 'rand' + (Math.random() + 1).toString(36).substring(2);
 const success = (res)=>{
   emit('success',res);
 };
 vue.onMounted(()=>{
-  emit('modalId',modalId);
+  emit('modalId',realModalId);
 });
 
 const fieldChanged = (field, value)=>{
@@ -3729,25 +3729,26 @@ return (_ctx, _cache) => {
   return (vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
     vue.createElementVNode("a", {
       class: vue.normalizeClass(vue.unref(btnClass)),
-      href: '#' + modalId,
+      href: '#' + vue.unref(realModalId),
       "data-bs-toggle": "modal"
     }, [
       vue.renderSlot(_ctx.$slots, "default")
     ], 10 /* CLASS, PROPS */, _hoisted_1$g),
     vue.createVNode(script$k, {
-      "modal-id": modalId,
+      "modal-id": vue.unref(realModalId),
       "modal-title": __props.modalTitle
     }, {
       default: vue.withCtx(() => [
-        vue.createVNode(script$m, vue.mergeProps({
+        (vue.openBlock(), vue.createBlock(script$m, vue.mergeProps({
           onSuccess: success,
           onFieldChanged: fieldChanged,
           onFormSubmitted: formSubmitted,
-          onFormError: formError
-        }, props), null, 16 /* FULL_PROPS */)
+          onFormError: formError,
+          key: JSON.stringify(__props.currentData ?? {})
+        }, props), null, 16 /* FULL_PROPS */))
       ]),
       _: 1 /* STABLE */
-    }, 8 /* PROPS */, ["modal-title"])
+    }, 8 /* PROPS */, ["modal-id", "modal-title"])
   ], 64 /* STABLE_FRAGMENT */))
 }
 }
@@ -4609,16 +4610,16 @@ const _hoisted_7$2 = {
   class: "row"
 };
 const _hoisted_8$2 = { class: "col-12 mb-3 d-flex justify-content-start" };
-const _hoisted_9$2 = {
+const _hoisted_9$2 = ["placeholder"];
+const _hoisted_10$1 = {
   key: 0,
-  class: "sh-range-selector"
+  class: "input-group-text exact_checkbox"
 };
-const _hoisted_10$1 = ["placeholder"];
-const _hoisted_11$1 = {
+const _hoisted_11$1 = /*#__PURE__*/vue.createElementVNode("span", { class: "ms-1" }, "Exact", -1 /* HOISTED */);
+const _hoisted_12$1 = {
   key: 0,
-  class: "input-group-text exact_checkbox"
+  class: "sh-range-selector"
 };
-const _hoisted_12$1 = /*#__PURE__*/vue.createElementVNode("span", { class: "ms-1" }, "Exact", -1 /* HOISTED */);
 const _hoisted_13$1 = {
   key: 0,
   class: "text-center"
@@ -5101,11 +5102,6 @@ return (_ctx, _cache) => {
     (!__props.hideSearch)
       ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7$2, [
           vue.createElementVNode("div", _hoisted_8$2, [
-            (__props.hasRange)
-              ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9$2, [
-                  vue.createVNode(script$c, { onRangeSelected: _ctx.rangeChanged }, null, 8 /* PROPS */, ["onRangeSelected"])
-                ]))
-              : vue.createCommentVNode("v-if", true),
             vue.createElementVNode("div", {
               class: vue.normalizeClass(["sh-search-bar input-group", __props.hasRange ? 'ms-2':''])
             }, [
@@ -5117,11 +5113,11 @@ return (_ctx, _cache) => {
                 "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => ((_ctx.filter_value) = $event)),
                 placeholder: __props.searchPlaceholder ? __props.searchPlaceholder : 'Search',
                 class: "form-control sh-search-input"
-              }, null, 40 /* PROPS, NEED_HYDRATION */, _hoisted_10$1), [
+              }, null, 40 /* PROPS, NEED_HYDRATION */, _hoisted_9$2), [
                 [vue.vModelText, _ctx.filter_value]
               ]),
               (_ctx.filter_value.length > 1)
-                ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_11$1, [
+                ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_10$1, [
                     vue.withDirectives(vue.createElementVNode("input", {
                       onChange: _cache[5] || (_cache[5] = (...args) => (_ctx.reloadData && _ctx.reloadData(...args))),
                       value: true,
@@ -5130,10 +5126,15 @@ return (_ctx, _cache) => {
                     }, null, 544 /* NEED_HYDRATION, NEED_PATCH */), [
                       [vue.vModelCheckbox, _ctx.exactMatch]
                     ]),
-                    _hoisted_12$1
+                    _hoisted_11$1
                   ]))
                 : vue.createCommentVNode("v-if", true)
-            ], 2 /* CLASS */)
+            ], 2 /* CLASS */),
+            (__props.hasRange)
+              ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_12$1, [
+                  vue.createVNode(script$c, { onRangeSelected: _ctx.rangeChanged }, null, 8 /* PROPS */, ["onRangeSelected"])
+                ]))
+              : vue.createCommentVNode("v-if", true)
           ])
         ]))
       : vue.createCommentVNode("v-if", true),

package/dist/library.mjs

@@ -3685,7 +3685,7 @@ var script$j = {
   'files',
   'phones',
   'numbers',
-  'customComponent','modalTitle','class','successMessage'],
+  'customComponent','modalTitle','class','successMessage', 'modalId'],
   emits: ['success','fieldChanged','formSubmitted','formError','modalId'],
   setup(__props, { emit: __emit }) {
 
@@ -3693,12 +3693,12 @@ const props = __props;
 const emit = __emit;
 ref(props);
 let btnClass=props.class;
-const modalId = 'rand' + (Math.random() + 1).toString(36).substring(2);
+const realModalId = props.modalId ?? 'rand' + (Math.random() + 1).toString(36).substring(2);
 const success = (res)=>{
   emit('success',res);
 };
 onMounted(()=>{
-  emit('modalId',modalId);
+  emit('modalId',realModalId);
 });
 
 const fieldChanged = (field, value)=>{
@@ -3717,25 +3717,26 @@ return (_ctx, _cache) => {
   return (openBlock(), createElementBlock(Fragment, null, [
     createElementVNode("a", {
       class: normalizeClass(unref(btnClass)),
-      href: '#' + modalId,
+      href: '#' + unref(realModalId),
       "data-bs-toggle": "modal"
     }, [
       renderSlot(_ctx.$slots, "default")
     ], 10 /* CLASS, PROPS */, _hoisted_1$g),
     createVNode(script$k, {
-      "modal-id": modalId,
+      "modal-id": unref(realModalId),
       "modal-title": __props.modalTitle
     }, {
       default: withCtx(() => [
-        createVNode(script$m, mergeProps({
+        (openBlock(), createBlock(script$m, mergeProps({
           onSuccess: success,
           onFieldChanged: fieldChanged,
           onFormSubmitted: formSubmitted,
-          onFormError: formError
-        }, props), null, 16 /* FULL_PROPS */)
+          onFormError: formError,
+          key: JSON.stringify(__props.currentData ?? {})
+        }, props), null, 16 /* FULL_PROPS */))
       ]),
       _: 1 /* STABLE */
-    }, 8 /* PROPS */, ["modal-title"])
+    }, 8 /* PROPS */, ["modal-id", "modal-title"])
   ], 64 /* STABLE_FRAGMENT */))
 }
 }
@@ -4597,16 +4598,16 @@ const _hoisted_7$2 = {
   class: "row"
 };
 const _hoisted_8$2 = { class: "col-12 mb-3 d-flex justify-content-start" };
-const _hoisted_9$2 = {
+const _hoisted_9$2 = ["placeholder"];
+const _hoisted_10$1 = {
   key: 0,
-  class: "sh-range-selector"
+  class: "input-group-text exact_checkbox"
 };
-const _hoisted_10$1 = ["placeholder"];
-const _hoisted_11$1 = {
+const _hoisted_11$1 = /*#__PURE__*/createElementVNode("span", { class: "ms-1" }, "Exact", -1 /* HOISTED */);
+const _hoisted_12$1 = {
   key: 0,
-  class: "input-group-text exact_checkbox"
+  class: "sh-range-selector"
 };
-const _hoisted_12$1 = /*#__PURE__*/createElementVNode("span", { class: "ms-1" }, "Exact", -1 /* HOISTED */);
 const _hoisted_13$1 = {
   key: 0,
   class: "text-center"
@@ -5089,11 +5090,6 @@ return (_ctx, _cache) => {
     (!__props.hideSearch)
       ? (openBlock(), createElementBlock("div", _hoisted_7$2, [
           createElementVNode("div", _hoisted_8$2, [
-            (__props.hasRange)
-              ? (openBlock(), createElementBlock("div", _hoisted_9$2, [
-                  createVNode(script$c, { onRangeSelected: _ctx.rangeChanged }, null, 8 /* PROPS */, ["onRangeSelected"])
-                ]))
-              : createCommentVNode("v-if", true),
             createElementVNode("div", {
               class: normalizeClass(["sh-search-bar input-group", __props.hasRange ? 'ms-2':''])
             }, [
@@ -5105,11 +5101,11 @@ return (_ctx, _cache) => {
                 "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => ((_ctx.filter_value) = $event)),
                 placeholder: __props.searchPlaceholder ? __props.searchPlaceholder : 'Search',
                 class: "form-control sh-search-input"
-              }, null, 40 /* PROPS, NEED_HYDRATION */, _hoisted_10$1), [
+              }, null, 40 /* PROPS, NEED_HYDRATION */, _hoisted_9$2), [
                 [vModelText, _ctx.filter_value]
               ]),
               (_ctx.filter_value.length > 1)
-                ? (openBlock(), createElementBlock("span", _hoisted_11$1, [
+                ? (openBlock(), createElementBlock("span", _hoisted_10$1, [
                     withDirectives(createElementVNode("input", {
                       onChange: _cache[5] || (_cache[5] = (...args) => (_ctx.reloadData && _ctx.reloadData(...args))),
                       value: true,
@@ -5118,10 +5114,15 @@ return (_ctx, _cache) => {
                     }, null, 544 /* NEED_HYDRATION, NEED_PATCH */), [
                       [vModelCheckbox, _ctx.exactMatch]
                     ]),
-                    _hoisted_12$1
+                    _hoisted_11$1
                   ]))
                 : createCommentVNode("v-if", true)
-            ], 2 /* CLASS */)
+            ], 2 /* CLASS */),
+            (__props.hasRange)
+              ? (openBlock(), createElementBlock("div", _hoisted_12$1, [
+                  createVNode(script$c, { onRangeSelected: _ctx.rangeChanged }, null, 8 /* PROPS */, ["onRangeSelected"])
+                ]))
+              : createCommentVNode("v-if", true)
           ])
         ]))
       : createCommentVNode("v-if", true),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iankibetsh/shframework",
-  "version": "4.4.4",
+  "version": "4.4.6",
   "description": "Vue library for handling laravel backend",
   "main": "dist/library.js",
   "module": "dist/library.mjs",