lightning-base-components 1.21.3-alpha → 1.21.5-alpha

package/src/lightning/datatable/renderManager.js

@@ -28,10 +28,6 @@ export function setVirtualize(state, value) {
     }
 }
 
-export function getDTWrapperHeight() {
-    return this.template.querySelector('.slds-scrollable_x').offsetHeight;
-}
-
 function getDefaultPreviousInfo() {
     return {
         renderedRowCount: 0,

package/src/lightning/datatable/resizeObserver.js

@@ -1,34 +1,25 @@
 import { LightningResizeObserver } from 'lightning/resizeObserver';
 import { isTableRenderedVisible } from './columnResizer';
-import { getColumns } from './columns';
 
 const WIDTH_OBSERVER_SELECTOR = '.dt-width-observer';
 
 export class LightningDatatableResizeObserver {
     _connected = false;
-    _resizeObserverAvailable = typeof ResizeObserver === 'function';
 
     /**
-     * Depending on the browser/availability, this will create either a (standard)
-     * ResizeObserver via LightningResizeObserver or fallback to the ResizeSensor
+     * Create either a standard ResizeObserver via LightningResizeObserver.
      */
-    constructor(template, state, widthsData, columnWidthManager) {
+    constructor(template, resizeCallback) {
         const resizeTarget = template.querySelector(WIDTH_OBSERVER_SELECTOR);
-
         // Create ResizeObserver and begin observing for changes.
         // Calculate and modify the column widths when there are changes to the dimensions
-        // and when the table is rendered and visible on screen
+        // and when the table is rendered and visible on screen.
         this._resizeObserver = new LightningResizeObserver(() => {
             if (this._connected && isTableRenderedVisible(template)) {
-                columnWidthManager.adjustColumnsSizeAfterResize(
-                    template,
-                    getColumns(state),
-                    widthsData
-                );
+                resizeCallback();
             }
         });
         this._resizeObserver.observe(resizeTarget);
-
         this._connected = true;
     }
 

package/src/lightning/datatable/rowLevelActions.js

@@ -1,5 +1,5 @@
 import { unwrap } from 'lwc';
-import { getUserRowByCellKeys } from './rows';
+import { getUserRowByCellKeys } from './indexes';
 import { getUserColumnIndex } from './columns';
 
 /**
@@ -64,7 +64,7 @@ export function handleCellButtonClick(event) {
     const { colKeyValue, rowKeyValue } = event.detail;
     const selectedRow = getUserRowByCellKeys(state, rowKeyValue, colKeyValue);
     const colIndex = getUserColumnIndex(state, colKeyValue);
-    const col = this._columns[colIndex];
+    const col = this._rawColumns[colIndex];
 
     this.dispatchEvent(
         new CustomEvent('rowaction', {

package/src/lightning/datatable/rowNumber.js

@@ -1,60 +1,17 @@
 import { normalizeNumberAttribute } from './utils';
 import labelRowLevelErrorAssistiveText from '@salesforce/label/LightningDatatable.rowLevelErrorAssistiveText';
-import labelRowNumber from '@salesforce/label/LightningDatatable.rowNumber';
 import { formatLabel } from 'lightning/utils';
-import { normalizeBoolean } from 'lightning/utilsPrivate';
 
 const CHAR_WIDTH = 10;
 const ROW_NUMBER_PADDING = 12;
 const ROW_NUMBER_COLUMN_TYPE = 'rowNumber';
-const i18n = {
-    rowLevelErrorAssistiveText: labelRowLevelErrorAssistiveText,
-    rowNumber: labelRowNumber,
-};
 
+export const ROW_NUMBER_INITIAL_WIDTH = 52;
 export const TOOLTIP_ALLOWANCE = 20;
 
-/**
- * Returns the initial default column definition
- * for the row number column
- */
-export function getRowNumberColumnDef() {
-    return {
-        type: ROW_NUMBER_COLUMN_TYPE,
-        ariaLabel: i18n.rowNumber,
-        sortable: false,
-        initialWidth: 52,
-        minWidth: 52,
-        maxWidth: 1000,
-        tabIndex: -1,
-        internal: true,
-        resizable: false,
-    };
-}
-
-/**
- * Retrieves showRowNumberColumn from the state
- * Can be used to determine if the datatable should
- * show the row number column or not
- */
-export function hasRowNumberColumn(state) {
-    return state.showRowNumberColumn;
-}
-
-/**
- * Normalizes the passed in `value` to a boolean and
- * sets it to showRowNumberColumn in the state
- */
-export function setShowRowNumberColumn(state, value) {
-    state.showRowNumberColumn = normalizeBoolean(value);
-}
-
-/**
- * Retrieves rowNumberOffset from the state
- */
-export function getRowNumberOffset(state) {
-    return state.rowNumberOffset;
-}
+const i18n = {
+    rowLevelErrorAssistiveText: labelRowLevelErrorAssistiveText,
+};
 
 /**
  * Normalizes the passed in value to a non-negative number
@@ -70,10 +27,6 @@ export function setRowNumberOffset(state, value) {
     );
 }
 
-export function isRowNumberColumn(column) {
-    return column.type === ROW_NUMBER_COLUMN_TYPE;
-}
-
 /**
  * Calculates the width of the row number column.
  * This takes into account the number of digits in the row number
@@ -91,7 +44,7 @@ export function getAdjustedRowNumberColumnWidth(state) {
         CHAR_WIDTH * numberOfChars +
             ROW_NUMBER_PADDING /* padding */ +
             TOOLTIP_ALLOWANCE /* primitive-tooltip */,
-        getRowNumberColumnDef().initialWidth
+        ROW_NUMBER_INITIAL_WIDTH
     );
 }
 
@@ -103,7 +56,7 @@ export function getAdjustedRowNumberColumnWidth(state) {
  * @returns {Number} index of row number column. Returns -1 if not present
  */
 export function getRowNumberColumnIndex(state) {
-    if (hasRowNumberColumn(state)) {
+    if (state.showRowNumberColumn) {
         const { columns } = state;
         for (let i = 0, { length } = columns; i < length; i += 1) {
             if (columns[i].type === ROW_NUMBER_COLUMN_TYPE) {
@@ -115,15 +68,13 @@ export function getRowNumberColumnIndex(state) {
 }
 
 /**
- * Constructs and returns the column definition for the row number column
- * Column definition contains the row number column's row type and
- * the error object containing the title, error messages and alt text
+ * Constructs columns definition error object containing the title, error messages and alt text.
  *
  * @param {Object} rowErrors - object containing metadata of errors in the row
  * @param {String} rowTitle - value of the cell which has the scope of the row/rowheader
  * @returns
  */
-export function getRowNumberErrorColumnDef(rowErrors, rowTitle) {
+export function getRowNumberError(rowErrors, rowTitle) {
     const { cells, fieldNames, messages, title } = rowErrors || {};
     let numberOfErrors = 0;
     if (cells) {
@@ -131,17 +82,28 @@ export function getRowNumberErrorColumnDef(rowErrors, rowTitle) {
     } else if (fieldNames) {
         numberOfErrors = fieldNames.length;
     }
-
     const alternativeText = formatLabel(
         i18n.rowLevelErrorAssistiveText,
         rowTitle || '',
         numberOfErrors
     );
+    return { title, messages, alternativeText };
+}
 
+/**
+ * Constructs and returns the column definition for the row number column
+ * Column definition contains the row number column's row type and
+ * the error object containing the title, error messages and alt text
+ *
+ * @param {Object} rowErrors - object containing metadata of errors in the row
+ * @param {String} rowTitle - value of the cell which has the scope of the row/rowheader
+ * @returns
+ */
+export function getRowNumberErrorColumnDef(rowErrors, rowTitle) {
     return {
         type: ROW_NUMBER_COLUMN_TYPE,
         typeAttributes: {
-            error: { title, messages, alternativeText },
+            error: getRowNumberError(rowErrors, rowTitle),
         },
     };
 }