Skip to content

Commit

Permalink
chore: use lit@3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Westbrook
Westbrook committed Mar 20, 2024
1 parent cb431b3 commit 224e7be
Show file tree
Hide file tree
Showing 29 changed files with 2,299 additions and 553 deletions.
17 changes: 9 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,17 @@
"@lit/react": "^1.0.2",
"@netlify/build": "^29.1.0",
"@open-wc/dev-server-hmr": "^0.2.0",
"@open-wc/testing": "^3.2.0",
"@open-wc/testing": "^3.2.1",
"@playwright/test": "^1.42.1",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-json": "^6.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@sindresorhus/slugify": "^2.1.1",
"@spectrum-web-components/eslint-plugin": "file:./linters/eslint",
"@storybook/addon-a11y": "^7.5.0",
"@storybook/addon-essentials": "^7.5.0",
"@storybook/addon-links": "^7.5.0",
"@storybook/web-components": "^7.5.0",
"@storybook/addon-a11y": "^7.6.17",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-links": "^7.6.17",
"@storybook/web-components": "^7.6.17",
"@types/chai": "^4.1.7",
"@types/command-line-args": "^5.0.0",
"@types/command-line-usage": "^5.0.1",
Expand Down Expand Up @@ -158,14 +158,15 @@
"geckodriver": "^4.3.0",
"genversion": "^3.1.1",
"gh-pages": "^6.0.0",
"glob": "^8.0.3",
"gunzip-maybe": "^1.4.2",
"husky": "^9.0.10",
"latest-version": "^7.0.0",
"lerna": "^6.6.2",
"lightningcss": "^1.24.0",
"lit": "^2.5.0",
"lit": "^3.0.0",
"lit-analyzer": "^2.0.3",
"lit-html": "^2.4.0",
"lit-html": "^3.0.1",
"mocha-junit-reporter": "^2.0.2",
"netlify-cli": "^15.9.0",
"next": "^14",
Expand All @@ -182,7 +183,7 @@
"rimraf": "^5.0.1",
"rollup": "^4.12.0",
"sinon": "^17.0.1",
"storybook": "^7.5.0",
"storybook": "^7.5.2",
"stylelint": "^15.10.2",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-standard": "^34.0.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/action-bar/test/action-bar.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ describe('ActionBar', () => {
await elementUpdated(el);

expect(el.variant).to.equal('');
expect(el.hasAttribute('variant')).to.be.false;
expect(
el.hasAttribute('variant'),
`actually: ${el.getAttribute('variant')}`
).to.be.false;

el.variant = 'fixed';

Expand Down
2 changes: 1 addition & 1 deletion packages/action-group/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"lit-html"
],
"dependencies": {
"@lit-labs/observers": "^2.0.0",
"@lit-labs/observers": "^2.0.1",
"@spectrum-web-components/action-button": "^0.42.0",
"@spectrum-web-components/base": "^0.42.0",
"@spectrum-web-components/icons-workflow": "^0.42.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/action-menu/test/action-menu-directive.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
governing permissions and limitations under the License.
*/

import { expect, oneEvent } from '@open-wc/testing';
import { expect, oneEvent, waitUntil } from '@open-wc/testing';
import { ActionMenu } from '@spectrum-web-components/action-menu';
import { sendKeys } from '@web/test-runner-commands';

Expand All @@ -30,6 +30,8 @@ describe('Slottable Request Directive', () => {
await opened;

expect(el.open).to.be.true;

await waitUntil(() => el.children.length > initialNodeLength);
expect(el.children.length).to.be.gt(initialNodeLength);

const closed = oneEvent(el, 'sp-closed');
Expand Down
2 changes: 1 addition & 1 deletion packages/alert-dialog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"lit-html"
],
"dependencies": {
"@lit-labs/observers": "^2.0.0",
"@lit-labs/observers": "^2.0.1",
"@spectrum-web-components/base": "^0.42.0",
"@spectrum-web-components/button": "^0.42.0",
"@spectrum-web-components/button-group": "^0.42.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/menu/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"lit-html"
],
"dependencies": {
"@lit-labs/observers": "^2.0.0",
"@lit-labs/observers": "^2.0.1",
"@spectrum-web-components/action-button": "^0.42.0",
"@spectrum-web-components/base": "^0.42.0",
"@spectrum-web-components/divider": "^0.42.0",
Expand Down
17 changes: 13 additions & 4 deletions packages/overlay/src/AbstractOverlay.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,11 @@ export class AbstractOverlay extends SpectrumElement {
: 'auto'
});
trigger.insertAdjacentElement('afterend', overlay);
await overlay.updateComplete;
// Wait until updates no longer trigger updates.
const done = await overlay.updateComplete;
if (!done) {
await overlay.updateComplete;
}
overlay.open = true;
return overlay.dispose;
}
Expand All @@ -377,9 +381,14 @@ export class AbstractOverlay extends SpectrumElement {
...options,
delayed: options.delayed || overlayContent.hasAttribute('delayed')
});
overlay.updateComplete.then(() => {
// Do we want to "open" this path, or leave that to the consumer?
overlay.open = true;
overlay.updateComplete.then(async (done) => {
if (!done) {
await overlay.updateComplete;
}
requestAnimationFrame(() => {
// Do we want to "open" this path, or leave that to the consumer?
overlay.open = true;
});
});
return overlay;
}
Expand Down
63 changes: 63 additions & 0 deletions packages/overlay/stories/overlay.stories.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,69 @@ export const sideHoverDraggable = (): TemplateResult => {
`;
};

export const stackedModals = (): TemplateResult => {
return html`
<div>
<style>
body {
display: flex;
align-items: center;
justify-content: center;
}
</style>
<overlay-trigger id="trigger" placement="top" type="modal">
<sp-button id="outer-button" variant="primary" slot="trigger">
Show Popover
</sp-button>
<sp-popover
id="outer-popover"
slot="click-content"
direction="bottom"
tip
>
<sp-dialog no-divider class="options-popover-content">
<overlay-trigger
id="inner-trigger"
placement="bottom"
type="modal"
>
<sp-button id="inner-button" slot="trigger">
Press Me
</sp-button>
<sp-popover
id="inner-popover"
slot="click-content"
direction="bottom"
tip
>
<sp-dialog
no-divider
class="options-popover-content"
>
Another Popover
<sp-button>Does nothing</sp-button>
</sp-dialog>
</sp-popover>
</overlay-trigger>
</sp-dialog>
</sp-popover>
<div
id="hover-content"
slot="hover-content"
class="tooltip"
delay="100"
>
Tooltip
</div>
</overlay-trigger>
</div>
`;
};

stackedModals.swc_vrt = {
skip: true,
};

export const superComplexModal = (): TemplateResult => {
return html`
<overlay-trigger type="modal">
Expand Down
Loading

0 comments on commit 224e7be

Please sign in to comment.