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

package/src/lightning/datatable/columns.js

@@ -70,7 +70,13 @@ export function getColumns(state) {
  * @returns {Boolean} Whether any of the columns are editable.
  */
 export function hasEditableColumn(columns) {
-    return columns.some((column) => column.editable);
+    const { length: colCount } = columns;
+    for (let colIndex = 0; colIndex < colCount; colIndex += 1) {
+        if (columns[colIndex].editable) {
+            return true;
+        }
+    }
+    return false;
 }
 
 /**
@@ -83,7 +89,14 @@ export function hasEditableColumn(columns) {
  *                        filled with truthy column definition objects.
  */
 export function getEditableColumns(columns) {
-    return columns.filter((column) => column.editable);
+    const editableColumns = [];
+    for (let i = 0, { length } = columns; i < length; i += 1) {
+        const col = columns[i];
+        if (col.editable) {
+            editableColumns.push(col);
+        }
+    }
+    return editableColumns;
 }
 
 /**
@@ -98,10 +111,9 @@ export function getEditableColumns(columns) {
  */
 export function normalizeEditable(column, types) {
     if (types.isEditableType(column.type)) {
-        if (
-            !(typeof column.editable === 'object' && column.editable.fieldName)
-        ) {
-            column.editable = normalizeBoolean(column.editable);
+        const { editable } = column;
+        if (!(editable && editable.fieldName)) {
+            column.editable = normalizeBoolean(editable);
         }
         column.editTemplate = types.getCustomTypeEditTemplate(column.type);
     } else {
@@ -125,63 +137,83 @@ export function normalizeEditable(column, types) {
  * @param {Object} types  The type handling factory.
  */
 export function normalizeColumns(state, columns, types) {
-    if (columns.length !== 0) {
+    const { length: colCount } = columns;
+    if (colCount !== 0) {
         let firstColumnForReaders = 0;
-        // Workaround: https://git.soma.salesforce.com/raptor/raptor/issues/763
-        const normalizedColumns = Object.assign([], columns);
+        let normColCount = colCount;
+        let { showRowNumberColumn } = state;
+        const notHideCheckboxColumn = !state.hideCheckboxColumn;
 
-        if (!state.hideCheckboxColumn) {
-            firstColumnForReaders++;
-            normalizedColumns.unshift(SELECTABLE_COLUMN);
+        if (notHideCheckboxColumn) {
+            normColCount += 1;
         }
 
         if (hasRowNumberColumn(state) || hasEditableColumn(columns)) {
-            firstColumnForReaders++;
             setShowRowNumberColumn(state, true);
-            normalizedColumns.unshift(getRowNumberColumnDef());
+            normColCount += 1;
+        }
+        const normalizedColumns = Array(normColCount);
+
+        // Tracked state change.
+        state.columns = normalizedColumns;
+
+        if (notHideCheckboxColumn) {
+            normalizedColumns[firstColumnForReaders] = Object.assign(
+                {},
+                SELECTABLE_COLUMN
+            );
+            firstColumnForReaders += 1;
+        }
+        if (showRowNumberColumn) {
+            normalizedColumns[firstColumnForReaders] = getRowNumberColumnDef();
+            firstColumnForReaders += 1;
+        }
+        for (let colIndex = 0; colIndex < colCount; colIndex += 1) {
+            normalizedColumns[colIndex + firstColumnForReaders] =
+                columns[colIndex];
         }
 
-        const columnKeyMap = {};
-        state.columns = normalizedColumns.map((column, index) => {
+        const seenColumnKeys = new Set();
+        for (let colIndex = 0; colIndex < normColCount; colIndex += 1) {
+            const column = normalizedColumns[colIndex];
+            const { columnKey } = column;
+
+            // state.columns = normalizedColumns.map((column, index) => {
             // Verify `columnKey` is unique
-            const columnKey = column.columnKey;
-            if (columnKey && columnKeyMap[columnKey]) {
+            if (columnKey && seenColumnKeys.has(columnKey)) {
                 console.error(
                     `The "columnKey" column property must be unique. Found a duplicate of columnKey "${columnKey}".`
                 );
             }
-            columnKeyMap[columnKey] = true;
+            seenColumnKeys.add(columnKey);
 
-            const normalizedColumn = Object.assign(
-                getColumnDefaults(column),
-                column
-            );
-            normalizedColumn.ariaLabel =
-                normalizedColumn.label || normalizedColumn.ariaLabel || null;
+            const normCol = Object.assign(getColumnDefaults(column), column);
+            normalizedColumns[colIndex] = normCol;
+            normCol.ariaLabel = normCol.label || normCol.ariaLabel || null;
 
+            let { type: columnType } = normCol;
             // `customType` attribute is needed to render default iedit component
-            normalizedColumn.editableCustomType =
-                types.isStandardCellLayoutForCustomType(normalizedColumn.type);
+            normCol.editableCustomType =
+                types.isStandardCellLayoutForCustomType(columnType);
 
-            if (isCustomerColumn(normalizedColumn)) {
-                normalizeColumnDataType(normalizedColumn, types);
-                normalizeEditable(normalizedColumn, types);
-                updateColumnSortingState(normalizedColumn, state);
+            if (isCustomerColumn(normCol)) {
+                normalizeColumnDataType(normCol, types);
+                normalizeEditable(normCol, types);
+                updateColumnSortingState(normCol, state);
             }
 
-            if (isTreeType(normalizedColumn.type)) {
-                normalizedColumn.typeAttributes = getNormalizedSubTypeAttribute(
-                    normalizedColumn.type,
-                    normalizedColumn.typeAttributes
+            if (isTreeType(normCol.type)) {
+                normCol.typeAttributes = getNormalizedSubTypeAttribute(
+                    normCol.type,
+                    normCol.typeAttributes
                 );
             }
 
-            return Object.assign(normalizedColumn, {
-                tabIndex: -1,
-                colKeyValue: generateColKeyValue(normalizedColumn, index),
-                isScopeCol: index === firstColumnForReaders,
-            });
-        });
+            // Generate colKeyValue after normalizing customer column.
+            normCol.colKeyValue = generateColKeyValue(normCol, colIndex);
+            normCol.isScopeCol = colIndex === firstColumnForReaders;
+            normCol.tabIndex = -1;
+        }
     } else {
         state.columns = [];
     }
@@ -267,20 +299,19 @@ export function generateColKeyValue(columnMetadata, index) {
  * @returns {Number} The index in `dt.columns`. -1 if not found or if its internal.
  */
 export function getUserColumnIndex(state, colKeyValue) {
-    const stateColumnIndex = getStateColumnIndex(state, colKeyValue);
-    let internalColumns = 0;
-
-    if (state.columns[stateColumnIndex].internal) {
+    const { columns } = state;
+    const colIndex = getStateColumnIndex(state, colKeyValue);
+    if (columns[colIndex].internal) {
         return -1;
     }
-
-    for (let i = 0; i < stateColumnIndex; i++) {
-        if (state.columns[i].internal) {
+    let internalColumns = 0;
+    for (let i = 0; i < colIndex; i += 1) {
+        if (columns[i].internal) {
             internalColumns++;
         }
     }
 
-    return stateColumnIndex - internalColumns;
+    return colIndex - internalColumns;
 }
 
 /**
@@ -319,17 +350,17 @@ export function getStateColumnIndex(state, colKeyValue) {
  * @returns {Number} The index in state.columns, -1 if it does not exist
  */
 export function getColumnIndexByColumnKey(state, key) {
-    let i = 0;
     const columns = getColumns(state);
-    const existFieldName = columns.some((column, index) => {
-        i = index;
-        return (
-            column.columnKey === key ||
-            (!column.columnKey && column.fieldName === key)
-        );
-    });
-
-    return existFieldName ? i : -1;
+    for (let colIndex = 0; colIndex < columns.length; colIndex += 1) {
+        const col = columns[colIndex];
+        if (
+            col.columnKey === key ||
+            (!col.columnKey && col.fieldName === key)
+        ) {
+            return colIndex;
+        }
+    }
+    return -1;
 }
 
 /************************** PRIVATE METHODS ***************************/

package/src/lightning/datatable/datagrid.slds.css

@@ -0,0 +1,187 @@
+
+/* Copyright (c) 2015-present, salesforce.com, inc. All rights reserved
+Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license */
+
+/**
+  *
+  * TODO: converted all exposed styling hooks to local pseudo-private variables.
+  * Need to remove all of those and replace with --slds-g values, since we are not exposing anything.
+  * Ok to keep any local var as needed
+  * (This is related to the native shadow work)
+  *
+  */
+
+:focus-visible {
+  outline: 0;
+}
+
+:host([data-render-mode="shadow"]) [part='datagrid-wrapper'] {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+
+:host([data-render-mode="shadow"]) [part='datagrid'] {
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 auto;
+  height: 100%;
+  background-color: var(--_slds-c-datagrid-color-background);
+}
+
+:host([data-render-mode="shadow"]) [part='datagrid-header'] {
+  color: var(--_slds-c-datagrid-header-text-color, #514f4d);
+  background-color: var(--_slds-c-datagrid-header-color-background,
+      var(--_slds-c-datagrid-color-background, #fafaf9));
+  border-top: 1px solid var(--_slds-c-datagrid-header-color-border, #babfc7);
+  width: 100%;
+
+  --_slds-c-datagrid-row-color-border: var(--_slds-c-datagrid-header-color-border, #babfc7);
+}
+
+:host([data-render-mode="shadow"]) [fixed-header='true'] [part='datagrid-header'] {
+  position: sticky;
+  top: 0;
+  min-height: 2rem;
+  z-index: 1;
+}
+
+/* Cells */
+
+:host([data-render-mode="shadow"]) [part='cell'] {
+  position: relative;
+  display: flex;
+  width: var(--_slds-c-datagrid-cell-sizing, 150px);
+  height: 100%;
+  padding-inline: var(--_slds-c-datagrid-cell-spacing-inline, 0.5rem);
+  padding-block: var(--_slds-c-datagrid-cell-spacing-block, 0.25rem);
+  background-color: var(--_slds-c-datagrid-cell-color-background, var(--_slds-c-datagrid-color-background));
+  border: var(--_slds-c-datagrid-cell-sizing-border, 1px) solid var(--_slds-c-datagrid-cell-color-border, transparent);
+  white-space: nowrap;
+  align-items: center;
+}
+
+:host([data-render-mode="shadow"]) [part='cell']:hover {
+  --_slds-c-datagrid-cell-color-background: var(--_slds-c-datagrid-cell-color-background-hover);
+}
+
+:host([data-render-mode="shadow"]) [part='cell'][aria-selected='true'] {
+  --_slds-c-datagrid-cell-color-border: var(--_slds-c-datagrid-cell-color-border-focus,
+      var(--slds-g-color-brand-base-contrast-3));
+}
+
+:host([data-render-mode="shadow"]) [part='cell']:focus-within {
+  --_slds-c-datagrid-cell-color-border: var(--_slds-c-datagrid-cell-color-border-focus,
+      var(--slds-g-color-brand-base-contrast-3));
+}
+
+/* Column Header Cells */
+
+:host([data-render-mode="shadow"]) [role='columnheader'] {
+  font-weight: 700;
+  border-right: 1px solid var(--_slds-c-datagrid-headercell-color-border, #babfc7);
+}
+
+:host([data-render-mode="shadow"]) [role='columnheader'][aria-sort]:hover {
+  background-color: var(--_slds-c-datagrid-headercell-color-background-hover, white);
+}
+
+:host([data-render-mode="shadow"]) [role='columnheader'][aria-selected='true'] {
+  border-right-color: var(--_slds-c-datagrid-headercell-color-border-focus,
+      var(--slds-g-color-brand-base-contrast-3));
+}
+
+:host([data-render-mode="shadow"]) [role='columnheader']:focus-within {
+  border-right-color: var(--_slds-c-datagrid-headercell-color-border-focus,
+      var(--slds-g-color-brand-base-contrast-3));
+  box-shadow: var(--_slds-c-datagrid-headercell-color-border-focus, var(--slds-g-color-brand-base-contrast-3)) -3px 0 0 0 inset;
+}
+
+/* Rows */
+
+:host([data-render-mode="shadow"]) [role~='row'] {
+  display: flex;
+  border-bottom: var(--_slds-c-datagrid-row-sizing-border, 1px) solid var(--_slds-c-datagrid-row-color-border, #dde2eb);
+}
+
+:host([data-render-mode="shadow"]) [role~='row'][aria-selected='true'] {
+  background-color: var(--_slds-c-datagrid-row-color-background-selected, #f3f2f2);
+}
+
+/* Text value in cells */
+
+:host([data-render-mode="shadow"]) [part='value'] {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 100%;
+}
+
+/* Column sorting */
+
+[data-sort] {
+  border: none;
+  background: transparent;
+  display: inline-flex;
+  min-width: 0;
+  flex: 1 1 0%;
+}
+
+[data-sort]::after {
+  content: '';
+  position: absolute;
+  inset: 0;
+}
+
+[data-sort] [part='value'] {
+  width: auto;
+}
+
+[data-resize-handle]:hover,:host([data-render-mode="shadow"]) 
+[type='range']:focus~[data-resize-handle] {
+  opacity: 1;
+}
+
+[data-resize-handle] {
+  width: 0.75rem;
+  position: absolute;
+  top: -1px;
+  right: -1px;
+  bottom: -1px;
+  cursor: col-resize;
+  opacity: 0;
+}
+
+[data-resize-handle]::before {
+  content: '';
+  width: 1px;
+  height: 100vh;
+  background-color: var(--_slds-c-datagrid-resize-color-background, var(--slds-g-color-brand-base-contrast-2));
+  position: absolute;
+  top: 0;
+  right: -1px;
+}
+
+[data-resize-handle]::after {
+  content: '';
+  width: 4px;
+  height: 100%;
+  background-color: var(--_slds-c-datagrid-resize-color-background, var(--slds-g-color-brand-base-contrast-2));
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+
+:host([data-render-mode="shadow"]) [part='datagrid-body'] [role~='row']:hover {
+  background-color: var(--_slds-c-datagrid-row-color-background-hover, #f3f2f2);
+}
+
+/* Action Mode */
+
+:host([data-render-mode="shadow"]) [aria-readonly='true'] {
+  --_slds-c-datagrid-cell-color-background-hover: inherit;
+}
+
+:host([data-render-mode="shadow"]) [aria-readonly='false'] {
+  --_slds-c-datagrid-cell-color-background-hover: #fff;
+}