lightning-base-components 1.21.2-alpha → 1.21.3-alpha

package/src/lightning/datatable/errors.js

@@ -15,6 +15,9 @@ export function getErrors(state) {
 /**
  * Sets the row-level errors and table-level errors in datatable's state object
  * Errors being set here overwrite the previous error object in the state
+ *
+ *
+ * @param {Object} state - The untracked datatable state
  */
 export function setErrors(state, errors) {
     return (state.errors = Object.assign({}, DEFAULT_ERROR_STATE, errors));

package/src/lightning/datatable/fixedWidthStrategy.js

@@ -1,18 +1,15 @@
-import {
-    getTotalWidthsMetadata,
-    getColumnWidthFromDef,
-} from './widthManagerShared';
+import { getColumnWidth, getTotalWidthsData } from './widthManagerShared';
 
 /**
  * Determines the expected table width
  *
  * @param {Number} availableWidth The available width for the entire table
- * @param {Object} widthsMetadata The widths metadata object
+ * @param {Object} widthsData The widths metadata object
  * @returns {Number} The expected width of the table
  */
-function getExpectedTableWidth(availableWidth, widthsMetadata) {
-    const minExpectedTableWidth = getMinExpectedTableWidth(widthsMetadata);
-    return widthsMetadata.totalFlexibleColumns === 0
+function getExpectedTableWidth(availableWidth, widthsData) {
+    const minExpectedTableWidth = getMinExpectedTableWidth(widthsData);
+    return widthsData.totalFlexibleColumns === 0
         ? minExpectedTableWidth
         : Math.max(minExpectedTableWidth, availableWidth);
 }
@@ -38,13 +35,12 @@ function getMinExpectedTableWidth(widthsMetadata) {
  * Strategy for columns with defined fixed widths.
  */
 export class FixedWidthStrategy {
-    // Private variables
-    _columnWidthMetaData = {};
+    widthsData = {};
 
     /************************** LIFECYCLE HOOKS **************************/
 
     constructor(minColumnWidth, maxColumnWidth) {
-        this._columnWidthMetaData = { minColumnWidth, maxColumnWidth };
+        this.widthsData = { minColumnWidth, maxColumnWidth };
     }
 
     /************************** PRIVATE SETTERS **************************/
@@ -55,7 +51,7 @@ export class FixedWidthStrategy {
      * @param {Number} value The minimum width
      */
     set minColumnWidth(value) {
-        this._columnWidthMetaData.minColumnWidth = value;
+        this.widthsData.minColumnWidth = value;
     }
 
     /**
@@ -64,7 +60,7 @@ export class FixedWidthStrategy {
      * @param {Number} value The maximum width
      */
     set maxColumnWidth(value) {
-        this._columnWidthMetaData.maxColumnWidth = value;
+        this.widthsData.maxColumnWidth = value;
     }
 
     /**
@@ -72,31 +68,28 @@ export class FixedWidthStrategy {
      * equally amongst the possible columns
      *
      * @param {Object} datatableInterface Interface to datatable with callbacks giving width information
-     * @param {Array} columnDefs Ccolumn definitions array with defined widths and other attributes
+     * @param {Array} _columns The untracked column definitions
      * @returns {Object} columnWidths: [], expectedTableWidth: (number)
      */
-    getAdjustedColumnWidths(datatableInterface, columnDefs) {
-        const widthsMetadata = getTotalWidthsMetadata(
-            this._columnWidthMetaData,
-            columnDefs
-        );
+    getAdjustedColumnWidths(datatableInterface, _columns) {
+        const totalWidthsData = getTotalWidthsData(this.widthsData, _columns);
         const availableWidth = datatableInterface.getAvailableWidthFromDom();
         const expectedTableWidth = getExpectedTableWidth(
             availableWidth,
-            widthsMetadata
+            totalWidthsData
         );
-
-        const expectedFlexibleColumnWidth = this._getFlexibleColumnWidth(
-            widthsMetadata,
+        const expectedFlexibleColumnWidth = this.getFlexibleColumnWidth(
+            totalWidthsData,
             expectedTableWidth
         );
 
         const columnWidths = [];
-        columnDefs.forEach((column, colIndex) => {
+        for (let colIndex = 0; colIndex < _columns.length; colIndex += 1) {
             const width =
-                getColumnWidthFromDef(column) || expectedFlexibleColumnWidth;
+                getColumnWidth(_columns[colIndex]) ||
+                expectedFlexibleColumnWidth;
             columnWidths[colIndex] = width;
-        });
+        }
 
         return { columnWidths, expectedTableWidth };
     }
@@ -104,18 +97,18 @@ export class FixedWidthStrategy {
     /**
      * Determines the expected flexible column width
      *
-     * @param {Object} widthsMetadata The widths metadata object
+     * @param {Object} widthsData The widths metadata object
      * @param {Number} totalTableWidth The total available width for the table
      * @returns {Number} The column width
      */
-    _getFlexibleColumnWidth(widthsMetadata, totalTableWidth) {
+    getFlexibleColumnWidth(widthsData, totalTableWidth) {
         const {
             totalFixedWidth,
             totalResizedWidth,
             totalFlexibleColumns,
             minColumnWidth,
             maxColumnWidth,
-        } = widthsMetadata;
+        } = widthsData;
         const totalFlexibleWidth =
             totalTableWidth - totalFixedWidth - totalResizedWidth;
         const avgFlexibleColumnWidth = Math.floor(

package/src/lightning/datatable/headerActions.js

@@ -29,16 +29,14 @@ export function getInternalActions(state, columnDefinition) {
  */
 export function updateHeaderActions(state) {
     const columns = getColumns(state);
-
-    columns.forEach((column, idx) => {
-        column.actions = {
-            menuAlignment: getMenuAlignment(columns, idx),
-            customerActions: Array.isArray(column.actions)
-                ? column.actions
-                : [],
-            internalActions: getInternalActions(state, column),
+    for (let colIndex = 0; colIndex < columns.length; colIndex += 1) {
+        const col = columns[colIndex];
+        col.actions = {
+            menuAlignment: getMenuAlignment(columns, colIndex),
+            customerActions: Array.isArray(col.actions) ? col.actions : [],
+            internalActions: getInternalActions(state, col),
         };
-    });
+    }
 }
 
 /**

package/src/lightning/datatable/infiniteLoading.js

@@ -42,7 +42,7 @@ export function isInfiniteLoadingEnabled(state) {
  * @param {Object} state The datatable state object
  * @param {Boolean} value The infinite loading state to set
  */
-export function setInfiniteLoading(state, value) {
+export function setEnableInfiniteLoading(state, value) {
     state.enableInfiniteLoading = normalizeBoolean(value);
 }
 
@@ -117,13 +117,13 @@ export function handlePrefetch(root, state) {
             !this._renderManager.hasWrapperHeight()) ||
         !hasData(root)
     ) {
-        // dont prefetch if already loading or data is not set yet
+        // Don't prefetch if already loading or data is not set yet
         return;
     }
 
-    const elem = root.querySelector('.slds-scrollable_y');
+    const scrollerY = root.querySelector('.slds-scrollable_y');
 
-    if (elem && isScrollerVisible(elem) && !isScrollable(elem)) {
+    if (scrollerY && isScrollerVisible(scrollerY) && !isScrollable(scrollerY)) {
         this.dispatchEvent(new CustomEvent('loadmore'));
     }
 }
@@ -131,27 +131,27 @@ export function handlePrefetch(root, state) {
 /************************** PRIVATE METHODS ***************************/
 
 /**
- * Determines if a DOM element is scrollable
+ * Determines if a scroller element is scrollable.
  *
- * @param {Element} element The DOM element to check
+ * @param {Element} scroller The scroller element to check
  * @returns {Boolean} Whether or not the element is scrollable
  */
-function isScrollable(element) {
+function isScrollable(scroller) {
     // scrollHeight should be greater than clientHeight by some allowance
-    return element.scrollHeight > element.clientHeight + SCROLL_ALLOWANCE;
+    return scroller.scrollHeight > scroller.clientHeight + SCROLL_ALLOWANCE;
 }
 
 /**
- * Determines if a DOM element's scroll bars are visible
+ * Determines if a scroller element's scroll bars are visible.
  *
- * @param {Element} element The DOM element to check
- * @returns {Boolean} Whether or not the element's scroll bars are visible
+ * @param {Element} scroller The DOM element to check
+ * @returns {Boolean} Whether or not the scroller element's scroll bars are visible
  */
-function isScrollerVisible(element) {
+function isScrollerVisible(scroller) {
     return !!(
-        element.offsetParent ||
-        element.offsetHeight ||
-        element.offsetWidth
+        scroller.offsetParent ||
+        scroller.offsetHeight ||
+        scroller.offsetWidth
     );
 }