Skip to content

fix(types): allow combined DashStyle values (T1283037) #35591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpreyskurantov merged 4 commits into from
Oct 12, 2026
Merged

fix(types): allow combined DashStyle values (T1283037) #35591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afaef96
RepeatUnion helper
alexslavr Mar 3, 2026
858baae
Refacror
alexslavr Aug 24, 2026
51ecd5c
DashStyle as RepeatUnion & uidRef for ts, keep as existing enum for a…
mpreyskurantov Oct 8, 2026
d381b51
rename RepeatUnion to PermutationsWithRepetition, remove unused helpers
mpreyskurantov Oct 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/devextreme-metadata/aspnet/enums.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ export const enums = {
'swing',
],
},
DashStyle: {
Items: ['dash', 'dot', 'longDash', 'solid'],
},
Comment thread
mpreyskurantov marked this conversation as resolved.
EdmType: {
Items: ['Guid', 'Int32', 'Int64', 'String', 'Boolean', 'Single', 'Decimal'],
},
Expand Down
11 changes: 10 additions & 1 deletion packages/devextreme-metadata/make-integration-metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Imd, addMetadata, replaceTypes, removeMembers } from 'devextreme-internal-tools/metadata';
import { cleanArtifacts } from './common';
import { cleanArtifacts, types } from './common';
import { IMD_FILE, PATHS } from './common/paths';

