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

docs: refactor navigation and settings UI to leverage trigger directive #4247

Merged
merged 4 commits into from
Apr 29, 2024
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/overlay/package.json
Expand Up @@ -77,6 +77,10 @@
"development": "./src/VirtualTrigger.dev.js",
"default": "./src/VirtualTrigger.js"
},
"./src/events.js": {
"development": "./src/events.dev.js",
"default": "./src/events.js"
},
"./src/fullSizePlugin.js": {
"development": "./src/fullSizePlugin.dev.js",
"default": "./src/fullSizePlugin.js"
Expand Down
60 changes: 0 additions & 60 deletions packages/overlay/src/AbstractOverlay.ts
Expand Up @@ -19,7 +19,6 @@ import type {
OverlayState,
OverlayTypes,
Placement,
TriggerInteractions,
TriggerInteractionsV1,
} from './overlay-types.js';
import type { Overlay } from './Overlay.js';
Expand All @@ -34,65 +33,6 @@ export const noop = (): void => {
return;
};

export class BeforetoggleClosedEvent extends Event {
currentState = 'open';
newState = 'closed';
constructor() {
super('beforetoggle', {
bubbles: false,
composed: false,
});
}
}

export class BeforetoggleOpenEvent extends Event {
currentState = 'closed';
newState = 'open';
constructor() {
super('beforetoggle', {
bubbles: false,
composed: false,
});
}
}

export class OverlayStateEvent extends Event {
detail!: {
interaction: string;
reason?: 'external-click';
};

constructor(
type: string,
public overlay: HTMLElement,
{
publish,
interaction,
reason,
}: {
publish?: boolean;
interaction: TriggerInteractions;
reason?: 'external-click';
}
) {
super(type, {
bubbles: publish,
composed: publish,
});
this.detail = {
interaction,
reason,
};
}
}

declare global {
interface GlobalEventHandlersEventMap {
'sp-open': OverlayStateEvent;
'sp-close': OverlayStateEvent;
}
}

/**
* Apply a "transitionend" listener to an element that may not transition but
* guarantee the callback will be fired either way.
Expand Down
5 changes: 2 additions & 3 deletions packages/overlay/src/OverlayDialog.ts
Expand Up @@ -16,13 +16,12 @@ import {
} from '@spectrum-web-components/shared/src/first-focusable-in.js';
import { VirtualTrigger } from './VirtualTrigger.js';
import { Constructor, OpenableElement } from './overlay-types.js';
import { guaranteedAllTransitionend, nextFrame } from './AbstractOverlay.js';
import {
BeforetoggleClosedEvent,
BeforetoggleOpenEvent,
guaranteedAllTransitionend,
nextFrame,
OverlayStateEvent,
} from './AbstractOverlay.js';
} from './events.js';
import type { AbstractOverlay } from './AbstractOverlay.js';
import { userFocusableSelector } from '@spectrum-web-components/shared';

Expand Down
8 changes: 5 additions & 3 deletions packages/overlay/src/OverlayNoPopover.ts
Expand Up @@ -17,13 +17,15 @@ import type { SpectrumElement } from '@spectrum-web-components/base';
import { VirtualTrigger } from './VirtualTrigger.js';
import { Constructor, OpenableElement } from './overlay-types.js';
import {
BeforetoggleClosedEvent,
BeforetoggleOpenEvent,
guaranteedAllTransitionend,
nextFrame,
OverlayStateEvent,
overlayTimer,
} from './AbstractOverlay.js';
import {
BeforetoggleClosedEvent,
BeforetoggleOpenEvent,
OverlayStateEvent,
} from './events.js';
import type { AbstractOverlay } from './AbstractOverlay.js';
import { userFocusableSelector } from '@spectrum-web-components/shared';

Expand Down
8 changes: 5 additions & 3 deletions packages/overlay/src/OverlayPopover.ts
Expand Up @@ -17,13 +17,15 @@ import type { SpectrumElement } from '@spectrum-web-components/base';
import { VirtualTrigger } from './VirtualTrigger.js';
import { Constructor, OpenableElement } from './overlay-types.js';
import {
BeforetoggleClosedEvent,
BeforetoggleOpenEvent,
guaranteedAllTransitionend,
nextFrame,
OverlayStateEvent,
overlayTimer,
} from './AbstractOverlay.js';
import {
BeforetoggleClosedEvent,
BeforetoggleOpenEvent,
OverlayStateEvent,
} from './events.js';
import type { AbstractOverlay } from './AbstractOverlay.js';
import { userFocusableSelector } from '@spectrum-web-components/shared';

Expand Down
2 changes: 1 addition & 1 deletion packages/overlay/src/OverlayTrigger.ts
Expand Up @@ -24,7 +24,7 @@ import {
} from '@spectrum-web-components/base/src/decorators.js';
import type { Placement } from '@floating-ui/dom';

import type { BeforetoggleOpenEvent } from './AbstractOverlay.js';
import type { BeforetoggleOpenEvent } from './events.js';
import type { Overlay } from './Overlay.js';
import type { OverlayTriggerInteractions } from './overlay-types';

Expand Down
65 changes: 65 additions & 0 deletions packages/overlay/src/events.ts
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like abstracting the events into their own file. Nice.

@@ -0,0 +1,65 @@
/*
Copyright 2024 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
*/

import type { TriggerInteractions } from './overlay-types.js';

export class BeforetoggleClosedEvent extends Event {
currentState = 'open';
newState = 'closed';
constructor() {
super('beforetoggle', {
bubbles: false,
composed: false,
});
}
}

export class BeforetoggleOpenEvent extends Event {
currentState = 'closed';
newState = 'open';
constructor() {
super('beforetoggle', {
bubbles: false,
composed: false,
});
}
}

export class OverlayStateEvent extends Event {
detail!: {
interaction: string;
reason?: 'external-click';
};

constructor(
type: string,
public overlay: HTMLElement,
{
publish,
interaction,
reason,
}: {
publish?: boolean;
interaction: TriggerInteractions;
reason?: 'external-click';
}
) {
super(type, {
bubbles: publish,
composed: publish,
});
this.detail = {
interaction,
reason,
};
}
}
11 changes: 5 additions & 6 deletions packages/overlay/src/overlay-trigger-directive.ts
Expand Up @@ -17,13 +17,13 @@ import {
} from '@spectrum-web-components/base';
import { directive } from 'lit/async-directive.js';
import { strategies } from './strategies.js';
import { OverlayOptions, TriggerInteraction } from './overlay-types.js';
import { ClickController } from './ClickController.js';
import { HoverController } from './HoverController.js';
import { LongpressController } from './LongpressController.js';
import type { OverlayOptions, TriggerInteraction } from './overlay-types.js';
import type { ClickController } from './ClickController.js';
import type { HoverController } from './HoverController.js';
import type { LongpressController } from './LongpressController.js';
import {
removeSlottableRequest,
SlottableRequestEvent,
type SlottableRequestEvent,
} from './slottable-request-event.js';
import { SlottableRequestDirective } from './slottable-request-directive.js';
import { AbstractOverlay } from './AbstractOverlay.js';
Expand All @@ -47,7 +47,6 @@ export class OverlayTriggerDirective extends SlottableRequestDirective {
protected defaultOptions: OverlayTriggerOptions = {
triggerInteraction: 'click',
overlayOptions: {
placement: 'top-start',
type: 'auto',
offset: 0,
},
Expand Down
5 changes: 3 additions & 2 deletions projects/documentation/src/components/layout.css
Expand Up @@ -262,6 +262,7 @@ aside .manage-theme {
flex-direction: column;
display: flex;
padding: 0px 24px 24px;
order: 1;
}

.scrim {
Expand All @@ -281,12 +282,12 @@ aside .theme-control {
margin: 0 0 calc(var(--swc-scale-factor) * 24px);
}

aside.show {
sp-underlay[open] + aside {
transition-delay: 0ms, 0ms;
visibility: visible;
}

aside:not(.show) {
sp-underlay:not([open]) + aside {
transform: translateX(100%);
visibility: hidden;
}
Expand Down