diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts index 29986d3fdb47..7ab9e4914d2e 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts @@ -383,7 +383,7 @@ class DropDownList< return selectedItem !== undefined ? Deferred().resolve(selectedItem).promise() // @ts-expect-error ts-error - : this._loadValue(value); + : this._loadValue(value, this.option('allowNullValue') ?? false); } _getPlainItems(items?) { diff --git a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts index 369fb532d86d..bff735d2ee9d 100644 --- a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts +++ b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts @@ -66,11 +66,11 @@ const DataExpressionMixin = extend({}, DataHelperMixin, { return this.option('valueExpr') || 'this'; }, - _loadValue(value) { + _loadValue(value, allowNullValue = false) { const deferred = Deferred(); value = this._unwrappedValue(value); - if (!isDefined(value)) { + if (!isDefined(value) || (value === null && !allowNullValue)) { return deferred.reject().promise(); }