@karta.io/utils 1.0.0-alpha.19 → 1.0.0-alpha.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -838,6 +838,35 @@ function useDialog() {
838
838
  } = useGlobalScroll();
839
839
  const route = vueRouter.useRoute();
840
840
  const router = vueRouter.useRouter();
841
+ const HASH_PREFIX = "#ud_";
842
+ const parseHash = (hash, componentName) => {
843
+ if (!hash)
844
+ return void 0;
845
+ if (!hash.includes(HASH_PREFIX))
846
+ return void 0;
847
+ let dataFromHash;
848
+ try {
849
+ dataFromHash = JSON.parse(window.atob(hash.slice(HASH_PREFIX.length)));
850
+ } catch (error) {
851
+ logger.warn("*parseHash* cant parse hash");
852
+ }
853
+ if (typeof dataFromHash !== "object")
854
+ return void 0;
855
+ if (!dataFromHash.name) {
856
+ logger.warn("*parseHash* cant find component name in hash");
857
+ return void 0;
858
+ }
859
+ if (dataFromHash.name !== componentName)
860
+ return void 0;
861
+ return dataFromHash;
862
+ };
863
+ const clearHash = () => {
864
+ router.push({
865
+ name: route.name || void 0,
866
+ query: route.query,
867
+ hash: void 0
868
+ });
869
+ };
841
870
  vue.onMounted(() => {
842
871
  appContext = vue.getCurrentInstance()?.appContext;
843
872
  });
