ublo-lib 1.17.4 → 1.17.6

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.
Files changed (3) hide show
  1. package/es/common/components/msem-preset-editor/msem-preset-editor.d.ts.map +1 -1
  2. package/es/common/components/msem-preset-editor/msem-preset-editor.js +14 -6
  3. package/package.json +1 -1
package/es/common/components/msem-preset-editor/msem-preset-editor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"msem-preset-editor.d.ts","sourceRoot":"","sources":["../../../../src/common/components/msem-preset-editor/msem-preset-editor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAoB/B,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;KACxB,CAAC;IACF,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;QAC/C,QAAQ,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KAC/C,CAAC;IACF,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IACxD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,cAAc,EACd,QAAQ,EACR,QAAQ,GACT,EAAE,KAAK,kDAyLP"}
1
+ {"version":3,"file":"msem-preset-editor.d.ts","sourceRoot":"","sources":["../../../../src/common/components/msem-preset-editor/msem-preset-editor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAoB/B,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;KACxB,CAAC;IACF,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;QAC/C,QAAQ,CAAC,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KAC/C,CAAC;IACF,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IACxD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,cAAc,EACd,QAAQ,EACR,QAAQ,GACT,EAAE,KAAK,kDAiMP"}
package/es/common/components/msem-preset-editor/msem-preset-editor.js CHANGED
@@ -18,13 +18,15 @@ const { publicRuntimeConfig } = getConfig();
18
18
  const { langPrefix } = publicRuntimeConfig;
19
19
  export default function MseMPresetEditor({ lang, options, urls, selectedPreset, onChange, children, }) {
20
20
  const currentPreset = selectedPreset ? JSON.parse(selectedPreset) : undefined;
21
+ const defaultResort = Number(currentPreset ? currentPreset.options.resort : options.resort);
21
22
  const [facet, setFacet] = React.useState(currentPreset?.options?.facet?.toString() || "");
22
23
  const [stay, setStay] = React.useState(currentPreset?.presets?.stay || { from: "", to: "" });
23
24
  const [preset, setPreset] = React.useState(currentPreset || null);
24
25
  const [error, setError] = React.useState(null);
25
26
  const [showPresetDialog, setShowPresetDialog] = React.useState(false);
26
27
  const [presetUrl, setPresetUrl] = React.useState("");
27
- const [resort, setResort] = React.useState(Number(options.resort));
28
+ const [resort, setResort] = React.useState(defaultResort);
29
+ const initialRender = React.useRef(true);
28
30
  const showWidgetList = resort && facet !== "";
29
31
  const baseUrl = getBaseUrl({
30
32
  lang,
@@ -65,10 +67,10 @@ export default function MseMPresetEditor({ lang, options, urls, selectedPreset,
65
67
  onChange?.(newPreset);
66
68
  setPreset(newPreset);
67
69
  }, [baseUrl, facet, onChange, options, stay, resort]);
68
- const removePreset = () => {
70
+ const removePreset = React.useCallback(() => {
69
71
  onChange?.(null);
70
72
  setPreset(null);
71
- };
73
+ }, [onChange]);
72
74
  const testPreset = () => {
73
75
  if (!preset)
74
76
  return;
@@ -102,8 +104,13 @@ export default function MseMPresetEditor({ lang, options, urls, selectedPreset,
102
104
  }
103
105
  }, [baseUrl, lang, preset]);
104
106
  React.useEffect(() => {
105
- removePreset();
106
- }, [resort]);
107
+ if (initialRender.current) {
108
+ initialRender.current = false;
109
+ }
110
+ else {
111
+ removePreset();
112
+ }
113
+ }, [removePreset, resort]);
107
114
  if (!resort)
108
115
  return null;
109
116
  const CurrentEditor = preset?.widget && Editors[preset.widget];
@@ -131,7 +138,8 @@ function getBaseUrl({ lang, widget, facet, urls, slug }) {
131
138
  if (slug) {
132
139
  url = url.concat("/", slug);
133
140
  }
134
- if (url && langPrefix) {
141
+ const isExternalUrl = url?.startsWith("http");
142
+ if (!isExternalUrl && url && langPrefix) {
135
143
  url = "/".concat(lang, url);
136
144
  }
137
145
  return url;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ublo-lib",
3
- "version": "1.17.4",
3
+ "version": "1.17.6",
4
4
  "peerDependencies": {
5
5
  "dt-design-system": "^2.9.0",
6
6
  "leaflet": "^1.9.1",