@salesforcedevs/dx-components 1.2.6-avatar-button-6 → 1.2.7-avatar-button-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -77,7 +77,7 @@ export default class AvatarButton extends LightningElement {
|
|
|
77
77
|
private _didReceiveUserInfo = false;
|
|
78
78
|
|
|
79
79
|
private get loginUrl() {
|
|
80
|
-
return `${TBID_API_LOGIN_URL}?
|
|
80
|
+
return `${TBID_API_LOGIN_URL}?startUrl=${encodeURIComponent(
|
|
81
81
|
window.location.href
|
|
82
82
|
)}`;
|
|
83
83
|
}
|
|
@@ -124,7 +124,7 @@ export default class Popover extends LightningElement {
|
|
|
124
124
|
this.popover = this.template.querySelector(".popover-container");
|
|
125
125
|
}
|
|
126
126
|
if (!this.popoverContent) {
|
|
127
|
-
this.popoverContent = this.template.querySelector(
|
|
127
|
+
this.popoverContent = this.template.querySelector(".popover");
|
|
128
128
|
}
|
|
129
129
|
if (!this.arrow && this.showArrow) {
|
|
130
130
|
this.arrow = this.template.querySelector(".popover-arrow");
|
|
@@ -246,16 +246,14 @@ export default class Popover extends LightningElement {
|
|
|
246
246
|
const elements = slot.assignedElements();
|
|
247
247
|
const slotted = elements.length === 0 ? null : elements[0];
|
|
248
248
|
// allows dropdown/select to compose popover
|
|
249
|
-
const slotElement = (
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
if (isNoWorkToDo) {
|
|
249
|
+
const slotElement = (slotted?.tagName === "SLOT"
|
|
250
|
+
? slotted.firstChild
|
|
251
|
+
: slotted) as HTMLElement | null;
|
|
252
|
+
const isWorkToDo =
|
|
253
|
+
slotElement &&
|
|
254
|
+
(!this.control || !slotElement.isSameNode(this.control));
|
|
255
|
+
|
|
256
|
+
if (!isWorkToDo) {
|
|
259
257
|
return;
|
|
260
258
|
}
|
|
261
259
|
|
|
@@ -341,7 +339,9 @@ export default class Popover extends LightningElement {
|
|
|
341
339
|
};
|
|
342
340
|
|
|
343
341
|
if (this.offset && this.popoverContent) {
|
|
344
|
-
arrowStyles.marginTop = getComputedStyle(
|
|
342
|
+
arrowStyles.marginTop = getComputedStyle(
|
|
343
|
+
this.popoverContent
|
|
344
|
+
).marginTop;
|
|
345
345
|
}
|
|
346
346
|
|
|
347
347
|
Object.assign(this.arrow.style, arrowStyles);
|