Merge branch '26_1' into issue-4222_26_1

Author: GoodDayForSurf

apps/demos/Demos/DataGrid/AIAssistant/description.md

@@ -1,6 +1,6 @@
-The AI Assistant for the DevExtreme [DataGrid](/Documentation/Guide/UI_Components/DataGrid/Overview/) allows you to interact with the component using natural language. The Chat also supports [speech-to-text input](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#speechToTextEnabled), ideal for hands-free interactions or entering longer prompts.
+The AI Assistant for the DevExtreme [DataGrid](/Documentation/Guide/UI_Components/DataGrid/Overview/) allows you to interact with the component using natural language. Our Chat implementation supports [speech-to-text input](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#speechToTextEnabled), ideal for hands-free interaction or entering longer prompts.
 
-You can use/configure the following DataGrid features in the AI Assistant Chat prompts:
+You can use/configure the following DataGrid features via AI Assistant Chat prompts:
 
 - [Filtering and Searching](/Documentation/Guide/UI_Components/DataGrid/Filtering_and_Searching/)
 - [Sorting](/Documentation/Guide/UI_Components/DataGrid/Sorting/)
@@ -11,7 +11,7 @@ You can use/configure the following DataGrid features in the AI Assistant Chat p
 - [Summaries](/Documentation/Guide/UI_Components/DataGrid/Summaries/Predefined_Aggregate_Functions/)
 - [Column Fixing](/Documentation/Guide/UI_Components/DataGrid/Columns/Column_Fixing/), [Resizing](/Documentation/Guide/UI_Components/DataGrid/Columns/Column_Sizing/), and [Reordering](/Documentation/Guide/UI_Components/DataGrid/Columns/Column_Reordering/)
 
-The AI Assistant feature is also available for the DevExtreme [TreeList](/Documentation/ApiReference/UI_Components/dxTreeList/Configuration/#aiAssistant) component.
+This AI Assistant feature is also available in the DevExtreme [TreeList](/Documentation/ApiReference/UI_Components/dxTreeList/Configuration/#aiAssistant) component.
 <!--split-->
 
 In this demo, the AI Assistant is enabled for a DataGrid that displays mock sales data with over 1500 records.
@@ -24,6 +24,6 @@ When connected to your own AI model/service without rate and data limits, the AI
 
 [/note]
 
-To enable the AI Assistant, configure the [aiIntegration](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/#aiIntegration) or **aiAssistant**.[aiIntegration](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/aiAssistant/#aiIntegration) object and set the **aiAssistant**.[enabled](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/aiAssistant/#enabled) property to `true`. Once activated, the DataGrid adds a predefined item (*"aiAssistantButton"*) to the toolbar. This button opens the AI Assistant Chat in a draggable pop-up window.
+To enable the AI Assistant, configure the [aiIntegration](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/#aiIntegration) or **aiAssistant**.[aiIntegration](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/aiAssistant/#aiIntegration) object and set the **aiAssistant**.[enabled](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/aiAssistant/#enabled) property to `true`. Once activated, the DataGrid adds a predefined item (*"aiAssistantButton"*) to the toolbar. This button opens our AI Assistant Chat in a draggable pop-up window.
 
 This demo also configures [suggestions](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#suggestions) for the AI Assistant Chat. These buttons allow you to interact with the assistant in one click using predefined prompts. For additional information about suggestions, refer to the following demo: [DevExtreme Chat - Prompt Suggestions](/Demos/WidgetsGallery/Demo/Chat/PromptSuggestions/).

packages/devextreme/js/__internal/ui/m_tag_box.ts

@@ -33,6 +33,9 @@ function xor(a: boolean, b: boolean): boolean {
   return (a || b) && !(a && b);
 }
 
+type TagBoxItem = string | number | any;
+type SelectedItemsMap = Record<string, TagBoxItem>;
+
 const TAGBOX_TAG_DATA_KEY = 'dxTagData';
 const TAGBOX_TAG_DISPLAY_VALUE = 'dxTagDisplayValue';
 
@@ -51,13 +54,13 @@ const TEXTEDITOR_INPUT_CONTAINER_CLASS = 'dx-texteditor-input-container';
 
 const TAGBOX_MOUSE_WHEEL_DELTA_MULTIPLIER = -0.3;
 
-export interface TagBoxProperties extends Omit<Properties,
-'onCustomItemCreating'
-| 'onItemClick' | 'onSelectionChanged'
-| 'onOpened' | 'onClosed'
-| 'onChange' | 'onCopy' | 'onCut' | 'onEnterKey' | 'onFocusIn' | 'onFocusOut' | 'onInput' | 'onKeyDown' | 'onKeyUp' | 'onPaste'
-| 'onValueChanged' | 'validationMessagePosition' | 'onContentReady' | 'onDisposing' | 'onOptionChanged' | 'onInitialized'> {
-
+export interface TagBoxProperties extends Omit<
+  Properties,
+  'onCustomItemCreating'
+  | 'onItemClick' | 'onSelectionChanged'
+  | 'onOpened' | 'onClosed'
+  | 'onChange' | 'onCopy' | 'onCut' | 'onEnterKey' | 'onFocusIn' | 'onFocusOut' | 'onInput' | 'onKeyDown' | 'onKeyUp' | 'onPaste'
+  | 'onValueChanged' | 'validationMessagePosition' | 'onContentReady' | 'onDisposing' | 'onOptionChanged' | 'onInitialized'> {
 }
 
 class TagBox<
@@ -860,7 +863,7 @@ class TagBox<
     // @ts-expect-error ts-error
     const isListItemsLoaded = !!listSelectedItems && this._list._dataController.isLoaded();
     const selectedItems = listSelectedItems || this.option('selectedItems');
-    // @ts-expect-error ts-error
+    // @ts-expect-error _valueGetter is injected by DataExpressionMixin
     const clientFilterFunction = creator.getLocalFilter(this._valueGetter);
     // @ts-expect-error ts-error
     const filteredItems = selectedItems.filter(clientFilterFunction);
@@ -907,13 +910,13 @@ class TagBox<
   _createTagsData(values, filteredItems) {
     const items = [];
     const cache = {};
-    // @ts-expect-error ts-error
+    // @ts-expect-error _valueGetterExpr is injected by DataExpressionMixin
     const isValueExprSpecified = this._valueGetterExpr() === 'this';
     const { acceptCustomValue } = this.option();
     const filteredValues = {};
 
     filteredItems.forEach((filteredItem) => {
-      // @ts-expect-error
+      // @ts-expect-error _valueGetter is injected by DataExpressionMixin
       const filteredItemValue = isValueExprSpecified ? JSON.stringify(filteredItem) : this._valueGetter(filteredItem);
 
       filteredValues[filteredItemValue] = filteredItem;
@@ -967,7 +970,7 @@ class TagBox<
       return item;
     }
     const selectedItem = this.option('selectedItem');
-    // @ts-expect-error
+    // @ts-expect-error _valueGetter is injected by DataExpressionMixin
     const customItem = this._valueGetter(selectedItem) === value ? selectedItem : value;
 
     return customItem;
@@ -1046,7 +1049,10 @@ class TagBox<
       this._selectedItems = this._getItemsFromPlain(this._valuesToUpdate);
 
       if (this._selectedItems.length === this._valuesToUpdate.length) {
-        this._tagsToRender = this._selectedItems;
+        this._tagsToRender = this._sortSelectedItemsByValues(
+          this._selectedItems,
+          this._valuesToUpdate,
+        );
         this._renderTagsImpl();
         isPlainDataUsed = true;
         d.resolve();
@@ -1113,6 +1119,45 @@ class TagBox<
     return selectedItems;
   }
 
+  _shouldUseClickOrderForTags(values: TagBox['_valuesToUpdate']): boolean {
+    const { maxDisplayedTags, showMultiTagOnly } = this.option();
+
+    return !showMultiTagOnly
+      && isDefined(maxDisplayedTags)
+      && values.length > maxDisplayedTags;
+  }
+
+  _sortSelectedItemsByValues(
+    selectedItems: TagBoxItem[],
+    values: TagBoxItem[],
+  ): TagBoxItem[] {
+    if (!this._shouldUseClickOrderForTags(values) || !selectedItems.length) {
+      return selectedItems;
+    }
+    // @ts-expect-error _valueGetterExpr is injected by DataExpressionMixin
+    const isValueExprDefault = this._valueGetterExpr() === 'this';
+
+    const mappedSelectedItems = selectedItems.reduce<SelectedItemsMap>((result, item) => {
+      // @ts-expect-error _valueGetter is injected by DataExpressionMixin
+      const itemValue = isValueExprDefault ? JSON.stringify(item) : this._valueGetter(item);
+      result[itemValue] = item;
+
+      return result;
+    }, {});
+
+    const selectedByOrderItems: TagBoxItem[] = values.reduce((result, currentValue) => {
+      const normalizedValue = isValueExprDefault ? JSON.stringify(currentValue) : currentValue;
+      const item = mappedSelectedItems[normalizedValue];
+      if (isDefined(item)) {
+        result.push(item);
+      }
+
+      return result;
+    }, []);
+
+    return selectedByOrderItems;
+  }
+
   _filterSelectedItems(plainItems, values) {
     const selectedItems = plainItems.filter((dataItem) => {
       let currentValue;
@@ -1180,8 +1225,7 @@ class TagBox<
 
   _renderTagsElements(items): void {
     const $multiTag = this._multiTagRequired() && this._renderMultiTag(this._input());
-    const showMultiTagOnly = this.option('showMultiTagOnly');
-    const maxDisplayedTags = this.option('maxDisplayedTags');
+    const { showMultiTagOnly, maxDisplayedTags } = this.option();
 
     items.forEach((item, index) => {
       // @ts-expect-error ts-error
@@ -1206,7 +1250,7 @@ class TagBox<
       const $tags = this._tagElements();
 
       const selectedItems = this.option('selectedItems') ?? [];
-      // @ts-expect-error ts-error
+      // @ts-expect-error _valueGetter is injected by DataExpressionMixin
       const values = selectedItems.map((item) => this._valueGetter(item));
 
       each($tags, (_, tag) => {
@@ -1252,7 +1296,7 @@ class TagBox<
   }
 
   _renderTag(item, $input): void {
-    // @ts-expect-error ts-error
+    // @ts-expect-error _valueGetter is injected by DataExpressionMixin
     const value = this._valueGetter(item);
 
     if (!isDefined(value)) {
@@ -1399,12 +1443,12 @@ class TagBox<
     const value = this._getValue().slice();
 
     each(e.removedItems || [], (_, removedItem) => {
-      // @ts-expect-error ts-error
+      // @ts-expect-error _valueGetter is injected by DataExpressionMixin
       this._removeTag(value, this._valueGetter(removedItem));
     });
 
     each(e.addedItems || [], (_, addedItem) => {
-      // @ts-expect-error ts-error
+      // @ts-expect-error _valueGetter is injected by DataExpressionMixin
       this._addTag(value, this._valueGetter(addedItem));
     });
 
@@ -1562,7 +1606,7 @@ class TagBox<
     }
 
     const dataController = this._dataController;
-    // @ts-expect-error ts-error
+    // @ts-expect-error _valueGetterExpr is injected by DataExpressionMixin
     const valueGetterExpr = this._valueGetterExpr();
 
     if (isString(valueGetterExpr) && valueGetterExpr !== 'this') {
@@ -1584,14 +1628,14 @@ class TagBox<
 
   _dataSourceFilterExpr() {
     const filter = [];
-    // @ts-expect-error
+    // @ts-expect-error _valueGetterExpr is injected by DataExpressionMixin
     this._getValue().forEach((value) => filter.push(['!', [this._valueGetterExpr(), value]]));
 
     return filter;
   }
 
   _dataSourceFilterFunction(itemData) {
-    // @ts-expect-error ts-error
+    // @ts-expect-error _valueGetter is injected by DataExpressionMixin
     const itemValue = this._valueGetter(itemData);
     let result = true;
 
@@ -1640,7 +1684,7 @@ class TagBox<
 
     return this
       ._getPlainItems(this._list.option('selectedItems'))
-      // @ts-expect-error
+      // @ts-expect-error _valueGetter is injected by DataExpressionMixin
       .map((item) => this._valueGetter(item));
   }
 
@@ -1699,15 +1743,15 @@ class TagBox<
     }
 
     const previousItemsValuesMap = previousItems.reduce((map, item) => {
-      // @ts-expect-error ts-error
+      // @ts-expect-error _valueGetter is injected by DataExpressionMixin
       const value = this._valueGetter(item);
       map[value] = item;
       return map;
     }, {});
 
     const addedItems = [];
     newItems.forEach((item) => {
-      // @ts-expect-error ts-error
+      // @ts-expect-error _valueGetter is injected by DataExpressionMixin
       const value = this._valueGetter(item);
       if (!previousItemsValuesMap[value]) {
         addedItems.push(item as never);

packages/devextreme/playground/index.ts

@@ -29,4 +29,4 @@ window.addEventListener('load', () =>
         cardMinWidth: 320,
         columns: ['Company', 'Address', 'City', 'State', 'Zipcode', 'Phone'],
       });
-    }));
+    }));

packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js

@@ -1078,6 +1078,62 @@ QUnit.module('multi tag support', {
         assert.deepEqual(this.getTexts($tagBox.find('.' + TAGBOX_TAG_CLASS)), ['1', '2'], 'tags have correct text');
     });
 
+
+    QUnit.test('TagBox should preserve reverse click order in leading tag when showMultiTagOnly is false', function(assert) {
+        const $tagBox = $('#tagBox').dxTagBox({
+            items: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+            showSelectionControls: true,
+            maxDisplayedTags: 2,
+            showMultiTagOnly: false,
+            opened: true
+        });
+
+        const tagBox = $tagBox.dxTagBox('instance');
+
+        this.clock.tick(TIME_TO_WAIT);
+
+        const $listItems = getListItems(tagBox);
+
+        $listItems.last().trigger('dxclick');
+        $listItems.eq(7).trigger('dxclick');
+        $listItems.eq(6).trigger('dxclick');
+
+
+        assert.strictEqual($tagBox.find('.' + TAGBOX_TAG_CLASS).first().text(), '10', 'leading tag has correct text');
+    });
+
+    QUnit.test('TagBox should work correctly with string ID\'s in item when valueExpr is used', function(assert) {
+        const items = [
+            { ID: 'a', Name: 'HD Video Player' },
+            { ID: 'b', Name: 'SuperHD Video Player' },
+            { ID: 'c', Name: 'SuperPlasma 50' },
+            { ID: 'd', Name: 'SuperLED 50' }
+        ];
+        const $tagBox = $('#tagBox').dxTagBox({
+            items: items,
+            valueExpr: 'ID',
+            displayExpr: 'Name',
+            showSelectionControls: true,
+            maxDisplayedTags: 2,
+            showMultiTagOnly: false,
+            opened: true
+        });
+
+        const tagBox = $tagBox.dxTagBox('instance');
+
+        this.clock.tick(TIME_TO_WAIT);
+
+        const $listItems = getListItems(tagBox);
+
+        $listItems.last().trigger('dxclick');
+        $listItems.eq(2).trigger('dxclick');
+        $listItems.eq(1).trigger('dxclick');
+
+
+        assert.strictEqual($tagBox.find('.' + TAGBOX_TAG_CLASS).first().text(), items[items.length - 1].Name, 'leading tag has correct text');
+    });
+
+
     QUnit.test('only one multi tag should be rendered when selectAll checked and value changind on runtime', function(assert) {
         let suppressSelectionChanged = false;
 

pnpm-lock.yaml

@@ -11,7 +11,7 @@ catalog:
   inferno-create-element: ^8.2.3
   inferno-server: ^8.2.3
   devexpress-diagram: 2.2.29
-  devexpress-gantt: 4.1.68
+  devexpress-gantt: 4.1.69
   devextreme-exceljs-fork: 4.4.9
   devextreme-quill: 1.7.9
   eslint: 9.39.4