@@ -863,6 +892,11 @@ function useDialog() {
863
892
  vnode2.props["onUpdate:modelValue"] = (value) => {
864
893
  if (vnode2 && vnode2.component) {
865
894
  vnode2.component.props.modelValue = value;
895
+ if (!value && route.hash) {
896
+ const dataFromHash = parseHash(route.hash, component.name);
897
+ if (dataFromHash)
898
+ clearHash();
899
+ }
866
900
  if (!value && (dialogs.length === 1 || layer === 0) && isGlobalScrollLocked.value) {
867
901
  unlockGlobalScroll();
868
902
  }
@@ -870,9 +904,14 @@ function useDialog() {
870
904
  };
871
905
  }
872
906
  vnode2.close = () => {
873
- if (vnode2 && vnode2.component) {
874
- vnode2.component.props.modelValue = false;
875
- }
907
+ if (!vnode2 || !vnode2.component)
908
+ return;
909
+ vnode2.component.props.modelValue = false;
910
+ if (!route.hash)
911
+ return;
912
+ const dataFromHash = parseHash(route.hash, component.name);
913
+ if (dataFromHash)
914
+ clearHash();
876
915
  };
877
916
  vnode2.props.onDestroy = () => {
878
917
  vue.render(null, el2);
@@ -967,7 +1006,7 @@ function useDialog() {
967
1006
  router.push({
968
1007
  name: route.name || void 0,
969
1008
  query: route.query,
970
- hash: `#${window.btoa(JSON.stringify(data))}`
1009
+ hash: `${HASH_PREFIX}${window.btoa(JSON.stringify(data))}`
971
1010
  });
972
1011
  };
973
1012
  const watchHash = ({
@@ -979,22 +1018,13 @@ function useDialog() {
979
1018
  () => route.hash,
980
1019
  async (newHash) => {
981
1020
  if (!newHash) {
1021
+ if (!dialogs.length)
1022
+ return;
982
1023
  closeAll();
983
1024
  return;
984
1025
  }
985
- let dataFromHash;
986
- try {
987
- dataFromHash = JSON.parse(window.atob(newHash.slice(1)));
988
- } catch (error) {
989
- logger.error("*watchHash* cant parse hash");
990
- }
991
- if (typeof dataFromHash !== "object")
992
- return;
993
- if (!dataFromHash.name) {
994
- logger.error("*watchHash* cant find component name in hash");
995
- return;
996
- }
997
- if (dataFromHash.name !== component.name)
1026
+ const dataFromHash = parseHash(newHash, component.name);
1027
+ if (!dataFromHash)
998
1028
  return;
999
1029
  logger.info("*watchHash* data from hash", dataFromHash);
1000
1030
  await vue.nextTick();
@@ -1002,15 +1032,6 @@ function useDialog() {
1002
1032
  component,
1003
1033
  layer: dataFromHash.layer || 0,
1004
1034
  props: {
1005
- "onUpdate:modelValue": (value) => {
1006
- if (value)
1007
- return;
1008
- router.push({
1009
- name: route.name || void 0,
1010
- query: route.query,
1011
- hash: void 0
1012
- });
1013
- },
1014
1035
  ...dataFromHash.props,
1015
1036
  ...events
1016
1037
  }
package/dist/index.mjs CHANGED
@@ -820,6 +820,35 @@ function useDialog() {
820
820
  } = useGlobalScroll();
821
821
  const route = useRoute();
822
822
  const router = useRouter();
823
+ const HASH_PREFIX = "#ud_";
824
+ const parseHash = (hash, componentName) => {
825
+ if (!hash)
826
+ return void 0;
827
+ if (!hash.includes(HASH_PREFIX))
828
+ return void 0;
829
+ let dataFromHash;
830
+ try {
831
+ dataFromHash = JSON.parse(window.atob(hash.slice(HASH_PREFIX.length)));
832
+ } catch (error) {
833
+ logger.warn("*parseHash* cant parse hash");
834
+ }
835
+ if (typeof dataFromHash !== "object")
836
+ return void 0;
837
+ if (!dataFromHash.name) {
838
+ logger.warn("*parseHash* cant find component name in hash");
839
+ return void 0;
840
+ }
841
+ if (dataFromHash.name !== componentName)
842
+ return void 0;
843
+ return dataFromHash;
844
+ };
845
+ const clearHash = () => {
846
+ router.push({
847
+ name: route.name || void 0,
848
+ query: route.query,
849
+ hash: void 0
850
+ });
851
+ };
823
852
  onMounted(() => {
824
853
  appContext = getCurrentInstance()?.appContext;
825
854
  });
@@ -845,6 +874,11 @@ function useDialog() {
845
874
  vnode2.props["onUpdate:modelValue"] = (value) => {
846
875
  if (vnode2 && vnode2.component) {
847
876
  vnode2.component.props.modelValue = value;
877
+ if (!value && route.hash) {
878
+ const dataFromHash = parseHash(route.hash, component.name);
879
+ if (dataFromHash)
880
+ clearHash();
881
+ }
848
882
  if (!value && (dialogs.length === 1 || layer === 0) && isGlobalScrollLocked.value) {
849
883
  unlockGlobalScroll();
850
884
  }
@@ -852,9 +886,14 @@ function useDialog() {
852
886
  };
853
887
  }
854
888
  vnode2.close = () => {
855
- if (vnode2 && vnode2.component) {
856
- vnode2.component.props.modelValue = false;
857
- }
889
+ if (!vnode2 || !vnode2.component)
890
+ return;
891
+ vnode2.component.props.modelValue = false;
892
+ if (!route.hash)
893
+ return;
894
+ const dataFromHash = parseHash(route.hash, component.name);
895
+ if (dataFromHash)
896
+ clearHash();
858
897
  };
859
898
  vnode2.props.onDestroy = () => {
860
899
  render(null, el2);
@@ -949,7 +988,7 @@ function useDialog() {
949
988
  router.push({
950
989
  name: route.name || void 0,
951
990
  query: route.query,
952
- hash: `#${window.btoa(JSON.stringify(data))}`
991
+ hash: `${HASH_PREFIX}${window.btoa(JSON.stringify(data))}`
953
992
  });
954
993
  };
955
994
  const watchHash = ({
@@ -961,22 +1000,13 @@ function useDialog() {
961
1000
  () => route.hash,
962
1001
  async (newHash) => {
963
1002
  if (!newHash) {
1003
+ if (!dialogs.length)
1004
+ return;
964
1005
  closeAll();
965
1006
  return;
966
1007
  }
967
- let dataFromHash;
968
- try {
969
- dataFromHash = JSON.parse(window.atob(newHash.slice(1)));
970
- } catch (error) {
971
- logger.error("*watchHash* cant parse hash");
972
- }
973
- if (typeof dataFromHash !== "object")
974
- return;
975
- if (!dataFromHash.name) {
976
- logger.error("*watchHash* cant find component name in hash");
977
- return;
978
- }
979
- if (dataFromHash.name !== component.name)
1008
+ const dataFromHash = parseHash(newHash, component.name);
1009
+ if (!dataFromHash)
980
1010
  return;
981
1011
  logger.info("*watchHash* data from hash", dataFromHash);
982
1012
  await nextTick();
@@ -984,15 +1014,6 @@ function useDialog() {
984
1014
  component,
985
1015
  layer: dataFromHash.layer || 0,
986
1016
  props: {
987
- "onUpdate:modelValue": (value) => {
988
- if (value)
989
- return;
990
- router.push({
991
- name: route.name || void 0,
992
- query: route.query,
993
- hash: void 0
994
- });
995
- },
996
1017
  ...dataFromHash.props,
997
1018
  ...events
998
1019
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@karta.io/utils",
3
- "version": "1.0.0-alpha.19",
3
+ "version": "1.0.0-alpha.20",
4
4
  "description": "karta.io utils for admin and application",
5
5
  "author": "Vitaly Blokhin <karambafe@gmail.com>",
6
6
  "homepage": "",
@@ -24,7 +24,7 @@
24
24
  "vue": "3.3.x"
25
25
  },
26
26
  "dependencies": {
27
- "@karta.io/common-data": "^1.0.0-alpha.19",
27
+ "@karta.io/common-data": "^1.0.0-alpha.20",
28
28
  "@tanstack/vue-query": "4.33.1",
29
29
  "@vueuse/core": "10.3.0",
30
30
  "async-validator": "4.2.5",