fix(panel): Remove double border styling when content isn't provided #7368
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,12 @@ import { | |
| VNode, | ||
| Watch, | ||
| } from "@stencil/core"; | ||
| import { | ||
| focusFirstTabbable, | ||
| slotChangeGetAssignedElements, | ||
| slotChangeHasAssignedElement, | ||
| toAriaBoolean, | ||
| } from "../../utils/dom"; | ||
| import { | ||
| connectInteractive, | ||
| disconnectInteractive, | ||
|
|
@@ -168,6 +173,8 @@ export class Panel | |
|
|
||
| resizeObserver = createObserver("resize", () => this.resizeHandler()); | ||
|
|
||
| @State() hasDefaultContent = false; | ||
|
|
||
| @State() hasStartActions = false; | ||
|
|
||
| @State() hasEndActions = false; | ||
|
|
@@ -257,28 +264,20 @@ export class Panel | |
| this.calcitePanelScroll.emit(); | ||
| }; | ||
|
|
||
| handleDefaultSlotChange = (event: Event): void => { | ||
| this.hasDefaultContent = slotChangeHasAssignedElement(event); | ||
| }; | ||
|
|
||
| handleHeaderActionsStartSlotChange = (event: Event): void => { | ||
| this.hasStartActions = slotChangeHasAssignedElement(event); | ||
| }; | ||
|
|
||
| handleHeaderActionsEndSlotChange = (event: Event): void => { | ||
| this.hasEndActions = slotChangeHasAssignedElement(event); | ||
| }; | ||
|
|
||
| handleHeaderMenuActionsSlotChange = (event: Event): void => { | ||
| this.hasMenuItems = slotChangeHasAssignedElement(event); | ||
| }; | ||
|
|
||
| handleActionBarSlotChange = (event: Event): void => { | ||
|
|
@@ -292,35 +291,19 @@ export class Panel | |
| }; | ||
|
|
||
| handleHeaderContentSlotChange = (event: Event): void => { | ||
| this.hasHeaderContent = slotChangeHasAssignedElement(event); | ||
| }; | ||
|
|
||
| handleFooterSlotChange = (event: Event): void => { | ||
| this.hasFooterContent = slotChangeHasAssignedElement(event); | ||
| }; | ||
|
|
||
| handleFooterActionsSlotChange = (event: Event): void => { | ||
| this.hasFooterActions = slotChangeHasAssignedElement(event); | ||
| }; | ||
|
|
||
| handleFabSlotChange = (event: Event): void => { | ||
| this.hasFab = slotChangeHasAssignedElement(event); | ||
| }; | ||
|
|
||
| // -------------------------------------------------------------------------- | ||
|
|
@@ -380,7 +363,10 @@ export class Panel | |
|
|
||
| renderActionBar(): VNode { | ||
| return ( | ||
| <div | ||
| class={{ [CSS.actionBarContainer]: true, [CSS.bottomSeparator]: this.hasDefaultContent }} | ||
| hidden={!this.hasActionBar} | ||
| > | ||
| <slot name={SLOTS.actionBar} onSlotchange={this.handleActionBarSlotChange} /> | ||
| </div> | ||
| ); | ||
|
|
@@ -475,7 +461,15 @@ export class Panel | |
| } | ||
|
|
||
| renderHeaderNode(): VNode { | ||
| const { | ||
| hasHeaderContent, | ||
| hasStartActions, | ||
| hasEndActions, | ||
| closable, | ||
| hasMenuItems, | ||
| hasDefaultContent, | ||
| hasActionBar, | ||
| } = this; | ||
|
|
||
| const headerContentNode = this.renderHeaderContent(); | ||
|
|
||
|
|
@@ -488,7 +482,10 @@ export class Panel | |
| hasMenuItems; | ||
|
|
||
| return ( | ||
| <header | ||
| class={{ [CSS.header]: true, [CSS.bottomSeparator]: hasDefaultContent || hasActionBar }} | ||
| hidden={!showHeader} | ||
| > | ||
| {this.renderHeaderStartActions()} | ||
| {this.renderHeaderSlottedContent()} | ||
| {headerContentNode} | ||
|
|
@@ -525,27 +522,16 @@ export class Panel | |
| }; | ||
|
|
||
| renderContent(): VNode { | ||
| return ( | ||
| <div | ||
| class={CSS.contentWrapper} | ||
| onScroll={this.panelScrollHandler} | ||
| // eslint-disable-next-line react/jsx-sort-props | ||
| ref={this.setPanelScrollEl} | ||
| > | ||
| <section class={CSS.contentContainer}> | ||
|
Member
Author
There was a problem hiding this comment. @asangma do you remember why this
Contributor
There was a problem hiding this comment. I think the section was there to keep the FAB sticky. But if it can be sticky without the section, that's cool too.
Member
Author
There was a problem hiding this comment. Ok. i have it so the section is always there regardless of the FAB or not. Ill move forward with that since its safer. |
||
| <slot onSlotchange={this.handleDefaultSlotChange} /> | ||
| </section> | ||
| {this.renderFab()} | ||
| </div> | ||
| ); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@asangma do you think you could review these changes? I changed this because it was causing some problems with
onSlotChangesince this default slot was getting moved into a section element depending on if there was a FAB or not. I don't think its necessary if we always have the section element present and the FAB content classes are no longer conditional.