Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overlay review updates. #1147

Merged
merged 2 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions packages/dialog/dialog-wrapper.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,7 @@ import { DialogWrapper } from '@spectrum-web-components/dialog';
>
Content of the dialog
</sp-dialog-wrapper>
<sp-button
slot="trigger"
variant="primary"
onClick="
const overlayTrigger = this.parentElement;
overlayTrigger.clickContent.open = true;
"
>
Toggle Dialog
</sp-button>
<sp-button slot="trigger" variant="primary">Toggle Dialog</sp-button>
</overlay-trigger>
```

Expand All @@ -72,7 +63,6 @@ import { DialogWrapper } from '@spectrum-web-components/dialog';
onClick="
const overlayTrigger = this.parentElement;
const dialogWrapper = overlayTrigger.clickContent;
dialogWrapper.open = true;
function handleEvent({type}) {
spAlert(this, `<sp-dialog-wrapper> '${type}' event handled.`);
dialogWrapper.open = false;
Expand Down
10 changes: 3 additions & 7 deletions packages/overlay/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@ import {
}
</style>
<overlay-trigger id="trigger" placement="bottom" offset="6">
<sp-button variant="primary" slot="trigger">
Button popover
</sp-button>
<sp-popover dialog slot="click-content" direction="bottom" tip open>
<sp-button variant="primary" slot="trigger">Button popover</sp-button>
<sp-popover dialog slot="click-content" direction="bottom" tip>
<div class="options-popover-content">
<sp-slider
value="5"
Expand All @@ -66,9 +64,7 @@ import {
<sp-button>Press me</sp-button>
</div>
</sp-popover>
<sp-tooltip slot="hover-content" delayed open>
Tooltip
</sp-tooltip>
<sp-tooltip slot="hover-content" delayed>Tooltip</sp-tooltip>
</overlay-trigger>
```

Expand Down
2 changes: 1 addition & 1 deletion packages/overlay/src/ActiveOverlay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export class ActiveOverlay extends SpectrumElement {

public focus(): void {
const firstFocusable = this.querySelector(
'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])'
'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"]), [focusable]'
) as HTMLElement;
if (firstFocusable) {
firstFocusable.focus();
Expand Down
4 changes: 4 additions & 0 deletions packages/overlay/src/OverlayTrigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ export class OverlayTrigger extends LitElement {
@click=${this.onTrigger}
@mouseenter=${this.onTrigger}
@mouseleave=${this.onTrigger}
@focusin=${this.onTrigger}
@focusout=${this.onTrigger}
>
<slot
@slotchange=${this.onTargetSlotChange}
Expand Down Expand Up @@ -137,9 +139,11 @@ export class OverlayTrigger extends LitElement {
this.onTriggerClick();
return;
case 'mouseenter':
case 'focusin':
this.onTriggerMouseEnter();
return;
case 'mouseleave':
case 'focusout':
this.onTriggerMouseLeave();
return;
}
Expand Down
8 changes: 8 additions & 0 deletions packages/overlay/src/active-overlay.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ governing permissions and limitations under the License.
pointer-events: none;
}

:host(:focus) {
outline: none;
}

:host([placement='none']) ::slotted(*) {
height: 100vh;
}

sp-theme,
#contents {
height: 100%;
Expand Down
16 changes: 15 additions & 1 deletion packages/overlay/src/overlay-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export class OverlayStack {
return;
}
this.tabTrapper.tabIndex = -1;
this.tabTrapper.setAttribute('aria-hidden', 'true');
this.overlayHolder.hidden = false;
}

Expand All @@ -108,6 +109,7 @@ export class OverlayStack {
return;
}
this.tabTrapper.removeAttribute('tabindex');
this.tabTrapper.removeAttribute('aria-hidden');
this.overlayHolder.hidden = true;
}

Expand Down Expand Up @@ -189,6 +191,12 @@ export class OverlayStack {
this.overlays.push(activeOverlay);
await activeOverlay.updateComplete;
this.addOverlayEventListeners(activeOverlay);
const contentWithOpen = (activeOverlay.overlayContent as unknown) as {
open: boolean;
};
if (typeof contentWithOpen.open !== 'undefined') {
contentWithOpen.open = true;
}
if (details.receivesFocus === 'auto') {
activeOverlay.focus();
}
Expand All @@ -198,7 +206,7 @@ export class OverlayStack {
composed: true,
cancelable: true,
detail: {
interaction: details.interaction
interaction: details.interaction,
},
})
);
Expand Down Expand Up @@ -316,6 +324,12 @@ export class OverlayStack {
): Promise<void> {
if (overlay) {
await overlay.hide(animated);
const contentWithOpen = (overlay.overlayContent as unknown) as {
open: boolean;
};
if (typeof contentWithOpen.open !== 'undefined') {
contentWithOpen.open = false;
}
if (overlay.state != 'dispose') return;

const index = this.overlays.indexOf(overlay);
Expand Down
4 changes: 4 additions & 0 deletions packages/overlay/src/overlay-trigger.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ OF ANY KIND, either express or implied. See the License for the specific languag
governing permissions and limitations under the License.
*/

#trigger {
display: contents;
}

:host([disabled]) #trigger {
pointer-events: none;
}
Expand Down
18 changes: 4 additions & 14 deletions packages/overlay/stories/overlay-story-components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,10 @@ class RecursivePopover extends LitElement {
}

private handleFocusin(): void {
console.log('focusin');
this.focus();
}

public focus(): void {
console.log('focus');
if (this.shadowRoot.activeElement !== null) {
return;
}
Expand Down Expand Up @@ -267,18 +265,10 @@ class RecursivePopover extends LitElement {
selected="${this.placement}"
name="group-example"
>
<sp-radio value="top">
Top
</sp-radio>
<sp-radio value="right">
Right
</sp-radio>
<sp-radio value="bottom">
Bottom
</sp-radio>
<sp-radio value="left">
Left
</sp-radio>
<sp-radio value="top">Top</sp-radio>
<sp-radio value="right">Right</sp-radio>
<sp-radio value="bottom">Bottom</sp-radio>
<sp-radio value="left">Left</sp-radio>
</sp-radio-group>
<overlay-trigger placement="${this.placement}" type="modal">
<sp-button
Expand Down
3 changes: 3 additions & 0 deletions packages/popover/src/Popover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ export class Popover extends SpectrumElement {
return [popoverStyles];
}

@property({ type: Boolean, reflect: true })
public open = false;

/**
* @type {"auto" | "auto-start" | "auto-end" | "top" | "bottom" | "right" | "left" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "right-start" | "right-end" | "left-start" | "left-end" | "none"}
* @attr
Expand Down
3 changes: 3 additions & 0 deletions packages/tooltip/src/Tooltip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ export class Tooltip extends SpectrumElement {
return [tooltipStyles];
}

@property({ type: Boolean, reflect: true })
public open = false;

/**
* @type {"auto" | "auto-start" | "auto-end" | "top" | "bottom" | "right" | "left" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "right-start" | "right-end" | "left-start" | "left-end" | "none"}
* @attr
Expand Down