cleanArtifacts(IMD_FILE, 'IntegrationDataGenerator.cfg.json');
Expand All @@ -9,6 +9,15 @@ Imd.makeMetadata({
artifacts: PATHS.artifactsDir,
},
mutations: [
// Normalize all DashStyle references: MemberRef -> UidRef
replaceTypes(/\.dashStyle/, ['*'], [types.uidRef('common/charts:DashStyle')]),
// Restore explicit undefined where declared
replaceTypes(
/^(?:common\/charts:SeriesLabel\.border|viz\/chart:dxChartSeriesTypesCommonSeries(?:HoverStyle|SelectionStyle)?Border|viz\/(?:pie_chart|polar_chart):.+\.border)\.dashStyle$/,
['*'],
[types.uidRef('common/charts:DashStyle'), 'undefined'],
),

replaceTypes('common/grids:AIAssistant.chat', ['*'], ['object']),
replaceTypes('common/grids:ColumnAIOptions.popup', ['*'], ['object']),
replaceTypes('ui/card_view:dxCardViewOptions.filterBuilderPopup', ['*'], ['object']),
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-vue/src/bar-gauge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ const DxBorderConfig = {
props: {
color: String,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
Comment thread
mpreyskurantov marked this conversation as resolved.
opacity: Number,
visible: Boolean,
width: Number
Expand Down Expand Up @@ -556,7 +556,7 @@ const DxLegendBorderConfig = {
props: {
color: String,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down Expand Up @@ -854,7 +854,7 @@ const DxTooltipBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-vue/src/bullet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ const DxBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down
36 changes: 18 additions & 18 deletions packages/devextreme-vue/src/chart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ const DxAnnotationBorderConfig = {
props: {
color: String,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
Comment thread
mpreyskurantov marked this conversation as resolved.
opacity: Number,
visible: Boolean,
width: Number
Expand Down Expand Up @@ -785,7 +785,7 @@ const DxAxisConstantLineStyleConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
label: Object as PropType<Record<string, any>>,
paddingLeftRight: Number,
paddingTopBottom: Number,
Expand Down Expand Up @@ -947,7 +947,7 @@ const DxBorderConfig = {
bottom: Boolean,
color: String,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
left: Boolean,
opacity: Number,
right: Boolean,
Expand Down Expand Up @@ -1261,7 +1261,7 @@ const DxCommonAxisSettingsConstantLineStyleConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
label: Object as PropType<Record<string, any>>,
paddingLeftRight: Number,
paddingTopBottom: Number,
Expand Down Expand Up @@ -1478,7 +1478,7 @@ const DxCommonSeriesSettingsConfig = {
closeValueField: String,
color: [Object, String] as PropType<ChartsColor | string | Record<string, any>>,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
fullstackedarea: {},
fullstackedbar: {},
fullstackedline: {},
Expand Down Expand Up @@ -1563,7 +1563,7 @@ const DxCommonSeriesSettingsHoverStyleConfig = {
props: {
border: Object as PropType<Record<string, any>>,
color: [Object, String] as PropType<ChartsColor | string | Record<string, any>>,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
hatching: Object as PropType<Record<string, any>>,
highlight: Boolean,
width: Number
Expand Down Expand Up @@ -1649,7 +1649,7 @@ const DxCommonSeriesSettingsSelectionStyleConfig = {
props: {
border: Object as PropType<Record<string, any>>,
color: [Object, String] as PropType<ChartsColor | string | Record<string, any>>,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
hatching: Object as PropType<Record<string, any>>,
highlight: Boolean,
width: Number
Expand Down Expand Up @@ -1705,7 +1705,7 @@ const DxConstantLineConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
displayBehindSeries: Boolean,
extendAxis: Boolean,
label: Object as PropType<Record<string, any>>,
Expand Down Expand Up @@ -1769,7 +1769,7 @@ const DxConstantLineStyleConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
label: Object as PropType<Record<string, any>>,
paddingLeftRight: Number,
paddingTopBottom: Number,
Expand Down Expand Up @@ -1802,7 +1802,7 @@ const DxCrosshairConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
enabled: Boolean,
horizontalLine: [Boolean, Object] as PropType<boolean | Record<string, any>>,
label: Object as PropType<Record<string, any>>,
Expand Down Expand Up @@ -2023,7 +2023,7 @@ const DxHorizontalLineConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
label: Object as PropType<Record<string, any>>,
opacity: Number,
visible: Boolean,
Expand Down Expand Up @@ -2085,7 +2085,7 @@ const DxHoverStyleConfig = {
props: {
border: Object as PropType<Record<string, any>>,
color: [Object, String] as PropType<ChartsColor | string | Record<string, any>>,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
hatching: Object as PropType<Record<string, any>>,
highlight: Boolean,
size: Number,
Expand Down Expand Up @@ -2583,7 +2583,7 @@ const DxPaneBorderConfig = {
props: {
bottom: Boolean,
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
left: Boolean,
opacity: Number,
right: Boolean,
Expand Down Expand Up @@ -2801,7 +2801,7 @@ const DxSelectionStyleConfig = {
props: {
border: Object as PropType<Record<string, any>>,
color: [Object, String] as PropType<ChartsColor | string | Record<string, any>>,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
hatching: Object as PropType<Record<string, any>>,
highlight: Boolean,
size: Number,
Expand Down Expand Up @@ -2878,7 +2878,7 @@ const DxSeriesConfig = {
closeValueField: String,
color: [Object, String] as PropType<ChartsColor | string | Record<string, any>>,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
highValueField: String,
hoverMode: String as PropType<SeriesHoverMode>,
hoverStyle: Object as PropType<Record<string, any>>,
Expand Down Expand Up @@ -2944,7 +2944,7 @@ const DxSeriesBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
visible: Boolean,
width: Number
}
Expand Down Expand Up @@ -3326,7 +3326,7 @@ const DxTooltipBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down Expand Up @@ -3538,7 +3538,7 @@ const DxVerticalLineConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
label: Object as PropType<Record<string, any>>,
opacity: Number,
visible: Boolean,
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-vue/src/circular-gauge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ const DxBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-vue/src/funnel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ const DxBorderConfig = {
props: {
color: String,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
Comment thread
mpreyskurantov marked this conversation as resolved.
opacity: Number,
visible: Boolean,
width: Number
Expand Down Expand Up @@ -598,7 +598,7 @@ const DxLabelBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
visible: Boolean,
width: Number
}
Expand Down Expand Up @@ -691,7 +691,7 @@ const DxLegendBorderConfig = {
props: {
color: String,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down Expand Up @@ -1013,7 +1013,7 @@ const DxTooltipBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-vue/src/linear-gauge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ const DxBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-vue/src/pie-chart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ const DxAnnotationBorderConfig = {
props: {
color: String,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
Comment thread
mpreyskurantov marked this conversation as resolved.
opacity: Number,
visible: Boolean,
width: Number
Expand Down Expand Up @@ -469,7 +469,7 @@ const DxBorderConfig = {
props: {
color: String,
cornerRadius: Number,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down Expand Up @@ -1204,7 +1204,7 @@ const DxSeriesBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
visible: Boolean,
width: Number
}
Expand Down Expand Up @@ -1440,7 +1440,7 @@ const DxTooltipBorderConfig = {
},
props: {
color: String,
dashStyle: String as PropType<DashStyle>,
dashStyle: Object as PropType<DashStyle>,
opacity: Number,
visible: Boolean,
width: Number
Expand Down
Loading
Loading