@brightspace-ui/core 3.175.3 → 3.175.4

package/components/table/demo/table-test.js

@@ -41,6 +41,7 @@ class TestTable extends DemoPassthroughMixin(TableWrapper, 'd2l-table-wrapper')
 		return {
 			paging: { type: Boolean, reflect: true },
 			multiLine: { type: Boolean, attribute: 'multi-line' },
+			resetOnSort: { type: Boolean, attribute: 'reset-on-sort' },
 			showButtons: { type: Boolean, attribute: 'show-buttons' },
 			stickyControls: { attribute: 'sticky-controls', type: Boolean, reflect: true },
 			visibleBackground: { attribute: 'visible-background', type: Boolean, reflect: true },
@@ -187,7 +188,7 @@ class TestTable extends DemoPassthroughMixin(TableWrapper, 'd2l-table-wrapper')
 	}
 
 	_handleSortData() {
-		this._data = this._data.sort((a, b) => {
+		this._data = (this.resetOnSort ? data() : this._data).sort((a, b) => {
 			if (this._sortDesc) {
 				if (a.data[this._sortField] > b.data[this._sortField]) return -1;
 				if (a.data[this._sortField] < b.data[this._sortField]) return 1;

package/components/table/demo/table.html

@@ -50,6 +50,13 @@
 				</template>
 			</d2l-demo-snippet>
 
+			<h2>Default, Paging, Reset on sort</h2>
+			<d2l-demo-snippet>
+				<template>
+					<d2l-test-table type="default" sticky-controls paging reset-on-sort></d2l-test-table>
+				</template>
+			</d2l-demo-snippet>
+
 			<h2>Default, Visible controls background</h2>
 			<d2l-demo-snippet>
 				<template>

package/components/table/table-wrapper.js

@@ -258,7 +258,8 @@ export const tableStyles = css`
 
 const SELECTORS = {
 	headers: 'tr.d2l-table-header, tr[header], thead tr',
-	items: ':not(thead) > tr:not(.d2l-table-header):not([header])',
+	body: ':not(thead)',
+	items: 'tr:not(.d2l-table-header):not([header])',
 };
 
 /**
@@ -494,7 +495,7 @@ export class TableWrapper extends PageableMixin(SelectionMixin(LitElement)) {
 	}
 
 	_getItems() {
-		return this._table?.querySelectorAll(SELECTORS.items) || [];
+		return this._table?.querySelectorAll(`${SELECTORS.body} > ${SELECTORS.items}`) || [];
 	}
 
 	_getItemShowingCount() {
@@ -604,7 +605,7 @@ export class TableWrapper extends PageableMixin(SelectionMixin(LitElement)) {
 					updates.classNames ||= node.matches('tr, td, th');
 					updates.syncWidths ||= node.matches('tr');
 					updates.sticky ||= node.matches(SELECTORS.headers);
-					updates.count ||= node.matches(SELECTORS.items);
+					updates.count ||= node.matches(SELECTORS.items) && target.matches(SELECTORS.body);
 				}
 			}
 		}

package/components/tooltip/tooltip.js

@@ -14,7 +14,6 @@ import { RtlMixin } from '../../mixins/rtl/rtl-mixin.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
 const usePopoverMixin = getFlag('GAUD-7355-tooltip-popover', false);
-const useMutationObserver = getFlag('GAUD-8203-tooltip-mutation-observer', true);
 
 const contentBorderSize = 1;
 const contentHorizontalPadding = 15;
@@ -337,11 +336,9 @@ if (usePopoverMixin) {
 			this.#targetSizeObserver = new ResizeObserver(this.#handleTargetResizeBound);
 			this.#targetSizeObserver.observe(this.#target);
 
-			if (useMutationObserver) {
-				this.#targetMutationObserver = new MutationObserver(this.#handleTargetMutationBound);
-				this.#targetMutationObserver.observe(this.#target, { attributes: true, attributeFilter: ['id'] });
-				this.#targetMutationObserver.observe(this.#target.parentNode, { childList: true });
-			}
+			this.#targetMutationObserver = new MutationObserver(this.#handleTargetMutationBound);
+			this.#targetMutationObserver.observe(this.#target, { attributes: true, attributeFilter: ['id'] });
+			this.#targetMutationObserver.observe(this.#target.parentNode, { childList: true });
 		}
 
 		#findTarget() {
@@ -1215,11 +1212,9 @@ if (usePopoverMixin) {
 			this._targetSizeObserver = new ResizeObserver(this._onTargetResize);
 			this._targetSizeObserver.observe(this._target);
 
-			if (useMutationObserver) {
-				this._targetMutationObserver = new MutationObserver(this._onTargetMutation);
-				this._targetMutationObserver.observe(this._target, { attributes: true, attributeFilter: ['id'] });
-				this._targetMutationObserver.observe(this._target.parentNode, { childList: true });
-			}
+			this._targetMutationObserver = new MutationObserver(this._onTargetMutation);
+			this._targetMutationObserver.observe(this._target, { attributes: true, attributeFilter: ['id'] });
+			this._targetMutationObserver.observe(this._target.parentNode, { childList: true });
 		}
 
 		_computeAvailableSpaces(targetRect, spaceAround) {

package/custom-elements.json

@@ -13495,6 +13495,10 @@
       "name": "d2l-test-table",
       "path": "./components/table/demo/table-test.js",
       "attributes": [
+        {
+          "name": "reset-on-sort",
+          "type": "boolean"
+        },
         {
           "name": "multi-line",
           "type": "boolean",
@@ -13557,6 +13561,11 @@
         }
       ],
       "properties": [
+        {
+          "name": "resetOnSort",
+          "attribute": "reset-on-sort",
+          "type": "boolean"
+        },
         {
           "name": "multiLine",
           "attribute": "multi-line",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightspace-ui/core",
-  "version": "3.175.3",
+  "version": "3.175.4",
   "description": "A collection of accessible, free, open-source web components for building Brightspace applications",
   "type": "module",
   "repository": "https://github.com/BrightspaceUI/core.git",