Skip to content

Commit 4d5b1a2

Browse files
committed
SVY-20819 use signals instead of @input in our components
instead of null/empty i get 'SVY_TS_NULL_VALUE'
1 parent ae70cc8 commit 4d5b1a2

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

components/projects/bootstrapcomponents/src/datalabel/datalabel.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
@if ((showAs() === 'html' || showAs() === 'trusted_html')) {
1212
<span
1313
class="bts-label-text"
14-
[innerHTML]="dataProviderID() | formatFilter:format() | htmlFilter | trustAsHtml:isTrustedHTML() | designFilter:servoyApi.isInDesigner()"
14+
[innerHTML]="getDisplayValue() | formatFilter:format() | htmlFilter | trustAsHtml:isTrustedHTML() | designFilter:servoyApi.isInDesigner()"
1515
>
1616
</span>
1717
}
1818
@if (showAs() == 'text') {
1919
<span
2020
class="bts-label-text"
21-
[textContent]="dataProviderID() | formatFilter:format() | htmlFilter | trustAsHtml:isTrustedHTML() | designFilter:servoyApi.isInDesigner()"
21+
[textContent]="getDisplayValue() | formatFilter:format() | htmlFilter | trustAsHtml:isTrustedHTML() | designFilter:servoyApi.isInDesigner()"
2222
>
2323
</span>
2424
}

components/projects/bootstrapcomponents/src/datalabel/datalabel.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ export class ServoyBootstrapDatalabel extends ServoyBootstrapBaseLabel<HTMLSpanE
2626
});
2727
}
2828
}
29+
30+
getDisplayValue(): string {
31+
const value = this.dataProviderID();
32+
return value === 'SVY_TS_NULL_VALUE_' ? null : value;
33+
}
2934

3035
}
3136

0 commit comments

Comments
 (0)