@iankibetsh/shframework 4.4.3 → 4.4.5

package/dist/dist/library.mjs.css

@@ -1,4 +1,36 @@
 
+.sh-phone{
+  display: flex;
+  width: 100%;
+  align-items: center;
+  padding: 0 0.25rem;
+}
+.phone-country{
+  width: 2rem;
+  border: none;
+  align-self: center;
+  outline: none !important;
+  padding: 0.4rem;
+  border-right: 1px solid #0003;
+}
+.phone-number{
+  width: calc(100% - 2.2rem);
+  border: none;
+  align-self: center;
+  outline: none;
+  margin-bottom: 0;
+  padding: 0.4rem;
+}
+.sh-phone img{
+  padding: 0.125rem;
+  width: 2rem;
+  height: 2rem;
+}
+.phone-number::placeholder{
+  font-weight: 300;
+  opacity: 0.5;
+}
+
 .colored-toast.swal2-icon-success {
   background-color: #a5dc86 !important;
 }
@@ -63,38 +95,6 @@
   flex-grow: 1;
 }
 
-.sh-phone{
-  display: flex;
-  width: 100%;
-  align-items: center;
-  padding: 0 0.25rem;
-}
-.phone-country{
-  width: 2rem;
-  border: none;
-  align-self: center;
-  outline: none !important;
-  padding: 0.4rem;
-  border-right: 1px solid #0003;
-}
-.phone-number{
-  width: calc(100% - 2.2rem);
-  border: none;
-  align-self: center;
-  outline: none;
-  margin-bottom: 0;
-  padding: 0.4rem;
-}
-.sh-phone img{
-  padding: 0.125rem;
-  width: 2rem;
-  height: 2rem;
-}
-.phone-number::placeholder{
-  font-weight: 300;
-  opacity: 0.5;
-}
-
 .sh-selected-item{
   line-height: unset!important;
 }

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 */))
 }
 }
@@ -4900,7 +4901,16 @@ const __default__ = {
     },
     replaceLinkUrl: function (path, obj){
       if (typeof path === 'object') {
-        path = path.link ?? path.url;
+       // check path,link or url
+        if (path.link) {
+          path = path.link;
+        } else if (path.url) {
+          path = path.url;
+        } else if(path.path){
+          path = path.path;
+        } else {
+          path = '';
+        }
       }
       var matches = path.match(/\{(.*?)\}/g);
       matches && matches.forEach(key => {

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 */))
 }
 }
@@ -4888,7 +4889,16 @@ const __default__ = {
     },
     replaceLinkUrl: function (path, obj){
       if (typeof path === 'object') {
-        path = path.link ?? path.url;
+       // check path,link or url
+        if (path.link) {
+          path = path.link;
+        } else if (path.url) {
+          path = path.url;
+        } else if(path.path){
+          path = path.path;
+        } else {
+          path = '';
+        }
       }
       var matches = path.match(/\{(.*?)\}/g);
       matches && matches.forEach(key => {

package/package.json

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