@skyux/ag-grid 15.0.0-alpha.9 → 15.0.0-beta.1

package/fesm2022/skyux-ag-grid.mjs

@@ -87,6 +87,56 @@ const RESOURCES = {
         sky_ag_grid_locale_no_rows_to_show: { message: 'No data available' },
         sky_ag_grid_locale_no_matching_rows: { message: 'No matching rows' },
     },
+    ES: {
+        sky_ag_grid_row_selector_aria_label: {
+            message: 'Selector de fila para la fila {0}',
+        },
+        sky_ag_grid_row_selector_column_heading: { message: 'Selección de filas' },
+        sky_ag_grid_cell_editor_datepicker_aria_label: {
+            message: 'Fecha editable {0} para la fila {1}',
+        },
+        sky_ag_grid_cell_editor_datepicker_hint_text: {
+            message: 'Utilice el formato {0}.',
+        },
+        sky_ag_grid_cell_editor_number_aria_label: {
+            message: 'Número editable {0} para la fila {1}',
+        },
+        sky_ag_grid_cell_editor_text_aria_label: {
+            message: 'Texto editable {0} para la fila {1}',
+        },
+        sky_ag_grid_cell_editor_autocomplete_aria_label: {
+            message: 'Autocompletado editable {0} para la fila {1}',
+        },
+        sky_ag_grid_cell_renderer_number_validator_message: {
+            message: 'Introduzca un número válido.',
+        },
+        sky_ag_grid_cell_renderer_currency_validator_message: {
+            message: 'Introduzca un valor de moneda válido.',
+        },
+        skyux_lookup_tokens_summary: { message: '{0} artículos seleccionados' },
+        sky_ag_grid_cell_editor_currency_aria_label: {
+            message: 'Valor de moneda editable {0} para la fila {1}',
+        },
+        sky_ag_grid_column_header_sort_button_aria_label_currently_asc: {
+            message: 'Ordenar columna {0}, actualmente en orden ascendente',
+        },
+        sky_ag_grid_column_header_sort_button_aria_label_currently_desc: {
+            message: 'Ordenar columna {0}, actualmente en orden descendente',
+        },
+        sky_ag_grid_column_header_sort_button_aria_label_currently_not_sorted: {
+            message: 'Ordenar columna {0}, actualmente sin ordenar',
+        },
+        sky_ag_grid_column_group_header_expand_aria_label: {
+            message: 'Expandir grupo de columnas {0}',
+        },
+        sky_ag_grid_column_group_header_collapse_aria_label: {
+            message: 'Contraer grupo de columnas {0}',
+        },
+        sky_ag_grid_locale_no_rows_to_show: { message: 'No hay datos disponibles' },
+        sky_ag_grid_locale_no_matching_rows: {
+            message: 'No hay filas coincidentes',
+        },
+    },
     'FR-CA': {
         sky_ag_grid_row_selector_aria_label: {
             message: 'Sélecteur de ligne pour la ligne {0}',
@@ -115,7 +165,7 @@ const RESOURCES = {
         sky_ag_grid_cell_renderer_currency_validator_message: {
             message: 'Entrez une devise valide.',
         },
-        skyux_lookup_tokens_summary: { message: '{0} articles sélectionnés' },
+        skyux_lookup_tokens_summary: { message: '{0} éléments sélectionnés' },
         sky_ag_grid_cell_editor_currency_aria_label: {
             message: 'Devise modifiable {0} pour la ligne {1}',
         },
@@ -134,9 +184,7 @@ const RESOURCES = {
         sky_ag_grid_column_group_header_collapse_aria_label: {
             message: 'Réduire le groupe de colonnes {0}',
         },
-        sky_ag_grid_locale_no_rows_to_show: {
-            message: 'Aucune donnée disponible.',
-        },
+        sky_ag_grid_locale_no_rows_to_show: { message: 'Aucune donnée disponible' },
         sky_ag_grid_locale_no_matching_rows: {
             message: 'Aucune ligne correspondante',
         },
@@ -1011,18 +1059,9 @@ class SkyAgGridDataManagerAdapterDirective {
                     gridColumnStates?.find((aGridColumnState) => aGridColumnState.sort);
                 if (viewConfig && this.#currentDataState) {
                     const newState = new SkyDataManagerState(this.#currentDataState.getStateOptions());
-                    if (activeSortColumnState) {
-                        const activeSortColumnDef = agGrid.api.getColumnDef(activeSortColumnState.colId);
-                        newState.activeSortOption = {
-                            descending: activeSortColumnState.sort === 'desc',
-                            id: activeSortColumnState.colId,
-                            propertyName: activeSortColumnDef?.field || '',
-                            label: activeSortColumnDef?.headerName || '',
-                        };
-                    }
-                    else {
-                        newState.activeSortOption = undefined;
-                    }
+                    newState.activeSortOption = activeSortColumnState
+                        ? this.#resolveActiveSortOption(agGrid.api, activeSortColumnState)
+                        : undefined;
                     this.#currentDataState = newState;
                     this.#dataManagerSvc.updateDataState(newState, viewConfig.id);
                     this.#changeDetector.markForCheck();
@@ -1030,6 +1069,24 @@ class SkyAgGridDataManagerAdapterDirective {
             });
         }
     }
+    #resolveActiveSortOption(api, activeSortColumnState) {
+        const activeSortColumnDef = api.getColumnDef(activeSortColumnState.colId);
+        const descending = activeSortColumnState.sort === 'desc';
+        const propertyName = activeSortColumnDef?.field || activeSortColumnState.colId;
+        // Prefer the configured sort option matching this column and direction
+        // so the sort menu's selected item stays in sync; columns without a
+        // matching option fall back to a column-derived sort option.
+        const matchingSortOption = this.#dataManagerSvc
+            .getCurrentDataManagerConfig()
+            .sortOptions?.find((option) => option.propertyName === propertyName &&
+            !!option.descending === descending);
+        return (matchingSortOption ?? {
+            descending,
+            id: activeSortColumnState.colId,
+            propertyName,
+            label: activeSortColumnDef?.headerName || '',
+        });
+    }
     #updateColumnsInCurrentDataState(api) {
         const viewConfig = this.#viewConfig();
         if (viewConfig && this.#currentDataState) {
@@ -1082,17 +1139,30 @@ class SkyAgGridDataManagerAdapterDirective {
         const agGridApi = this.#currentAgGrid()?.api;
         const activeSort = dataState.activeSortOption;
         if (agGridApi && activeSort) {
-            agGridApi.applyColumnState({
-                state: [
-                    {
-                        colId: activeSort.id,
-                        sort: activeSort.descending ? 'desc' : 'asc',
-                    },
-                ],
-                defaultState: { sort: null },
-            });
+            const colId = this.#resolveSortColumnId(agGridApi, activeSort);
+            if (colId) {
+                agGridApi.applyColumnState({
+                    state: [
+                        {
+                            colId,
+                            sort: activeSort.descending ? 'desc' : 'asc',
+                        },
+                    ],
+                    defaultState: { sort: null },
+                });
+            }
         }
     }
+    #resolveSortColumnId(api, activeSort) {
+        const columnStates = api.getColumnState();
+        const findColId = (predicate) => columnStates.find(predicate)?.colId;
+        // Match on the option's data property first, since a sort option's ID is
+        // arbitrary and could otherwise select an unrelated column. Only fall
+        // back to the legacy ID match for options predating the property lookup.
+        return (findColId((state) => api.getColumnDef(state.colId)?.field === activeSort.propertyName) ??
+            findColId((state) => state.colId === activeSort.propertyName) ??
+            findColId((state) => state.colId === activeSort.id));
+    }
     #updateColumnWidth(colId, width, breakpoint) {
         const viewId = this.viewId();
         const viewState = viewId && this.#currentDataState?.getViewStateById(viewId);