Skip to content

Commit 8fb8131

Browse files
Merge pull request #177 from gisce/sync/v2-to-v2-develop-20250217-135239 [skip ci]
fix: sync changes from v2 to v2-develop
2 parents 3cba312 + f8aa9ca commit 8fb8131

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gisce/ooui",
3-
"version": "2.29.0",
3+
"version": "2.29.1",
44
"engines": {
55
"node": "20.5.0"
66
},

src/helpers/attributeParser.ts

+12-11
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,6 @@ const evaluateAttributes = ({
278278
fallbackMode?: boolean;
279279
}) => {
280280
let finalTagAttributes = {};
281-
let oldTagAttributes = {};
282-
if (tagAttributes.attrs) {
283-
oldTagAttributes = parseAttributes({
284-
attrs: tagAttributes.attrs,
285-
values,
286-
fields,
287-
widgetType,
288-
});
289-
}
290281

291282
if (tagAttributes.json_attrs) {
292283
try {
@@ -298,13 +289,23 @@ const evaluateAttributes = ({
298289
});
299290
} catch (error) {
300291
if (fallbackMode && tagAttributes.attrs) {
301-
finalTagAttributes = oldTagAttributes;
292+
finalTagAttributes = parseAttributes({
293+
attrs: tagAttributes.attrs,
294+
values,
295+
fields,
296+
widgetType,
297+
});
302298
} else {
303299
throw error;
304300
}
305301
}
306302
} else if (tagAttributes.attrs) {
307-
finalTagAttributes = oldTagAttributes;
303+
finalTagAttributes = parseAttributes({
304+
attrs: tagAttributes.attrs,
305+
values,
306+
fields,
307+
widgetType,
308+
});
308309
}
309310

310311
return {

0 commit comments

Comments
 (0)